Changeset 181

Timestamp:

04/30/06 11:16:24 (3 years ago)

Author:

nicfit

Message:

Plugin refactoring

Files:

• trunk/po/es.po (modified) (10 diffs)
• trunk/po/mesk.pot (modified) (8 diffs)
• trunk/src/audio_control.py (modified) (2 diffs)
• trunk/src/main_window.py (modified) (2 diffs)
• trunk/src/mesk/__init__.py (modified) (2 diffs)
• trunk/src/mesk/plugin/__init__.py (modified) (9 diffs)
• trunk/src/mesk_gui.glade (modified) (6 diffs)
• trunk/src/plugins/audioscrobbler.py (modified) (4 diffs)
• trunk/src/plugins/gajimstatus.py (modified) (4 diffs)
• trunk/src/preference_window.py (modified) (3 diffs)

trunk/po/es.po

@@ -8 +8 @@
-"Project-Id-Version: 0.1.1\n"
-"Report-Msgid-Bugs-To: \n"
-15 19:11
+24 20:30
-"PO-Revision-Date: 2006-04-15 17:38-0600\n"
-"Last-Translator: Travis Shirk <travis@pobox.com>\n"
@@ -29 +29 @@
-
-#: ../src/mesk_gui.glade.h:2
-
+
+
-msgstr "<b>Descripción</b>"
-
-#: ../src/mesk_gui.glade.h:3
-Advanced
-Avanzado
+<b>Copyright:</b>
+
-
-#: ../src/mesk_gui.glade.h:4
+#, fuzzy
+msgid "<b>Description:</b>"
+msgstr "<b>Descripción</b>"
+
+#: ../src/mesk_gui.glade.h:5
+#, fuzzy
+msgid "<b>Plugin Name</b>"
+msgstr "<b>Descripción</b>"
+
+#: ../src/mesk_gui.glade.h:6
+#, fuzzy
+msgid "<b>Site:</b>"
+msgstr "<b>Descripción</b>"
+
+#: ../src/mesk_gui.glade.h:7
-msgid "Auto-Open"
-msgstr "Automo'vil-A'brase"
-
-5
+8
-msgid "Clear search"
-msgstr "Búsqueda clara"
-
-6
+9
-msgid "Close search"
-msgstr "Búsqueda cercana"
-
-7
+10
-msgid "Compact"
-msgstr "Acuerdo"
-
-
+
+
+
+
+
-msgid "Copyright © 2006 Travis Shirk"
-msgstr "Copyright © 2006 Travis Shirk"
-
-
-
-
-
-
+
-msgid "Find:"
-msgstr "Hallazgo:"
-
-
-
-
-
-
+
-msgid "Mesk"
-msgstr "Mesk"
-
-3
+5
-msgid "Name"
-msgstr "Nombre"
-
-4
+6
-msgid "Next"
-msgstr "Después"
-
-5
+7
-msgid "Password:"
-msgstr "Contraseña:"
-
-
+
+
-msgid "Play"
-msgstr "Juego"
-
-7
+9
-msgid "Playlist"
-msgstr "Playlist"
-
-18
+20
-msgid "Playlist stats"
-msgstr "Playlist stats"
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-msgid "Preferences"
-msgstr "Preferencias"
-
-0
+7
-msgid "Previous"
-msgstr "Anterior"
-
-1
+8
-msgid "Repeat playlist"
-msgstr "Repetición el playlist"
-
-2
+9
-msgid "Shuffle playlist"
-msgstr "Playlist de la barajadura"
-
-23
+30
-msgid "Stop"
-msgstr "Parada"
-
-
+
+
+
+
+
+
-msgid "Username:"
-msgstr "Username:"
-
-25
+34
-msgid "Web site"
-msgstr "Sitio del Web"
-
-26
+35
-msgid "_About"
-msgstr "_Sobre"
-
-27
+36
-msgid "_Edit"
-msgstr "_Corrija"
-
-28
+37
-msgid "_File"
-msgstr "_Archivo"
-
-29
+38
-msgid "_Help"
-msgstr "_Ayuda"
-
-
+
+
+
+
+
+
-msgid "_View"
-msgstr "_Visión"
-
-
-
-
-
-
-
+
-msgid "Pause"
-msgstr "Pausa"
-
+#: ../src/audio_control.py:119
+#, python-format
+msgid "Gstreamer version %d.%d.%d audio control initialized"
+msgstr ""
+
+#: ../src/audio_control.py:425
+#, python-format
+msgid "Gstreamer error -- {bin: %s} {element: %s} {debug: %s}: %s"
+msgstr ""
+
-#. we talk about file
-#: ../src/gtk_utils.py:79 ../src/gtk_utils.py:94
@@ -159 +207 @@
-msgstr "Error: no puede abrir %s para la lectura"
-
-3
+4
-msgid "Select a specific profile other than the default"
-msgstr "Seleccione un perfil específico con excepción del defecto"
-
-5
+6
-msgid "Session management disabled (no gnome.ui module)"
-msgstr "La gerencia de la sesión inhabilitó (ningún módulo de gnome.ui)"
-
-0
+1
-#, python-format
-msgid "Error loading playlist '%s'"
@@ -173 +221 @@
-
-#. TODO
-24
+35
-msgid "Open playlist"
-msgstr "Abra el playlist"
-
-31
+42
-msgid "Playlists"
-msgstr "Playlists"
-
-
+
+
+
+
+
+
-#, python-format
-msgid "Error reading source metadata in '%s': %s"
-msgstr "Metadata de la fuente de la lectura de error en '%s': %s"
-
-5
+7
-#, python-format
-msgid "No metadata for file '%s'"
-msgstr "Ningún metadata para el archivo '%s'"
-
-0
+2
-#, python-format
-msgid "Unknown type: %s"
-msgstr "Tipo desconocido: %s"
-
-1
+3
-#, python-format
-msgid "Unsupported audio format: %s"
-msgstr "Formato audio sin apoyo: %s"
-
-5
+7
-#, python-format
-msgid "Error loading source file %s"
-msgstr "Archivo de fuente del cargamento del error %s"
-
-08
+10
-#, python-format
-msgid "Unsupported audio URI scheme: %s"
-msgstr "Esquema sin apoyo del audio URI: %s"
-
-5
+6
-msgid "Application version"
-msgstr "Versión del uso"
-
-7
+8
-msgid "The directory containing playlists"
-msgstr "El directorio que contiene playlists"
-
-59
+60
-msgid ""
-"A list of playlists (separated by ';') that refer to a playlist config "
@@ -227 +280 @@
-"los config del playlist abajo"
-
-2
+3
-msgid "Logging level. May be CRITICAL, ERROR, WARNING, INFO, VERBOSE, or DEBUG"
-msgstr ""
@@ -233 +286 @@
-"DEBUG"
-
-5
+6
-msgid "The directory containing user installed plugins"
-msgstr "El directorio que contiene plugins instalados usuario"
-
-6
+7
-msgid "A list of plugins (separated by ';') to activate on startup."
-msgstr "Una lista de los plugins (separados por ';') para activar en arranque"
-
-1
+2
-msgid "Start in compact view mode"
-msgstr "Comience en modo compacto de la visión"
-
-3
+4
-msgid ""
-"If True, the main window is hidded instead of closed when the window close "
@@ -253 +306 @@
-"chasca el botón del cierre de la ventana"
-
-6
+7
-msgid "Main window width"
-msgstr "Anchura principal de la ventana"
-
-7
+8
-msgid "Main window height"
-msgstr "Altura principal de la ventana"
-
-8
+9
-msgid "Main window x origin"
-msgstr "Origen principal de la ventana x"
-
-79
+80
-msgid "Main window y origin"
-msgstr "Origen principal de la ventana y"
-
-1
+2
-msgid "Main window x origin in compact mode"
-msgstr "Origen principal de la ventana x en modo compacto"
-
-3
+4
-msgid "Main window y origin in compact mode"
-msgstr "Origen principal de la ventana y en modo compacto"
-
-8
-
-
+9
+fuzzy, 
+%s, 
-msgstr "Fregadero de la salida de GStreamer. Pueden ser '%s', '%s', o '%s'"
-
-1
+2
-msgid "Number of milliseconds to pause between tracks"
-msgstr "Número de los milisegundos a detenerse brevemente entre las pistas"
-
-5
+6
-msgid "Playlist (file) location"
-msgstr "Localización de Playlist (archivo)"
-
-6
+7
-msgid "Open on startup"
-msgstr "Ábrase en arranque"
-
-7
+8
-msgid "Starting playlist index"
-msgstr "Comenzar índice del playlist"
-
-8
+9
-msgid "Is the playlist in repeat mode"
-msgstr "Es el playlist en modo de la repetición"
-
-99
+100
-msgid "Is the playlist in shuffle mode"
-msgstr "Es el playlist en modo de la barajadura"
-
-0
+1
-msgid "The playlist queue which is a comma separated list of indices"
-msgstr "La coleta del playlist que es una coma separó la lista de índices"
-
-1 ../src/mesk/__init__.py:113
-5
+2 ../src/mesk/__init__.py:114
+6
-#, python-format
-msgid "Creating %s..."
@@ -321 +374 @@
-msgstr "%s que activa plugin"
-
-3
+9
-#, python-format
-msgid "Loading plugin %s"
-msgstr "El cargar plugin %s"
-
-0
+6
-#, python-format
-msgid "Plugin '%s' failed to load: %s"
-msgstr "'%s' plugin no pudieron cargar: %s"
-
-55
+61
-#, python-format
-msgid "Invalid type for plugin '%s': %s"
@@ -468 +521 @@
-msgstr "Falta de BADAUTH, hanshake requerido"
-
-
+
+
+
+
+
+
-#, python-format
-msgid "Source %s is missing artist and/or title: "
@@ -491 +549 @@
-msgid " [paused]"
-msgstr " [detenido brevemente]"
+
+#~ msgid "Advanced"
+#~ msgstr "Avanzado"
+
+#, fuzzy
+#~ msgid "Delay"
+#~ msgstr "Juego"
+
+#~ msgid "Filter:"
+#~ msgstr "Filtro:"
+
+#~ msgid "General"
+#~ msgstr "General"
+
+#~ msgid "translator-credits"
+#~ msgstr "Travis Shirk"

