Changeset 335

Timestamp:

06/27/06 23:27:48 (2 years ago)

Author:

nicfit

Message:

Added a MUCH better volume widget. /me is proud

Files:

• trunk/po/es.po (modified) (8 diffs)
• trunk/po/mesk.pot (modified) (6 diffs)
• trunk/src/audio_control.py (modified) (7 diffs)
• trunk/src/images/audio-volume-high.png (added)
• trunk/src/images/audio-volume-low.png (added)
• trunk/src/images/audio-volume-medium.png (added)
• trunk/src/images/audio-volume-muted.png (added)
• trunk/src/main_window.py (modified) (4 diffs)
• trunk/src/mesk_gui.glade (modified) (13 diffs)
• trunk/src/playlist_control.py (modified) (1 diff)

trunk/po/es.po

@@ -8 +8 @@
-"Project-Id-Version: 0.1.1\n"
-"Report-Msgid-Bugs-To: \n"
-5 15:01
+7 14:19
-"PO-Revision-Date: 2006-04-15 17:38-0600\n"
-"Last-Translator: Travis Shirk <travis@pobox.com>\n"
@@ -49 +49 @@
-
-#: ../src/mesk_gui.glade.h:7
+msgid ""
+"<big>Welcome To <b>Mesk</b></big>\n"
+"\n"
+"Add, or open, a playlist using the File menu."
+msgstr ""
+
+#: ../src/mesk_gui.glade.h:10
-msgid "Add Music..."
-msgstr "Agregue La Música"
-
-8
+11
-msgid "Add music..."
-msgstr "Agregue la música"
-
-9
+12
-msgid "CD Audio"
-msgstr ""
-
-0
+3
-msgid "Clear Queue"
-msgstr "Coleta Clara"
-
-1
+4
-msgid "Clear search"
-msgstr "Búsqueda clara"
-
-2
+5
-msgid "Close search"
-msgstr "Búsqueda cercana"
-
-3
+6
-msgid "Configure..."
-msgstr "Configure..."
-
-4
+7
-msgid "Copyright © 2006 Travis Shirk"
-msgstr "Copyright © 2006 Travis Shirk"
-
-5
+8
-msgid "Find:"
-msgstr "Hallazgo:"
-
-
+
+
+
+
+
-msgid "Mesk"
-msgstr "Mesk"
-
-17
+21
-msgid "Next"
-msgstr "Después"
-
-18
+22
-msgid "Online Help"
-msgstr "Ayuda En línea"
-
-#. Tooltip strings
-19
+23
-msgid "Play"
-msgstr "Juego"
-
-0
+4
-msgid "Playlist"
-msgstr "Playlist"
-
-1
+5
-#, fuzzy
-msgid "Playlist Name"
-msgstr "Playlist"
-
-2
+6
-msgid "Playlist stats"
-msgstr "Playlist stats"
-
-3
+7
-msgid "Plugins"
-msgstr "Plugins"
-
-4
+8
-msgid "Preferences"
-msgstr "Preferencias"
-
-5
+9
-msgid "Previous"
-msgstr "Anterior"
-
-26
+30
-msgid "Queue"
-msgstr "Coleta"
-
-27
+31
-msgid "Queue/Unqueue"
-msgstr "Coleta/Unqueue"
-
-28
+32
-msgid "Remove"
-msgstr "Quite"
-
-29
+33
-msgid "Rename..."
-msgstr ""
-
-0
+4
-msgid "Repeat playlist"
-msgstr "Repetición el playlist"
-
-1
+5
-msgid "Shuffle playlist"
-msgstr "Playlist de la barajadura"
-
-2
+6
-msgid "Stop"
-msgstr "Parada"
-
-3
+7
-msgid "_About"
-msgstr "_Sobre"
-
-4
+8
-#, fuzzy
-msgid "_Compact"
-msgstr "Acuerdo"
-
-5
+9
-#, fuzzy
-msgid "_Contents"
-msgstr "Contenido"
-
-36
+40
-msgid "_Edit"
-msgstr "_Corrija"
-
-37
+41
-msgid "_File"
-msgstr "_Archivo"
-
-38
+42
-msgid "_Help"
-msgstr "_Ayuda"
-
-39
+43
-#, fuzzy
-msgid "_New Playlist..."
-msgstr "Abra el playlist"
-
-0
+4
-#, fuzzy
-msgid "_Open Playlist"
-msgstr "Abra el playlist"
-
-1
+5
-msgid "_Preferences"
-msgstr "_Preferencias"
-
-2
+6
-msgid "_View"
-msgstr "_Visión"
-
-#. TRANSLATORS: Replace this string with your names, one name per line.
-4
+8
-msgid "es: Babelfish"
-msgstr ""
-
-5
+9
-msgid "example"
-msgstr ""
@@ -293 +304 @@
-msgstr "La gerencia de la sesión inhabilitó (ningún módulo de gnome.ui)"
-
-2 ../src/main_window.py:362
+3 ../src/main_window.py:394
-#, python-format
-msgid "Volume %d%%"
-msgstr ""
-
-94
+110
-#, python-format
-msgid "Error loading playlist '%s'"
@@ -327 +338 @@
-
-#: ../src/mesk/__init__.py:57
+msgid "The foreground playlist that has audio control"
+msgstr ""
+
+#: ../src/mesk/__init__.py:59
-#, fuzzy
-msgid "A list of playlists to open on startup"
-msgstr "Una lista de los plugins (separados por ';') para activar en arranque"
-
-59
+61
-msgid "Logging level. May be CRITICAL, ERROR, WARNING, INFO, VERBOSE, or DEBUG"
-msgstr ""
@@ -337 +352 @@
-"DEBUG"
-
-2
+4
-msgid "The directory containing user installed plugins"
-msgstr "El directorio que contiene plugins instalados usuario"
-
-3
+5
-msgid "A list of plugins (separated by ';') to activate on startup."
-msgstr "Una lista de los plugins (separados por ';') para activar en arranque"
-
-68
+70
-msgid "Start in compact view mode"
-msgstr "Comience en modo compacto de la visión"
-
-0
+2
-msgid ""
-"If True, the main window is hidded instead of closed when the window close "
@@ -357 +372 @@
-"chasca el botón del cierre de la ventana"
-
-3
+5
-msgid "Main window width"
-msgstr "Anchura principal de la ventana"
-
-4
+6
-msgid "Main window height"
-msgstr "Altura principal de la ventana"
-
-5
+7
-msgid "Main window x origin"
-msgstr "Origen principal de la ventana x"
-
-6
+8
-msgid "Main window y origin"
-msgstr "Origen principal de la ventana y"
-
-78
+80
-msgid "Main window x origin in compact mode"
-msgstr "Origen principal de la ventana x en modo compacto"
-
-0
+2
-msgid "Main window y origin in compact mode"
-msgstr "Origen principal de la ventana y en modo compacto"
-
-2
+4
-msgid "Display the close button on each tab"
-msgstr ""
-
-7
+9
-#, fuzzy, python-format
-msgid "GStreamer output sink. May be %s (default), %s, '%s','%s', or '%s'"
@@ -391 +406 @@
-"Fregadero de la salida de GStreamer. Pueden ser '%s', '%s', '%s' o '%s'"
-
-1
+3
-msgid "Number of milliseconds to pause between tracks"
-msgstr "Número de los milisegundos a detenerse brevemente entre las pistas"
-
-3
+5
-msgid "Volume level is a value between 0.0 and 1.0"
-msgstr ""
-
-7
+9
-msgid "Playlist (file) location"
-msgstr "Localización de Playlist (archivo)"
-
-98
+100
-msgid "Starting playlist index"
-msgstr "Comenzar índice del playlist"
-
-99
+101
-msgid "Is the playlist in repeat mode"
-msgstr "Es el playlist en modo de la repetición"
-
-0
+2
-msgid "Is the playlist in shuffle mode"
-msgstr "Es el playlist en modo de la barajadura"
-
-1
+3
-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"
-
-4
+6
-msgid "The directory to open when adding files"
-msgstr "El directorio a abrirse al agregar archivos"
-
-5 ../src/mesk/__init__.py:117
-19
+7 ../src/mesk/__init__.py:119
+21
-#, python-format
-msgid "Creating %s..."
@@ -671 +686 @@
-msgstr "Gajim y/o Dbus no está funcionando"
-
-29
+41
-msgid " [paused]"
-msgstr " [detenido brevemente]"
-
-80
+94
-msgid "Gajim must be running in order to determine accounts."
-msgstr "Gajim debe funcionar para determinar cuentas."

