GNOME.org
 

[gitg] Use GtkBox instead of Gtk[HV]Box

commit 2d08c3d52232c38a150dd6bce6227e2550534c76
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Tue Jul 26 16:54:13 2011 +0200

    Use GtkBox instead of Gtk[HV]Box

 gitg/gitg-new-branch.ui             |    3 +-
 gitg/gitg-preferences.ui            |   60 +++++++++++++++++++++++-----------
 gitg/gitg-repository.ui             |   18 +++++++---
 gitg/gitg-revision-changes-panel.ui |    5 ++-
 gitg/gitg-tag.ui                    |    3 +-
 gitg/gitg-window.ui                 |   33 +++++++++++++------
 6 files changed, 82 insertions(+), 40 deletions(-)
---
diff --git a/gitg/gitg-new-branch.ui b/gitg/gitg-new-branch.ui
index 7da500f..ae26a80 100644
--- a/gitg/gitg-new-branch.ui
+++ b/gitg/gitg-new-branch.ui
@@ -9,9 +9,10 @@
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog_vbox_main">
+      <object class="GtkBox" id="dialog_vbox_main">
         <property name="visible">True</property>
         <property name="spacing">2</property>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkTable" id="table_main">
             <property name="visible">True</property>
diff --git a/gitg/gitg-preferences.ui b/gitg/gitg-preferences.ui
index a9f8039..cca2a74 100644
--- a/gitg/gitg-preferences.ui
+++ b/gitg/gitg-preferences.ui
@@ -25,23 +25,26 @@
     <property name="default_height">500</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog_vbox_main">
+      <object class="GtkBox" id="dialog_vbox_main">
         <property name="visible">True</property>
         <property name="spacing">2</property>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkNotebook" id="notebook1">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="expand">True</property>
             <child>
-              <object class="GtkVBox" id="vbox_history">
+              <object class="GtkBox" id="vbox_history">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
                 <property name="spacing">18</property>
+                <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkVBox" id="vbox1">
+                  <object class="GtkBox" id="vbox1">
                     <property name="visible">True</property>
                     <property name="spacing">6</property>
+                    <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkLabel" id="label130">
                         <property name="visible">True</property>
@@ -55,8 +58,9 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="hbox23">
+                      <object class="GtkBox" id="hbox23">
                         <property name="visible">True</property>
+                        <property name="orientation">horizontal</property>
                         <child>
                           <object class="GtkLabel" id="label22">
                             <property name="visible">True</property>
@@ -69,9 +73,10 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkVBox" id="vbox54">
+                          <object class="GtkBox" id="vbox54">
                             <property name="visible">True</property>
                             <property name="spacing">6</property>
+                            <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkCheckButton" id="check_button_main_layout_vertical">
                                 <property name="label" translatable="yes">Use vertical layout</property>
@@ -102,10 +107,11 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkVBox" id="vbox3">
+                  <object class="GtkBox" id="vbox3">
                     <property name="visible">True</property>
                     <property name="spacing">6</property>
                     <property name="expand">False</property>
+                    <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkLabel" id="label10">
                         <property name="visible">True</property>
@@ -119,8 +125,9 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="hbox5">
+                      <object class="GtkBox" id="hbox5">
                         <property name="visible">True</property>
+                        <property name="orientation">horizontal</property>
                         <child>
                           <object class="GtkLabel" id="label12">
                             <property name="visible">True</property>
@@ -133,9 +140,10 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkVBox" id="vbox5">
+                          <object class="GtkBox" id="vbox5">
                             <property name="visible">True</property>
                             <property name="spacing">6</property>
+                            <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkCheckButton" id="check_button_history_search_filter">
                                 <property name="label" translatable="yes">Search filters revisions in the history view</property>
@@ -296,15 +304,17 @@
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox_commit">
+              <object class="GtkBox" id="vbox_commit">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
                 <property name="spacing">18</property>