trunk/po/mesk.pot

@@ -9 +9 @@
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-15 19:11
+24 20:30
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -30 +30 @@
-
-#: ../src/mesk_gui.glade.h:2
-Description
+Author:
-msgstr ""
-
-#: ../src/mesk_gui.glade.h:3
-Advanced
+<b>Copyright:</b>
-msgstr ""
-
-#: ../src/mesk_gui.glade.h:4
+msgid "<b>Description:</b>"
+msgstr ""
+
+#: ../src/mesk_gui.glade.h:5
+msgid "<b>Plugin Name</b>"
+msgstr ""
+
+#: ../src/mesk_gui.glade.h:6
+msgid "<b>Site:</b>"
+msgstr ""
+
+#: ../src/mesk_gui.glade.h:7
-msgid "Auto-Open"
-msgstr ""
-
-5
+8
-msgid "Clear search"
-msgstr ""
-
-6
+9
-msgid "Close search"
-msgstr ""
-
-7
+10
-msgid "Compact"
-msgstr ""
-
-
+
+
+
+
+
-msgid "Copyright © 2006 Travis Shirk"
-msgstr ""
-
-
-
-
-
-
+
-msgid "Find:"
-msgstr ""
-
-
-
-
-
-
+
-msgid "Mesk"
-msgstr ""
-
-3
+5
-msgid "Name"
-msgstr ""
-
-4
+6
-msgid "Next"
-msgstr ""
-
-5
+7
-msgid "Password:"
-msgstr ""
-
-
+
+
-msgid "Play"
-msgstr ""
-
-7
+9
-msgid "Playlist"
-msgstr ""
-
-18
+20
-msgid "Playlist stats"
-msgstr ""
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-msgid "Preferences"
-msgstr ""
-
-0
+7
-msgid "Previous"
-msgstr ""
-
-1
+8
-msgid "Repeat playlist"
-msgstr ""
-
-2
+9
-msgid "Shuffle playlist"
-msgstr ""
-
-23
+30
-msgid "Stop"
-msgstr ""
-
-#: ../src/mesk_gui.glade.h:24
-msgid "Username:"
-msgstr ""
-
-#: ../src/mesk_gui.glade.h:25
-msgid "Web site"
-msgstr ""
-
-#: ../src/mesk_gui.glade.h:26
-msgid "_About"
-msgstr ""
-
-#: ../src/mesk_gui.glade.h:27
-msgid "_Edit"
-msgstr ""
-
-#: ../src/mesk_gui.glade.h:28
-msgid "_File"
-msgstr ""
-
-#: ../src/mesk_gui.glade.h:29
-msgid "_Help"
-msgstr ""
-
-#: ../src/mesk_gui.glade.h:30
-msgid "_View"
-msgstr ""
-
-#. TRANSLATORS: Replace this string with your names, one name per line.
-#: ../src/mesk_gui.glade.h:32
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-msgid "Pause"
+msgstr ""
+
+#: ../src/audio_control.py:119
+#, python-format
+msgid "Gstreamer version %d.%d.%d audio control initialized"
+msgstr ""
+
+#: ../src/audio_control.py:425
+#, python-format
+msgid "Gstreamer error -- {bin: %s} {element: %s} {debug: %s}: %s"
-msgstr ""
-
@@ -160 +203 @@
-msgstr ""
-
-3
+4
-msgid "Select a specific profile other than the default"
-msgstr ""
-
-5
+6
-msgid "Session management disabled (no gnome.ui module)"
-msgstr ""
-
-0
+1
-#, python-format
-msgid "Error loading playlist '%s'"
@@ -174 +217 @@
-
-#. TODO
-24
+35
-msgid "Open playlist"
-msgstr ""
-
-31
+42
-msgid "Playlists"
-msgstr ""
-
-
+
+
+
+
+
-#, python-format
-msgid "Error reading source metadata in '%s': %s"
-msgstr ""
-
-5
+7
-#, python-format
-msgid "No metadata for file '%s'"
-msgstr ""
-
-0
+2
-#, python-format
-msgid "Unknown type: %s"
-msgstr ""
-
-1
+3
-#, python-format
-msgid "Unsupported audio format: %s"
-msgstr ""
-
-5
+7
-#, python-format
-msgid "Error loading source file %s"
-msgstr ""
-
-08
+10
-#, python-format
-msgid "Unsupported audio URI scheme: %s"
-msgstr ""
-
-5
+6
-msgid "Application version"
-msgstr ""
-
-7
+8
-msgid "The directory containing playlists"
-msgstr ""
-
-59
+60
-msgid ""
-"A list of playlists (separated by ';') that refer to a playlist config "
@@ -226 +273 @@
-msgstr ""
-
-2
+3
-msgid "Logging level. May be CRITICAL, ERROR, WARNING, INFO, VERBOSE, or DEBUG"
-msgstr ""
-
-5
+6
-msgid "The directory containing user installed plugins"
-msgstr ""
-
-6
+7
-msgid "A list of plugins (separated by ';') to activate on startup."
-msgstr ""
-
-1
+2
-msgid "Start in compact view mode"
-msgstr ""
-
-3
+4
-msgid ""
-"If True, the main window is hidded instead of closed when the window close "
@@ -248 +295 @@
-msgstr ""
-
-6
+7
-msgid "Main window width"
-msgstr ""
-
-7
+8
-msgid "Main window height"
-msgstr ""
-
-8
+9
-msgid "Main window x origin"
-msgstr ""
-
-79
+80
-msgid "Main window y origin"
-msgstr ""
-
-1
+2
-msgid "Main window x origin in compact mode"
-msgstr ""
-
-3
+4
-msgid "Main window y origin in compact mode"
-msgstr ""
-
-8
-
-
-
-
-1
+9
+
+%s, 
+
+
+2
-msgid "Number of milliseconds to pause between tracks"
-msgstr ""
-
-5
+6
-msgid "Playlist (file) location"
-msgstr ""
-
-6
+7
-msgid "Open on startup"
-msgstr ""
-
-7
+8
-msgid "Starting playlist index"
-msgstr ""
-
-8
+9
-msgid "Is the playlist in repeat mode"
-msgstr ""
-
-99
+100
-msgid "Is the playlist in shuffle mode"
-msgstr ""
-
-0
+1
-msgid "The playlist queue which is a comma separated list of indices"
-msgstr ""
-
-1 ../src/mesk/__init__.py:113
-5
+2 ../src/mesk/__init__.py:114
+6
-#, python-format
-msgid "Creating %s..."
@@ -316 +363 @@
-msgstr ""
-
-3
+9
-#, python-format
-msgid "Loading plugin %s"
-msgstr ""
-
-0
+6
-#, python-format
-msgid "Plugin '%s' failed to load: %s"
-msgstr ""
-
-55
+61
-#, python-format
-msgid "Invalid type for plugin '%s': %s"
@@ -459 +506 @@
-msgstr ""
-
-
+
+
+
+
+
+
-#, python-format
-msgid "Source %s is missing artist and/or title: "

