Changeset 346

Timestamp:

07/08/06 20:28:54 (2 years ago)

Author:

nicfit

Message:

Show notebook border when num tabs > 1, and select new controls (closes #168)

Files:

• trunk/po/es.po (modified) (1 diff)
• trunk/po/mesk.pot (modified) (1 diff)
• trunk/src/control.py (modified) (2 diffs)
• trunk/src/main_window.py (modified) (5 diffs)
• trunk/src/playlist_control.py (modified) (2 diffs)

trunk/po/es.po

@@ -8 +8 @@
-"Project-Id-Version: 0.1.1\n"
-"Report-Msgid-Bugs-To: \n"
-6-30 19:09
+7-01 16:38
-"PO-Revision-Date: 2006-04-15 17:38-0600\n"
-"Last-Translator: Travis Shirk <travis@pobox.com>\n"

trunk/po/mesk.pot

@@ -9 +9 @@
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-6-30 19:09
+7-01 16:38
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

trunk/src/control.py

@@ -24 +24 @@
-    '''A GUI element'''
-    # FIXME: Document
+
+    # The notebook tab widget
+    tab_widget = gtk.Label('')
+    # The notebook page widget
+    widget = None
-
-    def __init__(self):
@@ -58 +63 @@
-        self.widget = self.xml.get_widget('empty_control')
-        self.widget.show()
-
-        # FIXME
-        self.tab_label_ebox = gtk.Label('foo')
-
-        #self.xml.get_widget('image_left').set_from_file('images/mesk.svg')
-        #self.xml.get_widget('image_right').set_from_file('images/mesk.svg')

trunk/src/main_window.py

@@ -160 +160 @@
-    def add_notebook_control(self, ctrl):
-
-# FIXME: Add an accessor for the label, with a suitable default
-append_page(ctrl.widget, ctrl.tab_label_ebo
+new_index = self._notebook.append_page(ctrl.widget, ctrl.tab_widget)
+set_current_page(new_inde
-
-        if ctrl != self._empty_control:
@@ -167 +167 @@
-            # it
-            close_button = \
-label_ebox
+widget
-            if mesk.config.getboolean(mesk.CONFIG_UI, 'show_tab_close_button'):
-                close_button.connect('clicked',
@@ -179 +179 @@
-                self._notebook.remove_page(page_num)
-
+        # Show tabs and notebook borner when num controls > 1
-        if self._notebook.get_n_pages() > 1:
-            self._notebook.set_show_tabs(True)
+            self._notebook.set_show_border(True)
+        else:
+            self._notebook.set_show_border(False)
+
-        # This list order does not necessarily correspond to the tab order
-        self._controls.append(ctrl)
@@ -186 +191 @@
-
-        # Set tab label as drag source and connect the drag_data_get signal
-
-
-
-
-
-
+
+
+
+
-
-    def remove_notebook_control(self, ctrl):
@@ -221 +224 @@
-            self.add_notebook_control(self._empty_control)
-        elif self._notebook.get_n_pages() == 1:
+            self._notebook.set_show_border(False)
-            # DnD clean up
-            self._notebook.drag_dest_unset()

trunk/src/playlist_control.py

@@ -74 +74 @@
-        # Setup tab label
-        self.tab_label_xml = gtk_utils.get_glade('playlist_tab_ebox')
-
-
-
-
+
+
+
-        # FIXME: My handler is never called
-label_ebox
-    
+widget
+
-        self.tab_label_label = \
-            self.tab_label_xml.get_widget('playlist_tab_label')
@@ -251 +250 @@
-        self._is_active = active
-
+        # Connect events for audio_control on first activation
-        if self._is_active and not self._initial_active:
-            assert(self._audio_control)
-            # Connect events for audio_control of first active
-            self._initial_active = True
-            self._audio_control.connect('play', self._on_audio_playing)