Changeset 340

Timestamp:

06/29/06 21:29:34 (2 years ago)

Author:

nicfit

Message:

Tab drag-and-drop reordering (closes #153)

Files:

• trunk/po/es.po (modified) (6 diffs)
• trunk/po/mesk.pot (modified) (5 diffs)
• trunk/src/main_window.py (modified) (6 diffs)

trunk/po/es.po

@@ -8 +8 @@
-"Project-Id-Version: 0.1.1\n"
-"Report-Msgid-Bugs-To: \n"
-14:19
+23:31
-"PO-Revision-Date: 2006-04-15 17:38-0600\n"
-"Last-Translator: Travis Shirk <travis@pobox.com>\n"
@@ -25 +25 @@
-
-#: ../src/mesk_gui.glade.h:1
+msgid "+"
+msgstr ""
+
+#: ../src/mesk_gui.glade.h:2
+msgid "-"
+msgstr ""
+
+#: ../src/mesk_gui.glade.h:3
-msgid "--:--"
-msgstr "--:--"
-
-2
+4
-msgid "<b>Author:</b>"
-msgstr "<b>Autor:</b>"
-
-3
+5
-msgid "<b>Copyright:</b>"
-msgstr "<b>Copyright:</b>"
-
-4
+6
-msgid "<b>Description:</b>"
-msgstr "<b>Descripción:</b>"
-
-5
+7
-msgid "<b>Plugin Name</b>"
-msgstr "<b>Nombre Plugin</b>"
-
-6
+8
-msgid "<b>URL:</b>"
-msgstr "<b>URL:</b>"
-
-7
+9
-msgid ""
-"<big>Welcome To <b>Mesk</b></big>\n"
@@ -55 +63 @@
-msgstr ""
-
-0
+2
-msgid "Add Music..."
-msgstr "Agregue La Música"
-
-1
+3
-msgid "Add music..."
-msgstr "Agregue la música"
-
-2
+4
-msgid "CD Audio"
-msgstr ""
-
-3
+5
-msgid "Clear Queue"
-msgstr "Coleta Clara"
-
-4
+6
-msgid "Clear search"
-msgstr "Búsqueda clara"
-
-5
+7
-msgid "Close search"
-msgstr "Búsqueda cercana"
-
-6
+8
-msgid "Configure..."
-msgstr "Configure..."
-
-7
+9
-msgid "Copyright © 2006 Travis Shirk"
-msgstr "Copyright © 2006 Travis Shirk"
-
-18
+20
-msgid "Find:"
-msgstr "Hallazgo:"
-
-19
+21
-msgid "First"
-msgstr ""
-
-0
+2
-msgid "Mesk"
-msgstr "Mesk"
-
-1
+3
-msgid "Next"
-msgstr "Después"
-
-2
+4
-msgid "Online Help"
-msgstr "Ayuda En línea"
-
-#. Tooltip strings
-3 ../src/audio_control.py:42
+5 ../src/audio_control.py:43
-msgid "Play"
-msgstr "Juego"
-
-4
+6
-msgid "Playlist"
-msgstr "Playlist"
-
-
-
-
-
-
-
+
-msgid "Playlist stats"
-msgstr "Playlist stats"
-
-7
+8
-msgid "Plugins"
-msgstr "Plugins"
-
-8
+9
-msgid "Preferences"
-msgstr "Preferencias"
-
-29
+30
-msgid "Previous"
-msgstr "Anterior"
-
-0
+1
-msgid "Queue"
-msgstr "Coleta"
-
-1
+2
-msgid "Queue/Unqueue"
-msgstr "Coleta/Unqueue"
-
-2
+3
-msgid "Remove"
-msgstr "Quite"
-
-#: ../src/mesk_gui.glade.h:33
-msgid "Rename..."
-msgstr ""
-
-#: ../src/mesk_gui.glade.h:34
@@ -265 +264 @@
-msgstr "Formato audio sin apoyo: %s"
-
-3
+4
-msgid "Pause"
-msgstr "Pausa"
-
-20
+33
-#, python-format
-msgid "Gstreamer version %d.%d.%d audio control initialized"
-msgstr "El control audio de la versión %d.%d.%d de Gstreamer se inicializó"
+
+#: ../src/audio_control.py:309
+#, python-format
+msgid "Volume %d%%"
+msgstr ""
-
-#. we talk about file
@@ -304 +308 @@
-msgstr "La gerencia de la sesión inhabilitó (ningún módulo de gnome.ui)"
-
-
-
-
-
-
-
+
-#, python-format
-msgid "Error loading playlist '%s'"
@@ -711 +710 @@
-
-#, fuzzy
+#~ msgid "Playlist Name"
+#~ msgstr "Playlist"
+
+#, fuzzy
-#~ msgid "item2"
-#~ msgstr "Título"

trunk/po/mesk.pot

@@ -9 +9 @@
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-14:19
+23:31
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -26 +26 @@
-
-#: ../src/mesk_gui.glade.h:1
+msgid "+"
+msgstr ""
+
+#: ../src/mesk_gui.glade.h:2
+msgid "-"
+msgstr ""
+
+#: ../src/mesk_gui.glade.h:3
-msgid "--:--"
-msgstr ""
-
-2
+4
-msgid "<b>Author:</b>"
-msgstr ""
-
-3
+5
-msgid "<b>Copyright:</b>"
-msgstr ""
-
-4
+6
-msgid "<b>Description:</b>"
-msgstr ""
-
-5
+7
-msgid "<b>Plugin Name</b>"
-msgstr ""
-
-6
+8
-msgid "<b>URL:</b>"
-msgstr ""
-
-7
+9
-msgid ""
-"<big>Welcome To <b>Mesk</b></big>\n"
@@ -56 +64 @@
-msgstr ""
-
-0
+2
-msgid "Add Music..."
-msgstr ""
-
-1
+3
-msgid "Add music..."
-msgstr ""
-
-2
+4
-msgid "CD Audio"
-msgstr ""
-
-3
+5
-msgid "Clear Queue"
-msgstr ""
-
-4
+6
-msgid "Clear search"
-msgstr ""
-
-5
+7
-msgid "Close search"
-msgstr ""
-
-6
+8
-msgid "Configure..."
-msgstr ""
-
-7
+9
-msgid "Copyright © 2006 Travis Shirk"
-msgstr ""
-
-18
+20
-msgid "Find:"
-msgstr ""
-
-19
+21
-msgid "First"
-msgstr ""
-
-0
+2
-msgid "Mesk"
-msgstr ""
-
-1
+3
-msgid "Next"
-msgstr ""
-
-2
+4
-msgid "Online Help"
-msgstr ""
-
-#. Tooltip strings
-3 ../src/audio_control.py:42
+5 ../src/audio_control.py:43
-msgid "Play"
-msgstr ""
-
-4
+6
-msgid "Playlist"
-msgstr ""
-
-
-
-
-
-
+
-msgid "Playlist stats"
-msgstr ""
-
-7
+8
-msgid "Plugins"
-msgstr ""
-
-8
+9
-msgid "Preferences"
-msgstr ""
-
-29
+30
-msgid "Previous"
-msgstr ""
-
-0
+1
-msgid "Queue"
-msgstr ""
-
-1
+2
-msgid "Queue/Unqueue"
-msgstr ""
-
-2
+3
-msgid "Remove"
-msgstr ""
-
-#: ../src/mesk_gui.glade.h:33
-msgid "Rename..."
-msgstr ""
-
@@ -258 +258 @@
-msgstr ""
-
-3
+4
-msgid "Pause"
-msgstr ""
-
-20
+33
-#, python-format
-msgid "Gstreamer version %d.%d.%d audio control initialized"
+msgstr ""
+
+#: ../src/audio_control.py:309
+#, python-format
+msgid "Volume %d%%"
-msgstr ""
-
@@ -293 +298 @@
-msgstr ""
-
-
-
-
-
-
-
+
-#, python-format
-msgid "Error loading playlist '%s'"

trunk/src/main_window.py

@@ -36 +36 @@
-
-class MainWindow:
+    # DND_TARGETS is the targets needed by drag_source_set and drag_dest_set
+    DND_TARGETS = [('MESK_TAB', 0, 81)]
+
-    def __init__(self):
-        self._is_compact = False
@@ -95 +98 @@
-
-        self._pref_window = None
+
+        # Set up DnD
+        self._notebook.connect('drag_data_received',
+                               self._on_tab_drag_data_received)
+        self._notebook.drag_dest_set(gtk.DEST_DEFAULT_ALL, self.DND_TARGETS,
+                                     gtk.gdk.ACTION_MOVE)
-
-        # TODO: Initialize multi-media keys
@@ -176 +185 @@
-        self._update_playlists_menu()
-
+        # Set tab label as drag source and connect the drag_data_get signal
+        ctrl.tab_label_ebox.dnd_handler = \
+            ctrl.tab_label_ebox.connect('drag_data_get',
+                                        self._on_tab_drag_data_get)
+        ctrl.tab_label_ebox.drag_source_set(gtk.gdk.BUTTON1_MASK,
+                                            self.DND_TARGETS,
+                                            gtk.gdk.ACTION_MOVE)
+
-    def remove_notebook_control(self, ctrl):
-        page_num = self._notebook.page_num(ctrl.widget)
@@ -203 +220 @@
-        if self._notebook.get_n_pages() == 0:
-            self.add_notebook_control(self._empty_control)
+        elif self._notebook.get_n_pages() == 1:
+            # DnD clean up
+            self._notebook.drag_dest_unset()
+
-
-    def _get_control_from_widget(self, widget):
@@ -249 +270 @@
-        # Shutdown all controls
-        playlists = []
-
+
+
+
-            if isinstance(ctrl, PlaylistControl):
-                playlists.append(ctrl.name)
@@ -426 +449 @@
-        self.add_playlist_control(name)
-
+    ### DnD support ###
+    def _on_tab_drag_data_received(self, widget, drag_context, x, y, selection,
+                                   type, time):
+        '''Reorder the tabs according to the drop position'''
+        source_page_num = int(selection.data)
+        dest_page_num, to_right = self._get_tab_at_xy(x, y)
+        source_child = self._notebook.get_nth_page(source_page_num)
+        source_tab_label = self._notebook.get_tab_label(source_child)
+        if dest_page_num != source_page_num:
+            self._notebook.reorder_child(source_child, dest_page_num)
+
+
+    def _on_tab_drag_data_get(self, widget, drag_context, selection, info,
+                              time):
+        source_page_num = self._find_page_num_according_to_tab_label(widget)
+        # 8 is the data size for the string
+        selection.set(selection.target, 8, str(source_page_num))
+
+    def _find_page_num_according_to_tab_label(self, tab_label):
+        '''Find the page num of the tab label'''
+        page_num = -1
+        for i in xrange(self._notebook.get_n_pages()):
+            page = self._notebook.get_nth_page(i)
+            tab = self._notebook.get_tab_label(page)
+            if tab == tab_label:
+                page_num = i
+                break
+        return page_num
+
+
+    def _get_tab_at_xy(self, x, y):
+        '''Thanks to Gaim
+        Return the tab under xy and
+        if its nearer from left or right side of the tab        
+        '''
+        page_num = -1
+        to_right = False
+        horiz = self._notebook.get_tab_pos() == gtk.POS_TOP or \
+                self._notebook.get_tab_pos() == gtk.POS_BOTTOM
+        for i in xrange(self._notebook.get_n_pages()):
+            page = self._notebook.get_nth_page(i)
+            tab = self._notebook.get_tab_label(page)
+            tab_alloc = tab.get_allocation()
+            if horiz:
+                if (x >= tab_alloc.x and
+                    (x <= (tab_alloc.x + tab_alloc.width))):
+                    page_num = i
+                    if x >= tab_alloc.x + (tab_alloc.width / 2.0):
+                        to_right = True
+                    break
+            else:
+                if (y >= tab_alloc.y and 
+                    (y <= (tab_alloc.y + tab_alloc.height))):
+                    page_num = i
+                
+                    if y > tab_alloc.y + (tab_alloc.height / 2.0):
+                        to_right = True
+                    break
+        return (page_num, to_right)
+