summaryrefslogtreecommitdiff
path: root/svx/uiconfig
diff options
context:
space:
mode:
authorKrisztian Pinter <pin.terminator@gmail.com>2014-07-28 19:18:14 +0200
committerTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2014-09-17 10:19:51 +0200
commitec4a78420e4a6ea9e3ded6c14ff8143e96f159d6 (patch)
tree8c35e1a10057b10f0d8a5854b270eb246daba225 /svx/uiconfig
parentd5109b2fcf1ed7880e7e68c70daaa2f05b0b3cea (diff)
Change palette selection ComboBox to ListBox
Change-Id: Id844781c06e37d66f3eebac9d905c58a62682cb0
Diffstat (limited to 'svx/uiconfig')
-rw-r--r--svx/uiconfig/ui/colorwindow.ui23
1 files changed, 14 insertions, 9 deletions
diff --git a/svx/uiconfig/ui/colorwindow.ui b/svx/uiconfig/ui/colorwindow.ui
index 54b8f49ca057..0527e78c7294 100644
--- a/svx/uiconfig/ui/colorwindow.ui
+++ b/svx/uiconfig/ui/colorwindow.ui
@@ -14,15 +14,9 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkComboBox" id="palette_list_combobox">
+ <object class="GtkComboBox" id="palette_listbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="has_entry">True</property>
- <child internal-child="entry">
- <object class="GtkEntry" id="combobox-entry">
- <property name="can_focus">False</property>
- </object>
- </child>
</object>
<packing>
<property name="expand">True</property>
@@ -32,14 +26,14 @@
</child>
<child>
<object class="GtkButton" id="color_picker_button">
- <property name="label">Palette</property>
+ <property name="label">Color picker</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -62,6 +56,17 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkSeparator" id="separator1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
</child>
</object>