diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-10-11 11:25:31 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-10-11 16:54:46 +0200 |
| commit | 0d6a64c218791156e050c2050b8070d40fdacf97 (patch) | |
| tree | dcf85889606d2e296b3ae8dd7069095c14df3160 /cui/source | |
| parent | 732e02f80fceda3e3b6ee14c590d3632d0e369a5 (diff) | |
Resolves: tdf#123265 hide show-icons under gtk3
because there the menus are native gtk menus and follow the global gtk settings
for showing icons
Change-Id: Id1d679ce12cc031289b73aa7e91f9c16f8db8c0c
Reviewed-on: https://gerrit.libreoffice.org/80649
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui/source')
| -rw-r--r-- | cui/source/options/optgdlg.cxx | 2 | ||||
| -rw-r--r-- | cui/source/options/optgdlg.hxx | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index c41a2ab51576..fb320a25c289 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -616,6 +616,7 @@ OfaViewTabPage::OfaViewTabPage(weld::Container* pPage, weld::DialogController* p , m_xFontAntiAliasing(m_xBuilder->weld_check_button("aafont")) , m_xAAPointLimitLabel(m_xBuilder->weld_label("aafrom")) , m_xAAPointLimit(m_xBuilder->weld_metric_spin_button("aanf", FieldUnit::PIXEL)) + , m_xMenuIconBox(m_xBuilder->weld_widget("menuiconsbox")) , m_xMenuIconsLB(m_xBuilder->weld_combo_box("menuicons")) , m_xContextMenuShortcutsLB(m_xBuilder->weld_combo_box("contextmenushortcuts")) , m_xFontShowCB(m_xBuilder->weld_check_button("showfontpreview")) @@ -634,6 +635,7 @@ OfaViewTabPage::OfaViewTabPage(weld::Container* pPage, weld::DialogController* p m_xForceOpenGL->hide(); m_xOpenGLStatusEnabled->hide(); m_xOpenGLStatusDisabled->hide(); + m_xMenuIconBox->hide(); } #if defined( UNX ) diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 5a3737a4f591..33029f1acb4a 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -95,7 +95,9 @@ private: std::unique_ptr<weld::Label> m_xAAPointLimitLabel; std::unique_ptr<weld::MetricSpinButton> m_xAAPointLimit; + std::unique_ptr<weld::Widget> m_xMenuIconBox; std::unique_ptr<weld::ComboBox> m_xMenuIconsLB; + std::unique_ptr<weld::ComboBox> m_xContextMenuShortcutsLB; std::unique_ptr<weld::CheckButton> m_xFontShowCB; |