[Libreoffice-commits] core.git: cui/uiconfig

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Fri Oct 2 10:15:12 UTC 2020


 cui/uiconfig/ui/additionsdialog.ui |   15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 14c928265ba324c0d42f5bc8af65df7666dab020
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Oct 2 09:15:01 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Oct 2 12:14:28 2020 +0200

    use the same gtkbuilder pattern for all gearmenus
    
    Change-Id: I743a98407f184291ad6b798bbee316d10b00bc12
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103817
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/uiconfig/ui/additionsdialog.ui b/cui/uiconfig/ui/additionsdialog.ui
index 3ce21025e5e8..507410467960 100644
--- a/cui/uiconfig/ui/additionsdialog.ui
+++ b/cui/uiconfig/ui/additionsdialog.ui
@@ -2,6 +2,11 @@
 <!-- Generated with glade 3.22.1 -->
 <interface domain="cui">
   <requires lib="gtk+" version="3.18"/>
+  <object class="GtkImage" id="imageGear">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">cmd/sc_menubar.png</property>
+  </object>
   <object class="GtkMenu" id="additionsmenu">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -194,21 +199,15 @@
                 </child>
                 <child>
                   <object class="GtkMenuButton" id="buttonGear">
-                    <property name="label" translateable="no"></property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="halign">end</property>
                     <property name="margin_left">1</property>
+                    <property name="image">imageGear</property>
+                    <property name="always_show_image">True</property>
                     <property name="popup">additionsmenu</property>
                     <property name="use_popover">False</property>
-                    <child>
-                      <object class="GtkImage" id="imageGear">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">cmd/sc_menubar.png</property>
-                      </object>
-                    </child>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="buttonGear-atkobject">
                         <property name="AtkObject::accessible-name" translatable="yes" context="additionsdialog|buttonGear">Gear Menu</property>


More information about the Libreoffice-commits mailing list