Awn

Merge lp:~albyrock87/awn/awn-lucido into lp:awn/0.4

Proposed by Alberto Aldegheri
Status: Merged
Merged at revision: 716
Proposed branch: lp:~albyrock87/awn/awn-lucido
Merge into: lp:awn/0.4
Diff against target: 548 lines (+153/-64)
5 files modified
applets/taskmanager/task-icon-build-context-menus.c (+4/-4)
awn-settings/awnClass.py (+13/-19)
awn-settings/awnSettings.py.in (+6/-6)
po/avant-window-navigator.pot (+120/-33)
src/awn-background-lucido.c (+10/-2)
To merge this branch: bzr merge lp:~albyrock87/awn/awn-lucido
Reviewer Review Type Date Requested Status
Awn-core Pending
Review via email: mp+31000@code.launchpad.net

Description of the change

- Better starting animation for Lucido Style
- Some Translation patches for bug #608927
- Fixed critical on Lucdio start

To post a comment you must log in.
Revision history for this message
Michal Hruby (mhr3) wrote :

Is the refresh method even called by anything now? If not it should be just removed.

Revision history for this message
Michal Hruby (mhr3) wrote :

RE: 126 - Please use printf-style string, not every language has to use the dir name as first word.

lp:~albyrock87/awn/awn-lucido updated
766. By Alberto <alby@CASA>

Remove unused refresh method from awnClass.py. A little fix to a translation string.

Revision history for this message
Alberto Aldegheri (albyrock87) wrote :

> Is the refresh method even called by anything now? If not it should be just removed.
> RE: 126 - Please use printf-style string, not every language has to use the
> dir name as first word.

