diff options
| author | David King <amigadave@amigadave.com> | 2013-11-08 21:36:57 +0000 |
|---|---|---|
| committer | David King <amigadave@amigadave.com> | 2013-11-08 22:22:40 +0000 |
| commit | 62ccf52c58f2f03bfc8b28b2593fc78447ae1704 (patch) | |
| tree | b172f02a765bfb247ef9bdde74513ec01a19878b /data | |
| parent | 92c979cd3495f4d159db7991e5c5b84f86254bbd (diff) | |
| download | cheese-62ccf52c58f2f03bfc8b28b2593fc78447ae1704.tar.gz | |
Convert some GtkGrid widgets to GtkBox
Diffstat (limited to 'data')
| -rw-r--r-- | data/cheese-main-window.ui | 45 |
1 files changed, 10 insertions, 35 deletions
diff --git a/data/cheese-main-window.ui b/data/cheese-main-window.ui index b888ec7c..50bc7fc3 100644 --- a/data/cheese-main-window.ui +++ b/data/cheese-main-window.ui @@ -1,16 +1,17 @@ <?xml version="1.0"?> <interface> - <requires lib="gtk+" version="2.16"/> - <object class="GtkGrid" id="mainbox_normal"> + <requires lib="gtk+" version="3.6"/> + <object class="GtkBox" id="mainbox_normal"> <property name="orientation">vertical</property> <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> - <object class="GtkGrid" id="content_area"> + <object class="GtkBox" id="content_area"> <property name="vexpand">True</property> <property name="hexpand">True</property> <property name="orientation">horizontal</property> <child> - <object class="GtkGrid" id="view_area"> + <object class="GtkBox" id="view_area"> + <property name="orientation">vertical</property> <child> <object class="GtkClutterEmbed" id="viewport"> <property name="vexpand">True</property> @@ -19,12 +20,6 @@ <property name="height_request">450</property> <property name="width_request">600</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> <child> <object class="GtkAlignment" id="action_area_alignment"> @@ -32,7 +27,7 @@ <property name="right_padding">24</property> <property name="hexpand">True</property> <child> - <object class="GtkGrid" id="buttons_area"> + <object class="GtkBox" id="buttons_area"> <property name="orientation">horizontal</property> <child> <object class="GtkBox" id="mode_toggle_buttons"> @@ -88,9 +83,8 @@ </object> </child> <child> - <object class="GtkGrid" id="effects_actions_pack"> + <object class="GtkBox" id="effects_actions_pack"> <property name="orientation">horizontal</property> - <property name="column-spacing">0</property> <child> <object class="GtkButton" id="effects_prev_page_button"> <property name="action-name">win.effects-previous</property> @@ -111,10 +105,10 @@ <property name="action-name">app.effects</property> <property name="tooltip_text" translatable="yes">Effects</property> <child> - <object class="GtkGrid" id="effects_toggle_button_internal_hbox"> + <object class="GtkBox" id="effects_toggle_button_internal_hbox"> <property name="orientation">horizontal</property> + <property name="spacing">2</property> <property name="visible">True</property> - <property name="column-spacing">2</property> <child> <object class="GtkLabel" id="effects_toggle_button_internal_label"> <property name="label" translatable="yes">_Effects</property> @@ -142,7 +136,7 @@ </object> </child> <child> - <object class="GtkGrid" id="leave_fullscreen_button_bin"> + <object class="GtkBox" id="leave_fullscreen_button_bin"> <property name="orientation">horizontal</property> <property name="visible">False</property> <property name="no-show-all">True</property> @@ -164,12 +158,6 @@ </object> </child> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> </object> </child> @@ -183,13 +171,6 @@ </object> </child> </object> - - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> <child> <object class="GtkAlignment" id="thumbnails_bottom"> @@ -199,12 +180,6 @@ <placeholder/> </child> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> </child> </object> <object class="GtkSizeGroup" id="button_sizegroup"> |