Changeset 304

Timestamp:

06/10/06 23:39:37 (2 years ago)

Author:

nicfit

Message:

Moved all images into a separate subdir

Files:

• trunk/Makefile.in (modified) (2 diffs)
• trunk/src/album_cover_control.py (modified) (1 diff)
• trunk/src/audio_control.py (modified) (1 diff)
• trunk/src/images (added)
• trunk/src/images/mesk.png (moved) (moved from trunk/src/mesk.png)
• trunk/src/images/mesk.svg (moved) (moved from trunk/src/mesk.svg)
• trunk/src/images/stock_repeat.png (moved) (moved from trunk/src/stock_repeat.png)
• trunk/src/images/stock_shuffle.png (moved) (moved from trunk/src/stock_shuffle.png)
• trunk/src/main_window.py (modified) (1 diff)
• trunk/src/mesk_gui.glade (modified) (4 diffs)
• trunk/src/playlist_control.py (modified) (1 diff)

trunk/Makefile.in

@@ -62 +62 @@
-        install -m 644 ./src/*.py ${libdir}
-        install -m 644 ./src/*.glade ${libdir}
+        install -m 755 -d ${libdir}/images
+        install -m 644 ./src/* ${libdir}/images
-        # This blows, but AFAIK pixmaps MUST be in the same dir per glade
-        install -m 644 ./src/*.png ${libdir}
@@ -94 +96 @@
-          install -m 755 -d "${datadir}/pixmaps";\
-        fi
-
+images/
-
-        # i18n

trunk/src/album_cover_control.py

@@ -55 +55 @@
-    MAX_LARGE_DISPLAY_WIDTH = 600
-    MAX_LARGE_DISPLAY_HEIGHT = 600
-.
+images
-
-    def __init__(self, parent_xml, audio_control):

trunk/src/audio_control.py

@@ -511 +511 @@
-            p = d = 0
-        label = mesk.utils.format_track_time(p / gst.SECOND, d)
-text(
+markup('<i>%s</i>' % 

trunk/src/main_window.py

@@ -44 +44 @@
-        self.window = self.xml.get_widget('main_window')
-        self.window.connect('key-press-event', self._on_window_key_press_event)
-
+images/
-
-        self._notebook = self.xml.get_widget('notebook')

trunk/src/mesk_gui.glade

@@ -597 +597 @@
-                              <property name="tooltip" translatable="yes">Shuffle playlist</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">True</property>
@@ -602 +604 @@
-                              <property name="inconsistent">False</property>
-                              <signal name="toggled" handler="_on_shuffle_togglebutton_toggled" last_modification_time="Tue, 14 Mar 2006 02:19:52 GMT"/>
-
-                              <child>
-                                <widget class="GtkImage" id="image18">
-                                  <property name="visible">True</property>
-                                  <property name="pixbuf">stock_shuffle.png</property>
-                                  <property name="xalign">0.5</property>
-                                  <property name="yalign">0.5</property>
-                                  <property name="xpad">0</property>
-                                  <property name="ypad">0</property>
-                                </widget>
-                              </child>
-                            </widget>
-                            <packing>
@@ -626 +617 @@
-                              <property name="tooltip" translatable="yes">Repeat playlist</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">True</property>
@@ -631 +624 @@
-                              <property name="inconsistent">False</property>
-                              <signal name="toggled" handler="_on_repeat_togglebutton_toggled" last_modification_time="Tue, 14 Mar 2006 02:20:05 GMT"/>
-
-                              <child>
-                                <widget class="GtkImage" id="image19">
-                                  <property name="visible">True</property>
-                                  <property name="pixbuf">stock_repeat.png</property>
-                                  <property name="xalign">0.5</property>
-                                  <property name="yalign">0.5</property>
-                                  <property name="xpad">0</property>
-                                  <property name="ypad">0</property>
-                                </widget>
-                              </child>
-                            </widget>
-                            <packing>

trunk/src/playlist_control.py

@@ -82 +82 @@
-        self.widget = self.widget_xml.get_widget('playlist_control')
-        self.widget_xml.signal_autoconnect(self)
+
+        img = gtk.Image()
+        pix = gtk.gdk.pixbuf_new_from_file('images/stock_shuffle.png')
+        img.set_from_pixbuf(pix)
+        self.widget_xml.get_widget('shuffle_togglebutton').set_image(img)
+        
+        img = gtk.Image()
+        pix = gtk.gdk.pixbuf_new_from_file('images/stock_repeat.png')
+        img.set_from_pixbuf(pix)
+        self.widget_xml.get_widget('repeat_togglebutton').set_image(img)
-
-        # Playlist treeview data store