Use table to align interface

2 files changed, 70 insertions, 89 deletions

diff --git a/src/data/pulsecaster.glade b/src/data/pulsecaster.glade
index d7317b9..62caabf 100644
--- a/src/data/pulsecaster.glade
+++ b/src/data/pulsecaster.glade
@@ -99,72 +99,34 @@
               </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox5">
+              <object class="GtkTable" id="table1">
                 <property name="visible">True</property>
+                <property name="n_rows">3</property>
+                <property name="n_columns">2</property>
+                <property name="column_spacing">5</property>
+                <property name="row_spacing">5</property>
                 <child>
-                  <object class="GtkVBox" id="vbox1">
+                  <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">5</property>
-                    <property name="homogeneous">True</property>
-                    <child>
-                      <object class="GtkLabel" id="label3">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="xpad">10</property>
-                        <property name="label" translatable="yes">Your voice:</property>
-                        <property name="justify">right</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="padding">5</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label4">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="xpad">10</property>
-                        <property name="label" translatable="yes">Subject's voice:</property>
-                        <property name="justify">right</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="padding">5</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
+                    <property name="xalign">0</property>
+                    <property name="xpad">10</property>
+                    <property name="label" translatable="yes">Your voice:</property>
+                    <property name="justify">right</property>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">0</property>
-                  </packing>
                 </child>
                 <child>
-                  <object class="GtkVBox" id="combo_vbox">
+                  <object class="GtkLabel" id="label4">
                     <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">5</property>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
+                    <property name="xalign">0</property>
+                    <property name="xpad">10</property>
+                    <property name="label" translatable="yes">Subject's voice:</property>
+                    <property name="justify">right</property>
                   </object>
                   <packing>
-                    <property name="position">1</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
                   </packing>
                 </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkHBox" id="hbox2">
-                <property name="visible">True</property>
                 <child>
                   <object class="GtkLabel" id="label5">
                     <property name="visible">True</property>
@@ -174,39 +136,55 @@
                     <property name="justify">right</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="padding">5</property>
-                    <property name="position">0</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="destfile_label">
+                  <object class="GtkHBox" id="hbox2">
                     <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="use_markup">True</property>
-                    <property name="ellipsize">middle</property>
-                    <property name="width_chars">30</property>
+                    <child>
+                      <object class="GtkLabel" id="destfile_label">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="use_markup">True</property>
+                        <property name="ellipsize">middle</property>
+                        <property name="width_chars">30</property>
+                      </object>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="open_button">
+                        <property name="label" translatable="yes">Browse...</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">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
-                    <property name="position">1</property>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton" id="open_button">
-                    <property name="label" translatable="yes">Browse...</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">False</property>
-                    <property name="position">2</property>
-                  </packing>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
                 </child>
               </object>
               <packing>
-                <property name="position">2</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>
@@ -220,7 +198,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="about_button">
-                <property name="label" translatable="yes">gtk-about</property>
+                <property name="label">gtk-about</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -235,7 +213,7 @@
             </child>
             <child>
               <object class="GtkButton" id="close_button">
-                <property name="label" translatable="yes">gtk-close</property>
+                <property name="label">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -251,7 +229,7 @@
             </child>
             <child>
               <object class="GtkButton" id="record_button">
-                <property name="label" translatable="yes">gtk-media-record</property>
+                <property name="label">gtk-media-record</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -289,8 +267,8 @@
     <property name="type_hint">normal</property>
     <property name="has_separator">False</property>
     <property name="local_only">False</property>
-    <property name="do_overwrite_confirmation">True</property>
     <property name="action">save</property>
+    <property name="do_overwrite_confirmation">True</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox4">
         <property name="visible">True</property>
@@ -305,7 +283,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="file_chooser_cancel_button">
-                <property name="label" translatable="yes">gtk-cancel</property>
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -319,7 +297,7 @@
             </child>
             <child>
               <object class="GtkButton" id="file_chooser_save_button">
-                <property name="label" translatable="yes">gtk-save</property>
+                <property name="label">gtk-save</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -448,7 +426,7 @@ without their consent.</property>
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="dismiss_warning">
-                <property name="label" translatable="yes">gtk-ok</property>
+                <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/src/ui.py b/src/ui.py
index b99c9d1..fc5851f 100644
--- a/src/ui.py
+++ b/src/ui.py
@@ -88,11 +88,13 @@ class PulseCasterUI:
         self.pa = PulseObj(clientName=NAME)
 
         # Create and populate combo boxes
-        self.combo_vbox = self.builder.get_object('combo_vbox')
+        self.table = self.builder.get_object('table1')
         self.user_vox = gtk.combo_box_new_text()
         self.subject_vox = gtk.combo_box_new_text()
-        self.combo_vbox.add(self.user_vox)
-        self.combo_vbox.add(self.subject_vox)
+        self.table.attach(self.user_vox, 1, 2, 0, 1,
+                          xoptions=gtk.EXPAND|gtk.FILL)
+        self.table.attach(self.subject_vox, 1, 2, 1, 2,
+                          xoptions=gtk.EXPAND|gtk.FILL)
         self.user_vox.connect('button-press-event', self.repop_sources)
         self.subject_vox.connect('button-press-event', self.repop_sources)
 
@@ -129,9 +131,10 @@ class PulseCasterUI:
                 self.subject_vox.append_text(source.description)
         self.user_vox.set_active(0)
         self.subject_vox.set_active(0)
-        self.combo_vbox.reorder_child(self.user_vox, 0)
-        self.combo_vbox.reorder_child(self.subject_vox, 1)
-        self.combo_vbox.show_all()
+        #self.combo_vbox.reorder_child(self.user_vox, 0)
+        #self.combo_vbox.reorder_child(self.subject_vox, 1)
+        #self.combo_vbox.show_all()
+        self.table.show_all()
 
         if self.gconfig.skip_warn is False:
             self.warning.show()