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

[Adolfo Jayme Barrientos]

 svx/uiconfig/ui/colorwindow.ui |   19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

New commits:
commit bfe02672a969a921a2ec954f4035af0671a82149
Author: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Date:   Fri Oct 24 09:03:41 2014 -0500

    Rename color picker button and add an icon to it
    
    Change-Id: I24def42d6167c6e7a7a4d5871f2a6e3b51230d58
    Reviewed-on: https://gerrit.libreoffice.org/12086
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/uiconfig/ui/colorwindow.ui b/svx/uiconfig/ui/colorwindow.ui
index 66ac451..1c2978e 100644
--- a/svx/uiconfig/ui/colorwindow.ui
+++ b/svx/uiconfig/ui/colorwindow.ui
@@ -2,13 +2,21 @@
 <!-- Generated with glade 3.16.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
-  <!-- interface-requires LibreOffice 1.0 -->
+  <requires lib="LibreOffice" version="1.0"/>
+  <object class="GtkImage" id="custom_color_icon">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="margin_right">6</property>
+    <property name="xalign">0</property>
+    <property name="pixbuf">cmd/sc_colorsettings.png</property>
+    <property name="icon_size">1</property>
+  </object>
   <object class="GtkWindow" id="palette_popup_window">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
-    <property name="border_width">6</property>
+    <property name="border_width">4</property>
     <property name="resizable">False</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">popup-menu</property>
@@ -84,7 +92,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0.019999999552965164</property>
+            <property name="xalign">0.1</property>
             <property name="label" translatable="yes">Recent</property>
           </object>
           <packing>
@@ -118,11 +126,14 @@
         </child>
         <child>
           <object class="GtkButton" id="color_picker_button">
-            <property name="label">Color picker</property>
+            <property name="label">Custom Color…</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
+            <property name="image">custom_color_icon</property>
             <property name="relief">none</property>
+            <property name="xalign">0</property>
+            <property name="always_show_image">True</property>
           </object>
           <packing>
             <property name="expand">False</property>