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

[Alberto Aldegheri]

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

[Michal Hruby (mhr3)]

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

[Michal Hruby (mhr3)]

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

[lp:~albyrock87/awn/awn-lucido]

766. By Alberto <alby@CASA> on 2010-08-04

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

[Alberto Aldegheri (albyrock87)]

> 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!

=== modified file 'applets/taskmanager/task-icon-build-context-menus.c'
--- applets/taskmanager/task-icon-build-context-menus.c	2010-07-19 22:41:03 +0000
+++ applets/taskmanager/task-icon-build-context-menus.c	2010-08-04 20:12:46 +0000
@@ -812,7 +812,7 @@
     {
       continue;
     }
-    menuitem = gtk_image_menu_item_new_with_label ("Minimize all");
+    menuitem = gtk_image_menu_item_new_with_label (_("Minimize all"));
     gtk_widget_show (menuitem);
     g_signal_connect (menuitem,"activate",G_CALLBACK(_minimize_all_cb),icon);
   }
@@ -848,7 +848,7 @@
     {
       continue;
     }
-    menuitem = gtk_image_menu_item_new_with_label ("Unminimize all");
+    menuitem = gtk_image_menu_item_new_with_label (_("Unminimize all"));
     gtk_widget_show (menuitem);
     g_signal_connect (menuitem,"activate",G_CALLBACK(_unminimize_all_cb),icon);
   }
@@ -884,7 +884,7 @@
     {
       continue;
     }
-    menuitem = gtk_image_menu_item_new_with_label ("Maximize all");
+    menuitem = gtk_image_menu_item_new_with_label (_("Maximize all"));
     gtk_widget_show (menuitem);
     g_signal_connect (menuitem,"activate",G_CALLBACK(_maximize_all_cb),icon);
   }
@@ -920,7 +920,7 @@
     {
       continue;
     }
-    menuitem = gtk_image_menu_item_new_with_label ("Unmaximize all");
+    menuitem = gtk_image_menu_item_new_with_label (_("Unmaximize all"));
     gtk_widget_show (menuitem);
     g_signal_connect (menuitem,"activate",G_CALLBACK(_unmaximize_all_cb),icon);
   }
 
=== modified file 'awn-settings/awnClass.py'
--- awn-settings/awnClass.py	2010-07-19 22:28:12 +0000
+++ awn-settings/awnClass.py	2010-08-04 20:12:46 +0000
@@ -1061,13 +1061,6 @@
     def changeTab(self, iconView):
         self.notebook.set_current_page(iconView.get_cursor()[0][0])
 
-    def refresh(self, button):
-        dialog = gtk.MessageDialog(self.window, 0, gtk.MESSAGE_INFO,
-                                   gtk.BUTTONS_OK,
-                                   _('AWN has been successfully refreshed'))
-        dialog.run()
-        dialog.hide()
-
     def about(self, button):
         self.about = gtk.AboutDialog()
         self.about.set_name(_("Avant Window Navigator"))
@@ -1221,7 +1214,7 @@
         dialog.set_default_response(gtk.RESPONSE_OK)
 
         filter = gtk.FileFilter()
-        filter.set_name("AWN Applet Package")
+        filter.set_name(_("Awn Applet Package"))
         filter.add_pattern("*.tar.gz")
         filter.add_pattern("*.tgz")
         filter.add_pattern("*.bz2")
@@ -1266,7 +1259,7 @@
             else:
                 self.register_applet(appletpath, False, applet_exists)
         else:
-            message = "Applet Installation Failed"
+            message = _("Applet Installation Failed")
             success = gtk.MessageDialog(parent=None, flags=0, type=gtk.MESSAGE_WARNING, buttons=gtk.BUTTONS_OK, message_format=message)
             success.run()
             success.destroy()
@@ -1278,7 +1271,7 @@
             model = self.appmodel
 
         if applet_exists:
-            message = "Applet Successfully Updated"
+            message = _("Applet Successfully Updated")
         else:
             icon, text, name = self.make_row (appletpath)
             if len (text) > 2:
@@ -1294,9 +1287,9 @@
                     model.set_value (row, 3, name)
 
             if msg:
-                message = "Applet Successfully Added"
+                message = _("Applet Successfully Added")
             else:
