Changeset 474

Timestamp:

10/16/06 20:14:41 (2 years ago)

Author:

nicfit

Message:

Removed mmkeys (for the time being, not sure how I want to do keybindings) and xspf work.

Files:

• trunk/src/config.py (modified) (1 diff)
• trunk/src/data/glade/version_migration.glade (added)
• trunk/src/main.py (modified) (2 diffs)
• trunk/src/main_window.py (modified) (2 diffs)
• trunk/src/mesk/gtk_utils.py (modified) (2 diffs)
• trunk/src/mmkeys (deleted)
• trunk/src/playlist_control.py (modified) (4 diffs)

trunk/src/config.py

@@ -36 +36 @@
-            name = section.split('.', 1)[1]
-            playlists.append(name)
-    return playlists
-
-def get_all_playlists():
-    playlists = {}
-    for section in mesk.config.sections():
-        if section.startswith(mesk.CONFIG_PLAYLIST + '.'):
-            name = section.split('.', 1)[1]
-            playlists[name] = PlaylistConfig(name)
-    return playlists
-

trunk/src/main.py

@@ -64 +64 @@
-            self.main_window.show_tips_window()
-
+        # FIXME:
+        self.tray_icon = \
+            gtk.status_icon_new_from_file('data/images/mesk-22.png')
+        self.tray_icon.set_visible(True)
+        self.tray_icon.set_tooltip("This is a test")
+        self.tray_icon.connect('activate', self._on_trayicon_activate)
+        self.tray_icon.connect('popup-menu', self._on_trayicon_menu)
+
-        try:
-            gtk.main()
@@ -194 +202 @@
-
-            if minor == 2: # 0.2.x --> 0.3.x
-
-
-
-
+
-                # FIXME
-                #sys.exit(1)
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-import optparse

trunk/src/main_window.py

@@ -378 +378 @@
-        if self._pref_window is None:
-            self._pref_window = PreferenceWindow()
-show
+present
-
-    def _on_compact_menuitem_activate(self, widget):
@@ -478 +478 @@
-
-        # Add new playlist entries
-s().key
+_name
-        playlists = list(playlists.difference(shown_playlists))
-        if playlists:

trunk/src/mesk/gtk_utils.py

@@ -19 +19 @@
-################################################################################
-import os, sys
-
+gtk.glade, 
-import xml.sax.saxutils
-
@@ -106 +106 @@
-        glade_file = '%s.glade' % symbol
-    return gtk.glade.XML(os.path.join(glade_dir, glade_file), symbol, 'mesk')
+
+def update_pending_events():
+    while gtk.events_pending():
+        gtk.main_iteration(False)

trunk/src/playlist_control.py

@@ -182 +182 @@
-
-        # Load playlist
-
+: remove timing code?
-        import time
-        t1 = time.time()
@@ -188 +188 @@
-        t2 = time.time()
-        print "Playlist load time: %fs" % (t2 - t1)
-        pl.set_shuffle(self._pl_config.shuffle)
-        pl.set_repeat(self._pl_config.repeat)
-        pl.set_curr_index(-1)
-        if not pl.is_shuffled() and not self._pl_config.queue:
-            try:
-                pl.set_curr_index(self._pl_config.current)
-            except IndexError:
-                pass
-        pl._queue = self._pl_config.queue
-
@@ -226 +219 @@
-            mesk.playlist.xspf.save(mesk.uri.unescape(self._pl_config.uri.path),
-                                    self._playlist)
-            # FIXME
-            #mesk.playlist.xspf.save('../pl.xspf', self._playlist)
-
-            self._debug_show_playlist()
@@ -1029 +1020 @@
-                        # For every N inserts update UI
-                        if count % MAX_ROWS_PENDING == 0:
-while gtk.events_pending():
-
+mesk.gtk_utils.update_pending_events()
+
-            except (UnsupportedScheme, Exception), ex:
-                msg = _('Error dropping source: %s\n\n%s') % \