trunk/src/audio_control.py

@@ -371 +371 @@
-        #        required
-        src = gst.element_factory_make("gnomevfssrc", "src")
-        # FIXME:
-        print "signals:", gobject.signal_list_names(src)
-        pipeline.add(src)
-        self._gst_src = src
@@ -407 +405 @@
-
-    def _create_audio_sink(self):
+        # FIXME
+        return gst.element_factory_make("autoaudiosink", "audio_sink")
+
-        config_sink = mesk.config.get(mesk.CONFIG_AUDIO, 'gst_sink')
+
-        if config_sink == mesk.GST_OSS:
-            audio_sink = gst.element_factory_make("osssink", "audio_sink")

trunk/src/main_window.py

@@ -144 +144 @@
-        self.window.hide()
-
+        if self._pref_window:
+            self._pref_window.window.destroy()
+
-        # Shutdown all controls
-        for ctrl in self._controls:
@@ -197 +200 @@
-        if self._pref_window is None:
-            self._pref_window = PreferenceWindow()
-window.
+
-    
-    def set_compact_mode(self, state):

trunk/src/mesk/__init__.py

@@ -41 +41 @@
-
-# GST sinks
-
-
-
+
+
+
+
-
-DEFAULT_PLAYLIST_NAME = 'mesk'
@@ -86 +87 @@
-    CONFIG_AUDIO: {
-    'gst_sink': [str, GST_ALSA, 
-
-
+%s, 
+GCONF, GST_
-    'gst_delay': [int, 1000, 
-                  _('Number of milliseconds to pause between tracks')],

trunk/src/mesk/plugin/__init__.py

@@ -27 +27 @@
-    mgr = get_manager()
-    if mgr:
-
+active_
-            method = getattr(plugin, event)
-            # XXX: There has got to be a better way
@@ -50 +50 @@
-    if not mgr:
-        return
-
+active_
-        plugin.shutdown()
-
@@ -70 +70 @@
-    __url = None
-    url = property(lambda self: self.__url)
-
-
+
+
+
+
+
+
-        self.__name = name
-        self.__description = description
-        self.__author = author
-        self.__url = url
+        self.__copyright = copyright
+        self.__xpm = xpm
-
-    def shutdown(self):
@@ -83 +89 @@
-
-    SYS_PLUGINS_DIR = './plugins'
-    PLUGIN_TUPLE_LEN = 5
-    (NAME,
-     DESCRIPTION,
-     AUTHOR,
-     URL,
-     FACTORY) = range(PLUGIN_TUPLE_LEN)
-
-    def __init__(self, plugins_dir):
@@ -96 +96 @@
-
-        def load_plugins(root):
-
+u
-            for file in os.listdir(root):
-                file = root + os.sep + file
-                plugin = self.load_plugin(file)
-                if plugin:
-
-
+u
+u
-
-        self.__plugins = {}     # Loaded and active plugins
-
-
-
+
-        load_plugins(self.SYS_PLUGINS_DIR)
-        load_plugins(plugins_dir)
@@ -114 +112 @@
-        active_plugins = mesk.config.get(mesk.CONFIG_MAIN, 'plugins')
-        active_plugins = active_plugins.split(';')
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if not type:
-            return [plugin for plugin in self.__plugins.values()]
@@ -144 +147 @@
-            __import__(module)
-            module = sys.modules[module]
-tuple
+registry_entry
-            if plugin_info:
-all_plugins
+plugin_registry
-        except Exception, ex:
-            mesk.log.error(_('Plugin \'%s\' failed to load: %s') % (module,
@@ -159 +162 @@
-        return plugin
-
-tuple
+registry_entry
-        try:
-            name = getattr(module, 'NAME')
@@ -165 +168 @@
-            author = getattr(module, 'AUTHOR')
-            url = getattr(module, 'URL')
+            copyright = getattr(module, 'COPYRIGHT')
+            xpm = getattr(module, 'XPM')
-            factory = getattr(module, 'create_plugin')
-            return (name, descr, author, url, factory)
-        except AttributeError, ex:
-
+
+
-            return None
+        return {'NAME': name, 'DESCRIPTION': descr, 'AUTHOR': author,
+                'URL': url, 'COPYRIGHT': copyright, 'XPM': xpm,
+                'FACTORY': factory}
+
+DEFAULT_PLUGIN_XPM = [
+"64 67 561 2",
+"       c None",
+".      c #000000",
+"+      c #070302",
+"@      c #020101",
+"#      c #080303",
+"$      c #280F0B",
+"%      c #3B170F",
+"&      c #451A11",
+"*      c #44170E",
+"=      c #42140B",
+"-      c #3D1108",
+";      c #2D0D06",