New first view using fancy buttons

diff --git a/src/mussorgsky.py b/src/mussorgsky.py
index 17a6ef2..013c92f 100755 (executable)
--- a/src/mussorgsky.py
+++ b/src/mussorgsky.py
@@ -4,6 +4,7 @@ import gtk, gobject
 from tracker_backend import TrackerBackend
 from album_art_panel import MussorgskyAlbumArtPanel
 from browse_panel import MussorgskyBrowsePanel
+from fancy_button import FancyButton
 
 class MussorgskyMainWindow (hildon.StackableWindow):
 
@@ -13,34 +14,17 @@ class MussorgskyMainWindow (hildon.StackableWindow):
         self.set_title ("MussOrgsky")
         self.set_border_width (12)
         self.connect ("destroy", gtk.main_quit)
-        main_view_box = self.create_main_view ()
-        self.add (main_view_box)
-        self.update_values (None)
+        self.__create_view ()
         self.show_all ()
         
     def show_edit_panel (self, songs):
         panel = MussorgskyBrowsePanel (songs)
-        panel.connect ("destroy", self.back_to_main_view)
         panel.show_all ()
 
-    def back_to_main_view (self, widget):
-        print "Waiting to update"
-        gobject.timeout_add_seconds (3, self.update_values, None)
-
     def broken_files_clicked (self, widget):
         list_songs = self.tracker.get_all_broken_songs ()
         self.show_edit_panel (list_songs)
 
-    def update_values (self, user_data):
-        print "Updating labels"
-        self.label_no_artist.set_text ("%s songs without artist" %
-                                       self.tracker.count_songs_wo_artist ())
-        self.label_no_title.set_text ("%s songs without title" %
-                                      self.tracker.count_songs_wo_title ())
-        self.label_no_album.set_text ("%s songs without album" %
-                                      self.tracker.count_songs_wo_album ())
-        return False
-
     def browse_clicked (self, widget):
         list_songs = self.tracker.get_all_songs ()
         self.show_edit_panel (list_songs)
@@ -50,44 +34,33 @@ class MussorgskyMainWindow (hildon.StackableWindow):
         panel = MussorgskyAlbumArtPanel (album_artists)
         panel.show_all ()
 
-    def create_main_view (self):
-        vbox = gtk.VBox (spacing=12, homogeneous=False)
-
-        # Labels artist row
-        self.label_no_artist = gtk.Label ("")
-        vbox.add (self.label_no_artist)
+    def __create_view (self):
 
-        self.label_no_title = gtk.Label ("")
-        vbox.add (self.label_no_title)
+        image1 = gtk.Image ()
+        # "app_install_applications" "app_install_browse"
+        image1.set_from_icon_name ("app_install_applications", gtk.ICON_SIZE_MENU)
+        image1.set_pixel_size (164)
 
-        self.label_no_album = gtk.Label ("")
-        vbox.add (self.label_no_album)
-        
-        # Buttons
-        all_songs_row = gtk.HBox (homogeneous=True, spacing=12)
-
-        button_broken_files = gtk.Button ("Fix metadata!")
-        button_broken_files.connect ("clicked", self.broken_files_clicked)
-        all_songs_row.add (button_broken_files)
-        
-        browse = hildon.Button (hildon.BUTTON_STYLE_NORMAL,
-                                hildon.BUTTON_ARRANGEMENT_HORIZONTAL)
-        browse.set_title ("Manage\ncollection")
-        browse.connect ("clicked", self.browse_clicked)
-        all_songs_row.add (browse)
+        image2 = gtk.Image ()
+        image2.set_from_icon_name ("app_install_browse", gtk.ICON_SIZE_MENU)
+        image2.set_pixel_size (164)
 
-        album_art = hildon.Button (hildon.BUTTON_STYLE_NORMAL,
-                                   hildon.BUTTON_ARRANGEMENT_HORIZONTAL)
-        album_art.set_title ("Album art")
-        album_art.connect ("clicked", self.album_art_clicked)
-        all_songs_row.add (album_art)
+        hbox = gtk.HBox ()
 
-        vbox.add (all_songs_row)
+        align1 = gtk.Alignment (xalign=0.5, yalign=0.5)
+        button1 = FancyButton (image2, "Browse metadata")
+        button1.connect ("clicked", self.browse_clicked)
+        align1.add (button1)
+        hbox.pack_start (align1)
 
-        return vbox
+        align2 = gtk.Alignment (xalign=0.5, yalign=0.5)
+        button2 = FancyButton(image1, "Album art")
+        button2.connect ("clicked", self.album_art_clicked)
+        align2.add (button2)
+        hbox.pack_start (align2)
 
+        self.add (hbox)
 
-    
 
 if __name__ == "__main__":