Merge lp:~kiddo/backintime/usability into lp:backintime/1.0
- usability
- Merge into release-1.0
Proposed by
Jeff Fortin Tam
Status: | Needs review | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Proposed branch: | lp:~kiddo/backintime/usability | ||||||||||||
Merge into: | lp:backintime/1.0 | ||||||||||||
Diff against target: |
419 lines (+83/-121) 3 files modified
gnome/app.py (+0/-5) gnome/mainwindow.glade (+64/-99) gnome/settingsdialog.glade (+19/-17) |
||||||||||||
To merge this branch: | bzr merge lp:~kiddo/backintime/usability | ||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Adolfo Jayme Barrientos (community) | Approve | ||
Back In Time Team | Pending | ||
Review via email: mp+47946@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Unmerged revisions
- 778. By Jeff Fortin Tam
-
Settings: standardize spacing, alignment, wording
- 777. By Jeff Fortin Tam
-
Kill the "Website" button, rearrange the rest to make a clear distinction between global and contextual actions
- 776. By Jeff Fortin Tam
-
Use "header" capitalization for button labels, "sentence" for tooltips
- 775. By Jeff Fortin Tam
-
Prioritize toolbar buttons, rename them for clarity, use stock buttons
- 774. By Jeff Fortin Tam
-
Remove the Quit button
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'gnome/app.py' | |||
2 | --- gnome/app.py 2010-10-18 20:21:39 +0000 | |||
3 | +++ gnome/app.py 2011-01-30 23:17:13 +0000 | |||
4 | @@ -119,7 +119,6 @@ | |||
5 | 119 | 'on_MainWindow_destroy' : gtk.main_quit, | 119 | 'on_MainWindow_destroy' : gtk.main_quit, |
6 | 120 | 'on_MainWindow_delete_event' : self.on_close, | 120 | 'on_MainWindow_delete_event' : self.on_close, |
7 | 121 | 'on_MainWindow_key_release_event': self.on_key_release_event, | 121 | 'on_MainWindow_key_release_event': self.on_key_release_event, |
8 | 122 | 'on_btn_exit_clicked' : self.on_close, | ||
9 | 123 | 'on_btn_help_clicked' : self.on_btn_help_clicked, | 122 | 'on_btn_help_clicked' : self.on_btn_help_clicked, |
10 | 124 | 'on_btn_about_clicked' : self.on_btn_about_clicked, | 123 | 'on_btn_about_clicked' : self.on_btn_about_clicked, |
11 | 125 | 'on_btn_settings_clicked' : self.on_btn_settings_clicked, | 124 | 'on_btn_settings_clicked' : self.on_btn_settings_clicked, |
12 | @@ -142,7 +141,6 @@ | |||
13 | 142 | 'on_list_folder_view_drag_data_get': self.on_list_folder_view_drag_data_get, | 141 | 'on_list_folder_view_drag_data_get': self.on_list_folder_view_drag_data_get, |
14 | 143 | 'on_list_folder_view_key_press_event' : self.on_list_folder_view_key_press_event, | 142 | 'on_list_folder_view_key_press_event' : self.on_list_folder_view_key_press_event, |
15 | 144 | 'on_combo_profiles_changed': self.on_combo_profiles_changed, | 143 | 'on_combo_profiles_changed': self.on_combo_profiles_changed, |
16 | 145 | 'on_btn_website_clicked': self.on_btn_website_clicked, | ||
17 | 146 | } | 144 | } |
18 | 147 | 145 | ||
19 | 148 | builder.connect_signals(signals) | 146 | builder.connect_signals(signals) |
20 | @@ -958,9 +956,6 @@ | |||
21 | 958 | #self.on_help() | 956 | #self.on_help() |
22 | 959 | os.system( "gnome-open http://backintime.le-web.org/documentation &" ) | 957 | os.system( "gnome-open http://backintime.le-web.org/documentation &" ) |
23 | 960 | 958 | ||
24 | 961 | def on_btn_website_clicked( self, button ): | ||
25 | 962 | os.system( "gnome-open http://backintime.le-web.org &" ) | ||
26 | 963 | |||
27 | 964 | def on_key_release_event( self, widget, event ): | 959 | def on_key_release_event( self, widget, event ): |
28 | 965 | if 'F1' == gtk.gdk.keyval_name( event.keyval ) and ( event.state & (gtk.gdk.CONTROL_MASK | gtk.gdk.MOD1_MASK) ) == 0: | 960 | if 'F1' == gtk.gdk.keyval_name( event.keyval ) and ( event.state & (gtk.gdk.CONTROL_MASK | gtk.gdk.MOD1_MASK) ) == 0: |
29 | 966 | self.on_help() | 961 | self.on_help() |
30 | 967 | 962 | ||
31 | === modified file 'gnome/mainwindow.glade' | |||
32 | --- gnome/mainwindow.glade 2010-10-16 20:07:12 +0000 | |||
33 | +++ gnome/mainwindow.glade 2011-01-30 23:17:13 +0000 | |||
34 | @@ -1,4 +1,4 @@ | |||
36 | 1 | <?xml version="1.0"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
37 | 2 | <interface> | 2 | <interface> |
38 | 3 | <requires lib="gtk+" version="2.16"/> | 3 | <requires lib="gtk+" version="2.16"/> |
39 | 4 | <!-- interface-naming-policy toplevel-contextual --> | 4 | <!-- interface-naming-policy toplevel-contextual --> |
40 | @@ -33,8 +33,9 @@ | |||
41 | 33 | <child> | 33 | <child> |
42 | 34 | <object class="GtkToolButton" id="btn_backup"> | 34 | <object class="GtkToolButton" id="btn_backup"> |
43 | 35 | <property name="visible">True</property> | 35 | <property name="visible">True</property> |
46 | 36 | <property name="tooltip_text" translatable="yes">Take snapshot</property> | 36 | <property name="tooltip_text" translatable="yes">Take a snapshot</property> |
47 | 37 | <property name="label" translatable="yes">Backup Now</property> | 37 | <property name="is_important">True</property> |
48 | 38 | <property name="label" translatable="yes">Backup</property> | ||
49 | 38 | <property name="stock_id">gtk-save</property> | 39 | <property name="stock_id">gtk-save</property> |
50 | 39 | <signal name="clicked" handler="on_btn_backup_clicked"/> | 40 | <signal name="clicked" handler="on_btn_backup_clicked"/> |
51 | 40 | </object> | 41 | </object> |
52 | @@ -46,8 +47,8 @@ | |||
53 | 46 | <child> | 47 | <child> |
54 | 47 | <object class="GtkToolButton" id="btn_update_snapshots"> | 48 | <object class="GtkToolButton" id="btn_update_snapshots"> |
55 | 48 | <property name="visible">True</property> | 49 | <property name="visible">True</property> |
58 | 49 | <property name="tooltip_text" translatable="yes">Refresh snapshots list</property> | 50 | <property name="tooltip_text" translatable="yes">Refresh the list of snapshots</property> |
59 | 50 | <property name="label" translatable="yes">Refresh snapshots list</property> | 51 | <property name="label" translatable="yes">Refresh Snapshots</property> |
60 | 51 | <property name="stock_id">gtk-refresh</property> | 52 | <property name="stock_id">gtk-refresh</property> |
61 | 52 | <signal name="clicked" handler="on_btn_update_snapshots_clicked"/> | 53 | <signal name="clicked" handler="on_btn_update_snapshots_clicked"/> |
62 | 53 | </object> | 54 | </object> |
63 | @@ -57,10 +58,34 @@ | |||
64 | 57 | </packing> | 58 | </packing> |
65 | 58 | </child> | 59 | </child> |
66 | 59 | <child> | 60 | <child> |
67 | 61 | <object class="GtkToolButton" id="btn_view_last_log"> | ||
68 | 62 | <property name="visible">True</property> | ||
69 | 63 | <property name="tooltip_text" translatable="yes">View the log of the latest snapshot</property> | ||
70 | 64 | <property name="label" translatable="yes">View Last Log</property> | ||
71 | 65 | <property name="use_underline">True</property> | ||
72 | 66 | <property name="stock_id">gtk-new</property> | ||
73 | 67 | <signal name="clicked" handler="on_btn_view_last_log_clicked"/> | ||
74 | 68 | </object> | ||
75 | 69 | <packing> | ||
76 | 70 | <property name="expand">False</property> | ||
77 | 71 | <property name="homogeneous">True</property> | ||
78 | 72 | </packing> | ||
79 | 73 | </child> | ||
80 | 74 | <child> | ||
81 | 75 | <object class="GtkSeparatorToolItem" id="toolbutton5"> | ||
82 | 76 | <property name="visible">True</property> | ||
83 | 77 | </object> | ||
84 | 78 | <packing> | ||
85 | 79 | <property name="expand">False</property> | ||
86 | 80 | <property name="homogeneous">True</property> | ||
87 | 81 | </packing> | ||
88 | 82 | </child> | ||
89 | 83 | <child> | ||
90 | 60 | <object class="GtkToolButton" id="btn_snapshot_name"> | 84 | <object class="GtkToolButton" id="btn_snapshot_name"> |
91 | 61 | <property name="visible">True</property> | 85 | <property name="visible">True</property> |
94 | 62 | <property name="tooltip_text" translatable="yes">Snapshot Name</property> | 86 | <property name="tooltip_text" translatable="yes">Assign a custom name to this snapshot</property> |
95 | 63 | <property name="label" translatable="yes">Snapshot Name</property> | 87 | <property name="is_important">True</property> |
96 | 88 | <property name="label" translatable="yes">Rename Snapshot</property> | ||
97 | 64 | <property name="stock_id">gtk-edit</property> | 89 | <property name="stock_id">gtk-edit</property> |
98 | 65 | <signal name="clicked" handler="on_btn_snapshot_name_clicked"/> | 90 | <signal name="clicked" handler="on_btn_snapshot_name_clicked"/> |
99 | 66 | </object> | 91 | </object> |
100 | @@ -72,7 +97,7 @@ | |||
101 | 72 | <child> | 97 | <child> |
102 | 73 | <object class="GtkToolButton" id="btn_remove_snapshot"> | 98 | <object class="GtkToolButton" id="btn_remove_snapshot"> |
103 | 74 | <property name="visible">True</property> | 99 | <property name="visible">True</property> |
105 | 75 | <property name="tooltip_text" translatable="yes">Remove Snapshot</property> | 100 | <property name="tooltip_text" translatable="yes">Remove this snapshot</property> |
106 | 76 | <property name="label" translatable="yes">Remove Snapshot</property> | 101 | <property name="label" translatable="yes">Remove Snapshot</property> |
107 | 77 | <property name="stock_id">gtk-delete</property> | 102 | <property name="stock_id">gtk-delete</property> |
108 | 78 | <signal name="clicked" handler="on_btn_remove_snapshot_clicked"/> | 103 | <signal name="clicked" handler="on_btn_remove_snapshot_clicked"/> |
109 | @@ -85,7 +110,7 @@ | |||
110 | 85 | <child> | 110 | <child> |
111 | 86 | <object class="GtkToolButton" id="btn_view_snapshot_log"> | 111 | <object class="GtkToolButton" id="btn_view_snapshot_log"> |
112 | 87 | <property name="visible">True</property> | 112 | <property name="visible">True</property> |
114 | 88 | <property name="tooltip_markup">View Snapshot Log</property> | 113 | <property name="tooltip_text" translatable="yes">View this snapshot's log</property> |
115 | 89 | <property name="label" translatable="yes">View Snapshot Log</property> | 114 | <property name="label" translatable="yes">View Snapshot Log</property> |
116 | 90 | <property name="use_underline">True</property> | 115 | <property name="use_underline">True</property> |
117 | 91 | <property name="stock_id">gtk-file</property> | 116 | <property name="stock_id">gtk-file</property> |
118 | @@ -97,20 +122,6 @@ | |||
119 | 97 | </packing> | 122 | </packing> |
120 | 98 | </child> | 123 | </child> |
121 | 99 | <child> | 124 | <child> |
122 | 100 | <object class="GtkToolButton" id="btn_view_last_log"> | ||
123 | 101 | <property name="visible">True</property> | ||
124 | 102 | <property name="tooltip_markup">View Last Log</property> | ||
125 | 103 | <property name="label" translatable="yes">View Last Log</property> | ||
126 | 104 | <property name="use_underline">True</property> | ||
127 | 105 | <property name="stock_id">gtk-new</property> | ||
128 | 106 | <signal name="clicked" handler="on_btn_view_last_log_clicked"/> | ||
129 | 107 | </object> | ||
130 | 108 | <packing> | ||
131 | 109 | <property name="expand">False</property> | ||
132 | 110 | <property name="homogeneous">True</property> | ||
133 | 111 | </packing> | ||
134 | 112 | </child> | ||
135 | 113 | <child> | ||
136 | 114 | <object class="GtkSeparatorToolItem" id="toolbutton1"> | 125 | <object class="GtkSeparatorToolItem" id="toolbutton1"> |
137 | 115 | <property name="visible">True</property> | 126 | <property name="visible">True</property> |
138 | 116 | </object> | 127 | </object> |
139 | @@ -119,10 +130,22 @@ | |||
140 | 119 | </packing> | 130 | </packing> |
141 | 120 | </child> | 131 | </child> |
142 | 121 | <child> | 132 | <child> |
143 | 133 | <object class="GtkToolItem" id="mtb_separator1"> | ||
144 | 134 | <property name="visible">True</property> | ||
145 | 135 | <child> | ||
146 | 136 | <placeholder/> | ||
147 | 137 | </child> | ||
148 | 138 | </object> | ||
149 | 139 | <packing> | ||
150 | 140 | <property name="expand">True</property> | ||
151 | 141 | <property name="homogeneous">True</property> | ||
152 | 142 | </packing> | ||
153 | 143 | </child> | ||
154 | 144 | <child> | ||
155 | 122 | <object class="GtkToolButton" id="btn_settings"> | 145 | <object class="GtkToolButton" id="btn_settings"> |
156 | 123 | <property name="visible">True</property> | 146 | <property name="visible">True</property> |
159 | 124 | <property name="tooltip_text" translatable="yes">Settings</property> | 147 | <property name="tooltip_text" translatable="yes">Snapshot and application settings</property> |
160 | 125 | <property name="label" translatable="yes">Settings</property> | 148 | <property name="is_important">True</property> |
161 | 126 | <property name="stock_id">gtk-preferences</property> | 149 | <property name="stock_id">gtk-preferences</property> |
162 | 127 | <signal name="clicked" handler="on_btn_settings_clicked"/> | 150 | <signal name="clicked" handler="on_btn_settings_clicked"/> |
163 | 128 | </object> | 151 | </object> |
164 | @@ -132,8 +155,20 @@ | |||
165 | 132 | </packing> | 155 | </packing> |
166 | 133 | </child> | 156 | </child> |
167 | 134 | <child> | 157 | <child> |
170 | 135 | <object class="GtkSeparatorToolItem" id="toolbutton5"> | 158 | <object class="GtkSeparatorToolItem" id="toolbutton4"> |
171 | 136 | <property name="visible">True</property> | 159 | <property name="visible">True</property> |
172 | 160 | </object> | ||
173 | 161 | <packing> | ||
174 | 162 | <property name="expand">False</property> | ||
175 | 163 | <property name="homogeneous">True</property> | ||
176 | 164 | </packing> | ||
177 | 165 | </child> | ||
178 | 166 | <child> | ||
179 | 167 | <object class="GtkToolButton" id="btn_help"> | ||
180 | 168 | <property name="visible">True</property> | ||
181 | 169 | <property name="tooltip_text" translatable="yes">Help</property> | ||
182 | 170 | <property name="stock_id">gtk-help</property> | ||
183 | 171 | <signal name="clicked" handler="on_btn_help_clicked"/> | ||
184 | 137 | </object> | 172 | </object> |
185 | 138 | <packing> | 173 | <packing> |
186 | 139 | <property name="expand">False</property> | 174 | <property name="expand">False</property> |
187 | @@ -144,7 +179,6 @@ | |||
188 | 144 | <object class="GtkToolButton" id="btn_about"> | 179 | <object class="GtkToolButton" id="btn_about"> |
189 | 145 | <property name="visible">True</property> | 180 | <property name="visible">True</property> |
190 | 146 | <property name="tooltip_text" translatable="yes">About</property> | 181 | <property name="tooltip_text" translatable="yes">About</property> |
191 | 147 | <property name="label" translatable="yes">About</property> | ||
192 | 148 | <property name="stock_id">gtk-about</property> | 182 | <property name="stock_id">gtk-about</property> |
193 | 149 | <signal name="clicked" handler="on_btn_about_clicked"/> | 183 | <signal name="clicked" handler="on_btn_about_clicked"/> |
194 | 150 | </object> | 184 | </object> |
195 | @@ -153,74 +187,6 @@ | |||
196 | 153 | <property name="homogeneous">True</property> | 187 | <property name="homogeneous">True</property> |
197 | 154 | </packing> | 188 | </packing> |
198 | 155 | </child> | 189 | </child> |
199 | 156 | <child> | ||
200 | 157 | <object class="GtkToolButton" id="btn_help"> | ||
201 | 158 | <property name="visible">True</property> | ||
202 | 159 | <property name="tooltip_text" translatable="yes">Help</property> | ||
203 | 160 | <property name="label" translatable="yes">Help</property> | ||
204 | 161 | <property name="stock_id">gtk-help</property> | ||
205 | 162 | <signal name="clicked" handler="on_btn_help_clicked"/> | ||
206 | 163 | </object> | ||
207 | 164 | <packing> | ||
208 | 165 | <property name="expand">False</property> | ||
209 | 166 | <property name="homogeneous">True</property> | ||
210 | 167 | </packing> | ||
211 | 168 | </child> | ||
212 | 169 | <child> | ||
213 | 170 | <object class="GtkSeparatorToolItem" id="toolbutton2"> | ||
214 | 171 | <property name="visible">True</property> | ||
215 | 172 | </object> | ||
216 | 173 | <packing> | ||
217 | 174 | <property name="expand">False</property> | ||
218 | 175 | </packing> | ||
219 | 176 | </child> | ||
220 | 177 | <child> | ||
221 | 178 | <object class="GtkToolButton" id="btn_exit"> | ||
222 | 179 | <property name="visible">True</property> | ||
223 | 180 | <property name="tooltip_text" translatable="yes">Exit</property> | ||
224 | 181 | <property name="label" translatable="yes">Exit</property> | ||
225 | 182 | <property name="stock_id">gtk-quit</property> | ||
226 | 183 | <signal name="clicked" handler="on_btn_exit_clicked"/> | ||
227 | 184 | </object> | ||
228 | 185 | <packing> | ||
229 | 186 | <property name="expand">False</property> | ||
230 | 187 | <property name="homogeneous">True</property> | ||
231 | 188 | </packing> | ||
232 | 189 | </child> | ||
233 | 190 | <child> | ||
234 | 191 | <object class="GtkToolItem" id="mtb_separator1"> | ||
235 | 192 | <property name="visible">True</property> | ||
236 | 193 | <child> | ||
237 | 194 | <placeholder/> | ||
238 | 195 | </child> | ||
239 | 196 | </object> | ||
240 | 197 | <packing> | ||
241 | 198 | <property name="expand">True</property> | ||
242 | 199 | <property name="homogeneous">True</property> | ||
243 | 200 | </packing> | ||
244 | 201 | </child> | ||
245 | 202 | <child> | ||
246 | 203 | <object class="GtkSeparatorToolItem" id="toolbutton4"> | ||
247 | 204 | <property name="visible">True</property> | ||
248 | 205 | </object> | ||
249 | 206 | <packing> | ||
250 | 207 | <property name="expand">False</property> | ||
251 | 208 | <property name="homogeneous">True</property> | ||
252 | 209 | </packing> | ||
253 | 210 | </child> | ||
254 | 211 | <child> | ||
255 | 212 | <object class="GtkToolButton" id="btn_website"> | ||
256 | 213 | <property name="visible">True</property> | ||
257 | 214 | <property name="tooltip_text" translatable="yes">Website</property> | ||
258 | 215 | <property name="label" translatable="yes">Website</property> | ||
259 | 216 | <property name="stock_id">gtk-home</property> | ||
260 | 217 | <signal name="clicked" handler="on_btn_website_clicked"/> | ||
261 | 218 | </object> | ||
262 | 219 | <packing> | ||
263 | 220 | <property name="expand">False</property> | ||
264 | 221 | <property name="homogeneous">True</property> | ||
265 | 222 | </packing> | ||
266 | 223 | </child> | ||
267 | 224 | </object> | 190 | </object> |
268 | 225 | <packing> | 191 | <packing> |
269 | 226 | <property name="expand">False</property> | 192 | <property name="expand">False</property> |
270 | @@ -287,7 +253,7 @@ | |||
271 | 287 | <property name="visible">True</property> | 253 | <property name="visible">True</property> |
272 | 288 | <property name="can_focus">True</property> | 254 | <property name="can_focus">True</property> |
273 | 289 | <property name="editable">False</property> | 255 | <property name="editable">False</property> |
275 | 290 | <property name="invisible_char">•</property> | 256 | <property name="invisible_char">•</property> |
276 | 291 | </object> | 257 | </object> |
277 | 292 | </child> | 258 | </child> |
278 | 293 | </object> | 259 | </object> |
279 | @@ -322,7 +288,7 @@ | |||
280 | 322 | <property name="visible">True</property> | 288 | <property name="visible">True</property> |
281 | 323 | <property name="has_tooltip">True</property> | 289 | <property name="has_tooltip">True</property> |
282 | 324 | <property name="tooltip_text" translatable="yes">Restore</property> | 290 | <property name="tooltip_text" translatable="yes">Restore</property> |
284 | 325 | <property name="label" translatable="yes">Restore</property> | 291 | <property name="is_important">True</property> |
285 | 326 | <property name="stock_id">gtk-undelete</property> | 292 | <property name="stock_id">gtk-undelete</property> |
286 | 327 | <signal name="clicked" handler="on_btn_restore_clicked"/> | 293 | <signal name="clicked" handler="on_btn_restore_clicked"/> |
287 | 328 | </object> | 294 | </object> |
288 | @@ -336,7 +302,6 @@ | |||
289 | 336 | <property name="visible">True</property> | 302 | <property name="visible">True</property> |
290 | 337 | <property name="has_tooltip">True</property> | 303 | <property name="has_tooltip">True</property> |
291 | 338 | <property name="tooltip_text" translatable="yes">Copy</property> | 304 | <property name="tooltip_text" translatable="yes">Copy</property> |
292 | 339 | <property name="label" translatable="yes">Copy</property> | ||
293 | 340 | <property name="stock_id">gtk-copy</property> | 305 | <property name="stock_id">gtk-copy</property> |
294 | 341 | <signal name="clicked" handler="on_btn_copy_clicked"/> | 306 | <signal name="clicked" handler="on_btn_copy_clicked"/> |
295 | 342 | </object> | 307 | </object> |
296 | 343 | 308 | ||
297 | === modified file 'gnome/settingsdialog.glade' | |||
298 | --- gnome/settingsdialog.glade 2010-11-02 20:51:40 +0000 | |||
299 | +++ gnome/settingsdialog.glade 2011-01-30 23:17:13 +0000 | |||
300 | @@ -1,4 +1,4 @@ | |||
302 | 1 | <?xml version="1.0"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
303 | 2 | <interface> | 2 | <interface> |
304 | 3 | <requires lib="gtk+" version="2.16"/> | 3 | <requires lib="gtk+" version="2.16"/> |
305 | 4 | <!-- interface-naming-policy toplevel-contextual --> | 4 | <!-- interface-naming-policy toplevel-contextual --> |
306 | @@ -10,11 +10,10 @@ | |||
307 | 10 | <property name="destroy_with_parent">True</property> | 10 | <property name="destroy_with_parent">True</property> |
308 | 11 | <property name="icon_name">gtk-preferences</property> | 11 | <property name="icon_name">gtk-preferences</property> |
309 | 12 | <property name="type_hint">dialog</property> | 12 | <property name="type_hint">dialog</property> |
310 | 13 | <property name="has_separator">False</property> | ||
311 | 14 | <child internal-child="vbox"> | 13 | <child internal-child="vbox"> |
312 | 15 | <object class="GtkVBox" id="dialog-vbox2"> | 14 | <object class="GtkVBox" id="dialog-vbox2"> |
313 | 16 | <property name="visible">True</property> | 15 | <property name="visible">True</property> |
315 | 17 | <property name="spacing">2</property> | 16 | <property name="spacing">6</property> |
316 | 18 | <child> | 17 | <child> |
317 | 19 | <object class="GtkHBox" id="hbox5"> | 18 | <object class="GtkHBox" id="hbox5"> |
318 | 20 | <property name="visible">True</property> | 19 | <property name="visible">True</property> |
319 | @@ -136,7 +135,7 @@ | |||
320 | 136 | <property name="visible">True</property> | 135 | <property name="visible">True</property> |
321 | 137 | <property name="can_focus">True</property> | 136 | <property name="can_focus">True</property> |
322 | 138 | <property name="editable">False</property> | 137 | <property name="editable">False</property> |
324 | 139 | <property name="invisible_char">•</property> | 138 | <property name="invisible_char">•</property> |
325 | 140 | </object> | 139 | </object> |
326 | 141 | <packing> | 140 | <packing> |
327 | 142 | <property name="position">0</property> | 141 | <property name="position">0</property> |
328 | @@ -209,7 +208,7 @@ | |||
329 | 209 | <object class="GtkEntry" id="txt_host"> | 208 | <object class="GtkEntry" id="txt_host"> |
330 | 210 | <property name="visible">True</property> | 209 | <property name="visible">True</property> |
331 | 211 | <property name="can_focus">True</property> | 210 | <property name="can_focus">True</property> |
333 | 212 | <property name="invisible_char">•</property> | 211 | <property name="invisible_char">•</property> |
334 | 213 | </object> | 212 | </object> |
335 | 214 | <packing> | 213 | <packing> |
336 | 215 | <property name="position">1</property> | 214 | <property name="position">1</property> |
337 | @@ -229,7 +228,7 @@ | |||
338 | 229 | <object class="GtkEntry" id="txt_user"> | 228 | <object class="GtkEntry" id="txt_user"> |
339 | 230 | <property name="visible">True</property> | 229 | <property name="visible">True</property> |
340 | 231 | <property name="can_focus">True</property> | 230 | <property name="can_focus">True</property> |
342 | 232 | <property name="invisible_char">•</property> | 231 | <property name="invisible_char">•</property> |
343 | 233 | </object> | 232 | </object> |
344 | 234 | <packing> | 233 | <packing> |
345 | 235 | <property name="position">3</property> | 234 | <property name="position">3</property> |
346 | @@ -249,7 +248,7 @@ | |||
347 | 249 | <object class="GtkEntry" id="txt_profile"> | 248 | <object class="GtkEntry" id="txt_profile"> |
348 | 250 | <property name="visible">True</property> | 249 | <property name="visible">True</property> |
349 | 251 | <property name="can_focus">True</property> | 250 | <property name="can_focus">True</property> |
351 | 252 | <property name="invisible_char">•</property> | 251 | <property name="invisible_char">•</property> |
352 | 253 | </object> | 252 | </object> |
353 | 254 | <packing> | 253 | <packing> |
354 | 255 | <property name="position">5</property> | 254 | <property name="position">5</property> |
355 | @@ -745,7 +744,7 @@ | |||
356 | 745 | <child> | 744 | <child> |
357 | 746 | <object class="GtkAlignment" id="alignment4"> | 745 | <object class="GtkAlignment" id="alignment4"> |
358 | 747 | <property name="visible">True</property> | 746 | <property name="visible">True</property> |
360 | 748 | <property name="left_padding">40</property> | 747 | <property name="left_padding">36</property> |
361 | 749 | <child> | 748 | <child> |
362 | 750 | <object class="GtkTable" id="table1"> | 749 | <object class="GtkTable" id="table1"> |
363 | 751 | <property name="visible">True</property> | 750 | <property name="visible">True</property> |
364 | @@ -1039,9 +1038,6 @@ | |||
365 | 1039 | <property name="position">5</property> | 1038 | <property name="position">5</property> |
366 | 1040 | </packing> | 1039 | </packing> |
367 | 1041 | </child> | 1040 | </child> |
368 | 1042 | <child> | ||
369 | 1043 | <placeholder/> | ||
370 | 1044 | </child> | ||
371 | 1045 | </object> | 1041 | </object> |
372 | 1046 | <packing> | 1042 | <packing> |
373 | 1047 | <property name="position">4</property> | 1043 | <property name="position">4</property> |
374 | @@ -1065,8 +1061,11 @@ | |||
375 | 1065 | <child> | 1061 | <child> |
376 | 1066 | <object class="GtkLabel" id="label15"> | 1062 | <object class="GtkLabel" id="label15"> |
377 | 1067 | <property name="visible">True</property> | 1063 | <property name="visible">True</property> |
380 | 1068 | <property name="label" translatable="yes"><b>Change these options only if you really know what you are doing !</b></property> | 1064 | <property name="xalign">0</property> |
381 | 1069 | <property name="use_markup">True</property> | 1065 | <property name="label" translatable="yes">Only change these options if you really know what you are doing!</property> |
382 | 1066 | <attributes> | ||
383 | 1067 | <attribute name="weight" value="bold"/> | ||
384 | 1068 | </attributes> | ||
385 | 1070 | </object> | 1069 | </object> |
386 | 1071 | <packing> | 1070 | <packing> |
387 | 1072 | <property name="expand">False</property> | 1071 | <property name="expand">False</property> |
388 | @@ -1181,7 +1180,7 @@ | |||
389 | 1181 | <child type="tab"> | 1180 | <child type="tab"> |
390 | 1182 | <object class="GtkLabel" id="label6"> | 1181 | <object class="GtkLabel" id="label6"> |
391 | 1183 | <property name="visible">True</property> | 1182 | <property name="visible">True</property> |
393 | 1184 | <property name="label" translatable="yes">Expert Options</property> | 1183 | <property name="label" translatable="yes">Advanced</property> |
394 | 1185 | </object> | 1184 | </object> |
395 | 1186 | <packing> | 1185 | <packing> |
396 | 1187 | <property name="position">5</property> | 1186 | <property name="position">5</property> |
397 | @@ -1196,8 +1195,11 @@ | |||
398 | 1196 | <child> | 1195 | <child> |
399 | 1197 | <object class="GtkLabel" id="label8"> | 1196 | <object class="GtkLabel" id="label8"> |
400 | 1198 | <property name="visible">True</property> | 1197 | <property name="visible">True</property> |
403 | 1199 | <property name="label" translatable="yes"><b>This options don't depend on profile</b></property> | 1198 | <property name="xalign">0</property> |
404 | 1200 | <property name="use_markup">True</property> | 1199 | <property name="label" translatable="yes">These options do not depend on the snapshot profile</property> |
405 | 1200 | <attributes> | ||
406 | 1201 | <attribute name="weight" value="bold"/> | ||
407 | 1202 | </attributes> | ||
408 | 1201 | </object> | 1203 | </object> |
409 | 1202 | <packing> | 1204 | <packing> |
410 | 1203 | <property name="expand">False</property> | 1205 | <property name="expand">False</property> |
411 | @@ -1229,7 +1231,7 @@ | |||
412 | 1229 | <child type="tab"> | 1231 | <child type="tab"> |
413 | 1230 | <object class="GtkLabel" id="label"> | 1232 | <object class="GtkLabel" id="label"> |
414 | 1231 | <property name="visible">True</property> | 1233 | <property name="visible">True</property> |
416 | 1232 | <property name="label" translatable="yes">GUI Options</property> | 1234 | <property name="label" translatable="yes">Global preferences</property> |
417 | 1233 | </object> | 1235 | </object> |
418 | 1234 | <packing> | 1236 | <packing> |
419 | 1235 | <property name="position">6</property> | 1237 | <property name="position">6</property> |
Merge!