diff options
| author | Alessandro Ghedini <al3xbio@gmail.com> | 2012-03-05 12:20:00 +0100 |
|---|---|---|
| committer | Alessandro Ghedini <al3xbio@gmail.com> | 2012-03-05 12:20:00 +0100 |
| commit | 9efffcc071e59e6c0fe5d0b406e558cc7319e8ee (patch) | |
| tree | 1f4d8d555dc439403da78c52e413be3c29833c21 /resources/ui/settings.ui | |
| parent | 75655ffca55cb5e5ca51d8f6a4d3d600f1f54cdc (diff) | |
| parent | 98f3ef2689de06e8ab8b46a91acfa7dd2056a3a6 (diff) | |
Merge tag 'upstream/0.5.1'
Upstream version 0.5.1
Diffstat (limited to 'resources/ui/settings.ui')
| -rw-r--r-- | resources/ui/settings.ui | 99 |
1 files changed, 79 insertions, 20 deletions
diff --git a/resources/ui/settings.ui b/resources/ui/settings.ui index 889124a..77e3403 100644 --- a/resources/ui/settings.ui +++ b/resources/ui/settings.ui @@ -107,6 +107,62 @@ <property name="position">1</property> </packing> </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Behavior</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frame1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">6</property> + <property name="bottom_padding">6</property> + <property name="left_padding">6</property> + <property name="right_padding">6</property> + <child> + <object class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkScrolledWindow" id="theme-scrolledwindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> <child> <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> @@ -143,7 +199,26 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="captions-checkbox"> + <property name="label" translatable="yes">Display Slice labels</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="has_tooltip">True</property> + <property name="tooltip_markup" translatable="yes">Displays the name of each Slice next to it. Only available if supported by the theme.</property> + <property name="tooltip_text" translatable="yes">Displays the name of each Slice next to it. Only available if supported by the theme.</property> + <property name="use_action_appearance">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> </object> @@ -151,10 +226,10 @@ </object> </child> <child type="label"> - <object class="GtkLabel" id="label3"> + <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Appearance and behavior</property> + <property name="label" translatable="yes">Appearance</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -162,25 +237,9 @@ </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="theme-scrolledwindow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <child> - <placeholder/> - </child> - </object> - <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">4</property> </packing> </child> </object> |