1 |
From 0de1b098c7ae85c3d3ce97c04f2d6512b05ace03 Mon Sep 17 00:00:00 2001 |
2 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com> |
3 |
Date: Wed, 29 Apr 2015 16:23:06 +0100 |
4 |
Subject: [PATCH] the 'Edit' button is a color picker, rename and move |
5 |
|
6 |
to the color value entry column |
7 |
|
8 |
Change-Id: I3c044fbff2e93c553f2eb8da33f99a944a6db336 |
9 |
--- |
10 |
cui/uiconfig/ui/colorpage.ui | 32 +++++++++++++++++--------------- |
11 |
1 file changed, 17 insertions(+), 15 deletions(-) |
12 |
|
13 |
diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui |
14 |
index 8a5ff5f..5d91456 100644 |
15 |
--- a/cui/uiconfig/ui/colorpage.ui |
16 |
+++ b/cui/uiconfig/ui/colorpage.ui |
17 |
@@ -429,6 +429,22 @@ |
18 |
</packing> |
19 |
</child> |
20 |
<child> |
21 |
+ <object class="GtkButton" id="edit"> |
22 |
+ <property name="label">_Pick</property> |
23 |
+ <property name="visible">True</property> |
24 |
+ <property name="can_focus">True</property> |
25 |
+ <property name="receives_default">True</property> |
26 |
+ <property name="use_underline">True</property> |
27 |
+ </object> |
28 |
+ <packing> |
29 |
+ <property name="left_attach">1</property> |
30 |
+ <property name="top_attach">5</property> |
31 |
+ </packing> |
32 |
+ </child> |
33 |
+ <child> |
34 |
+ <placeholder/> |
35 |
+ </child> |
36 |
+ <child> |
37 |
<placeholder/> |
38 |
</child> |
39 |
<child> |
40 |
@@ -480,20 +496,6 @@ |
41 |
</packing> |
42 |
</child> |
43 |
<child> |
44 |
- <object class="GtkButton" id="edit"> |
45 |
- <property name="label">gtk-edit</property> |
46 |
- <property name="visible">True</property> |
47 |
- <property name="can_focus">True</property> |
48 |
- <property name="receives_default">True</property> |
49 |
- <property name="use_stock">True</property> |
50 |
- </object> |
51 |
- <packing> |
52 |
- <property name="expand">False</property> |
53 |
- <property name="fill">True</property> |
54 |
- <property name="position">2</property> |
55 |
- </packing> |
56 |
- </child> |
57 |
- <child> |
58 |
<object class="GtkButton" id="delete"> |
59 |
<property name="label">gtk-delete</property> |
60 |
<property name="visible">True</property> |
61 |
@@ -504,7 +506,7 @@ |
62 |
<packing> |
63 |
<property name="expand">False</property> |
64 |
<property name="fill">True</property> |
65 |
- <property name="position">3</property> |
66 |
+ <property name="position">2</property> |
67 |
</packing> |
68 |
</child> |
69 |
<child> |
70 |
-- |
71 |
2.1.0 |
72 |
|