[transmageddon] Remove all deprecated widgets from glade file



commit 29289dff3d57d65ef368603078be60222fb55ede
Author: Christian Fredrik Kalager Schaller <uraeus linuxrising org>
Date:   Sun Oct 12 22:05:35 2014 +0200

    Remove all deprecated widgets from glade file

 src/transcoder_engine.py |    2 -
 src/transmageddon.py     |   48 +++---
 src/transmageddon.ui     |  495 +++++++++++-----------------------------------
 3 files changed, 138 insertions(+), 407 deletions(-)
---
diff --git a/src/transcoder_engine.py b/src/transcoder_engine.py
index f5e0134..34d95d0 100644
--- a/src/transcoder_engine.py
+++ b/src/transcoder_engine.py
@@ -276,12 +276,10 @@ class Transcoder(GObject.GObject):
 
    def noMorePads(self, dbin):
        if self.streamdata['passcounter'] == int(0):
-           print("no more pads")
            self.transcodefileoutput.set_state(Gst.State.PAUSED)
        GLib.idle_add(self.idlePlay)
 
    def idlePlay(self):
-        print("playing")
         self.Pipeline("playing")
         return False
 
diff --git a/src/transmageddon.py b/src/transmageddon.py
index 593fe17..284cafd 100644
--- a/src/transmageddon.py
+++ b/src/transmageddon.py
@@ -255,7 +255,8 @@ class TransmageddonUI(Gtk.ApplicationWindow):
 
        def dynamic_comboboxes_video(streams,extra = []):
            vbox = Gtk.VBox()
-           combo = Gtk.ComboBoxText.new() # 2
+           combo = Gtk.ComboBoxText.new()
+           combo.set_popup_fixed_width(False) # 2
            self.videorows.append(combo)
            vbox.add(self.videorows[0])
            return vbox
@@ -270,16 +271,16 @@ class TransmageddonUI(Gtk.ApplicationWindow):
 
        ui_elements = [
            "videoinformation", "audioinformation",
-           "videocodec",   "audiocodec",      "langbutton",     "CodecBox",
+           "videocodec",   "audiocodec",      "langbutton",     "CodecGrid",
            "presetchoice", "containerchoice", "rotationchoice", "transcodebutton",
-           "ProgressBar",  "cancelbutton",    "StatusBar",      "table1"]
+           "ProgressBar",  "cancelbutton",    "StatusBar",      "grid1"]
 
        for element in ui_elements:
          setattr(self, element, self.builder.get_object(element))
 
        self.videobox = dynamic_comboboxes_video(GObject.TYPE_PYOBJECT)
-       self.CodecBox.attach(self.videobox, 2, 3, 1, 2, yoptions = Gtk.AttachOptions.SHRINK)
-       self.CodecBox.show_all()
+       self.CodecGrid.attach(self.videobox, 1, 1, 1, 1) # yoptions = Gtk.AttachOptions.SHRINK)
+       self.CodecGrid.show_all()
        self.transcodebutton.get_style_context().add_class('suggested-action')
        self.containerchoice.connect("changed", self.on_containerchoice_changed)
        self.presetchoice.connect("changed", self.on_presetchoice_changed)
@@ -310,7 +311,6 @@ class TransmageddonUI(Gtk.ApplicationWindow):
                timestamp):
            if target_type == TARGET_TYPE_URI_LIST:
                uri = selection.data.strip('\r\n\x00')
-               # self.builder.get_object ("FileChooser").set_uri(uri)
        self.combo=False    # this value will hold the filechooser combo box
        self.audiobox=False
        self.path=False
@@ -366,7 +366,7 @@ class TransmageddonUI(Gtk.ApplicationWindow):
 
        # default all but top box to insensitive by default
        # self.containerchoice.set_sensitive(False)
-       self.CodecBox.set_sensitive(False)
+       self.CodecGrid.set_sensitive(False)
        self.transcodebutton.set_sensitive(False)
        self.cancelbutton.set_sensitive(False)
        self.presetchoice.set_sensitive(False)
@@ -613,7 +613,7 @@ class TransmageddonUI(Gtk.ApplicationWindow):
            notification = Notify.Notification.new("Transmageddon", (_("%(file)s saved to %(dir)s") % {'dir': 
self.streamdata['outputdirectory'], 'file': self.streamdata['outputfilename']}), uri)
            notification.show()
            self.containerchoice.set_sensitive(True)
