Changeset 417

Timestamp:

09/04/06 11:47:08 (2 years ago)

Author:

nicfit

Message:

#199 finished and po updates

Files:

• trunk/po/POTFILES.in (modified) (1 diff)
• trunk/po/es.mo (modified) (previous)
• trunk/po/es.po (modified) (3 diffs)
• trunk/po/mesk.pot (modified) (3 diffs)
• trunk/src/dialogs.py (modified) (2 diffs)
• trunk/src/main_window.py (modified) (7 diffs)
• trunk/src/mesk/__init__.py (modified) (2 diffs)
• trunk/src/playlist_control.py (modified) (2 diffs)
• trunk/src/preference_window.py (modified) (2 diffs)

trunk/po/POTFILES.in

@@ -9 +9 @@
-src/config.py
-src/control.py
+src/dialogs.py
-src/main.py
-src/main_window.py

trunk/po/es.po

@@ -8 +8 @@
-"Project-Id-Version: 0.1.1\n"
-"Report-Msgid-Bugs-To: \n"
-8-30 20:18
+9-03 19:57
-"PO-Revision-Date: 2006-04-15 17:38-0600\n"
-"Last-Translator: Travis Shirk <travis@pobox.com>\n"
@@ -241 +241 @@
-msgstr ""
-
-5
+8
-#, fuzzy, python-format
-msgid "Migrating config version %s to %s"
-msgstr "Aumento de la versión %s de los config a %s"
-
-4
-
-
-
-88
+7
+ If profile NAME is 
+
+
+91
-#, fuzzy
-msgid ""
@@ -260 +260 @@
-
-#. Developer options
-4
+7
-msgid "Advanced Options"
-msgstr ""
-
-197
+200
-msgid "Break in python debugger on unhandled exceptions."
-msgstr ""
-
-1
+4
-msgid "Run using python profiler."
-msgstr ""
-
-4
-
-
-
-9
+7
+Display 
+
+
+7
-#, python-format
-msgid "Error loading playlist '%s'"
-msgstr "Playlist '%s' del cargamento del error"
-
-80
+78
-msgid "<b>Are you sure you want to quit?</b>"
-msgstr ""

trunk/po/mesk.pot

@@ -9 +9 @@
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-8-30 20:18
+9-03 19:57
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -236 +236 @@
-msgstr ""
-
-5
+8
-#, python-format
-msgid "Migrating config version %s to %s"
-msgstr ""
-
-4
-
-
-
-88
+7
+ If profile NAME is 
+
+
+91
-msgid ""
-"Select the amount of terminal logging.  May be CRITICAL, ERROR, WARNING, "
@@ -252 +252 @@
-
-#. Developer options
-4
+7
-msgid "Advanced Options"
-msgstr ""
-
-197
+200
-msgid "Break in python debugger on unhandled exceptions."
-msgstr ""
-
-1
+4
-msgid "Run using python profiler."
-msgstr ""
-
-4
-
-
-
-9
+7
+Display 
+
+
+7
-#, python-format
-msgid "Error loading playlist '%s'"
-msgstr ""
-
-80
+78
-msgid "<b>Are you sure you want to quit?</b>"
-msgstr ""

trunk/src/dialogs.py

@@ -19 +19 @@
-################################################################################
-import gtk
+import mesk
+from mesk.common.i18n import _
-
-class MessageDialog(gtk.MessageDialog):
@@ -37 +39 @@
-                                   type = gtk.MESSAGE_ERROR,
-                                   buttons = gtk.BUTTONS_OK)
+
+class ConfirmationDialog(gtk.MessageDialog):
+    def __init__(self, parent, modal = True, type=gtk.MESSAGE_QUESTION):
+        gtk.MessageDialog.__init__(self, parent=parent, flags=0, type=type)
+        self.add_button(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)
+        self.add_button(gtk.STOCK_OK, gtk.RESPONSE_OK)
+
+    def confirm(self):
+        resp = self.run()
+        self.destroy()
+        return (resp == gtk.RESPONSE_OK)
+
+class ConfirmationWithDisableOptionDialog(ConfirmationDialog):
+    def __init__(self, parent, modal=True, type=gtk.MESSAGE_QUESTION):
+        ConfirmationDialog.__init__(self, parent=parent, modal=modal, type=type)
+        self.checkbutton = gtk.CheckButton(_('Do not ask me again.'))
+        self.vbox.pack_start(self.checkbutton, expand=False, fill=False)
+        self.checkbutton.show()
+
+    def confirm(self):
+        confirmed = ConfirmationDialog.confirm(self)
+        return (confirmed, self.checkbutton.get_active())
+