Done :) thank you for review!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'applets/taskmanager/task-icon-build-context-menus.c'
2--- applets/taskmanager/task-icon-build-context-menus.c 2010-07-19 22:41:03 +0000
3+++ applets/taskmanager/task-icon-build-context-menus.c 2010-08-04 20:12:46 +0000
4@@ -812,7 +812,7 @@
5 {
6 continue;
7 }
8- menuitem = gtk_image_menu_item_new_with_label ("Minimize all");
9+ menuitem = gtk_image_menu_item_new_with_label (_("Minimize all"));
10 gtk_widget_show (menuitem);
11 g_signal_connect (menuitem,"activate",G_CALLBACK(_minimize_all_cb),icon);
12 }
13@@ -848,7 +848,7 @@
14 {
15 continue;
16 }
17- menuitem = gtk_image_menu_item_new_with_label ("Unminimize all");
18+ menuitem = gtk_image_menu_item_new_with_label (_("Unminimize all"));
19 gtk_widget_show (menuitem);
20 g_signal_connect (menuitem,"activate",G_CALLBACK(_unminimize_all_cb),icon);
21 }
22@@ -884,7 +884,7 @@
23 {
24 continue;
25 }
26- menuitem = gtk_image_menu_item_new_with_label ("Maximize all");
27+ menuitem = gtk_image_menu_item_new_with_label (_("Maximize all"));
28 gtk_widget_show (menuitem);
29 g_signal_connect (menuitem,"activate",G_CALLBACK(_maximize_all_cb),icon);
30 }
31@@ -920,7 +920,7 @@
32 {
33 continue;
34 }
35- menuitem = gtk_image_menu_item_new_with_label ("Unmaximize all");
36+ menuitem = gtk_image_menu_item_new_with_label (_("Unmaximize all"));
37 gtk_widget_show (menuitem);
38 g_signal_connect (menuitem,"activate",G_CALLBACK(_unmaximize_all_cb),icon);
39 }
40
41=== modified file 'awn-settings/awnClass.py'
42--- awn-settings/awnClass.py 2010-07-19 22:28:12 +0000
43+++ awn-settings/awnClass.py 2010-08-04 20:12:46 +0000
44@@ -1061,13 +1061,6 @@
45 def changeTab(self, iconView):
46 self.notebook.set_current_page(iconView.get_cursor()[0][0])
47
48- def refresh(self, button):
49- dialog = gtk.MessageDialog(self.window, 0, gtk.MESSAGE_INFO,
50- gtk.BUTTONS_OK,
51- _('AWN has been successfully refreshed'))
52- dialog.run()
53- dialog.hide()
54-
55 def about(self, button):
56 self.about = gtk.AboutDialog()
57 self.about.set_name(_("Avant Window Navigator"))
58@@ -1221,7 +1214,7 @@
59 dialog.set_default_response(gtk.RESPONSE_OK)
60
61 filter = gtk.FileFilter()
62- filter.set_name("AWN Applet Package")
63+ filter.set_name(_("Awn Applet Package"))
64 filter.add_pattern("*.tar.gz")
65 filter.add_pattern("*.tgz")
66 filter.add_pattern("*.bz2")
67@@ -1266,7 +1259,7 @@
68 else:
69 self.register_applet(appletpath, False, applet_exists)
70 else:
71- message = "Applet Installation Failed"
72+ message = _("Applet Installation Failed")
73 success = gtk.MessageDialog(parent=None, flags=0, type=gtk.MESSAGE_WARNING, buttons=gtk.BUTTONS_OK, message_format=message)
74 success.run()
75 success.destroy()
76@@ -1278,7 +1271,7 @@
77 model = self.appmodel
78
79 if applet_exists:
80- message = "Applet Successfully Updated"
81+ message = _("Applet Successfully Updated")
82 else:
83 icon, text, name = self.make_row (appletpath)
84 if len (text) > 2:
85@@ -1294,9 +1287,9 @@
86 model.set_value (row, 3, name)
87
88 if msg:
89- message = "Applet Successfully Added"
90+ message = _("Applet Successfully Added")
91 else:
92- message = "Applet Installation Failed"
93+ message = _("Applet Installation Failed")
94
95 if msg:
96 success = gtk.MessageDialog(parent=None, flags=0, type=gtk.MESSAGE_WARNING, buttons=gtk.BUTTONS_OK, message_format=message)
97@@ -1346,15 +1339,15 @@
98
99 self.active_model.foreach(self.test_active, path)
100 if self.active_found:
101- self.popup_msg("Can not delete active applet")
102+ self.popup_msg(_("Can not delete active applet"))
103 return
104
105- dialog = gtk.Dialog("Delete Applet",
106+ dialog = gtk.Dialog(_("Delete Applet"),
107 None,
108 gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
109 (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT,
110 gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
111- label = gtk.Label("<b>Delete %s?</b>" % item.getName())
112+ label = gtk.Label(_("<b>Delete %s?</b>") % item.getName())
113 label.set_use_markup(True)
114 align = gtk.Alignment()
115 align.set_padding(5,5,5,5)
116@@ -1374,7 +1367,7 @@
117 dialog.destroy()
118 else:
119 dialog.destroy()
120- self.popup_msg("Unable to Delete Applet")
121+ self.popup_msg(_("Unable to Delete Applet"))
122 else:
123 dialog.destroy()
124
125@@ -1580,7 +1573,8 @@
126 shutil.rmtree(themedir)
127 if os.path.exists(themedir):
128 self.hide_export_dialog(None)
129- msg = themedir+" already exists, unable to export theme."
130+ # Translators: This string is preceded by a filename
131+ msg = _("%s already exists, unable to export theme.") % (themedir)
132 self.theme_message(msg)
133 return
134
135@@ -1656,7 +1650,7 @@
136 themedir = os.path.join(defs.HOME_THEME_DIR, filename)
137
138 if os.path.exists(themefile):
139- msg = "Theme already installed, do you wish to overwrite it?"
140+ msg = _("Theme already installed, do you wish to overwrite it?")
141 message = gtk.MessageDialog(parent=None, flags=0, type=gtk.MESSAGE_WARNING, buttons=gtk.BUTTONS_YES_NO, message_format=msg)
142 resp = message.run()
143 if resp != gtk.RESPONSE_YES:
144@@ -1690,7 +1684,7 @@
145 f.close()
146 self.add_uris_to_model(self.treeview_themes.get_model(),[themefile])
147 else:
148- msg = "This is an incompatible theme file."
149+ msg = _("This is an incompatible theme file.")
150 self.theme_message(msg)
151
152 def delete_theme(self):
153
154=== modified file 'awn-settings/awnSettings.py.in'
155--- awn-settings/awnSettings.py.in 2010-07-19 22:28:12 +0000
156+++ awn-settings/awnSettings.py.in 2010-08-04 20:12:46 +0000
157@@ -626,7 +626,7 @@
158 self.custom_arrow_chooser.set_filename(filename)
159 self.custom_arrow_chooser.connect('file-set', self.arrow_select_callback)
160 filter = gtk.FileFilter()
161- filter.set_name("PNG Image")
162+ filter.set_name(_("PNG Image"))
163 filter.add_pattern("*.png")
164 self.custom_arrow_chooser.add_filter(filter)
165 self.custom_arrow_chooser.set_filter(filter)
166@@ -638,7 +638,7 @@
167 self.pattern_chooser.set_filename(filename)
168 self.pattern_chooser.connect('file-set', self.pattern_select_callback)
169 filter = gtk.FileFilter()
170- filter.set_name("Images")
171+ filter.set_name(_("Images"))
172 filter.add_pattern("*.png")
173 filter.add_pattern("*.svg")
174 filter.add_pattern("*.xpm")
175@@ -756,7 +756,7 @@
176
177 filename = "".join([x for x in name if x.isalpha() or x.isdigit()])
178
179- fc = gtk.FileChooserDialog(title='Save Theme...',
180+ fc = gtk.FileChooserDialog(title=_('Save Theme...'),
181 parent=None,
182 action=gtk.FILE_CHOOSER_ACTION_SAVE,
183 buttons=(gtk.STOCK_CANCEL,gtk.RESPONSE_CANCEL,gtk.STOCK_SAVE,gtk.RESPONSE_OK))
184@@ -765,7 +765,7 @@
185 fc.set_current_name(filename+'.tgz')
186 fc.set_do_overwrite_confirmation(True)
187 filter = gtk.FileFilter()
188- filter.set_name('Awn Theme')
189+ filter.set_name(_('Awn Theme'))
190 filter.add_pattern('*.tgz')
191 fc.add_filter(filter)
192 response = fc.run()
193@@ -880,7 +880,7 @@
194 return state
195
196 def tooltip_font_name_callback(self, data=None):
197- fontselect = gtk.FontSelectionDialog('Select Tooltip Font')
198+ fontselect = gtk.FontSelectionDialog(_('Select Tooltip Font'))
199 fontselect.set_font_name(fontname)
200
201 def update_view_themes(self, data=None):
202@@ -920,7 +920,7 @@
203 dialog.set_default_response(gtk.RESPONSE_OK)
204
205 filter = gtk.FileFilter()
206- filter.set_name("AWN Theme File")
207+ filter.set_name(_("Awn Theme File"))
208 filter.add_pattern("*.tar.gz")
209 filter.add_pattern("*.tgz")
210 dialog.add_filter(filter)
211
212=== modified file 'po/avant-window-navigator.pot'
213--- po/avant-window-navigator.pot 2010-07-19 22:28:12 +0000
214+++ po/avant-window-navigator.pot 2010-08-04 20:12:46 +0000
215@@ -8,7 +8,7 @@
216 msgstr ""
217 "Project-Id-Version: PACKAGE VERSION\n"
218 "Report-Msgid-Bugs-To: \n"
219-"POT-Creation-Date: 2010-07-07 11:06+0200\n"
220+"POT-Creation-Date: 2010-08-04 22:05+0200\n"
221 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
222 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
223 "Language-Team: LANGUAGE <LL@li.org>\n"
224@@ -161,7 +161,7 @@
225 msgstr ""
226
227 #: ../applets/taskmanager/task-launcher.c:1109
228-#: ../applets/taskmanager/task-icon-build-context-menus.c:955
229+#: ../applets/taskmanager/task-icon-build-context-menus.c:1020
230 msgid "Launch"
231 msgstr ""
232
233@@ -234,63 +234,83 @@
234 msgid "Workspace %s%d"
235 msgstr ""
236
237-#: ../applets/taskmanager/task-icon-build-context-menus.c:657
238+#: ../applets/taskmanager/task-icon-build-context-menus.c:683
239 msgid "Add as Launcher"
240 msgstr ""
241
242-#: ../applets/taskmanager/task-icon-build-context-menus.c:675
243+#: ../applets/taskmanager/task-icon-build-context-menus.c:722
244+msgid "Remove Launcher"
245+msgstr ""
246+
247+#: ../applets/taskmanager/task-icon-build-context-menus.c:740
248 msgid "_Close"
249 msgstr ""
250
251-#: ../applets/taskmanager/task-icon-build-context-menus.c:703
252+#: ../applets/taskmanager/task-icon-build-context-menus.c:768
253 msgid "_Close All"
254 msgstr ""
255
256-#: ../applets/taskmanager/task-icon-build-context-menus.c:872
257+#: ../applets/taskmanager/task-icon-build-context-menus.c:815
258+msgid "Minimize all"
259+msgstr ""
260+
261+#: ../applets/taskmanager/task-icon-build-context-menus.c:851
262+msgid "Unminimize all"
263+msgstr ""
264+
265+#: ../applets/taskmanager/task-icon-build-context-menus.c:887
266+msgid "Maximize all"
267+msgstr ""
268+
269+#: ../applets/taskmanager/task-icon-build-context-menus.c:923
270+msgid "Unmaximize all"
271+msgstr ""
272+
273+#: ../applets/taskmanager/task-icon-build-context-menus.c:937
274 msgid "Ma_ximize"
275 msgstr ""
276
277-#: ../applets/taskmanager/task-icon-build-context-menus.c:877
278+#: ../applets/taskmanager/task-icon-build-context-menus.c:942
279 msgid "Unma_ximize"
280 msgstr ""
281
282-#: ../applets/taskmanager/task-icon-build-context-menus.c:905
283+#: ../applets/taskmanager/task-icon-build-context-menus.c:970
284 msgid "Always on _Top"
285 msgstr ""
286
287-#: ../applets/taskmanager/task-icon-build-context-menus.c:929
288+#: ../applets/taskmanager/task-icon-build-context-menus.c:994
289 msgid "Mi_nimize"
290 msgstr ""
291
292-#: ../applets/taskmanager/task-icon-build-context-menus.c:934
293+#: ../applets/taskmanager/task-icon-build-context-menus.c:999
294 msgid "Unmi_nimize"
295 msgstr ""
296
297-#: ../applets/taskmanager/task-icon-build-context-menus.c:988
298+#: ../applets/taskmanager/task-icon-build-context-menus.c:1053
299 msgid "Always on Visible Workspace"
300 msgstr ""
301
302-#: ../applets/taskmanager/task-icon-build-context-menus.c:992
303+#: ../applets/taskmanager/task-icon-build-context-menus.c:1057
304 msgid "Only on This Workspace"
305 msgstr ""
306
307-#: ../applets/taskmanager/task-icon-build-context-menus.c:1081
308+#: ../applets/taskmanager/task-icon-build-context-menus.c:1146
309 msgid "Move to Workspace _Left"
310 msgstr ""
311
312-#: ../applets/taskmanager/task-icon-build-context-menus.c:1091
313+#: ../applets/taskmanager/task-icon-build-context-menus.c:1156
314 msgid "Move to Workspace _Right"
315 msgstr ""
316
317-#: ../applets/taskmanager/task-icon-build-context-menus.c:1101
318+#: ../applets/taskmanager/task-icon-build-context-menus.c:1166
319 msgid "Move to Workspace _Up"
320 msgstr ""
321
322-#: ../applets/taskmanager/task-icon-build-context-menus.c:1111
323+#: ../applets/taskmanager/task-icon-build-context-menus.c:1176
324 msgid "Move to Workspace _Down"
325 msgstr ""
326
327-#: ../applets/taskmanager/task-icon-build-context-menus.c:1120
328+#: ../applets/taskmanager/task-icon-build-context-menus.c:1185
329 msgid "Move to Another _Workspace"
330 msgstr ""
331
332@@ -686,11 +706,11 @@
333 msgstr ""
334
335 #: ../awn-settings/awn-settings.ui.h:99
336-msgid "Stripe Width"
337+msgid "Theme Export"
338 msgstr ""
339
340 #: ../awn-settings/awn-settings.ui.h:100
341-msgid "Theme Export"
342+msgid "Thickness"
343 msgstr ""
344
345 #: ../awn-settings/awn-settings.ui.h:101
346@@ -817,20 +837,16 @@
347 msgid "Could not locate the following icon: %s\n"
348 msgstr ""
349
350-#: ../awn-settings/awnClass.py:1067
351-msgid "AWN has been successfully refreshed"
352-msgstr ""
353-
354-#: ../awn-settings/awnClass.py:1073
355+#: ../awn-settings/awnClass.py:1066
356 #: ../data/avant-window-navigator.desktop.in.h:2
357 msgid "Avant Window Navigator"
358 msgstr ""
359
360-#: ../awn-settings/awnClass.py:1091
361+#: ../awn-settings/awnClass.py:1084
362 msgid "Fully customisable dock-like window navigator for GNOME."
363 msgstr ""
364
365-#: ../awn-settings/awnClass.py:1093
366+#: ../awn-settings/awnClass.py:1086
367 msgid ""
368 "This program is free software; you can redistribute it and/or modify it "
369 "under the terms of the GNU General Public License as published by the Free "
370@@ -838,7 +854,7 @@
371 "any later version."
372 msgstr ""
373
374-#: ../awn-settings/awnClass.py:1095
375+#: ../awn-settings/awnClass.py:1088
376 msgid ""
377 "This program is distributed in the hope that it will be useful, but WITHOUT "
378 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
379@@ -846,13 +862,60 @@
380 "more details."
381 msgstr ""
382
383-#: ../awn-settings/awnClass.py:1097
384+#: ../awn-settings/awnClass.py:1090
385 msgid ""
386 "You should have received a copy of the GNU General Public License along with "
387 "this program; if not, write to the Free Software Foundation, Inc., 51 "
388 "Franklin St, Fifth Floor, Boston, MA 02110-1301 USA."
389 msgstr ""
390
391+#: ../awn-settings/awnClass.py:1217
392+msgid "Awn Applet Package"
393+msgstr ""
394+
395+#: ../awn-settings/awnClass.py:1262 ../awn-settings/awnClass.py:1292
396+msgid "Applet Installation Failed"
397+msgstr ""
398+
399+#: ../awn-settings/awnClass.py:1274
400+msgid "Applet Successfully Updated"
401+msgstr ""
402+
403+#: ../awn-settings/awnClass.py:1290
404+msgid "Applet Successfully Added"
405+msgstr ""
406+
407+#: ../awn-settings/awnClass.py:1342
408+msgid "Can not delete active applet"
409+msgstr ""
410+
411+#: ../awn-settings/awnClass.py:1345
412+msgid "Delete Applet"
413+msgstr ""
414+
415+#: ../awn-settings/awnClass.py:1350
416+#, python-format
417+msgid "<b>Delete %s?</b>"
418+msgstr ""
419+
420+#: ../awn-settings/awnClass.py:1370
421+msgid "Unable to Delete Applet"
422+msgstr ""
423+
424+#. Translators: This string is preceded by a filename
425+#: ../awn-settings/awnClass.py:1577
426+#, python-format
427+msgid "%s already exists, unable to export theme."
428+msgstr ""
429+
430+#: ../awn-settings/awnClass.py:1653
431+msgid "Theme already installed, do you wish to overwrite it?"
432+msgstr ""
433+
434+#: ../awn-settings/awnClass.py:1687
435+msgid "This is an incompatible theme file."
436+msgstr ""
437+
438 #: ../awn-settings/awnSettings.py.in:71
439 msgid "Awn Settings can't be run as root."
440 msgstr ""
441@@ -925,6 +988,22 @@
442 msgid "Keep below"
443 msgstr ""
444
445+#: ../awn-settings/awnSettings.py.in:629
446+msgid "PNG Image"
447+msgstr ""
448+
449+#: ../awn-settings/awnSettings.py.in:641
450+msgid "Images"
451+msgstr ""
452+
453+#: ../awn-settings/awnSettings.py.in:759
454+msgid "Save Theme..."
455+msgstr ""
456+
457+#: ../awn-settings/awnSettings.py.in:768
458+msgid "Awn Theme"
459+msgstr ""
460+
461 #: ../awn-settings/awnSettings.py.in:797
462 msgid "Solid"
463 msgstr ""
464@@ -937,6 +1016,14 @@
465 msgid "Outline, Reversed"
466 msgstr ""
467
468+#: ../awn-settings/awnSettings.py.in:883
469+msgid "Select Tooltip Font"
470+msgstr ""
471+
472+#: ../awn-settings/awnSettings.py.in:923
473+msgid "Awn Theme File"
474+msgstr ""
475+
476 #: ../awn-settings/awnSettings.py.in:990
477 msgid "Use application-specified icons"
478 msgstr ""
479@@ -1246,13 +1333,13 @@
480 msgstr ""
481
482 #: ../data/avant-window-navigator.schema-ini.in.in.h:58
483+msgid "The thickness in 3D mode."
484+msgstr ""
485+
486+#: ../data/avant-window-navigator.schema-ini.in.in.h:59
487 msgid "The user-visible size of Awn."
488 msgstr ""
489
490-#: ../data/avant-window-navigator.schema-ini.in.in.h:59
491-msgid "The width of the stripe in Lucido mode."
492-msgstr ""
493-
494 #: ../data/avant-window-navigator.schema-ini.in.in.h:60
495 msgid "Time in ms after which AwnIcon will emit long-press signal."
496 msgstr ""
497@@ -1316,6 +1403,6 @@
498 msgid "Whoops! The applet crashed. Click to restart it."
499 msgstr ""
500
501-#: ../src/awn-panel.c:3960
502+#: ../src/awn-panel.c:3966
503 msgid "Close docklet"
504 msgstr ""
505
506=== modified file 'src/awn-background-lucido.c'
507--- src/awn-background-lucido.c 2010-07-24 23:29:53 +0000
508+++ src/awn-background-lucido.c 2010-08-04 20:12:46 +0000
509@@ -229,7 +229,7 @@
510 awn_background_lucido_init (AwnBackgroundLucido *bg)
511 {
512 AwnBackgroundLucidoPrivate *priv = AWN_BACKGROUND_LUCIDO_GET_PRIVATE (bg);
513- priv->lastx = 0;
514+ priv->lastx = -1;
515 priv->lastxend = INT_MAX;
516 priv->needs_animation = FALSE;
517 priv->tid = 0;
518@@ -342,6 +342,10 @@
519 {
520 AwnAppletManager *manager = NULL;
521 g_object_get (bg->panel, "applet-manager", &manager, NULL);
522+ if (!manager)
523+ {
524+ return NULL;
525+ }
526
527 return gtk_container_get_children (GTK_CONTAINER (manager));
528 }
529@@ -454,6 +458,10 @@
530 x += applet_manager_x - dc;
531 }
532 x = lroundf (x);
533+ if (priv->lastx == -1)
534+ {
535+ priv->lastx = x;
536+ }
537 if (x != priv->lastx)
538 {
539 needs_animation = TRUE;
540@@ -616,7 +624,7 @@
541 if (priv->pos_size <= j)
542 {
543 /* New special applet found, resize the array */
544- _add_n_positions (priv, 1, lx);
545+ _add_n_positions (priv, 1, MAX (lx, curx));
546 }
547 /************************************************************************/
548 /***************** UPDATE SINGLE CURVE POSITION *********************/

Subscribers

People subscribed via source and target branches