Changeset 308

Timestamp:

06/11/06 14:46:16 (2 years ago)

Author:

nicfit

Message:

MultiMediaKeys? start (code from listen) and po updates

Files:

• trunk/Makefile.in (modified) (6 diffs)
• trunk/configure.ac (modified) (1 diff)
• trunk/launch.sh (modified) (1 diff)
• trunk/po/es.po (modified) (8 diffs)
• trunk/po/mesk.pot (modified) (8 diffs)
• trunk/src/main_window.py (modified) (2 diffs)

trunk/Makefile.in

@@ -25 +25 @@
-exec_prefix:=@exec_prefix@
-bindir:=$(subst //,/,${DESTDIR}/@bindir@)
-/mesk
+
-mandir:=$(subst //,/,${DESTDIR}/@mandir@)
-datadir:=$(subst //,/,${DESTDIR}/@datadir@)
@@ -48 +48 @@
-module:
-        ${PYTHON} setup.py build
+        ${MAKE} -C ./src/mmkeys all
-
-etc/mesk.desktop: etc/mesk.desktop.in
@@ -55 +56 @@
-install: all
-        ${PYTHON} setup.py install --prefix=${prefix}
+        #${MAKE} -C src/mmkeys install
-
-        # Code
-        install -m 755 -d ${bindir}
-        install -m 755 scripts/mesk ${bindir}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-        # Plugins
-
-
-
+mesk/
+mesk/
+mesk/
-
-        # Docs
@@ -110 +111 @@
-        -rm -rf ${bindir}/mesk
-        -rm -rf ${libdir}/python2.4/site-packages/mesk
-
+/mesk
-        -rm -rf ${docdir}
-        -rm ${datadir}/applications/mesk.desktop
@@ -119 +120 @@
-        find . -name \*.pyc -exec rm '{}' \;
-        find . -name \*.pyo -exec rm '{}' \;
+        ${MAKE} -C src/mmkeys clean
-
-distclean: clean
@@ -133 +135 @@
-        -rm Makefile
-        -${MAKE} -C po distclean
+        ${MAKE} -C src/mmkeys distclean
-
-maintainer-clean:

trunk/configure.ac

@@ -45 +45 @@
-                 src/mesk/info.py\
-                 scripts/mesk\
-
+
+
-if test -f README.in; then
-   AC_CONFIG_FILES([README])

trunk/launch.sh

@@ -6 +6 @@
-    ./autogen.sh
-fi
-cd ${ROOT}/src
-
-profile=${MESK_TEST_PROFILE:-testing}
+cd ${ROOT}/src
+export PYTHONPATH=${PYTHONPATH}:./mmkeys
-exec python -OO main.py --profile=${profile} $@

trunk/po/es.po

@@ -8 +8 @@
-"Project-Id-Version: 0.1.1\n"
-"Report-Msgid-Bugs-To: \n"
-0 22:42
+1 14:26
-"PO-Revision-Date: 2006-04-15 17:38-0600\n"
-"Last-Translator: Travis Shirk <travis@pobox.com>\n"
@@ -222 +222 @@
-msgstr "Pausa"
-
-17
+22
-#, python-format
-msgid "Gstreamer version %d.%d.%d audio control initialized"
@@ -261 +261 @@
-msgstr "La gerencia de la sesión inhabilitó (ningún módulo de gnome.ui)"
-
-
+
+
+
+
+
+
-#, python-format
-msgid "Error loading playlist '%s'"
@@ -376 +381 @@
-msgstr "Número de los milisegundos a detenerse brevemente entre las pistas"
-
-
+
+
+
+
+
-msgid "Playlist (file) location"
-msgstr "Localización de Playlist (archivo)"
-
-99
+101
-msgid "Open on startup"
-msgstr "Ábrase en arranque"
-
-0
+2
-msgid "Starting playlist index"
-msgstr "Comenzar índice del playlist"
-
-1
+3
-msgid "Is the playlist in repeat mode"
-msgstr "Es el playlist en modo de la repetición"
-
-2
+4
-msgid "Is the playlist in shuffle mode"
-msgstr "Es el playlist en modo de la barajadura"
-
-3
+5
-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"
-
-6
+8
-msgid "The directory to open when adding files"
-msgstr "El directorio a abrirse al agregar archivos"
-
-7 ../src/mesk/__init__.py:119
-1
+9 ../src/mesk/__init__.py:121
+3
-#, python-format
-msgid "Creating %s..."
@@ -472 +481 @@
-
-#. Text columns
-3
+4
-msgid "Title"
-msgstr "Título"
-
-4
+5
-msgid "Artist"
-msgstr "Artista"
-
-4
+5
-msgid "Album"
-msgstr "Álbum"
-
-4
+5
-msgid "#"
-msgstr "#"
-
-4
+5
-msgid "Year"
-msgstr "Año"
-
-4
+5
-msgid "Time"
-msgstr "Tiempo"
-
-72
+85
-msgid "tracks"
-msgstr "pistas"
-
-77
+90
-#, fuzzy, python-format
-msgid ""
@@ -508 +517 @@
-msgstr "Fuente que cae del error: %s"
-
-85
+98
-#, fuzzy, python-format
-msgid ""
@@ -518 +527 @@
-"%s"
-
-28
+41
-msgid "Add Music"
-msgstr "Agregue La Música"
-
-35
+48
-msgid "MP3s"
-msgstr "MP3s"
-
-40
+53
-msgid "Playlists"
-msgstr "Playlists"
@@ -533 +542 @@
-#. the checkbox is toggles and files when not since this is not
-#. possible by default
-47
+60
-msgid "Make the _dialog be able/unable to select directories"
-msgstr "Haga que el _diálogo es able/unable para seleccionar directorios"
-
-39
+52
-#, python-format
-msgid "'%s' string not found"

trunk/po/mesk.pot

@@ -9 +9 @@
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-0 22:42
+1 14:26
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -221 +221 @@
-msgstr ""
-
-17
+22
-#, python-format
-msgid "Gstreamer version %d.%d.%d audio control initialized"
@@ -256 +256 @@
-msgstr ""
-
-
+
+
+
+
+
+
-#, python-format
-msgid "Error loading playlist '%s'"
@@ -364 +369 @@
-msgstr ""
-
-
+
+
+
+
+
-msgid "Playlist (file) location"
-msgstr ""
-
-99
+101
-msgid "Open on startup"
-msgstr ""
-
-0
+2
-msgid "Starting playlist index"
-msgstr ""
-
-1
+3
-msgid "Is the playlist in repeat mode"
-msgstr ""
-
-2
+4
-msgid "Is the playlist in shuffle mode"
-msgstr ""
-
-3
+5
-msgid "The playlist queue which is a comma separated list of indices"
-msgstr ""
-
-6
+8
-msgid "The directory to open when adding files"
-msgstr ""
-
-7 ../src/mesk/__init__.py:119
-1
+9 ../src/mesk/__init__.py:121
+3
-#, python-format
-msgid "Creating %s..."
@@ -460 +469 @@
-
-#. Text columns
-3
+4
-msgid "Title"
-msgstr ""
-
-4
+5
-msgid "Artist"
-msgstr ""
-
-4
+5
-msgid "Album"
-msgstr ""
-
-4
+5
-msgid "#"
-msgstr ""
-
-4
+5
-msgid "Year"
-msgstr ""
-
-4
+5
-msgid "Time"
-msgstr ""
-
-72
+85
-msgid "tracks"
-msgstr ""
-
-77
+90
-#, python-format
-msgid ""
@@ -496 +505 @@
-msgstr ""
-
-85
+98
-#, python-format
-msgid ""
@@ -504 +513 @@
-msgstr ""
-
-28
+41
-msgid "Add Music"
-msgstr ""
-
-35
+48
-msgid "MP3s"
-msgstr ""
-
-40
+53
-msgid "Playlists"
-msgstr ""
@@ -519 +528 @@
-#. the checkbox is toggles and files when not since this is not
-#. possible by default
-47
+60
-msgid "Make the _dialog be able/unable to select directories"
-msgstr ""
-
-39
+52
-#, python-format
-msgid "'%s' string not found"

trunk/src/main_window.py

@@ -30 +30 @@
-from album_cover_control import AlbumCoverControl
-from preference_window import PreferenceWindow
+from multi_media_keys import MultiMediaKeys
-
-class MainWindow:
@@ -302 +303 @@
-                               _('Volume %d%%') % (vol * 100))
-
-class MultiMediaKeys:
-    def __init__(self, audio_control):
-        self._audio = audio_control
-        import mmkeys