trunk/po/mesk.pot

@@ -9 +9 @@
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-5 15:01
+7 14:19
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -50 +50 @@
-
-#: ../src/mesk_gui.glade.h:7
+msgid ""
+"<big>Welcome To <b>Mesk</b></big>\n"
+"\n"
+"Add, or open, a playlist using the File menu."
+msgstr ""
+
+#: ../src/mesk_gui.glade.h:10
-msgid "Add Music..."
-msgstr ""
-
-8
+11
-msgid "Add music..."
-msgstr ""
-
-9
+12
-msgid "CD Audio"
-msgstr ""
-
-0
+3
-msgid "Clear Queue"
-msgstr ""
-
-1
+4
-msgid "Clear search"
-msgstr ""
-
-2
+5
-msgid "Close search"
-msgstr ""
-
-3
+6
-msgid "Configure..."
-msgstr ""
-
-4
+7
-msgid "Copyright © 2006 Travis Shirk"
-msgstr ""
-
-5
+8
-msgid "Find:"
-msgstr ""
-
-
+
+
+
+
+
-msgid "Mesk"
-msgstr ""
-
-17
+21
-msgid "Next"
-msgstr ""
-
-18
+22
-msgid "Online Help"
-msgstr ""
-
-#. Tooltip strings
-19
+23
-msgid "Play"
-msgstr ""
-
-0
+4
-msgid "Playlist"
-msgstr ""
-
-1
+5
-msgid "Playlist Name"
-msgstr ""
-
-2
+6
-msgid "Playlist stats"
-msgstr ""
-
-3
+7
-msgid "Plugins"
-msgstr ""
-
-4
+8
-msgid "Preferences"
-msgstr ""
-
-5
+9
-msgid "Previous"
-msgstr ""
-
-26
+30
-msgid "Queue"
-msgstr ""
-
-27
+31
-msgid "Queue/Unqueue"
-msgstr ""
-
-28
+32
-msgid "Remove"
-msgstr ""
-
-29
+33
-msgid "Rename..."
-msgstr ""
-
-0
+4
-msgid "Repeat playlist"
-msgstr ""
-
-1
+5
-msgid "Shuffle playlist"
-msgstr ""
-
-2
+6
-msgid "Stop"
-msgstr ""
-
-3
+7
-msgid "_About"
-msgstr ""
-
-4
+8
-msgid "_Compact"
-msgstr ""
-
-5
+9
-msgid "_Contents"
-msgstr ""
-
-36
+40
-msgid "_Edit"
-msgstr ""
-
-37
+41
-msgid "_File"
-msgstr ""
-
-38
+42
-msgid "_Help"
-msgstr ""
-
-39
+43
-msgid "_New Playlist..."
-msgstr ""
-
-0
+4
-msgid "_Open Playlist"
-msgstr ""
-
-1
+5
-msgid "_Preferences"
-msgstr ""
-
-2
+6
-msgid "_View"
-msgstr ""
-
-#. TRANSLATORS: Replace this string with your names, one name per line.
-4
+8
-msgid "es: Babelfish"
-msgstr ""
-
-5
+9
-msgid "example"
-msgstr ""
@@ -282 +293 @@
-msgstr ""
-
-2 ../src/main_window.py:362
+3 ../src/main_window.py:394
-#, python-format
-msgid "Volume %d%%"
-msgstr ""
-
-94
+110
-#, python-format
-msgid "Error loading playlist '%s'"
@@ -316 +327 @@
-
-#: ../src/mesk/__init__.py:57
+msgid "The foreground playlist that has audio control"
+msgstr ""
+
+#: ../src/mesk/__init__.py:59
-msgid "A list of playlists to open on startup"
-msgstr ""
-
-59
+61
-msgid "Logging level. May be CRITICAL, ERROR, WARNING, INFO, VERBOSE, or DEBUG"
-msgstr ""
-
-2
+4
-msgid "The directory containing user installed plugins"
-msgstr ""
-
-3
+5
-msgid "A list of plugins (separated by ';') to activate on startup."
-msgstr ""
-
-68
+70
-msgid "Start in compact view mode"
-msgstr ""
-
-0
+2
-msgid ""
-"If True, the main window is hidded instead of closed when the window close "
@@ -341 +356 @@
-msgstr ""
-
-3
+5
-msgid "Main window width"
-msgstr ""
-
-4
+6
-msgid "Main window height"
-msgstr ""
-
-5
+7
-msgid "Main window x origin"
-msgstr ""
-
-6
+8
-msgid "Main window y origin"
-msgstr ""
-
-78
+80
-msgid "Main window x origin in compact mode"
-msgstr ""
-
-0
+2
-msgid "Main window y origin in compact mode"
-msgstr ""
-
-2
+4
-msgid "Display the close button on each tab"
-msgstr ""
-
-7
+9
-#, python-format
-msgid "GStreamer output sink. May be %s (default), %s, '%s','%s', or '%s'"
-msgstr ""
-
-1
+3
-msgid "Number of milliseconds to pause between tracks"
-msgstr ""
-
-3
+5
-msgid "Volume level is a value between 0.0 and 1.0"
-msgstr ""
-
-7
+9
-msgid "Playlist (file) location"
-msgstr ""
-
-98
+100
-msgid "Starting playlist index"
-msgstr ""
-
-99
+101
-msgid "Is the playlist in repeat mode"
-msgstr ""
-
-0
+2
-msgid "Is the playlist in shuffle mode"
-msgstr ""
-
-1
+3
-msgid "The playlist queue which is a comma separated list of indices"
-msgstr ""
-
-4
+6
-msgid "The directory to open when adding files"
-msgstr ""
-
-5 ../src/mesk/__init__.py:117
-19
+7 ../src/mesk/__init__.py:119
+21
-#, python-format
-msgid "Creating %s..."
@@ -650 +665 @@
-msgstr ""
-
-29
+41
-msgid " [paused]"
-msgstr ""
-
-80
+94
-msgid "Gajim must be running in order to determine accounts."
-msgstr ""

