caolanm pushed to libreoffice (f22). "the 'Edit' button is a color picker, rename and move"

[notifications at fedoraproject.org]

>From b093dc1a791ce62a48122c7aa37764024248838a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
Date: Wed, 29 Apr 2015 16:27:44 +0100
Subject: the 'Edit' button is a color picker, rename and move


diff --git a/0001-the-Edit-button-is-a-color-picker-rename-and-move.patch b/0001-the-Edit-button-is-a-color-picker-rename-and-move.patch
new file mode 100644
index 0000000..2ece78c
--- /dev/null
+++ b/0001-the-Edit-button-is-a-color-picker-rename-and-move.patch
@@ -0,0 +1,72 @@
+From 0de1b098c7ae85c3d3ce97c04f2d6512b05ace03 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Wed, 29 Apr 2015 16:23:06 +0100
+Subject: [PATCH] the 'Edit' button is a color picker, rename and move
+
+to the color value entry column
+
+Change-Id: I3c044fbff2e93c553f2eb8da33f99a944a6db336
+---
+ cui/uiconfig/ui/colorpage.ui | 32 +++++++++++++++++---------------
+ 1 file changed, 17 insertions(+), 15 deletions(-)
+
+diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui
+index 8a5ff5f..5d91456 100644
+--- a/cui/uiconfig/ui/colorpage.ui
++++ b/cui/uiconfig/ui/colorpage.ui
+@@ -429,6 +429,22 @@
+                       </packing>
+                     </child>
+                     <child>
++                      <object class="GtkButton" id="edit">
++                        <property name="label">_Pick</property>
++                        <property name="visible">True</property>
++                        <property name="can_focus">True</property>
++                        <property name="receives_default">True</property>
++                        <property name="use_underline">True</property>
++                      </object>
++                      <packing>
++                        <property name="left_attach">1</property>
++                        <property name="top_attach">5</property>
++                      </packing>
++                    </child>
++                    <child>
++                      <placeholder/>
++                    </child>
++                    <child>
+                       <placeholder/>
+                     </child>
+                     <child>
+@@ -480,20 +496,6 @@
+                       </packing>
+                     </child>
+                     <child>
+-                      <object class="GtkButton" id="edit">
+-                        <property name="label">gtk-edit</property>
+-                        <property name="visible">True</property>
+-                        <property name="can_focus">True</property>
+-                        <property name="receives_default">True</property>
+-                        <property name="use_stock">True</property>
+-                      </object>
+-                      <packing>
+-                        <property name="expand">False</property>
+-                        <property name="fill">True</property>
+-                        <property name="position">2</property>
+-                      </packing>
+-                    </child>
+-                    <child>
+                       <object class="GtkButton" id="delete">
+                         <property name="label">gtk-delete</property>
+                         <property name="visible">True</property>
+@@ -504,7 +506,7 @@
+                       <packing>
+                         <property name="expand">False</property>
+                         <property name="fill">True</property>
+-                        <property name="position">3</property>
++                        <property name="position">2</property>
+                       </packing>
+                     </child>
+                     <child>
+-- 
+2.1.0
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 1f4e24c..f63a688 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -324,6 +324,7 @@ Patch29: 0001-rhbz-1197614-Fix-calculation-of-m_bHasActive-when-re.patch
 Patch30: 0001-rhbz-1134285-Access-dav-davs-URLs-via-GVFS.patch
 Patch31: 0001-Resolves-tdf-73211-gtk-checkboxes-need-erase-afer-to.patch
 Patch32: 0001-on-using-add-color-button-don-t-frighten-with-an-err.patch
+Patch33: 0001-the-Edit-button-is-a-color-picker-rename-and-move.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -2367,6 +2368,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %changelog
 * Wed Apr 29 2015 Caolán McNamara <caolanm at redhat.com> - 1:4.4.2.2-5-UNBUILT
 - on using add color button don't frighten with an error message
+- the 'Edit' button is a color picker, rename and move
 
 * Fri Apr 24 2015 Caolán McNamara <caolanm at redhat.com> - 1:4.4.2.2-4
 - Resolves: tdf#73211 fix annoying checkbox droppings on toggle off
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libreoffice.git/commit/?h=f22&id=b093dc1a791ce62a48122c7aa37764024248838a