[caribou: 2/6] UI changes for key color configuration
- From: Eitan Isaacson <eitani src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [caribou: 2/6] UI changes for key color configuration
- Date: Mon, 12 Jul 2010 18:02:58 +0000 (UTC)
commit 62911917da4d65a4c5fce2907d9c6275061a647d
Author: Daniel Baeyens <dbaeyens warp es>
Date: Sun Jun 20 15:33:15 2010 +0200
UI changes for key color configuration
https://bugzilla.gnome.org/show_bug.cgi?id=622246
data/caribou-prefs.ui | 339 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 239 insertions(+), 100 deletions(-)
---
diff --git a/data/caribou-prefs.ui b/data/caribou-prefs.ui
index 40d100e..6c4a029 100644
--- a/data/caribou-prefs.ui
+++ b/data/caribou-prefs.ui
@@ -2,6 +2,12 @@
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkListStore" id="liststore1">
+ <columns>
+ <!-- column-name gchararray1 -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
<object class="GtkDialog" id="dialog_prefs">
<property name="border_width">6</property>
<property name="title" translatable="yes">Caribou Preferences</property>
@@ -12,95 +18,153 @@
<child internal-child="vbox">
<object class="GtkVBox" id="vbox_dialog">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
- <object class="GtkVBox" id="vbox4">
+ <object class="GtkNotebook" id="notebook1">
<property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="orientation">vertical</property>
- <property name="spacing">18</property>
+ <property name="can_focus">True</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="border_width">12</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table1">
+ <object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">20</property>
- <property name="row_spacing">5</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkComboBox" id="combobox_layout">
+ <object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
- <property name="model">liststore1</property>
- <accessibility>
- <relation type="labelled-by" target="label_layout"/>
- </accessibility>
+ <property name="spacing">6</property>
<child>
- <object class="GtkCellRendererCombo" id="cellrenderertext1"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
+ <object class="GtkLabel" id="label_layout">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Keyboard _layout:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">combobox_layout</property>
+ <accessibility>
+ <relation type="label-for" target="combobox_layout"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="combobox_keysize">
+ <object class="GtkVBox" id="vbox5">
<property name="visible">True</property>
- <accessibility>
- <relation type="labelled-by" target="label_keysize"/>
- </accessibility>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkComboBox" id="combobox_layout">
+ <property name="visible">True</property>
+ <property name="model">liststore1</property>
+ <accessibility>
+ <relation type="labelled-by" target="label_layout"/>
+ </accessibility>
+ <child>
+ <object class="GtkCellRendererCombo" id="cellrenderertext1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label_keysize">
+ <object class="GtkLabel" id="label_test">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Key _size:</property>
+ <property name="label" translatable="yes">_Test settings here:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">combobox_keysize</property>
+ <property name="mnemonic_widget">entry_test</property>
<accessibility>
- <relation type="label-for" target="combobox_keysize"/>
+ <relation type="label-for" target="entry_test"/>
</accessibility>
</object>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_layout">
+ <object class="GtkEntry" id="entry_test">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ <accessibility>
+ <relation type="labelled-by" target="label_test"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">General</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <property name="border_width">12</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkVBox" id="vbox6">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label_keysize">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Keyboard _layout:</property>
+ <property name="label" translatable="yes">Key _size:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">combobox_layout</property>
+ <property name="mnemonic_widget">combobox_keysize</property>
<accessibility>
- <relation type="label-for" target="combobox_layout"/>
+ <relation type="label-for" target="combobox_keysize"/>
</accessibility>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="padding">6</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -115,10 +179,31 @@
</accessibility>
</object>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="padding">6</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox7">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkComboBox" id="combobox_keysize">
+ <property name="visible">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="label_keysize"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -129,67 +214,127 @@
</accessibility>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="expand">False</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
<packing>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkTable" id="table2">
- <property name="visible">True</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">20</property>
- <property name="row_spacing">5</property>
- <child>
- <object class="GtkLabel" id="label_test">
+ <child type="tab">
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Test settings here:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">entry_test</property>
- <accessibility>
- <relation type="label-for" target="entry_test"/>
- </accessibility>
+ <property name="label" translatable="yes">Keys</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
</packing>
</child>
<child>
- <object class="GtkEntry" id="entry_test">
+ <object class="GtkHBox" id="hbox5">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- <accessibility>
- <relation type="labelled-by" target="label_test"/>
- </accessibility>
+ <property name="border_width">12</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkVBox" id="vbox8">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Normal state:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">6</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Mouse over:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">6</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox9">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkColorButton" id="normal_state_color_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="color">#000000000000</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkColorButton" id="mouse_over_color_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="color">#000000000000</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="position">2</property>
</packing>
</child>
+ <child type="tab">
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Colors</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <placeholder/>
+ </child>
</object>
<packing>
- <property name="position">2</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
@@ -227,10 +372,4 @@
<action-widget response="0">button_close</action-widget>
</action-widgets>
</object>
- <object class="GtkListStore" id="liststore1">
- <columns>
- <!-- column-name gchararray1 -->
- <column type="gchararray"/>
- </columns>
- </object>
</interface>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
