cui/source/options/optgdlg.cxx | 2
cui/source/options/optgdlg.hxx | 2
cui/uiconfig/ui/optviewpage.ui | 104 +++++++++++++++++++++++++----------------
3 files changed, 68 insertions(+), 40 deletions(-)
New commits:
commit 0d6a64c218791156e050c2050b8070d40fdacf97
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Oct 11 11:25:31 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Oct 11 16:54:46 2019 +0200
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 <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
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;
diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index d70643f6634e..c72eaab3eb09 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -163,13 +163,40 @@
<property name="can_focus">False</property>
<property name="row_spacing">6</property>
<child>
- <object class="GtkLabel" id="label13">
+ <object class="GtkGrid" id="menuiconsbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes"
context="optviewpage|label13">Icons in men_us:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">menuicons</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label13">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes"
context="optviewpage|label13">Icons in men_us:</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">menuicons</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="menuicons">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <items>
+ <item translatable="yes"
context="optviewpage|menuicons">Automatic</item>
+ <item translatable="yes"
context="optviewpage|menuicons">Hide</item>
+ <item translatable="yes"
context="optviewpage|menuicons">Show</item>
+ </items>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -177,43 +204,40 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxText"
id="contextmenushortcuts">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <items>
- <item translatable="yes"
context="optviewpage|contextmenushortcuts">Automatic</item>
- <item translatable="yes"
context="optviewpage|contextmenushortcuts">Hide</item>
- <item translatable="yes"
context="optviewpage|contextmenushortcuts">Show</item>
- </items>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label10">
+ <object class="GtkGrid" id="menushortcutsbpx">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes"
context="optviewpage|label10">Shortcuts in context menus:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">contextmenushortcuts</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="menuicons">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <items>
- <item translatable="yes"
context="optviewpage|menuicons">Automatic</item>
- <item translatable="yes"
context="optviewpage|menuicons">Hide</item>
- <item translatable="yes"
context="optviewpage|menuicons">Show</item>
- </items>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes"
context="optviewpage|label10">Shortcuts in context menus:</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">contextmenushortcuts</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText"
id="contextmenushortcuts">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <items>
+ <item translatable="yes"
context="optviewpage|contextmenushortcuts">Automatic</item>
+ <item translatable="yes"
context="optviewpage|contextmenushortcuts">Hide</item>
+ <item translatable="yes"
context="optviewpage|contextmenushortcuts">Show</item>
+ </items>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