-           self.CodecBox.set_sensitive(True)
+           self.CodecGrid.set_sensitive(True)
            self.videorows[0].set_sensitive(True)
            self.audiorows[0].set_sensitive(True)
            self.presetchoice.set_sensitive(True)
@@ -881,7 +881,7 @@ class TransmageddonUI(Gtk.ApplicationWindow):
                    _("Plugins not found, choose different codecs."))
            self.combo.set_sensitive(True)
            self.containerchoice.set_sensitive(True)
-           self.CodecBox.set_sensitive(True)
+           self.CodecGrid.set_sensitive(True)
            self.cancelbutton.set_sensitive(False)
            self.transcodebutton.set_sensitive(True)
        elif donemessage == GstPbutils.InstallPluginsReturn.USER_ABORT:
@@ -891,7 +891,7 @@ class TransmageddonUI(Gtk.ApplicationWindow):
            self.StatusBar.push(context_id, _("Codec installation aborted."))
            self.combo.set_sensitive(True)
            self.containerchoice.set_sensitive(True)
-           self.CodecBox.set_sensitive(True)
+           self.CodecGrid.set_sensitive(True)
            self.cancelbutton.set_sensitive(False)
            self.transcodebutton.set_sensitive(True)
        else:
@@ -978,7 +978,7 @@ class TransmageddonUI(Gtk.ApplicationWindow):
        self.combo.set_sensitive(False)
        self.containerchoice.set_sensitive(False)
        self.presetchoice.set_sensitive(False)
-       self.CodecBox.set_sensitive(False)
+       self.CodecGrid.set_sensitive(False)
        self.transcodebutton.set_sensitive(False)
        self.rotationchoice.set_sensitive(False)
        self.cancelbutton.set_sensitive(True)
@@ -1014,7 +1014,7 @@ class TransmageddonUI(Gtk.ApplicationWindow):
    def on_cancelbutton_clicked(self, widget):
        self.combo.set_sensitive(True)
        self.containerchoice.set_sensitive(True)
-       self.CodecBox.set_sensitive(True)
+       self.CodecGrid.set_sensitive(True)
        self.presetchoice.set_sensitive(True)
        self.rotationchoice.set_sensitive(True)
        self.cancelbutton.set_sensitive(False)
@@ -1168,7 +1168,7 @@ class TransmageddonUI(Gtk.ApplicationWindow):
            self.houseclean=False
 
    def on_containerchoice_changed(self, widget):
-       self.CodecBox.set_sensitive(True)
+       self.CodecGrid.set_sensitive(True)
        self.ProgressBar.set_fraction(0.0)
        self.ProgressBar.set_text(_("Transcoding Progress"))
        if self.builder.get_object("containerchoice").get_active() == self.nocontainernumber:
@@ -1200,7 +1200,7 @@ class TransmageddonUI(Gtk.ApplicationWindow):
            self.rotationchoice.set_sensitive(True)
            if self.builder.get_object("containerchoice").get_active():
                self.populate_menu_choices()
-               self.CodecBox.set_sensitive(True)
+               self.CodecGrid.set_sensitive(True)
                self.transcodebutton.set_sensitive(True)
        else:
            self.usingpreset=True
@@ -1209,7 +1209,7 @@ class TransmageddonUI(Gtk.ApplicationWindow):
                self.streamdata['devicename']= self.presetchoices[presetchoice-1]
                self.provide_presets(self.streamdata['devicename'])
                self.containerchoice.set_sensitive(False)
-               self.CodecBox.set_sensitive(True) # Testing123
+               self.CodecGrid.set_sensitive(True) # Testing123
                self.rotationchoice.set_sensitive(False)
            else:
                if self.builder.get_object("containerchoice").get_active_text():
@@ -1307,12 +1307,9 @@ class TransmageddonUI(Gtk.ApplicationWindow):
 
        # Already exists? Remove it!
        if self.combo:  
-           #self.table1.remove(self.combo)
-           # self.combo.disconnect(self.handler_id)
            self.dvdname=[]
            self.dvddevice=[]
-           #self.combo.remove()
-           #self.combo = None
+
        else:
            if not self.finder:
                #print("self.finder is "+str(self.finder))
