Merge lp:~kiddo/backintime/usability into lp:backintime/1.0

Proposed by Jeff Fortin Tam on 2011-01-30
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
Reviewer Review Type Date Requested Status
Adolfo Jayme (community) Approve on 2011-10-17
Back In Time Team 2011-01-30 Pending
Review via email: mp+47946@code.launchpad.net
To post a comment you must log in.
Adolfo Jayme (fitojb) wrote :

Merge!

review: Approve

Unmerged revisions

778. By Jeff Fortin Tam on 2010-12-07

Settings: standardize spacing, alignment, wording

777. By Jeff Fortin Tam on 2010-12-07

Kill the "Website" button, rearrange the rest to make a clear distinction between global and contextual actions

776. By Jeff Fortin Tam on 2010-12-07

Use "header" capitalization for button labels, "sentence" for tooltips

775. By Jeff Fortin Tam on 2010-12-07

Prioritize toolbar buttons, rename them for clarity, use stock buttons

774. By Jeff Fortin Tam on 2010-12-07

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 'on_MainWindow_destroy' : gtk.main_quit,
6 'on_MainWindow_delete_event' : self.on_close,
7 'on_MainWindow_key_release_event': self.on_key_release_event,
8- 'on_btn_exit_clicked' : self.on_close,
9 'on_btn_help_clicked' : self.on_btn_help_clicked,
10 'on_btn_about_clicked' : self.on_btn_about_clicked,
11 'on_btn_settings_clicked' : self.on_btn_settings_clicked,
12@@ -142,7 +141,6 @@
13 'on_list_folder_view_drag_data_get': self.on_list_folder_view_drag_data_get,
14 'on_list_folder_view_key_press_event' : self.on_list_folder_view_key_press_event,
15 'on_combo_profiles_changed': self.on_combo_profiles_changed,
16- 'on_btn_website_clicked': self.on_btn_website_clicked,
17 }
18
19 builder.connect_signals(signals)
20@@ -958,9 +956,6 @@
21 #self.on_help()
22 os.system( "gnome-open http://backintime.le-web.org/documentation &" )
23
24- def on_btn_website_clicked( self, button ):
25- os.system( "gnome-open http://backintime.le-web.org &" )
26-
27 def on_key_release_event( self, widget, event ):
28 if 'F1' == gtk.gdk.keyval_name( event.keyval ) and ( event.state & (gtk.gdk.CONTROL_MASK | gtk.gdk.MOD1_MASK) ) == 0:
29 self.on_help()
30
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 @@
35-<?xml version="1.0"?>
36+<?xml version="1.0" encoding="UTF-8"?>
37 <interface>
38 <requires lib="gtk+" version="2.16"/>
39 <!-- interface-naming-policy toplevel-contextual -->
40@@ -33,8 +33,9 @@
41 <child>
42 <object class="GtkToolButton" id="btn_backup">
43 <property name="visible">True</property>
44- <property name="tooltip_text" translatable="yes">Take snapshot</property>
45- <property name="label" translatable="yes">Backup Now</property>
46+ <property name="tooltip_text" translatable="yes">Take a snapshot</property>
47+ <property name="is_important">True</property>
48+ <property name="label" translatable="yes">Backup</property>
49 <property name="stock_id">gtk-save</property>
50 <signal name="clicked" handler="on_btn_backup_clicked"/>
51 </object>
52@@ -46,8 +47,8 @@
53 <child>
54 <object class="GtkToolButton" id="btn_update_snapshots">
55 <property name="visible">True</property>
56- <property name="tooltip_text" translatable="yes">Refresh snapshots list</property>
57- <property name="label" translatable="yes">Refresh snapshots list</property>
58+ <property name="tooltip_text" translatable="yes">Refresh the list of snapshots</property>
59+ <property name="label" translatable="yes">Refresh Snapshots</property>
60 <property name="stock_id">gtk-refresh</property>
61 <signal name="clicked" handler="on_btn_update_snapshots_clicked"/>
62 </object>
63@@ -57,10 +58,34 @@
64 </packing>
65 </child>
66 <child>
67+ <object class="GtkToolButton" id="btn_view_last_log">
68+ <property name="visible">True</property>
69+ <property name="tooltip_text" translatable="yes">View the log of the latest snapshot</property>
70+ <property name="label" translatable="yes">View Last Log</property>
71+ <property name="use_underline">True</property>
72+ <property name="stock_id">gtk-new</property>
73+ <signal name="clicked" handler="on_btn_view_last_log_clicked"/>
74+ </object>
75+ <packing>
76+ <property name="expand">False</property>
77+ <property name="homogeneous">True</property>
78+ </packing>
79+ </child>
80+ <child>
81+ <object class="GtkSeparatorToolItem" id="toolbutton5">
82+ <property name="visible">True</property>
83+ </object>
84+ <packing>
85+ <property name="expand">False</property>
86+ <property name="homogeneous">True</property>
87+ </packing>
88+ </child>
89+ <child>
90 <object class="GtkToolButton" id="btn_snapshot_name">
91 <property name="visible">True</property>
92- <property name="tooltip_text" translatable="yes">Snapshot Name</property>
93- <property name="label" translatable="yes">Snapshot Name</property>
94+ <property name="tooltip_text" translatable="yes">Assign a custom name to this snapshot</property>
95+ <property name="is_important">True</property>
96+ <property name="label" translatable="yes">Rename Snapshot</property>
97 <property name="stock_id">gtk-edit</property>
98 <signal name="clicked" handler="on_btn_snapshot_name_clicked"/>
99 </object>
100@@ -72,7 +97,7 @@
101 <child>
102 <object class="GtkToolButton" id="btn_remove_snapshot">
103 <property name="visible">True</property>
104- <property name="tooltip_text" translatable="yes">Remove Snapshot</property>
105+ <property name="tooltip_text" translatable="yes">Remove this snapshot</property>
106 <property name="label" translatable="yes">Remove Snapshot</property>
107 <property name="stock_id">gtk-delete</property>
108 <signal name="clicked" handler="on_btn_remove_snapshot_clicked"/>
109@@ -85,7 +110,7 @@
110 <child>
111 <object class="GtkToolButton" id="btn_view_snapshot_log">
112 <property name="visible">True</property>
113- <property name="tooltip_markup">View Snapshot Log</property>
114+ <property name="tooltip_text" translatable="yes">View this snapshot's log</property>
115 <property name="label" translatable="yes">View Snapshot Log</property>
116 <property name="use_underline">True</property>
117 <property name="stock_id">gtk-file</property>
118@@ -97,20 +122,6 @@
119 </packing>
120 </child>
121 <child>
122- <object class="GtkToolButton" id="btn_view_last_log">
123- <property name="visible">True</property>
124- <property name="tooltip_markup">View Last Log</property>
125- <property name="label" translatable="yes">View Last Log</property>
126- <property name="use_underline">True</property>
127- <property name="stock_id">gtk-new</property>
128- <signal name="clicked" handler="on_btn_view_last_log_clicked"/>
129- </object>
130- <packing>
131- <property name="expand">False</property>
132- <property name="homogeneous">True</property>
133- </packing>
134- </child>
135- <child>
136 <object class="GtkSeparatorToolItem" id="toolbutton1">
137 <property name="visible">True</property>
138 </object>
139@@ -119,10 +130,22 @@
140 </packing>
141 </child>
142 <child>
143+ <object class="GtkToolItem" id="mtb_separator1">
144+ <property name="visible">True</property>
145+ <child>
146+ <placeholder/>
147+ </child>
148+ </object>
149+ <packing>
150+ <property name="expand">True</property>
151+ <property name="homogeneous">True</property>
152+ </packing>
153+ </child>
154+ <child>
155 <object class="GtkToolButton" id="btn_settings">
156 <property name="visible">True</property>
157- <property name="tooltip_text" translatable="yes">Settings</property>
158- <property name="label" translatable="yes">Settings</property>
159+ <property name="tooltip_text" translatable="yes">Snapshot and application settings</property>
160+ <property name="is_important">True</property>
161 <property name="stock_id">gtk-preferences</property>
162 <signal name="clicked" handler="on_btn_settings_clicked"/>
163 </object>
164@@ -132,8 +155,20 @@
165 </packing>
166 </child>
167 <child>
168- <object class="GtkSeparatorToolItem" id="toolbutton5">
169- <property name="visible">True</property>
170+ <object class="GtkSeparatorToolItem" id="toolbutton4">
171+ <property name="visible">True</property>
172+ </object>
173+ <packing>
174+ <property name="expand">False</property>
175+ <property name="homogeneous">True</property>
176+ </packing>
177+ </child>
178+ <child>
179+ <object class="GtkToolButton" id="btn_help">
180+ <property name="visible">True</property>
181+ <property name="tooltip_text" translatable="yes">Help</property>
182+ <property name="stock_id">gtk-help</property>
183+ <signal name="clicked" handler="on_btn_help_clicked"/>
184 </object>
185 <packing>
186 <property name="expand">False</property>
187@@ -144,7 +179,6 @@
188 <object class="GtkToolButton" id="btn_about">
189 <property name="visible">True</property>
190 <property name="tooltip_text" translatable="yes">About</property>
191- <property name="label" translatable="yes">About</property>
192 <property name="stock_id">gtk-about</property>
193 <signal name="clicked" handler="on_btn_about_clicked"/>
194 </object>
195@@ -153,74 +187,6 @@
196 <property name="homogeneous">True</property>
197 </packing>
198 </child>
199- <child>
200- <object class="GtkToolButton" id="btn_help">
201- <property name="visible">True</property>
202- <property name="tooltip_text" translatable="yes">Help</property>
203- <property name="label" translatable="yes">Help</property>
204- <property name="stock_id">gtk-help</property>
205- <signal name="clicked" handler="on_btn_help_clicked"/>
206- </object>
207- <packing>
208- <property name="expand">False</property>
209- <property name="homogeneous">True</property>
210- </packing>
211- </child>
212- <child>
213- <object class="GtkSeparatorToolItem" id="toolbutton2">
214- <property name="visible">True</property>
215- </object>
216- <packing>
217- <property name="expand">False</property>
218- </packing>
219- </child>
220- <child>
221- <object class="GtkToolButton" id="btn_exit">
222- <property name="visible">True</property>
223- <property name="tooltip_text" translatable="yes">Exit</property>
224- <property name="label" translatable="yes">Exit</property>
225- <property name="stock_id">gtk-quit</property>
226- <signal name="clicked" handler="on_btn_exit_clicked"/>
227- </object>
228- <packing>
229- <property name="expand">False</property>
230- <property name="homogeneous">True</property>
231- </packing>
232- </child>
233- <child>
234- <object class="GtkToolItem" id="mtb_separator1">
235- <property name="visible">True</property>
236- <child>
237- <placeholder/>
238- </child>
239- </object>
240- <packing>
241- <property name="expand">True</property>
242- <property name="homogeneous">True</property>
243- </packing>
244- </child>
245- <child>
246- <object class="GtkSeparatorToolItem" id="toolbutton4">
247- <property name="visible">True</property>
248- </object>
249- <packing>
250- <property name="expand">False</property>
251- <property name="homogeneous">True</property>
252- </packing>
253- </child>
254- <child>
255- <object class="GtkToolButton" id="btn_website">
256- <property name="visible">True</property>
257- <property name="tooltip_text" translatable="yes">Website</property>
258- <property name="label" translatable="yes">Website</property>
259- <property name="stock_id">gtk-home</property>
260- <signal name="clicked" handler="on_btn_website_clicked"/>
261- </object>
262- <packing>
263- <property name="expand">False</property>
264- <property name="homogeneous">True</property>
265- </packing>
266- </child>
267 </object>
268 <packing>
269 <property name="expand">False</property>
270@@ -287,7 +253,7 @@
271 <property name="visible">True</property>
272 <property name="can_focus">True</property>
273 <property name="editable">False</property>
274- <property name="invisible_char">&#x2022;</property>
275+ <property name="invisible_char">•</property>
276 </object>
277 </child>
278 </object>
279@@ -322,7 +288,7 @@
280 <property name="visible">True</property>
281 <property name="has_tooltip">True</property>
282 <property name="tooltip_text" translatable="yes">Restore</property>
283- <property name="label" translatable="yes">Restore</property>
284+ <property name="is_important">True</property>
285 <property name="stock_id">gtk-undelete</property>
286 <signal name="clicked" handler="on_btn_restore_clicked"/>
287 </object>
288@@ -336,7 +302,6 @@
289 <property name="visible">True</property>
290 <property name="has_tooltip">True</property>
291 <property name="tooltip_text" translatable="yes">Copy</property>
292- <property name="label" translatable="yes">Copy</property>
293 <property name="stock_id">gtk-copy</property>
294 <signal name="clicked" handler="on_btn_copy_clicked"/>
295 </object>
296
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 @@
301-<?xml version="1.0"?>
302+<?xml version="1.0" encoding="UTF-8"?>
303 <interface>
304 <requires lib="gtk+" version="2.16"/>
305 <!-- interface-naming-policy toplevel-contextual -->
306@@ -10,11 +10,10 @@
307 <property name="destroy_with_parent">True</property>
308 <property name="icon_name">gtk-preferences</property>
309 <property name="type_hint">dialog</property>
310- <property name="has_separator">False</property>
311 <child internal-child="vbox">
312 <object class="GtkVBox" id="dialog-vbox2">
313 <property name="visible">True</property>
314- <property name="spacing">2</property>
315+ <property name="spacing">6</property>
316 <child>
317 <object class="GtkHBox" id="hbox5">
318 <property name="visible">True</property>
319@@ -136,7 +135,7 @@
320 <property name="visible">True</property>
321 <property name="can_focus">True</property>
322 <property name="editable">False</property>
323- <property name="invisible_char">&#x2022;</property>
324+ <property name="invisible_char">•</property>
325 </object>
326 <packing>
327 <property name="position">0</property>
328@@ -209,7 +208,7 @@
329 <object class="GtkEntry" id="txt_host">
330 <property name="visible">True</property>
331 <property name="can_focus">True</property>
332- <property name="invisible_char">&#x2022;</property>
333+ <property name="invisible_char">•</property>
334 </object>
335 <packing>
336 <property name="position">1</property>
337@@ -229,7 +228,7 @@
338 <object class="GtkEntry" id="txt_user">
339 <property name="visible">True</property>
340 <property name="can_focus">True</property>
341- <property name="invisible_char">&#x2022;</property>
342+ <property name="invisible_char">•</property>
343 </object>
344 <packing>
345 <property name="position">3</property>
346@@ -249,7 +248,7 @@
347 <object class="GtkEntry" id="txt_profile">
348 <property name="visible">True</property>
349 <property name="can_focus">True</property>
350- <property name="invisible_char">&#x2022;</property>
351+ <property name="invisible_char">•</property>
352 </object>
353 <packing>
354 <property name="position">5</property>
355@@ -745,7 +744,7 @@
356 <child>
357 <object class="GtkAlignment" id="alignment4">
358 <property name="visible">True</property>
359- <property name="left_padding">40</property>
360+ <property name="left_padding">36</property>
361 <child>
362 <object class="GtkTable" id="table1">
363 <property name="visible">True</property>
364@@ -1039,9 +1038,6 @@
365 <property name="position">5</property>
366 </packing>
367 </child>
368- <child>
369- <placeholder/>
370- </child>
371 </object>
372 <packing>
373 <property name="position">4</property>
374@@ -1065,8 +1061,11 @@
375 <child>
376 <object class="GtkLabel" id="label15">
377 <property name="visible">True</property>
378- <property name="label" translatable="yes">&lt;b&gt;Change these options only if you really know what you are doing !&lt;/b&gt;</property>
379- <property name="use_markup">True</property>
380+ <property name="xalign">0</property>
381+ <property name="label" translatable="yes">Only change these options if you really know what you are doing!</property>
382+ <attributes>
383+ <attribute name="weight" value="bold"/>
384+ </attributes>
385 </object>
386 <packing>
387 <property name="expand">False</property>
388@@ -1181,7 +1180,7 @@
389 <child type="tab">
390 <object class="GtkLabel" id="label6">
391 <property name="visible">True</property>
392- <property name="label" translatable="yes">Expert Options</property>
393+ <property name="label" translatable="yes">Advanced</property>
394 </object>
395 <packing>
396 <property name="position">5</property>
397@@ -1196,8 +1195,11 @@
398 <child>
399 <object class="GtkLabel" id="label8">
400 <property name="visible">True</property>
401- <property name="label" translatable="yes">&lt;b&gt;This options don't depend on profile&lt;/b&gt;</property>
402- <property name="use_markup">True</property>
403+ <property name="xalign">0</property>
404+ <property name="label" translatable="yes">These options do not depend on the snapshot profile</property>
405+ <attributes>
406+ <attribute name="weight" value="bold"/>
407+ </attributes>
408 </object>
409 <packing>
410 <property name="expand">False</property>
411@@ -1229,7 +1231,7 @@
412 <child type="tab">
413 <object class="GtkLabel" id="label">
414 <property name="visible">True</property>
415- <property name="label" translatable="yes">GUI Options</property>
416+ <property name="label" translatable="yes">Global preferences</property>
417 </object>
418 <packing>
419 <property name="position">6</property>

Subscribers

People subscribed via source and target branches