Merge lp:~kiddo/backintime/usability into lp:backintime/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
Reviewer Review Type Date Requested Status
Adolfo Jayme Barrientos (community) Approve
Back In Time Team Pending
Review via email: mp+47946@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Adolfo Jayme Barrientos (fitojb) wrote :

Merge!

review: Approve

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
=== modified file 'gnome/app.py'
--- gnome/app.py 2010-10-18 20:21:39 +0000
+++ gnome/app.py 2011-01-30 23:17:13 +0000
@@ -119,7 +119,6 @@
119 'on_MainWindow_destroy' : gtk.main_quit,119 'on_MainWindow_destroy' : gtk.main_quit,
120 'on_MainWindow_delete_event' : self.on_close,120 'on_MainWindow_delete_event' : self.on_close,
121 'on_MainWindow_key_release_event': self.on_key_release_event,121 'on_MainWindow_key_release_event': self.on_key_release_event,
122 'on_btn_exit_clicked' : self.on_close,
123 'on_btn_help_clicked' : self.on_btn_help_clicked,122 'on_btn_help_clicked' : self.on_btn_help_clicked,
124 'on_btn_about_clicked' : self.on_btn_about_clicked,123 'on_btn_about_clicked' : self.on_btn_about_clicked,
125 'on_btn_settings_clicked' : self.on_btn_settings_clicked,124 'on_btn_settings_clicked' : self.on_btn_settings_clicked,
@@ -142,7 +141,6 @@
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,
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,
144 'on_combo_profiles_changed': self.on_combo_profiles_changed,143 'on_combo_profiles_changed': self.on_combo_profiles_changed,
145 'on_btn_website_clicked': self.on_btn_website_clicked,
146 }144 }
147145
148 builder.connect_signals(signals)146 builder.connect_signals(signals)
@@ -958,9 +956,6 @@
958 #self.on_help()956 #self.on_help()
959 os.system( "gnome-open http://backintime.le-web.org/documentation &" )957 os.system( "gnome-open http://backintime.le-web.org/documentation &" )
960958
961 def on_btn_website_clicked( self, button ):
962 os.system( "gnome-open http://backintime.le-web.org &" )
963
964 def on_key_release_event( self, widget, event ):959 def on_key_release_event( self, widget, event ):
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:
966 self.on_help()961 self.on_help()
967962
=== modified file 'gnome/mainwindow.glade'
--- gnome/mainwindow.glade 2010-10-16 20:07:12 +0000
+++ gnome/mainwindow.glade 2011-01-30 23:17:13 +0000
@@ -1,4 +1,4 @@
1<?xml version="1.0"?>1<?xml version="1.0" encoding="UTF-8"?>
2<interface>2<interface>
3 <requires lib="gtk+" version="2.16"/>3 <requires lib="gtk+" version="2.16"/>
4 <!-- interface-naming-policy toplevel-contextual -->4 <!-- interface-naming-policy toplevel-contextual -->
@@ -33,8 +33,9 @@
33 <child>33 <child>
34 <object class="GtkToolButton" id="btn_backup">34 <object class="GtkToolButton" id="btn_backup">
35 <property name="visible">True</property>35 <property name="visible">True</property>
36 <property name="tooltip_text" translatable="yes">Take snapshot</property>36 <property name="tooltip_text" translatable="yes">Take a snapshot</property>
37 <property name="label" translatable="yes">Backup Now</property>37 <property name="is_important">True</property>
38 <property name="label" translatable="yes">Backup</property>
38 <property name="stock_id">gtk-save</property>39 <property name="stock_id">gtk-save</property>
39 <signal name="clicked" handler="on_btn_backup_clicked"/>40 <signal name="clicked" handler="on_btn_backup_clicked"/>
40 </object>41 </object>
@@ -46,8 +47,8 @@
46 <child>47 <child>
47 <object class="GtkToolButton" id="btn_update_snapshots">48 <object class="GtkToolButton" id="btn_update_snapshots">
48 <property name="visible">True</property>49 <property name="visible">True</property>
49 <property name="tooltip_text" translatable="yes">Refresh snapshots list</property>50 <property name="tooltip_text" translatable="yes">Refresh the list of snapshots</property>
50 <property name="label" translatable="yes">Refresh snapshots list</property>51 <property name="label" translatable="yes">Refresh Snapshots</property>
51 <property name="stock_id">gtk-refresh</property>52 <property name="stock_id">gtk-refresh</property>
52 <signal name="clicked" handler="on_btn_update_snapshots_clicked"/>53 <signal name="clicked" handler="on_btn_update_snapshots_clicked"/>
53 </object>54 </object>
@@ -57,10 +58,34 @@
57 </packing>58 </packing>
58 </child>59 </child>
59 <child>60 <child>
61 <object class="GtkToolButton" id="btn_view_last_log">
62 <property name="visible">True</property>
63 <property name="tooltip_text" translatable="yes">View the log of the latest snapshot</property>
64 <property name="label" translatable="yes">View Last Log</property>
65 <property name="use_underline">True</property>
66 <property name="stock_id">gtk-new</property>
67 <signal name="clicked" handler="on_btn_view_last_log_clicked"/>
68 </object>
69 <packing>
70 <property name="expand">False</property>
71 <property name="homogeneous">True</property>
72 </packing>
73 </child>
74 <child>
75 <object class="GtkSeparatorToolItem" id="toolbutton5">
76 <property name="visible">True</property>
77 </object>
78 <packing>
79 <property name="expand">False</property>
80 <property name="homogeneous">True</property>
81 </packing>
82 </child>
83 <child>
60 <object class="GtkToolButton" id="btn_snapshot_name">84 <object class="GtkToolButton" id="btn_snapshot_name">
61 <property name="visible">True</property>85 <property name="visible">True</property>
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>
63 <property name="label" translatable="yes">Snapshot Name</property>87 <property name="is_important">True</property>
88 <property name="label" translatable="yes">Rename Snapshot</property>
64 <property name="stock_id">gtk-edit</property>89 <property name="stock_id">gtk-edit</property>
65 <signal name="clicked" handler="on_btn_snapshot_name_clicked"/>90 <signal name="clicked" handler="on_btn_snapshot_name_clicked"/>
66 </object>91 </object>
@@ -72,7 +97,7 @@
72 <child>97 <child>
73 <object class="GtkToolButton" id="btn_remove_snapshot">98 <object class="GtkToolButton" id="btn_remove_snapshot">
74 <property name="visible">True</property>99 <property name="visible">True</property>
75 <property name="tooltip_text" translatable="yes">Remove Snapshot</property>100 <property name="tooltip_text" translatable="yes">Remove this snapshot</property>
76 <property name="label" translatable="yes">Remove Snapshot</property>101 <property name="label" translatable="yes">Remove Snapshot</property>
77 <property name="stock_id">gtk-delete</property>102 <property name="stock_id">gtk-delete</property>
78 <signal name="clicked" handler="on_btn_remove_snapshot_clicked"/>103 <signal name="clicked" handler="on_btn_remove_snapshot_clicked"/>
@@ -85,7 +110,7 @@
85 <child>110 <child>
86 <object class="GtkToolButton" id="btn_view_snapshot_log">111 <object class="GtkToolButton" id="btn_view_snapshot_log">
87 <property name="visible">True</property>112 <property name="visible">True</property>
88 <property name="tooltip_markup">View Snapshot Log</property>113 <property name="tooltip_text" translatable="yes">View this snapshot's log</property>
89 <property name="label" translatable="yes">View Snapshot Log</property>114 <property name="label" translatable="yes">View Snapshot Log</property>
90 <property name="use_underline">True</property>115 <property name="use_underline">True</property>
91 <property name="stock_id">gtk-file</property>116 <property name="stock_id">gtk-file</property>
@@ -97,20 +122,6 @@
97 </packing>122 </packing>
98 </child>123 </child>
99 <child>124 <child>
100 <object class="GtkToolButton" id="btn_view_last_log">
101 <property name="visible">True</property>
102 <property name="tooltip_markup">View Last Log</property>
103 <property name="label" translatable="yes">View Last Log</property>
104 <property name="use_underline">True</property>
105 <property name="stock_id">gtk-new</property>
106 <signal name="clicked" handler="on_btn_view_last_log_clicked"/>
107 </object>
108 <packing>
109 <property name="expand">False</property>
110 <property name="homogeneous">True</property>
111 </packing>
112 </child>
113 <child>
114 <object class="GtkSeparatorToolItem" id="toolbutton1">125 <object class="GtkSeparatorToolItem" id="toolbutton1">
115 <property name="visible">True</property>126 <property name="visible">True</property>
116 </object>127 </object>
@@ -119,10 +130,22 @@
119 </packing>130 </packing>
120 </child>131 </child>
121 <child>132 <child>
133 <object class="GtkToolItem" id="mtb_separator1">
134 <property name="visible">True</property>
135 <child>
136 <placeholder/>
137 </child>
138 </object>
139 <packing>
140 <property name="expand">True</property>
141 <property name="homogeneous">True</property>
142 </packing>
143 </child>
144 <child>
122 <object class="GtkToolButton" id="btn_settings">145 <object class="GtkToolButton" id="btn_settings">
123 <property name="visible">True</property>146 <property name="visible">True</property>
124 <property name="tooltip_text" translatable="yes">Settings</property>147 <property name="tooltip_text" translatable="yes">Snapshot and application settings</property>
125 <property name="label" translatable="yes">Settings</property>148 <property name="is_important">True</property>
126 <property name="stock_id">gtk-preferences</property>149 <property name="stock_id">gtk-preferences</property>
127 <signal name="clicked" handler="on_btn_settings_clicked"/>150 <signal name="clicked" handler="on_btn_settings_clicked"/>
128 </object>151 </object>
@@ -132,8 +155,20 @@
132 </packing>155 </packing>
133 </child>156 </child>
134 <child>157 <child>
135 <object class="GtkSeparatorToolItem" id="toolbutton5">158 <object class="GtkSeparatorToolItem" id="toolbutton4">
136 <property name="visible">True</property>159 <property name="visible">True</property>
160 </object>
161 <packing>
162 <property name="expand">False</property>
163 <property name="homogeneous">True</property>
164 </packing>
165 </child>
166 <child>
167 <object class="GtkToolButton" id="btn_help">
168 <property name="visible">True</property>
169 <property name="tooltip_text" translatable="yes">Help</property>
170 <property name="stock_id">gtk-help</property>
171 <signal name="clicked" handler="on_btn_help_clicked"/>
137 </object>172 </object>
138 <packing>173 <packing>
139 <property name="expand">False</property>174 <property name="expand">False</property>
@@ -144,7 +179,6 @@
144 <object class="GtkToolButton" id="btn_about">179 <object class="GtkToolButton" id="btn_about">
145 <property name="visible">True</property>180 <property name="visible">True</property>
146 <property name="tooltip_text" translatable="yes">About</property>181 <property name="tooltip_text" translatable="yes">About</property>
147 <property name="label" translatable="yes">About</property>
148 <property name="stock_id">gtk-about</property>182 <property name="stock_id">gtk-about</property>
149 <signal name="clicked" handler="on_btn_about_clicked"/>183 <signal name="clicked" handler="on_btn_about_clicked"/>
150 </object>184 </object>
@@ -153,74 +187,6 @@
153 <property name="homogeneous">True</property>187 <property name="homogeneous">True</property>
154 </packing>188 </packing>
155 </child>189 </child>
156 <child>
157 <object class="GtkToolButton" id="btn_help">
158 <property name="visible">True</property>
159 <property name="tooltip_text" translatable="yes">Help</property>
160 <property name="label" translatable="yes">Help</property>
161 <property name="stock_id">gtk-help</property>
162 <signal name="clicked" handler="on_btn_help_clicked"/>
163 </object>
164 <packing>
165 <property name="expand">False</property>
166 <property name="homogeneous">True</property>
167 </packing>
168 </child>
169 <child>
170 <object class="GtkSeparatorToolItem" id="toolbutton2">
171 <property name="visible">True</property>
172 </object>
173 <packing>
174 <property name="expand">False</property>
175 </packing>
176 </child>
177 <child>
178 <object class="GtkToolButton" id="btn_exit">
179 <property name="visible">True</property>
180 <property name="tooltip_text" translatable="yes">Exit</property>
181 <property name="label" translatable="yes">Exit</property>
182 <property name="stock_id">gtk-quit</property>
183 <signal name="clicked" handler="on_btn_exit_clicked"/>
184 </object>
185 <packing>
186 <property name="expand">False</property>
187 <property name="homogeneous">True</property>
188 </packing>
189 </child>
190 <child>
191 <object class="GtkToolItem" id="mtb_separator1">
192 <property name="visible">True</property>
193 <child>
194 <placeholder/>
195 </child>
196 </object>
197 <packing>
198 <property name="expand">True</property>
199 <property name="homogeneous">True</property>
200 </packing>
201 </child>
202 <child>
203 <object class="GtkSeparatorToolItem" id="toolbutton4">
204 <property name="visible">True</property>
205 </object>
206 <packing>
207 <property name="expand">False</property>
208 <property name="homogeneous">True</property>
209 </packing>
210 </child>
211 <child>
212 <object class="GtkToolButton" id="btn_website">
213 <property name="visible">True</property>
214 <property name="tooltip_text" translatable="yes">Website</property>
215 <property name="label" translatable="yes">Website</property>
216 <property name="stock_id">gtk-home</property>
217 <signal name="clicked" handler="on_btn_website_clicked"/>
218 </object>
219 <packing>
220 <property name="expand">False</property>
221 <property name="homogeneous">True</property>
222 </packing>
223 </child>
224 </object>190 </object>
225 <packing>191 <packing>
226 <property name="expand">False</property>192 <property name="expand">False</property>
@@ -287,7 +253,7 @@
287 <property name="visible">True</property>253 <property name="visible">True</property>
288 <property name="can_focus">True</property>254 <property name="can_focus">True</property>
289 <property name="editable">False</property>255 <property name="editable">False</property>
290 <property name="invisible_char">&#x2022;</property>256 <property name="invisible_char">•</property>
291 </object>257 </object>
292 </child>258 </child>
293 </object>259 </object>
@@ -322,7 +288,7 @@
322 <property name="visible">True</property>288 <property name="visible">True</property>
323 <property name="has_tooltip">True</property>289 <property name="has_tooltip">True</property>
324 <property name="tooltip_text" translatable="yes">Restore</property>290 <property name="tooltip_text" translatable="yes">Restore</property>
325 <property name="label" translatable="yes">Restore</property>291 <property name="is_important">True</property>
326 <property name="stock_id">gtk-undelete</property>292 <property name="stock_id">gtk-undelete</property>
327 <signal name="clicked" handler="on_btn_restore_clicked"/>293 <signal name="clicked" handler="on_btn_restore_clicked"/>
328 </object>294 </object>
@@ -336,7 +302,6 @@
336 <property name="visible">True</property>302 <property name="visible">True</property>
337 <property name="has_tooltip">True</property>303 <property name="has_tooltip">True</property>
338 <property name="tooltip_text" translatable="yes">Copy</property>304 <property name="tooltip_text" translatable="yes">Copy</property>
339 <property name="label" translatable="yes">Copy</property>
340 <property name="stock_id">gtk-copy</property>305 <property name="stock_id">gtk-copy</property>
341 <signal name="clicked" handler="on_btn_copy_clicked"/>306 <signal name="clicked" handler="on_btn_copy_clicked"/>
342 </object>307 </object>
343308
=== modified file 'gnome/settingsdialog.glade'
--- gnome/settingsdialog.glade 2010-11-02 20:51:40 +0000
+++ gnome/settingsdialog.glade 2011-01-30 23:17:13 +0000
@@ -1,4 +1,4 @@
1<?xml version="1.0"?>1<?xml version="1.0" encoding="UTF-8"?>
2<interface>2<interface>
3 <requires lib="gtk+" version="2.16"/>3 <requires lib="gtk+" version="2.16"/>
4 <!-- interface-naming-policy toplevel-contextual -->4 <!-- interface-naming-policy toplevel-contextual -->
@@ -10,11 +10,10 @@
10 <property name="destroy_with_parent">True</property>10 <property name="destroy_with_parent">True</property>
11 <property name="icon_name">gtk-preferences</property>11 <property name="icon_name">gtk-preferences</property>
12 <property name="type_hint">dialog</property>12 <property name="type_hint">dialog</property>
13 <property name="has_separator">False</property>
14 <child internal-child="vbox">13 <child internal-child="vbox">
15 <object class="GtkVBox" id="dialog-vbox2">14 <object class="GtkVBox" id="dialog-vbox2">
16 <property name="visible">True</property>15 <property name="visible">True</property>
17 <property name="spacing">2</property>16 <property name="spacing">6</property>
18 <child>17 <child>
19 <object class="GtkHBox" id="hbox5">18 <object class="GtkHBox" id="hbox5">
20 <property name="visible">True</property>19 <property name="visible">True</property>
@@ -136,7 +135,7 @@
136 <property name="visible">True</property>135 <property name="visible">True</property>
137 <property name="can_focus">True</property>136 <property name="can_focus">True</property>
138 <property name="editable">False</property>137 <property name="editable">False</property>
139 <property name="invisible_char">&#x2022;</property>138 <property name="invisible_char">•</property>
140 </object>139 </object>
141 <packing>140 <packing>
142 <property name="position">0</property>141 <property name="position">0</property>
@@ -209,7 +208,7 @@
209 <object class="GtkEntry" id="txt_host">208 <object class="GtkEntry" id="txt_host">
210 <property name="visible">True</property>209 <property name="visible">True</property>
211 <property name="can_focus">True</property>210 <property name="can_focus">True</property>
212 <property name="invisible_char">&#x2022;</property>211 <property name="invisible_char">•</property>
213 </object>212 </object>
214 <packing>213 <packing>
215 <property name="position">1</property>214 <property name="position">1</property>
@@ -229,7 +228,7 @@
229 <object class="GtkEntry" id="txt_user">228 <object class="GtkEntry" id="txt_user">
230 <property name="visible">True</property>229 <property name="visible">True</property>
231 <property name="can_focus">True</property>230 <property name="can_focus">True</property>
232 <property name="invisible_char">&#x2022;</property>231 <property name="invisible_char">•</property>
233 </object>232 </object>
234 <packing>233 <packing>
235 <property name="position">3</property>234 <property name="position">3</property>
@@ -249,7 +248,7 @@
249 <object class="GtkEntry" id="txt_profile">248 <object class="GtkEntry" id="txt_profile">
250 <property name="visible">True</property>249 <property name="visible">True</property>
251 <property name="can_focus">True</property>250 <property name="can_focus">True</property>
252 <property name="invisible_char">&#x2022;</property>251 <property name="invisible_char">•</property>
253 </object>252 </object>
254 <packing>253 <packing>
255 <property name="position">5</property>254 <property name="position">5</property>
@@ -745,7 +744,7 @@
745 <child>744 <child>
746 <object class="GtkAlignment" id="alignment4">745 <object class="GtkAlignment" id="alignment4">
747 <property name="visible">True</property>746 <property name="visible">True</property>
748 <property name="left_padding">40</property>747 <property name="left_padding">36</property>
749 <child>748 <child>
750 <object class="GtkTable" id="table1">749 <object class="GtkTable" id="table1">
751 <property name="visible">True</property>750 <property name="visible">True</property>
@@ -1039,9 +1038,6 @@
1039 <property name="position">5</property>1038 <property name="position">5</property>
1040 </packing>1039 </packing>
1041 </child>1040 </child>
1042 <child>
1043 <placeholder/>
1044 </child>
1045 </object>1041 </object>
1046 <packing>1042 <packing>
1047 <property name="position">4</property>1043 <property name="position">4</property>
@@ -1065,8 +1061,11 @@
1065 <child>1061 <child>
1066 <object class="GtkLabel" id="label15">1062 <object class="GtkLabel" id="label15">
1067 <property name="visible">True</property>1063 <property name="visible">True</property>
1068 <property name="label" translatable="yes">&lt;b&gt;Change these options only if you really know what you are doing !&lt;/b&gt;</property>1064 <property name="xalign">0</property>
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>
1066 <attributes>
1067 <attribute name="weight" value="bold"/>
1068 </attributes>
1070 </object>1069 </object>
1071 <packing>1070 <packing>
1072 <property name="expand">False</property>1071 <property name="expand">False</property>
@@ -1181,7 +1180,7 @@
1181 <child type="tab">1180 <child type="tab">
1182 <object class="GtkLabel" id="label6">1181 <object class="GtkLabel" id="label6">
1183 <property name="visible">True</property>1182 <property name="visible">True</property>
1184 <property name="label" translatable="yes">Expert Options</property>1183 <property name="label" translatable="yes">Advanced</property>
1185 </object>1184 </object>
1186 <packing>1185 <packing>
1187 <property name="position">5</property>1186 <property name="position">5</property>
@@ -1196,8 +1195,11 @@
1196 <child>1195 <child>
1197 <object class="GtkLabel" id="label8">1196 <object class="GtkLabel" id="label8">
1198 <property name="visible">True</property>1197 <property name="visible">True</property>
1199 <property name="label" translatable="yes">&lt;b&gt;This options don't depend on profile&lt;/b&gt;</property>1198 <property name="xalign">0</property>
1200 <property name="use_markup">True</property>1199 <property name="label" translatable="yes">These options do not depend on the snapshot profile</property>
1200 <attributes>
1201 <attribute name="weight" value="bold"/>
1202 </attributes>
1201 </object>1203 </object>
1202 <packing>1204 <packing>
1203 <property name="expand">False</property>1205 <property name="expand">False</property>
@@ -1229,7 +1231,7 @@
1229 <child type="tab">1231 <child type="tab">
1230 <object class="GtkLabel" id="label">1232 <object class="GtkLabel" id="label">
1231 <property name="visible">True</property>1233 <property name="visible">True</property>
1232 <property name="label" translatable="yes">GUI Options</property>1234 <property name="label" translatable="yes">Global preferences</property>
1233 </object>1235 </object>
1234 <packing>1236 <packing>
1235 <property name="position">6</property>1237 <property name="position">6</property>

Subscribers

People subscribed via source and target branches