@@ -1362,7 +1359,7 @@ class TransmageddonUI(Gtk.ApplicationWindow):
            self.combo.set_model (liststore)
            self.combo.connect("changed", self.on_source_changed)
            self.combo.show_all()
-           self.table1.attach(self.combo, 2, 3, 0, 1)
+           self.grid1.attach(self.combo, 1, 0, 1, 1)
 
    def setup_audiovbox(self, streamcounter): # creates the list of audiostreams ui
        """
@@ -1373,14 +1370,15 @@ class TransmageddonUI(Gtk.ApplicationWindow):
                output=self.audiobox.destroy()
            self.audiorows=[] # set up the lists for holding the codec combobuttons
            self.audiobox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
-           self.CodecBox.attach(self.audiobox, 0, 1, 1, 2)
-       combo = Gtk.ComboBoxText()
+           self.CodecGrid.attach(self.audiobox, 0, 1, 1, 2)
+       combo = Gtk.ComboBoxText(popup_fixed_width=False)
+       combo.set_popup_fixed_width(False)
        self.audiorows.append(combo)
        self.audiobox.add(self.audiorows[streamcounter])
        self.audiorows[streamcounter].connect("changed", self.on_audiocodec_changed)
        self.audiorows[streamcounter].set_name("audiorow"+str(streamcounter))
        self.audiorows[streamcounter].show()
-       self.CodecBox.show_all()
+       self.CodecGrid.show_all()
 
    def on_source_changed(self, widget):
        """
@@ -1396,10 +1394,12 @@ class TransmageddonUI(Gtk.ApplicationWindow):
            self.isdvd=False
            dialog = Gtk.FileChooserDialog(title=_("Choose Source File..."),
                         buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.REJECT,
-                                 Gtk.STOCK_OPEN, Gtk.ResponseType.ACCEPT))
+                                 Gtk.STOCK_OPEN, Gtk.ResponseType.ACCEPT),
+                         transient_for=widget.get_toplevel())
            dialog.set_default_response(Gtk.ResponseType.ACCEPT)
            dialog.set_property("local-only", False)
            dialog.set_current_folder(self.videodirectory)
+   
            response = dialog.run()
            dialog.hide()
            filename = None
diff --git a/src/transmageddon.ui b/src/transmageddon.ui
index ef2c986..0cf3b5e 100644
--- a/src/transmageddon.ui
+++ b/src/transmageddon.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
-  <requires lib="gtk+" version="3.0"/>
+  <requires lib="gtk+" version="3.12"/>
   <object class="GtkAction" id="action1"/>
   <object class="GtkComboBox" id="combo">
     <property name="visible">True</property>
@@ -38,54 +38,24 @@
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkVBox" id="window">
+  <object class="GtkBox" id="window">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="valign">start</property>
+    <property name="orientation">vertical</property>
     <child>
-      <placeholder/>
-    </child>
-    <child>
-      <object class="GtkVBox" id="vbox2">
+      <object class="GtkBox" id="overallbox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="border_width">12</property>
+        <property name="margin_left">5</property>
+        <property name="margin_right">5</property>
+        <property name="margin_top">5</property>
+        <property name="margin_bottom">5</property>
+        <property name="orientation">vertical</property>
         <child>
-          <object class="GtkTable" id="table1">
+          <object class="GtkGrid" id="grid1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="n_rows">8</property>
-            <property name="n_columns">3</property>
-            <child>
-              <object class="GtkLabel" id="vspacer3">
-                <property name="width_request">12</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </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"/>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="audioinformation">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">&lt;small&gt;Audio Channels:&lt;/small&gt;
-&lt;small&gt;Audio Codec:&lt;/small&gt;</property>
-                <property name="use_markup">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">2</property>
-                <property name="right_attach">3</property>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-              </packing>
-            </child>
+            <property name="column_spacing">10</property>
             <child>
               <object class="GtkLabel" id="videoinformation">
                 <property name="visible">True</property>
@@ -97,286 +67,116 @@
                 <property name="use_markup">True</property>
               </object>
               <packing>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="preset_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">&lt;b&gt;Presets:&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
