Changeset 445

Timestamp:

09/18/06 20:29:01 (2 years ago)

Author:

nicfit

Message:

0.2.1 merges

Files:

• trunk (modified) (1 prop)
• trunk/configure.ac (modified) (1 diff)
• trunk/src/main_window.py (modified) (8 diffs)
• trunk/src/mesk/audio/__init__.py (modified) (1 diff)
• trunk/src/mesk_gui.glade (modified) (1 diff)

trunk/configure.ac

@@ -18 +18 @@
-AC_PREREQ([2.57])
-
-0
+99
-
-EBUILD_RELEASE=

trunk/src/main_window.py

@@ -139 +139 @@
-            if not len(ctrl.get_playlist()):
-                # Playlist is empty, current display
-marquee
+current_display
-                self._album_cover_control.clear()
-
@@ -154 +154 @@
-
-        # Clear state
-marquee
+current_display
-        self._album_cover_control.clear()
-
@@ -173 +173 @@
-
-        if ctrl != self._empty_control:
+            self._notebook.set_show_tabs(True)
-            # Handle tab close button if it is to be displayed, otherwise hide
-            # it
@@ -187 +188 @@
-            if page_num >= 0:
-                self._notebook.remove_page(page_num)
-
-
-
-
-
-
+
+
-
-        # This list order does not necessarily correspond to the tab order
@@ -228 +225 @@
-        # 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)
-
-
-
+
-            # DnD clean up
-            self._notebook.drag_dest_unset()
-
-
-    def _get_control_from_widget(self, widget):
@@ -428 +421 @@
-
-    def _on_audio_source_changed(self, audio_control, old, new):
-marquee
-
-marquee
+current_display
+
+current_display
-        if src is None:
-            self._marquee_label.set_markup('')
@@ -440 +433 @@
-        marquee = ''
-        if title:
-,
+
-            marquee += u'<span weight="bold" size="larger">%s</span>' % title
-        if artist or album:
-            marquee += '\n'
-            if artist:
-,
+
-                marquee += '%s' % artist
-            if album:
-,
+
-                if artist:
-                    marquee += ' - '
@@ -454 +447 @@
-        self._marquee_label.set_markup(marquee)
-
+        # Update window title
+        win_title = ''
+        if artist and title:
+            print type(artist), type(title)
+            win_title = '%s - %s' % (artist, title)
+        elif artist:
+            win_title = artist
+        elif title:
+            win_title = title
+
+        if win_title:
+            win_title += ' - Mesk'
+        else:
+            win_title = 'Mesk'
+        self.window.set_title(win_title)
+
-    def _on_audio_source_tag_update(self, ctrl, src):
-marquee
+current_display
-
-    def _update_playlists_menu(self):

trunk/src/mesk/audio/__init__.py

@@ -52 +52 @@
-# And add a few we know about but do not begin with 'audio/'
-for ext in ['.ogg', '.flac']:
-
+ and mimetypes.types_map.has_key(ext)
-        audio_mimetypes[ext] = mimetypes.types_map[ext]
-

trunk/src/mesk_gui.glade

@@ -902 +902 @@
-                        <packing>
-                          <property name="padding">0</property>
-Fals
-Fals
+Tru
+Tru
-                        </packing>
-                      </child>