trunk/src/audio_control.py

@@ -29 +29 @@
-
-import control
+import gtk_utils
-
-class AudioControl(control.Control):
@@ -51 +52 @@
-        self._current_audio_src = None
-        self._last_src_started = None
+        self._volume_button_tip = gtk.Tooltips()
+        self._volume_scale_tip = gtk.Tooltips()
+
+        # Volume slider window
+        vol_xml = gtk_utils.get_glade('volume_slider_window')
+        vol_xml.signal_autoconnect(self)
+        self._volume_window = vol_xml.get_widget('volume_slider_window')
+        self._volume_scale = vol_xml.get_widget('volume_scale')
+        self._volume_scale_ebox = vol_xml.get_widget('volume_scale_eventbox')
-
-        self._state = self.STOP
@@ -56 +66 @@
-        self._duration = gst.CLOCK_TIME_NONE
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        self._prev_button = parent_xml.get_widget('prev_button')
-        self._play_pause_button = parent_xml.get_widget('play_pause_button')
@@ -126 +139 @@
-        self._create_gst_pipeline()
-
+        # Set initial volume from config
+        vol = mesk.config.getfloat(mesk.CONFIG_AUDIO, 'volume')
+        vol = max(vol, 0.0)
+        vol = min(vol, 1.0)
+        self.set_volume(vol)
+
-    def set_playlist(self, pl):
-        self._playlist = pl
@@ -282 +301 @@
-        if v < 0.0 or v > 1.0:
-            raise AttributeError('Invalid volume: %f' % v)
+
-        self._volume = v
-        self._gst_bin.set_property('volume', v)
+
+        self._set_volume_image()
+        self._volume_scale.set_value(v)
+        tip_str = _('Volume %d%%') % int(self._volume * 100.0)
+        self._volume_button_tip.set_tip(self._volume_ebox, tip_str)
+        self._volume_scale_tip.set_tip(self._volume_scale_ebox, tip_str)
+
+        # Update config
-        mesk.config.set(mesk.CONFIG_AUDIO, 'volume', str(self._volume))
-
@@ -498 +526 @@
-        return not self._tick_stopped
-
+    ### Track scale events ###
-    def _on_track_scale_button_press_event(self, event, arg):
-        if self.is_playing():
@@ -533 +562 @@
-        label = mesk.utils.format_track_time(p / gst.SECOND, d)
-        self._track_time_label.set_markup('<i>%s</i>' % label)
+
+    def _set_volume_image(self):
+        old_img = self._volume_togglebutton.get_child()
+        if old_img:
+            self._volume_togglebutton.remove(old_img)
+
+        val = int(self._volume * 100.0)
+        if val == 0:
+            if not self._volume_mute_img:
+                img = gtk.Image()
+                img.set_from_file('images/audio-volume-muted.png')
+                self._volume_mute_img = img
+            new_img = self._volume_mute_img
+        elif val <= 35:
+            if not self._volume_low_img:
+                img = gtk.Image()
+                img.set_from_file('images/audio-volume-low.png')
+                self._volume_low_img = img
+            new_img = self._volume_low_img
+        elif val <= 68:
+            if not self._volume_medium_img:
+                img = gtk.Image()
+                img.set_from_file('images/audio-volume-medium.png')
+                self._volume_medium_img = img
+            new_img = self._volume_medium_img
+        else:
+            if not self._volume_high_img:
+                img = gtk.Image()
+                img.set_from_file('images/audio-volume-high.png')
+                self._volume_high_img = img
+            new_img = self._volume_high_img
+
+        self._volume_togglebutton.add(new_img)
+        new_img.show()
+
+    ### Volume events ###
+    def _on_volume_togglebutton_scroll_event(self, widget, event):
+        FACTOR = 0.04
+        if event.direction == gtk.gdk.SCROLL_UP:
+            new_vol = self._volume + FACTOR
+        elif event.direction == gtk.gdk.SCROLL_DOWN:
+            new_vol = self._volume - FACTOR
+        else:
+            return
+
+        # Coerce vol to an acceptable range
+        if new_vol < 0.0:
+            new_vol = 0.0
+        elif new_vol > 1.0:
+            new_vol = 1.0
+
+        self.set_volume(new_vol)
+
+    def _on_volume_togglebutton_toggled(self, button):
+        # Show or hide the volume scale window
+        if button.get_active():
+            self._volume_button_tip.disable()
+            self._volume_scale_tip.enable()
+
+            x0, y0 = self._volume_ebox.window.get_origin()
+            y0 += self._volume_ebox.allocation.height + 1
+            self._volume_window.move(x0, y0)
+            self._volume_window.show()
+            # FIXME: This does not appear to be working
+            self._volume_scale.grab_focus()
+        else:
+            self._volume_scale_tip.disable()
+            self._volume_button_tip.enable()
+            self._volume_window.hide()
+
+    def _on_main_window_configure_event(self, window, event):
+        if self._volume_togglebutton.get_active():
+            # The first stab at this I hid the volume window as soon as
+            # the top-level moved (self._volume_togglebutton.set_active(False))
+            # but emitting toggled makes the volume window follow the main
+            # window, which is definitely cool
+            self._volume_togglebutton.toggled()
+
+    def _on_volume_scale_value_changed(self, scale):
+        self.set_volume(scale.get_value())