-              </object>
-              <packing>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="vspacer6">
-                <property name="width_request">12</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-                <property name="x_options"/>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="ChooseFileLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="margin_top">4</property>
+                <property name="margin_bottom">4</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">&lt;b&gt;Choose Input File:&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
                 <property name="use_underline">True</property>
                 <property name="max_width_chars">0</property>
               </object>
-            </child>
-            <child>
-              <object class="GtkLabel" id="vspacer1">
-                <property name="width_request">12</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="x_options"/>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="vspacer4">
-                <property name="width_request">12</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="x_options"/>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="hspacer3">
-                <property name="height_request">6</property>
+              <object class="GtkLabel" id="preset_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">&lt;b&gt;Presets:&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
               </object>
               <packing>
+                <property name="left_attach">0</property>
                 <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="y_options">GTK_EXPAND</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="hspacer2">
-                <property name="height_request">6</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
-              <packing>
-                <property name="left_attach">2</property>
-                <property name="right_attach">3</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="y_options">GTK_EXPAND</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="vspacer2">
-                <property name="width_request">12</property>
-                <property name="height_request">6</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </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="x_options"/>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="hspacer1">
-                <property name="height_request">6</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
-              <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="y_options">GTK_EXPAND</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="hspacer7">
-                <property name="height_request">6</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
-              <packing>
-                <property name="top_attach">7</property>
-                <property name="bottom_attach">8</property>
-                <property name="y_options">GTK_EXPAND</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="hspacer8">
-                <property name="height_request">6</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
-              <packing>
-                <property name="left_attach">2</property>
-                <property name="right_attach">3</property>
-                <property name="top_attach">7</property>
-                <property name="bottom_attach">8</property>
-                <property name="y_options">GTK_EXPAND</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="vspacer8">
-                <property name="width_request">12</property>
-                <property name="height_request">6</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">7</property>
-                <property name="bottom_attach">8</property>
-                <property name="x_options"/>
-                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="presets_label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="margin_top">5</property>
+                <property name="margin_bottom">5</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">&lt;b&gt;Output Format:&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
               </object>
               <packing>
-                <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="hspacer5">
-                <property name="height_request">6</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
-              <packing>
-                <property name="top_attach">6</property>
-                <property name="bottom_attach">7</property>
-                <property name="y_options">GTK_EXPAND</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="hspacer6">
-                <property name="height_request">6</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
-              <packing>
-                <property name="left_attach">2</property>
-                <property name="right_attach">3</property>
-                <property name="top_attach">6</property>
-                <property name="bottom_attach">7</property>
-                <property name="y_options">GTK_EXPAND</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">4</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="vspacer5">
-                <property name="width_request">12</property>
-                <property name="height_request">6</property>
+              <object class="GtkLabel" id="audioinformation">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="margin_top">5</property>
+                <property name="margin_bottom">5</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">&lt;small&gt;Audio Channels:&lt;/small&gt;
+&lt;small&gt;Audio Codec:&lt;/small&gt;</property>
+                <property name="use_markup">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">6</property>
-                <property name="bottom_attach">7</property>
-                <property name="x_options"/>
-                <property name="y_options">GTK_FILL</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="vspacer7">
-                <property name="width_request">12</property>
-                <property name="height_request">6</property>
+              <object class="GtkButton" id="langbutton">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="halign">start</property>
+                <property name="relief">none</property>
+                <signal name="clicked" handler="on_langbutton_clicked" swapped="no"/>
+                <child>
+                  <placeholder/>
+                </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
-                <property name="x_options"/>
-                <property name="y_options">GTK_FILL</property>
+                <property name="top_attach">2</property>
               </packing>
             </child>
             <child>
               <object class="GtkComboBoxText" id="presetchoice">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="margin_top">5</property>
+                <property name="margin_bottom">5</property>
                 <signal name="changed" handler="on_presetchoice_changed" swapped="no"/>
               </object>
               <packing>
-                <property name="left_attach">2</property>
-                <property name="right_attach">3</property>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">3</property>
               </packing>
             </child>
             <child>
               <object class="GtkComboBoxText" id="containerchoice">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="margin_top">5</property>
+                <property name="margin_bottom">5</property>
                 <signal name="changed" handler="on_containerchoice_changed" swapped="no"/>
               </object>
               <packing>