+                <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkVBox" id="vbox11">
+                  <object class="GtkBox" id="vbox11">
                     <property name="visible">True</property>
                     <property name="spacing">6</property>
                     <property name="expand">False</property>
+                    <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
@@ -318,8 +328,9 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="hbox9">
+                      <object class="GtkBox" id="hbox9">
                         <property name="visible">True</property>
+                        <property name="orientation">horizontal</property>
                         <child>
                           <object class="GtkLabel" id="label2">
                             <property name="visible">True</property>
@@ -332,9 +343,10 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkVBox" id="vbox_commit_message">
+                          <object class="GtkBox" id="vbox_commit_message">
                             <property name="visible">True</property>
                             <property name="spacing">6</property>
+                            <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkCheckButton" id="check_button_show_right_margin">
                                 <property name="label" translatable="yes">Display right _margin</property>
@@ -350,9 +362,10 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkHBox" id="hbox_right_margin">
+                              <object class="GtkBox" id="hbox_right_margin">
                                 <property name="visible">True</property>
                                 <property name="spacing">6</property>
+                                <property name="orientation">horizontal</property>
                                 <child>
                                   <object class="GtkLabel" id="label_right_margin">
                                     <property name="visible">True</property>
@@ -420,14 +433,16 @@
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox_commit1">
+              <object class="GtkBox" id="vbox_commit1">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
                 <property name="spacing">18</property>
+                <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkVBox" id="vbox2">
+                  <object class="GtkBox" id="vbox2">
                     <property name="visible">True</property>
                     <property name="spacing">6</property>
+                    <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkLabel" id="label_diff_program">
                         <property name="visible">True</property>
@@ -441,8 +456,9 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="hbox1">
+                      <object class="GtkBox" id="hbox1">
                         <property name="visible">True</property>
+                        <property name="orientation">horizontal</property>
                         <child>
                           <object class="GtkLabel" id="label9">
                             <property name="visible">True</property>
@@ -455,9 +471,10 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkVBox" id="vbox_diff_program">
+                          <object class="GtkBox" id="vbox_diff_program">
                             <property name="visible">True</property>
                             <property name="spacing">6</property>
+                            <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkCheckButton" id="check_button_external_diff">
                                 <property name="label" translatable="yes">Allow external diff program</property>
@@ -505,15 +522,17 @@
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox_configure">
+              <object class="GtkBox" id="vbox_configure">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
                 <property name="spacing">18</property>
+                <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkVBox" id="vbox">
+                  <object class="GtkBox" id="vbox">
                     <property name="visible">True</property>
                     <property name="spacing">6</property>
                     <property name="expand">False</property>
+                    <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
@@ -527,8 +546,9 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="hbox2">
+                      <object class="GtkBox" id="hbox2">
                         <property name="visible">True</property>
+                        <property name="orientation">horizontal</property>
                         <child>
                           <object class="GtkLabel" id="label7">
                             <property name="visible">True</property>
diff --git a/gitg/gitg-repository.ui b/gitg/gitg-repository.ui
index 44080a9..f6012e5 100644
--- a/gitg/gitg-repository.ui
+++ b/gitg/gitg-repository.ui
@@ -24,15 +24,17 @@
     <property name="default_height">300</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog_vbox_main">
+      <object class="GtkBox" id="dialog_vbox_main">
         <property name="visible">True</property>
         <property name="spacing">2</property>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkNotebook" id="notebook_main">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="expand">True</property>
             <child>
-              <object class="GtkVBox" id="vbox_remotes_intern">
+              <object class="GtkBox" id="vbox_remotes_intern">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
                 <property name="orientation">vertical</property>
@@ -50,6 +52,7 @@
                         <property name="can_focus">True</property>
                         <property name="model">list_store_remotes</property>
                         <property name="rules_hint">True</property>
+                        <property name="expand">True</property>
                         <child>
                           <object class="GtkTreeViewColumn" id="tree_view_remotes_column_name">
                             <property name="title" translatable="yes">Name</property>
