Updated the glade file for mirrorselect

2 files changed, 13 insertions, 43 deletions

diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index 35462a8..a41af24 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -86,6 +86,8 @@ class MirrorselectWindow(InstallWindow):
 		treeview.append_column(_("Mirror Name"))
 		treeview.append_column("IPv4?")
 		treeview.append_column("IPv6?")
+		self.xml.get_widget("mirrors_viewport").add(treeview)
+		
 	
 	def addMirrorRow(self, ts, country_ts, region, country, mirror, data):
 		cb = gtk.CheckButton(label=data["url"], use_underline=False)
diff --git a/ui/mirrorselect.glade b/ui/mirrorselect.glade
index 317a225..5dd518f 100644
--- a/ui/mirrorselect.glade
+++ b/ui/mirrorselect.glade
@@ -1,30 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <glade-interface>
   <!-- interface-requires gtk+ 2.6 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <widget class="GtkWindow" id="mirrorselect_window">
+    <property name="can_focus">False</property>
     <property name="border_width">18</property>
     <child>
       <widget class="GtkAlignment" id="mirrorselect_align">
         <property name="width_request">400</property>
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="xalign">0</property>
         <property name="yalign">0</property>
         <child>
           <widget class="GtkVBox" id="mirrorselect_box">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="border_width">5</property>
-            <property name="orientation">vertical</property>
             <property name="spacing">10</property>
             <child>
               <widget class="GtkLabel" id="intro_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Choose your portage mirror(s).
 In order to download source code quickly it is recommended to select a fast mirror that's close to you.</property>
                 <property name="justify">center</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
@@ -33,55 +37,19 @@ In order to download source code quickly it is recommended to select a fast mirr
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <child>
-                  <widget class="GtkViewport" id="viewport1">
+                  <widget class="GtkViewport" id="mirrors_viewport">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="resize_mode">queue</property>
                     <child>
-                      <widget class="GtkTable" id="mirrors_table">
-                        <property name="visible">True</property>
-                        <property name="n_columns">3</property>
-                        <child>
-                          <widget class="GtkLabel" id="label2">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="yalign">0</property>
-                            <property name="label" translatable="yes">Mirror URL</property>
-                          </widget>
-                          <packing>
-                            <property name="x_options">GTK_FILL</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label3">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="yalign">0</property>
-                            <property name="label" translatable="yes">Region: Country
-Mirror Name</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label4">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="yalign">0</property>
-                            <property name="label" translatable="yes">Flags</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="right_attach">3</property>
-                          </packing>
-                        </child>
-                      </widget>
+                      <placeholder/>
                     </child>
                   </widget>
                 </child>
               </widget>
               <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>