-                message = "Applet Installation Failed"
+                message = _("Applet Installation Failed")
 
         if msg:
             success = gtk.MessageDialog(parent=None, flags=0, type=gtk.MESSAGE_WARNING, buttons=gtk.BUTTONS_OK, message_format=message)
@@ -1346,15 +1339,15 @@
 
         self.active_model.foreach(self.test_active, path)
         if self.active_found:
-            self.popup_msg("Can not delete active applet")
+            self.popup_msg(_("Can not delete active applet"))
             return
 
-        dialog = gtk.Dialog("Delete Applet",
+        dialog = gtk.Dialog(_("Delete Applet"),
                             None,
                             gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
                             (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT,
                             gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
-        label = gtk.Label("<b>Delete %s?</b>" % item.getName())
+        label = gtk.Label(_("<b>Delete %s?</b>") % item.getName())
         label.set_use_markup(True)
         align = gtk.Alignment()
         align.set_padding(5,5,5,5)
@@ -1374,7 +1367,7 @@
                 dialog.destroy()
             else:
                 dialog.destroy()
-                self.popup_msg("Unable to Delete Applet")
+                self.popup_msg(_("Unable to Delete Applet"))
         else:
             dialog.destroy()
             
@@ -1580,7 +1573,8 @@
                 shutil.rmtree(themedir)
         if os.path.exists(themedir):
             self.hide_export_dialog(None)
-            msg = themedir+" already exists, unable to export theme."
+            # Translators: This string is preceded by a filename
+            msg = _("%s already exists, unable to export theme.") % (themedir)
             self.theme_message(msg)
             return
 
@@ -1656,7 +1650,7 @@
                 themedir = os.path.join(defs.HOME_THEME_DIR, filename)
                 
                 if os.path.exists(themefile):
-                    msg = "Theme already installed, do you wish to overwrite it?"
+                    msg = _("Theme already installed, do you wish to overwrite it?")
                     message = gtk.MessageDialog(parent=None, flags=0, type=gtk.MESSAGE_WARNING, buttons=gtk.BUTTONS_YES_NO, message_format=msg)
                     resp = message.run()
                     if resp != gtk.RESPONSE_YES:
@@ -1690,7 +1684,7 @@
                 f.close()
                 self.add_uris_to_model(self.treeview_themes.get_model(),[themefile])
             else:
-                msg = "This is an incompatible theme file."
+                msg = _("This is an incompatible theme file.")
                 self.theme_message(msg)
                 
     def delete_theme(self):
 
=== modified file 'awn-settings/awnSettings.py.in'
--- awn-settings/awnSettings.py.in	2010-07-19 22:28:12 +0000
+++ awn-settings/awnSettings.py.in	2010-08-04 20:12:46 +0000
@@ -626,7 +626,7 @@
             self.custom_arrow_chooser.set_filename(filename)
         self.custom_arrow_chooser.connect('file-set', self.arrow_select_callback)
         filter = gtk.FileFilter()
-        filter.set_name("PNG Image")
+        filter.set_name(_("PNG Image"))
         filter.add_pattern("*.png")
         self.custom_arrow_chooser.add_filter(filter)
         self.custom_arrow_chooser.set_filter(filter)
@@ -638,7 +638,7 @@
             self.pattern_chooser.set_filename(filename)
         self.pattern_chooser.connect('file-set', self.pattern_select_callback)
         filter = gtk.FileFilter()
-        filter.set_name("Images")
+        filter.set_name(_("Images"))
         filter.add_pattern("*.png")
         filter.add_pattern("*.svg")
         filter.add_pattern("*.xpm")
@@ -756,7 +756,7 @@
 
 		filename = "".join([x for x in name if x.isalpha() or x.isdigit()])
 		
-		fc = gtk.FileChooserDialog(title='Save Theme...',
+		fc = gtk.FileChooserDialog(title=_('Save Theme...'),
                                    parent=None,
                                    action=gtk.FILE_CHOOSER_ACTION_SAVE,
                                    buttons=(gtk.STOCK_CANCEL,gtk.RESPONSE_CANCEL,gtk.STOCK_SAVE,gtk.RESPONSE_OK))
@@ -765,7 +765,7 @@
 		fc.set_current_name(filename+'.tgz')
 		fc.set_do_overwrite_confirmation(True)
 		filter = gtk.FileFilter()
-		filter.set_name('Awn Theme')
+		filter.set_name(_('Awn Theme'))
 		filter.add_pattern('*.tgz')
 		fc.add_filter(filter)
 		response = fc.run()
@@ -880,7 +880,7 @@
         return state
 		
 	def tooltip_font_name_callback(self, data=None):
-		fontselect = gtk.FontSelectionDialog('Select Tooltip Font')	
+		fontselect = gtk.FontSelectionDialog(_('Select Tooltip Font'))	
 		fontselect.set_font_name(fontname)
 		
     def update_view_themes(self, data=None):
@@ -920,7 +920,7 @@
         dialog.set_default_response(gtk.RESPONSE_OK)
         
         filter = gtk.FileFilter()
-        filter.set_name("AWN Theme File")
+        filter.set_name(_("Awn Theme File"))
         filter.add_pattern("*.tar.gz")
         filter.add_pattern("*.tgz")
         dialog.add_filter(filter)
 
=== modified file 'po/avant-window-navigator.pot'
--- po/avant-window-navigator.pot	2010-07-19 22:28:12 +0000
+++ po/avant-window-navigator.pot	2010-08-04 20:12:46 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-07 11:06+0200\n"
+"POT-Creation-Date: 2010-08-04 22:05+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -161,7 +161,7 @@
 msgstr ""
 
 #: ../applets/taskmanager/task-launcher.c:1109
-#: ../applets/taskmanager/task-icon-build-context-menus.c:955
+#: ../applets/taskmanager/task-icon-build-context-menus.c:1020
 msgid "Launch"
 msgstr ""
 
@@ -234,63 +234,83 @@
 msgid "Workspace %s%d"
 msgstr ""
 
-#: ../applets/taskmanager/task-icon-build-context-menus.c:657
+#: ../applets/taskmanager/task-icon-build-context-menus.c:683
 msgid "Add as Launcher"
 msgstr ""
 
-#: ../applets/taskmanager/task-icon-build-context-menus.c:675
+#: ../applets/taskmanager/task-icon-build-context-menus.c:722
+msgid "Remove Launcher"
+msgstr ""
+
+#: ../applets/taskmanager/task-icon-build-context-menus.c:740
 msgid "_Close"
 msgstr ""
 
-#: ../applets/taskmanager/task-icon-build-context-menus.c:703
+#: ../applets/taskmanager/task-icon-build-context-menus.c:768
 msgid "_Close All"
 msgstr ""
 
-#: ../applets/taskmanager/task-icon-build-context-menus.c:872
+#: ../applets/taskmanager/task-icon-build-context-menus.c:815
+msgid "Minimize all"
+msgstr ""
+
+#: ../applets/taskmanager/task-icon-build-context-menus.c:851
+msgid "Unminimize all"
+msgstr ""
+
+#: ../applets/taskmanager/task-icon-build-context-menus.c:887
+msgid "Maximize all"
+msgstr ""
+
+#: ../applets/taskmanager/task-icon-build-context-menus.c:923
+msgid "Unmaximize all"
+msgstr ""
+
+#: ../applets/taskmanager/task-icon-build-context-menus.c:937
 msgid "Ma_ximize"
 msgstr ""
 
-#: ../applets/taskmanager/task-icon-build-context-menus.c:877
+#: ../applets/taskmanager/task-icon-build-context-menus.c:942
 msgid "Unma_ximize"
 msgstr ""
 
-#: ../applets/taskmanager/task-icon-build-context-menus.c:905
+#: ../applets/taskmanager/task-icon-build-context-menus.c:970
 msgid "Always on _Top"
 msgstr ""
 
-#: ../applets/taskmanager/task-icon-build-context-menus.c:929
+#: ../applets/taskmanager/task-icon-build-context-menus.c:994
 msgid "Mi_nimize"
 msgstr ""
 
-#: ../applets/taskmanager/task-icon-build-context-menus.c:934
+#: ../applets/taskmanager/task-icon-build-context-menus.c:999
 msgid "Unmi_nimize"
 msgstr ""
 
-#: ../applets/taskmanager/task-icon-build-context-menus.c:988
+#: ../applets/taskmanager/task-icon-build-context-menus.c:1053
 msgid "Always on Visible Workspace"
 msgstr ""
 
-#: ../applets/taskmanager/task-icon-build-context-menus.c:992
+#: ../applets/taskmanager/task-icon-build-context-menus.c:1057
 msgid "Only on This Workspace"
 msgstr ""
 
-#: ../applets/taskmanager/task-icon-build-context-menus.c:1081
+#: ../applets/taskmanager/task-icon-build-context-menus.c:1146
 msgid "Move to Workspace _Left"
 msgstr ""
 
-#: ../applets/taskmanager/task-icon-build-context-menus.c:1091
+#: ../applets/taskmanager/task-icon-build-context-menus.c:1156
 msgid "Move to Workspace _Right"
 msgstr ""
 
-#: ../applets/taskmanager/task-icon-build-context-menus.c:1101
+#: ../applets/taskmanager/task-icon-build-context-menus.c:1166
 msgid "Move to Workspace _Up"
 msgstr ""
 
-#: ../applets/taskmanager/task-icon-build-context-menus.c:1111
+#: ../applets/taskmanager/task-icon-build-context-menus.c:1176
 msgid "Move to Workspace _Down"
 msgstr ""
 
-#: ../applets/taskmanager/task-icon-build-context-menus.c:1120
+#: ../applets/taskmanager/task-icon-build-context-menus.c:1185
 msgid "Move to Another _Workspace"
 msgstr ""
 
@@ -686,11 +706,11 @@
 msgstr ""
 
 #: ../awn-settings/awn-settings.ui.h:99
-msgid "Stripe Width"
+msgid "Theme Export"
 msgstr ""
 
 #: ../awn-settings/awn-settings.ui.h:100
-msgid "Theme Export"
+msgid "Thickness"
 msgstr ""
 
 #: ../awn-settings/awn-settings.ui.h:101
@@ -817,20 +837,16 @@
 msgid "Could not locate the following icon: %s\n"
 msgstr ""
 
-#: ../awn-settings/awnClass.py:1067
-msgid "AWN has been successfully refreshed"
-msgstr ""
-
-#: ../awn-settings/awnClass.py:1073
+#: ../awn-settings/awnClass.py:1066
 #: ../data/avant-window-navigator.desktop.in.h:2
 msgid "Avant Window Navigator"
 msgstr ""
 
-#: ../awn-settings/awnClass.py:1091
+#: ../awn-settings/awnClass.py:1084
 msgid "Fully customisable dock-like window navigator for GNOME."
 msgstr ""
 
-#: ../awn-settings/awnClass.py:1093
+#: ../awn-settings/awnClass.py:1086
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -838,7 +854,7 @@
 "any later version."
 msgstr ""
 
-#: ../awn-settings/awnClass.py:1095
+#: ../awn-settings/awnClass.py:1088
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -846,13 +862,60 @@
 "more details."
 msgstr ""
 
-#: ../awn-settings/awnClass.py:1097
+#: ../awn-settings/awnClass.py:1090
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin St, Fifth Floor, Boston, MA 02110-1301  USA."
 msgstr ""
 
+#: ../awn-settings/awnClass.py:1217
+msgid "Awn Applet Package"
+msgstr ""
+
+#: ../awn-settings/awnClass.py:1262 ../awn-settings/awnClass.py:1292
+msgid "Applet Installation Failed"
+msgstr ""
+
+#: ../awn-settings/awnClass.py:1274
+msgid "Applet Successfully Updated"
+msgstr ""
+
+#: ../awn-settings/awnClass.py:1290
+msgid "Applet Successfully Added"
+msgstr ""
+
+#: ../awn-settings/awnClass.py:1342
+msgid "Can not delete active applet"
+msgstr ""
+
+#: ../awn-settings/awnClass.py:1345
+msgid "Delete Applet"
+msgstr ""
+
+#: ../awn-settings/awnClass.py:1350
+#, python-format
+msgid "<b>Delete %s?</b>"
+msgstr ""
+
+#: ../awn-settings/awnClass.py:1370
+msgid "Unable to Delete Applet"
+msgstr ""
+
+#. Translators: This string is preceded by a filename
+#: ../awn-settings/awnClass.py:1577
+#, python-format
+msgid "%s already exists, unable to export theme."
+msgstr ""
+
+#: ../awn-settings/awnClass.py:1653
+msgid "Theme already installed, do you wish to overwrite it?"
+msgstr ""
+
+#: ../awn-settings/awnClass.py:1687
+msgid "This is an incompatible theme file."
+msgstr ""
+
 #: ../awn-settings/awnSettings.py.in:71
 msgid "Awn Settings can't be run as root."
 msgstr ""
@@ -925,6 +988,22 @@
 msgid "Keep below"
 msgstr ""
 
+#: ../awn-settings/awnSettings.py.in:629
+msgid "PNG Image"
+msgstr ""
+
+#: ../awn-settings/awnSettings.py.in:641
+msgid "Images"
+msgstr ""
+
+#: ../awn-settings/awnSettings.py.in:759
+msgid "Save Theme..."
+msgstr ""
+
+#: ../awn-settings/awnSettings.py.in:768
+msgid "Awn Theme"
+msgstr ""
+
 #: ../awn-settings/awnSettings.py.in:797
 msgid "Solid"
 msgstr ""
@@ -937,6 +1016,14 @@
 msgid "Outline, Reversed"
 msgstr ""
 
+#: ../awn-settings/awnSettings.py.in:883
+msgid "Select Tooltip Font"
+msgstr ""
+
+#: ../awn-settings/awnSettings.py.in:923
+msgid "Awn Theme File"
+msgstr ""
+
 #: ../awn-settings/awnSettings.py.in:990
 msgid "Use application-specified icons"
 msgstr ""
@@ -1246,13 +1333,13 @@
 msgstr ""
 
 #: ../data/avant-window-navigator.schema-ini.in.in.h:58
+msgid "The thickness in 3D mode."
+msgstr ""
+
+#: ../data/avant-window-navigator.schema-ini.in.in.h:59
 msgid "The user-visible size of Awn."
 msgstr ""
 
-#: ../data/avant-window-navigator.schema-ini.in.in.h:59
-msgid "The width of the stripe in Lucido mode."
-msgstr ""
-
 #: ../data/avant-window-navigator.schema-ini.in.in.h:60
 msgid "Time in ms after which AwnIcon will emit long-press signal."
 msgstr ""
@@ -1316,6 +1403,6 @@
 msgid "Whoops! The applet crashed. Click to restart it."
 msgstr ""
 
-#: ../src/awn-panel.c:3960
+#: ../src/awn-panel.c:3966
 msgid "Close docklet"
 msgstr ""
 
=== modified file 'src/awn-background-lucido.c'
--- src/awn-background-lucido.c	2010-07-24 23:29:53 +0000
+++ src/awn-background-lucido.c	2010-08-04 20:12:46 +0000
@@ -229,7 +229,7 @@
 awn_background_lucido_init (AwnBackgroundLucido *bg)
 {
   AwnBackgroundLucidoPrivate *priv = AWN_BACKGROUND_LUCIDO_GET_PRIVATE (bg);
-  priv->lastx = 0;
+  priv->lastx = -1;
   priv->lastxend = INT_MAX;
   priv->needs_animation = FALSE;
   priv->tid = 0;
@@ -342,6 +342,10 @@
 {
   AwnAppletManager *manager = NULL;
   g_object_get (bg->panel, "applet-manager", &manager, NULL);
+  if (!manager)
+  {
+    return NULL;
+  }
 
   return gtk_container_get_children (GTK_CONTAINER (manager));
 }
@@ -454,6 +458,10 @@
       x += applet_manager_x - dc;
     }
     x = lroundf (x);
+    if (priv->lastx == -1)
+    {
+      priv->lastx = x;
+    }
     if (x != priv->lastx)
     {
       needs_animation = TRUE;
@@ -616,7 +624,7 @@
       if (priv->pos_size <= j)
       {
         /* New special applet found, resize the array */
-        _add_n_positions (priv, 1, lx);
+        _add_n_positions (priv, 1, MAX (lx, curx));
       }
       /************************************************************************/
       /*****************    UPDATE SINGLE CURVE POSITION  *********************/