@@ -92,8 +95,9 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkHBox" id="hbox1">
+                  <object class="GtkBox" id="hbox1">
                     <property name="visible">True</property>
+                    <property name="orientation">horizontal</property>
                     <child>
                       <object class="GtkButton" id="button_fetch_remote">
                         <property name="label" translatable="yes">Fetch</property>
@@ -158,7 +162,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox_configuration_intern">
+              <object class="GtkBox" id="vbox_configuration_intern">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
                 <property name="orientation">vertical</property>
@@ -176,8 +180,9 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkHBox" id="hbox_configuration_message">
+                  <object class="GtkBox" id="hbox_configuration_message">
                     <property name="visible">True</property>
+                    <property name="orientation">horizontal</property>
                     <child>
                       <object class="GtkLabel" id="label_spacer">
                         <property name="visible">True</property>
@@ -196,7 +201,8 @@
                         <property name="n_columns">2</property>
                         <property name="column_spacing">6</property>
                         <property name="row_spacing">6</property>
-                        <property name="expand">False</property>
+                        <property name="hexpand">True</property>
+                        <property name="vexpand">False</property>
                         <child>
                           <object class="GtkLabel" id="label_configuration_user_name">
                             <property name="visible">True</property>
diff --git a/gitg/gitg-revision-changes-panel.ui b/gitg/gitg-revision-changes-panel.ui
index bd1ec7b..aab03bf 100644
--- a/gitg/gitg-revision-changes-panel.ui
+++ b/gitg/gitg-revision-changes-panel.ui
@@ -1,8 +1,9 @@
 <?xml version="1.0"?>
 <interface>
-  <object class="GtkVBox" id="revision_changes_page">
+  <object class="GtkBox" id="revision_changes_page">
     <property name="visible">True</property>
     <property name="spacing">3</property>
+    <property name="orientation">vertical</property>
     <child>
       <object class="GtkHPaned" id="hpaned_revision_view">
         <property name="visible">True</property>
@@ -19,6 +20,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="headers_visible">False</property>
+                <property name="expand">True</property>
                 <child>
                   <object class="GtkTreeViewColumn" id="revision_files_column_icon">
                     <property name="sizing">fixed</property>
@@ -59,6 +61,7 @@
                 <property name="show_line_numbers">False</property>
                 <property name="tab_width">4</property>
                 <property name="diff_enabled">True</property>
+                <property name="expand">True</property>
               </object>
             </child>
           </object>
diff --git a/gitg/gitg-tag.ui b/gitg/gitg-tag.ui
index 5e3a0ee..03758d7 100644
--- a/gitg/gitg-tag.ui
+++ b/gitg/gitg-tag.ui
@@ -11,9 +11,10 @@
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog_vbox_main">
+      <object class="GtkBox" id="dialog_vbox_main">
         <property name="visible">True</property>
         <property name="spacing">2</property>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkTable" id="table_main">
             <property name="visible">True</property>
diff --git a/gitg/gitg-window.ui b/gitg/gitg-window.ui
index 4dc3357..46bc353 100644
--- a/gitg/gitg-window.ui
+++ b/gitg/gitg-window.ui
@@ -17,28 +17,32 @@
     <property name="default_width">800</property>
     <property name="default_height">800</property>
     <child>
-      <object class="GtkVBox" id="vbox_main">
+      <object class="GtkBox" id="vbox_main">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkNotebook" id="notebook_main">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <child>
-              <object class="GtkVBox" id="vbox_history">
+              <object class="GtkBox" id="vbox_history">
                 <property name="visible">True</property>
+                <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkVPaned" id="vpaned_main">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="position">350</property>
                     <child>
-                      <object class="GtkVBox" id="vbox2">
+                      <object class="GtkBox" id="vbox2">
                         <property name="visible">True</property>
                         <property name="border_width">6</property>
+                        <property name="orientation">vertical</property>
                         <child>