-                <property name="left_attach">2</property>
-                <property name="right_attach">3</property>
-                <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">4</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="langbutton">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="relief">none</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <signal name="clicked" handler="on_langbutton_clicked" swapped="no"/>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">2</property>
-                <property name="right_attach">3</property>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-              </packing>
+              <placeholder/>
             </child>
             <child>
               <placeholder/>
@@ -384,145 +184,73 @@
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">False</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkTable" id="CodecBox">
+          <object class="GtkGrid" id="CodecGrid">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="n_rows">4</property>
-            <property name="n_columns">3</property>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <object class="GtkLabel" id="vspacer15">
-                <property name="width_request">12</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="x_options"/>
-              </packing>
-            </child>
+            <property name="margin_top">5</property>
+            <property name="margin_bottom">5</property>
+            <property name="column_spacing">15</property>
             <child>
-              <object class="GtkLabel" id="vspacer23">
-                <property name="width_request">12</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </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"/>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="vspacer24">
-                <property name="width_request">12</property>
+              <object class="GtkLabel" id="chooseaudiolabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="margin_top">5</property>
+                <property name="margin_bottom">5</property>
                 <property name="xalign">0</property>
-                <property name="yalign">0</property>
+                <property name="label" translatable="yes">&lt;b&gt;Choose Audio Codec&lt;/b&gt;:</property>
+                <property name="use_markup">True</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="x_options"/>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label15">
+              <object class="GtkLabel" id="chosevideolabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="margin_top">5</property>
+                <property name="margin_bottom">5</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">&lt;b&gt;Choose Audio Codec&lt;/b&gt;:</property>
+                <property name="label" translatable="yes">&lt;b&gt;Choose Video Codec&lt;/b&gt;:</property>
                 <property name="use_markup">True</property>
               </object>
-            </child>
-            <child>
-              <object class="GtkLabel" id="vspacer9">
-                <property name="width_request">12</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </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="x_options"/>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
-              <packing>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
-              <packing>
-                <property name="left_attach">2</property>
-                <property name="right_attach">3</property>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
+              <placeholder/>
             </child>
             <child>
-              <object class="GtkLabel" id="label14">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">&lt;b&gt;Choose Video Codec&lt;/b&gt;:</property>
-                <property name="use_markup">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">2</property>
-                <property name="right_attach">3</property>
-              </packing>
+              <placeholder/>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="vbox3">
+          <object class="GtkBox" id="rotationbox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
             <child>
               <object class="GtkLabel" id="rotationlabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="margin_left">5</property>
+                <property name="margin_right">5</property>
+                <property name="margin_top">5</property>
+                <property name="margin_bottom">5</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
                 <property name="label" translatable="yes">&lt;small&gt;Rotate the video image if 
needed&lt;/small&gt;</property>
@@ -539,6 +267,8 @@
               <object class="GtkComboBoxText" id="rotationchoice">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="margin_top">5</property>
+                <property name="margin_bottom">5</property>
                 <signal name="changed" handler="on_rotationchoice_changed" swapped="no"/>
               </object>
               <packing>
@@ -555,40 +285,45 @@
           </packing>
         </child>
         <child>
-          <object class="GtkProgressBar" id="ProgressBar">
+          <object class="GtkBox" id="statusbox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkProgressBar" id="ProgressBar">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_top">5</property>
+                <property name="margin_bottom">5</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="padding">6</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="padding">6</property>
             <property name="position">3</property>
           </packing>
         </child>
         <child>
-          <object class="GtkHBox" id="hbox1">
+          <object class="GtkBox" id="actionbox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="halign">end</property>
             <child>
-              <object class="GtkLabel" id="label8">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
+              <placeholder/>
             </child>
             <child>
               <object class="GtkButton" id="cancelbutton">
-                <property name="label">gtk-cancel</property>
+                <property name="label">Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
                 <signal name="clicked" handler="on_cancelbutton_clicked" swapped="no"/>
               </object>
               <packing>
@@ -616,28 +351,26 @@
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="padding">3</property>
+            <property name="fill">False</property>
             <property name="position">4</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="GtkStatusbar" id="StatusBar">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="spacing">2</property>
+        <child>
+          <object class="GtkStatusbar" id="StatusBar">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">5</property>
+          </packing>
+        </child>
       </object>
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="position">2</property>
+        <property name="position">0</property>
       </packing>
     </child>
   </object>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]