[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - cui/uiconfig

Mike Kaganski (via logerrit) logerrit at kemper.freedesktop.org
Thu Jun 6 13:35:29 UTC 2019


 cui/uiconfig/ui/bulletandposition.ui |   39 ++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

New commits:
commit 9d78d85ca6678a13e99776637893b6e10b2cd337
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Wed Jun 5 22:52:36 2019 +1000
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Thu Jun 6 15:34:40 2019 +0200

    Load align icons from theme
    
    GTK stock images aren't available using other vcl plugins
    
    Change-Id: I5ab23733d8d9c71fcf8db9f1867cb7d43516fff1
    Co-authored-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/73548
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit c3ce652b4a2a5891fa5664a0ad0ee8cb14aef908)
    Reviewed-on: https://gerrit.libreoffice.org/73600
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/cui/uiconfig/ui/bulletandposition.ui b/cui/uiconfig/ui/bulletandposition.ui
index 8ef2287792a0..d9d3a7e35fc4 100644
--- a/cui/uiconfig/ui/bulletandposition.ui
+++ b/cui/uiconfig/ui/bulletandposition.ui
@@ -66,6 +66,21 @@
       </object>
     </child>
   </object>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">cmd/sc_alignleft.png</property>
+  </object>
+  <object class="GtkImage" id="image2">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">cmd/sc_alignhorizontalcenter.png</property>
+  </object>
+  <object class="GtkImage" id="image3">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">cmd/sc_alignright.png</property>
+  </object>
   <object class="GtkTreeStore" id="liststore1">
     <columns>
       <!-- column-name text -->
@@ -796,14 +811,8 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">True</property>
+                                        <property name="image">image2</property>
                                         <property name="always_show_image">True</property>
-                                        <child>
-                                          <object class="GtkImage" id="image_justify_center">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="stock">gtk-justify-center</property>
-                                          </object>
-                                        </child>
                                       </object>
                                       <packing>
                                         <property name="left_attach">1</property>
@@ -816,14 +825,8 @@
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">True</property>
                                         <property name="margin_left">88</property>
+                                        <property name="image">image1</property>
                                         <property name="always_show_image">True</property>
-                                        <child>
-                                          <object class="GtkImage" id="image_justify_left">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="stock">gtk-justify-left</property>
-                                          </object>
-                                        </child>
                                       </object>
                                       <packing>
                                         <property name="left_attach">0</property>
@@ -835,14 +838,8 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">True</property>
+                                        <property name="image">image3</property>
                                         <property name="always_show_image">True</property>
-                                        <child>
-                                          <object class="GtkImage" id="image_justify_right">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="stock">gtk-justify-right</property>
-                                          </object>
-                                        </child>
                                       </object>
                                       <packing>
                                         <property name="left_attach">2</property>


More information about the Libreoffice-commits mailing list