trunk/src/main_window.py

@@ -37 +37 @@
-from preference_window import PreferenceWindow
-from multi_media_keys import MultiMediaKeys
+from dialogs import ErrorDialog, ConfirmationWithDisableOptionDialog
-
-class MainWindow(mesk.window.Window):
@@ -89 +90 @@
-            self.add_notebook_control(self._empty_control)
-            self._empty_control.widget.show()
+            self._notebook.set_show_tabs(False)
-        elif not self._active_control:
-            self.set_active_control(self._controls[0])
@@ -114 +116 @@
-            mesk.log.info('Loading playlist \'%s\'...' % name)
-            pl_ctrl = PlaylistControl(name)
-
-
-
-
-
-
+
+
+
+
-            d.format_secondary_text(str(ex))
-            d.run()
@@ -228 +228 @@
-        # Add special widget for whenever there are none
-        if self._notebook.get_n_pages() == 0:
+            self._notebook.set_show_tabs(False)
-            self.add_notebook_control(self._empty_control)
-        elif self._notebook.get_n_pages() == 1:
+            self._notebook.set_show_tabs(True)
-            self._notebook.set_show_border(False)
-            # DnD clean up
@@ -270 +272 @@
-        self.window.show()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        self._save_window_attrs()
-        self.window.hide()
@@ -313 +314 @@
-            pass
-
+        return True
+
-    def _save_window_attrs(self):
-        (width, height) = self.window.get_size()
@@ -342 +345 @@
-            return True
-        else:
-
-
+
+
+
+
+
-
-    def set_compact_mode(self, state):

trunk/src/mesk/__init__.py

@@ -54 +54 @@
-    'version': [str, APP_VERSION, _('Application version')],
-    'playlist_dir': [str, DEFAULT_PLAYLISTS_DIR,
-
+.
-    'active_playlist': [str, '', 
-
+.
-    'playlists': [str, DEFAULT_PLAYLIST_NAME, 
-
+.
-    'log_level': [str, 'INFO', 
-                  _('Logging level. May be CRITICAL, ERROR, WARNING, INFO, '
-                    'VERBOSE, or DEBUG')],
+    'confirm_quit': [bool, True,
+                     _('Show confirmation dialog before quitting the '
+                       'application.')],
-    'plugins_dir': [str, DEFAULT_PLUGINS_DIR,
-                    _('The directory containing user installed plugins')],
@@ -73 +76 @@
-                             _('If True, the main window is hidded instead of '
-                               'closed when the window close button is '
-
-
-
-
-
+.
+.
+.
+.
+.
-    'compact_main_window_pos_x': [int, -1, 
-
+.
-    'compact_main_window_pos_y': [int, -1, 
-
+.
-    'show_tab_close_button': [bool, False, 
-
+.
-    'show_tip_window_on_startup': [bool, True,
-                                   _('Show tips window each time Mesk is '

trunk/src/playlist_control.py

@@ -30 +30 @@
-from mesk.audio import UnsupportedFormat
-from mesk.audio.source import UnsupportedScheme
+
+from dialogs import ConfirmationDialog
-
-# Data model.  These do not have to correspond to the column order, nor
@@ -463 +465 @@
-    def _on_delete_menuitem_activate(self, menuitem):
-        # Confirm
-
-
-
-
+
-        d.set_markup(_('Are you sure you want to delete playlist \'%s\'?') % \
-                     self._pl_config.name)
-        d.format_secondary_text(_('All playlist data will be lost.'))
-
-
-
-
+
-            return
-        

trunk/src/preference_window.py

@@ -23 +23 @@
-_ = mesk.common.i18n._
-from mesk.plugin import PluginMgr
+import mesk.window
-
-
+
-
-class PreferenceWindow(mesk.window.Window):
@@ -136 +137 @@
-            model[path][0] = new_state
-        except Exception, ex:
-
-
-
+
-            d.set_markup('<b>%s</b>' % state_str)
-            d.format_secondary_text(str(ex))