-                          <object class="GtkHBox" id="hbox_top">
+                          <object class="GtkBox" id="hbox_top">
                             <property name="visible">True</property>
                             <property name="spacing">3</property>
+                            <property name="orientation">horizontal</property>
                             <child>
                               <object class="GtkLabel" id="label_branches">
                                 <property name="label" translatable="yes">Branch:</property>
@@ -89,6 +93,7 @@
                                 <property name="rules_hint">True</property>
                                 <property name="search_column">1</property>
                                 <property name="fixed_height_mode">True</property>
+                                <property name="expand">True</property>
                                 <signal name="event_after" handler="on_tree_view_rv_button_press_event"/>
                                 <child>
                                   <object class="GtkTreeViewColumn" id="rv_column_subject">
@@ -182,14 +187,15 @@
                 <property name="position">450</property>
                 <property name="position_set">True</property>
                 <child>
-                  <object class="GtkVBox" id="vbox_changes">
+                  <object class="GtkBox" id="vbox_changes">
                     <property name="visible">True</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">3</property>
                     <child>
-                      <object class="GtkHBox" id="hbox_changes">
+                      <object class="GtkBox" id="hbox_changes">
                         <property name="visible">True</property>
                         <property name="spacing">3</property>
+                        <property name="orientation">horizontal</property>
                         <child>
                           <object class="GtkLabel" id="label_changes">
                             <property name="visible">True</property>
@@ -250,6 +256,7 @@
                             <property name="cursor_visible">False</property>
                             <property name="show_line_numbers">False</property>
                             <property name="tab_width">4</property>
+                            <property name="expand">True</property>
                           </object>
                         </child>
                       </object>
@@ -268,7 +275,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <child>
-                      <object class="GtkVBox" id="vbox_unstaged">
+                      <object class="GtkBox" id="vbox_unstaged">
                         <property name="visible">True</property>
                         <property name="orientation">vertical</property>
                         <property name="spacing">3</property>
@@ -299,6 +306,7 @@
                                 <property name="can_focus">True</property>
                                 <property name="headers_visible">False</property>
                                 <property name="headers_clickable">False</property>
+                                <property name="expand">True</property>
                                 <child>
                                   <object class="GtkTreeViewColumn" id="unstaged_column_icon">
                                     <property name="sizing">fixed</property>
@@ -338,7 +346,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <child>
-                          <object class="GtkVBox" id="vbox_comment">
+                          <object class="GtkBox" id="vbox_comment">
                             <property name="visible">True</property>
                             <property name="orientation">vertical</property>
                             <property name="spacing">3</property>
@@ -370,6 +378,7 @@
                                     <property name="wrap_mode">word-char</property>
                                     <property name="left_margin">2</property>
                                     <property name="right_margin">2</property>
+                                    <property name="expand">True</property>
                                   </object>
                                 </child>
                               </object>
@@ -378,11 +387,12 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkHBox" id="hbox_commit">
+                              <object class="GtkBox" id="hbox_commit">
                                 <property name="visible">True</property>
                                 <property name="spacing">3</property>
+                                <property name="orientation">horizontal</property>
                                 <child>
-                                  <object class="GtkVBox" id="vbox1">
+                                  <object class="GtkBox" id="vbox1">
                                     <property name="visible">True</property>
                                     <property name="orientation">vertical</property>
                                     <child>
@@ -450,7 +460,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkVBox" id="vbox_staged">
+                          <object class="GtkBox" id="vbox_staged">
                             <property name="visible">True</property>
                             <property name="orientation">vertical</property>
                             <property name="spacing">3</property>
@@ -480,6 +490,7 @@
                                     <property name="can_focus">True</property>
                                     <property name="headers_visible">False</property>
                                     <property name="headers_clickable">False</property>
+                                    <property name="expand">True</property>
                                     <child>
                                       <object class="GtkTreeViewColumn" id="staged_column_icon">
                                         <property name="sizing">fixed</property>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]