Gentoo Archives: gentoo-commits

From: Wiktor W Brodlo <wiktor@××××××.net>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/anaconda:master commit in: ui/, iw/
Date: Sat, 30 Jul 2011 04:02:13
Message-Id: 3ef41ac3c1b8f37fd95265992833a2876a25e154.wiktor@gentoo
1 commit: 3ef41ac3c1b8f37fd95265992833a2876a25e154
2 Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
3 AuthorDate: Sat Jul 30 02:46:04 2011 +0000
4 Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
5 CommitDate: Sat Jul 30 02:46:04 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=3ef41ac3
7
8 Updated the glade file for mirrorselect
9
10 ---
11 iw/mirrorselect_gui.py | 2 +
12 ui/mirrorselect.glade | 54 +++++++++--------------------------------------
13 2 files changed, 13 insertions(+), 43 deletions(-)
14
15 diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
16 index 35462a8..a41af24 100644
17 --- a/iw/mirrorselect_gui.py
18 +++ b/iw/mirrorselect_gui.py
19 @@ -86,6 +86,8 @@ class MirrorselectWindow(InstallWindow):
20 treeview.append_column(_("Mirror Name"))
21 treeview.append_column("IPv4?")
22 treeview.append_column("IPv6?")
23 + self.xml.get_widget("mirrors_viewport").add(treeview)
24 +
25
26 def addMirrorRow(self, ts, country_ts, region, country, mirror, data):
27 cb = gtk.CheckButton(label=data["url"], use_underline=False)
28
29 diff --git a/ui/mirrorselect.glade b/ui/mirrorselect.glade
30 index 317a225..5dd518f 100644
31 --- a/ui/mirrorselect.glade
32 +++ b/ui/mirrorselect.glade
33 @@ -1,30 +1,34 @@
34 -<?xml version="1.0"?>
35 +<?xml version="1.0" encoding="UTF-8"?>
36 <glade-interface>
37 <!-- interface-requires gtk+ 2.6 -->
38 <!-- interface-naming-policy toplevel-contextual -->
39 <widget class="GtkWindow" id="mirrorselect_window">
40 + <property name="can_focus">False</property>
41 <property name="border_width">18</property>
42 <child>
43 <widget class="GtkAlignment" id="mirrorselect_align">
44 <property name="width_request">400</property>
45 <property name="visible">True</property>
46 + <property name="can_focus">False</property>
47 <property name="xalign">0</property>
48 <property name="yalign">0</property>
49 <child>
50 <widget class="GtkVBox" id="mirrorselect_box">
51 <property name="visible">True</property>
52 + <property name="can_focus">False</property>
53 <property name="border_width">5</property>
54 - <property name="orientation">vertical</property>
55 <property name="spacing">10</property>
56 <child>
57 <widget class="GtkLabel" id="intro_label">
58 <property name="visible">True</property>
59 + <property name="can_focus">False</property>
60 <property name="label" translatable="yes">Choose your portage mirror(s).
61 In order to download source code quickly it is recommended to select a fast mirror that's close to you.</property>
62 <property name="justify">center</property>
63 </widget>
64 <packing>
65 <property name="expand">False</property>
66 + <property name="fill">True</property>
67 <property name="position">0</property>
68 </packing>
69 </child>
70 @@ -33,55 +37,19 @@ In order to download source code quickly it is recommended to select a fast mirr
71 <property name="visible">True</property>
72 <property name="can_focus">True</property>
73 <child>
74 - <widget class="GtkViewport" id="viewport1">
75 + <widget class="GtkViewport" id="mirrors_viewport">
76 <property name="visible">True</property>
77 + <property name="can_focus">False</property>
78 <property name="resize_mode">queue</property>
79 <child>
80 - <widget class="GtkTable" id="mirrors_table">
81 - <property name="visible">True</property>
82 - <property name="n_columns">3</property>
83 - <child>
84 - <widget class="GtkLabel" id="label2">
85 - <property name="visible">True</property>
86 - <property name="xalign">0</property>
87 - <property name="yalign">0</property>
88 - <property name="label" translatable="yes">Mirror URL</property>
89 - </widget>
90 - <packing>
91 - <property name="x_options">GTK_FILL</property>
92 - </packing>
93 - </child>
94 - <child>
95 - <widget class="GtkLabel" id="label3">
96 - <property name="visible">True</property>
97 - <property name="xalign">0</property>
98 - <property name="yalign">0</property>
99 - <property name="label" translatable="yes">Region: Country
100 -Mirror Name</property>
101 - </widget>
102 - <packing>
103 - <property name="left_attach">1</property>
104 - <property name="right_attach">2</property>
105 - </packing>
106 - </child>
107 - <child>
108 - <widget class="GtkLabel" id="label4">
109 - <property name="visible">True</property>
110 - <property name="xalign">0</property>
111 - <property name="yalign">0</property>
112 - <property name="label" translatable="yes">Flags</property>
113 - </widget>
114 - <packing>
115 - <property name="left_attach">2</property>
116 - <property name="right_attach">3</property>
117 - </packing>
118 - </child>
119 - </widget>
120 + <placeholder/>
121 </child>
122 </widget>
123 </child>
124 </widget>
125 <packing>
126 + <property name="expand">True</property>
127 + <property name="fill">True</property>
128 <property name="position">1</property>
129 </packing>
130 </child>