trunk/src/main_window.py

@@ -40 +40 @@
-        self._controls = []
-
-        self._tooltips = gtk.Tooltips()
-        self.xml = gtk_utils.get_glade('main_window')
-        self.xml.signal_autoconnect(self)
@@ -59 +58 @@
-            self._audio_control = AudioControl(self.xml)
-        except Exception, ex:
-
+
+
-            # FIXME: This should not be able to fail when #149 is done
-            sys.exit(1)
@@ -67 +67 @@
-                                    self._on_audio_source_tag_update)
-
-        # Set initial volume
-        vol = self._audio_control.get_volume()
-        self.xml.get_widget('volume_scale').set_value(vol)
-        self._tooltips.set_tip(self.xml.get_widget('volume_eventbox'),
-                               _('Volume %d%%') % (vol * 100))
-
-        self._album_cover_control = AlbumCoverControl(self.xml,
@@ -388 +383 @@
-        self._update_marquee(src)
-
-    def _on_volume_scale_value_changed(self, scale):
-        vol = scale.get_value()
-        self._audio_control.set_volume(vol)
-        self._tooltips.set_tip(scale.get_parent(),
-                               _('Volume %d%%') % (vol * 100))
-
-    def _update_playlists_menu(self):
-        # Remove existing menu entries

trunk/src/mesk_gui.glade

@@ -22 +22 @@
-  <signal name="delete_event" handler="_on_window_delete" last_modification_time="Sun, 19 Feb 2006 04:08:26 GMT"/>
-  <signal name="focus_in_event" handler="_on_window_focus_in_event" last_modification_time="Thu, 09 Mar 2006 04:14:34 GMT"/>
+  <signal name="configure_event" handler="_on_main_window_configure_event" last_modification_time="Wed, 28 Jun 2006 04:45:21 GMT"/>
-
-  <child>
@@ -279 +280 @@
-                          <property name="can_focus">True</property>
-                          <property name="relief">GTK_RELIEF_NORMAL</property>
-Tru
+Fals
-
-                          <child>
@@ -308 +309 @@
-                          <property name="can_focus">True</property>
-                          <property name="relief">GTK_RELIEF_NORMAL</property>
-Tru
+Fals
-
-                          <child>
@@ -337 +338 @@
-                          <property name="can_focus">True</property>
-                          <property name="relief">GTK_RELIEF_NORMAL</property>
-Tru
+Fals
-
-                          <child>
@@ -366 +367 @@
-                          <property name="can_focus">True</property>
-                          <property name="relief">GTK_RELIEF_NORMAL</property>
-Tru
+Fals
-
-                          <child>
@@ -377 +378 @@
-                              <property name="xpad">0</property>
-                              <property name="ypad">0</property>
+                            </widget>
+                          </child>
+                        </widget>
+                        <packing>
+                          <property name="padding">0</property>
+                          <property name="expand">False</property>
+                          <property name="fill">False</property>
+                        </packing>
+                      </child>
+
+                      <child>
+                        <widget class="GtkVSeparator" id="vseparator2">
+                          <property name="visible">True</property>
+                        </widget>
+                        <packing>
+                          <property name="padding">0</property>
+                          <property name="expand">True</property>
+                          <property name="fill">True</property>
+                        </packing>
+                      </child>
+
+                      <child>
+                        <widget class="GtkEventBox" id="volume_eventbox">
+                          <property name="visible">True</property>
+                          <property name="visible_window">True</property>
+                          <property name="above_child">False</property>
+
+                          <child>
+                            <widget class="GtkToggleButton" id="volume_togglebutton">
+                              <property name="visible">True</property>
+                              <property name="can_focus">True</property>
+                              <property name="label" translatable="yes"></property>
+                              <property name="use_underline">True</property>
+                              <property name="relief">GTK_RELIEF_NORMAL</property>
+                              <property name="focus_on_click">False</property>
+                              <property name="active">False</property>
+                              <property name="inconsistent">False</property>
+                              <signal name="scroll_event" handler="_on_volume_togglebutton_scroll_event" last_modification_time="Wed, 28 Jun 2006 03:24:37 GMT"/>
+                              <signal name="toggled" handler="_on_volume_togglebutton_toggled" last_modification_time="Wed, 28 Jun 2006 03:39:12 GMT"/>
-                            </widget>
-                          </child>
@@ -464 +504 @@
-
-              <child>
-                <widget class="GtkVBox" id="vbox7">
-                  <property name="visible">True</property>
-                  <property name="homogeneous">False</property>
-                  <property name="spacing">0</property>
-
-                  <child>
-                    <widget class="GtkEventBox" id="volume_eventbox">
-                      <property name="visible">True</property>
-                      <property name="visible_window">True</property>
-                      <property name="above_child">False</property>
-
-                      <child>
-                        <widget class="GtkVScale" id="volume_scale">
-                      &nbs