Remove the "filename" label in front of the filename

[mussorgsky] / src / edit_panel_tm.py

diff --git a/src/edit_panel_tm.py b/src/edit_panel_tm.py
index 10f9444..7cd280f 100644 (file)
--- a/src/edit_panel_tm.py
+++ b/src/edit_panel_tm.py
@@ -22,7 +22,6 @@ class MussorgskyEditPanel (hildon.StackableWindow):
     def __init__ (self):
         hildon.StackableWindow.__init__ (self)
         self.set_border_width (12)
-        self.album_callback_id = -1
         self.album_change_handler = -1
         self.artist_change_handler = -1
         self.writer = MutagenBackend ()
@@ -95,10 +94,6 @@ class MussorgskyEditPanel (hildon.StackableWindow):
         if (self.player.is_playing ()):
             self.player.stop ()
 
-        if (self.album_callback_id != -1):
-            gobject.source_remove (self.album_callback_id)
-            self.album_callback_id = -1
-
         if self.__is_view_dirty ():
             print "Modified data. Save!"
             self.save_metadata ()
@@ -116,10 +111,6 @@ class MussorgskyEditPanel (hildon.StackableWindow):
         if (self.player.is_playing ()):
             self.player.stop ()
 
-        if (self.album_callback_id != -1):
-            gobject.source_remove (self.album_callback_id)
-            self.album_callback_id = -1
-
         if self.__is_view_dirty ():
             print "Modified data. Save!"
             self.save_metadata ()
@@ -195,9 +186,6 @@ class MussorgskyEditPanel (hildon.StackableWindow):
         view_vbox = gtk.VBox (homogeneous=False, spacing = 12)
 
         filename_row = gtk.HBox ()
-        filename_label = gtk.Label ()
-        filename_label.set_markup ("<small>Filename:</small>")
-        filename_row.pack_start (filename_label, expand=False, padding=12);
         self.filename_data = gtk.Label ("")
         filename_row.pack_start (self.filename_data, expand=True)
 
@@ -220,7 +208,7 @@ class MussorgskyEditPanel (hildon.StackableWindow):
         table.attach (self.title_entry, 1, 2, 0, 1)
 
         # Artist row
-        self.artist_button = hildon.PickerButton (gtk.HILDON_SIZE_FINGER_HEIGHT,
+        self.artist_button = hildon.PickerButton (gtk.HILDON_SIZE_THUMB_HEIGHT,
                                                   hildon.BUTTON_ARRANGEMENT_HORIZONTAL)
         self.artist_button.set_title ("Artist: ")
         # Set data will set the selector
@@ -228,11 +216,11 @@ class MussorgskyEditPanel (hildon.StackableWindow):
 
 
         # Album row
-        self.album_button = hildon.PickerButton (gtk.HILDON_SIZE_FINGER_HEIGHT,
+        self.album_button = hildon.PickerButton (gtk.HILDON_SIZE_THUMB_HEIGHT,
                                                  hildon.BUTTON_ARRANGEMENT_HORIZONTAL)
         self.album_button.set_title ("Album: ")
         # set_data will set the selector
-        table.attach (self.album_button, 0, 2, 2, 3) 
+        table.attach (self.album_button, 0, 2, 2, 3)
         
 
         # Album art space
@@ -252,12 +240,16 @@ class MussorgskyEditPanel (hildon.StackableWindow):
         separator.set_expand (True)
         button_box.insert  (separator, -1)
 
-        back_button = gtk.ToolButton (gtk.image_new_from_stock (gtk.STOCK_GO_BACK, gtk.ICON_SIZE_BUTTON))
+        back_img = gtk.Image ()
+        back_img.set_from_icon_name ("general_back", gtk.ICON_SIZE_BUTTON)
+        back_button = gtk.ToolButton (back_img)
         back_button.connect ("clicked", self.press_back_cb)
         back_button.set_expand (True)
         button_box.insert (back_button, -1)
 
-        next_button = gtk.ToolButton (gtk.image_new_from_stock (gtk.STOCK_GO_FORWARD, gtk.ICON_SIZE_BUTTON))
+        next_img = gtk.Image ()
+        next_img.set_from_icon_name ("general_forward", gtk.ICON_SIZE_BUTTON)
+        next_button = gtk.ToolButton (next_img)
         next_button.connect ("clicked", self.press_next_cb)
         next_button.set_expand (True)
         button_box.insert (next_button, -1)
@@ -338,7 +330,7 @@ class MussorgskyEditPanel (hildon.StackableWindow):
         if (self.player.is_playing ()):
             self.player.stop ()
         else:
-            song = self.songs_list [self.song_counter]
+            song = self.get_current_row ()
             self.player.play ("file://" + song[URI_COLUMN])
 
     def album_selection_cb (self, widget):