Merge lp:~carcohoma/foto/foto into lp:foto

[Carc]

- refresh icon cover image on album updated
- add debug stuff

[Erasmo Marín (erasmo-marin)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-03-25 18:07:06 +0000
+++ CMakeLists.txt	2013-05-09 08:34:32 +0000
@@ -7,6 +7,7 @@
 #
 # Base bits
 #
+set (CMAKE_C_FLAGS "-ggdb")
 set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
 set (PKGDATADIR "${DATADIR}/foto")
 set (GETTEXT_PACKAGE "foto")
@@ -152,6 +153,7 @@
 OPTIONS
     --thread
     -g
+    --debug
     )
 
 add_definitions(${CFLAGS}-Wall -Winit-self -Wwrite-strings -Wunreachable-code -Wstrict-prototypes)

=== modified file 'src/foto.vala'
--- src/foto.vala	2012-11-20 23:37:14 +0000
+++ src/foto.vala	2013-05-09 08:34:32 +0000
@@ -97,7 +97,7 @@
         }
 
         protected override void activate () {
-
+            Granite.Services.Logger.DisplayLevel = Granite.Services.LogLevel.DEBUG;
 		    if (get_windows () == null) {
 			    //get_windows ().data.present (); // present window if app is already running
                 album_manager = new AlbumHelper ();
@@ -134,7 +134,7 @@
 
         }
 
-        public static int main (string[] args) {
+        public static int main (string[] args) {                        
             var err = GtkClutter.init (ref args);
             if (err != Clutter.InitError.SUCCESS) {
                 error ("Could not initalize clutter! "+err.to_string ());

=== modified file 'src/views/AlbumViewer/FotoAlbumGrid.vala'
--- src/views/AlbumViewer/FotoAlbumGrid.vala	2013-03-25 18:07:06 +0000
+++ src/views/AlbumViewer/FotoAlbumGrid.vala	2013-05-09 08:34:32 +0000
@@ -45,7 +45,7 @@
         this.show_all ();
 	}
 
-    private void attach_album () {
+    private void attach_album () {        
         var album = album_manager.AlbumList.get (album_manager.AlbumList.size-1);
         var album_widget = new AlbumWidget.from_album (album,150,150);
         attach_new_widget (album_widget);

=== modified file 'src/views/ImageGridView/ImageGridView.vala'
--- src/views/ImageGridView/ImageGridView.vala	2013-03-18 03:04:12 +0000
+++ src/views/ImageGridView/ImageGridView.vala	2013-05-09 08:34:32 +0000
@@ -94,7 +94,7 @@
 
         foreach(File file in files){
             if (IOHelper.is_valid_file_type (file.get_path() )) {
-                print("\nFile dragged: " + file.get_path());
+                message("File dragged: " + file.get_path());
                 album_manager.create_picture(file.get_path(), album.album_name, "");
                 var icon = new Foto.Widgets.Icon.from_image_file(file.get_path(), 150, 150);
                 icon.set_have_close_button(false);
@@ -120,7 +120,7 @@
                     if (IOHelper.is_valid_file_type (new_file.get_path() )) {
                         files += new_file;
                         pics++;
-                        print("\nFile dragged: " + new_file.get_path());
+                        message("File dragged: " + new_file.get_path());
                     }
                 }
             }

=== modified file 'src/widgets/AlbumInfo.vala'
--- src/widgets/AlbumInfo.vala	2013-03-18 05:53:52 +0000
+++ src/widgets/AlbumInfo.vala	2013-05-09 08:34:32 +0000
@@ -104,18 +104,23 @@
             var new_album = album_manager.get_album_by_name(album_name);
             rating.set_rating(album.rating);
 
-            if(album == new_album) 
+            if(album == new_album && !cover_has_changed(new_album)) 
                 return;
+
             album = new_album;
             if(album.album_cover.picture_path != null && album.album_cover.picture_path != "")
                 icon.set_icon(album.album_cover.picture_path);
-            else if(album.picture_list.size > 0) {
+            else if(album.picture_list.size > 0) 
                 icon.set_icon(album.picture_list.get(0).picture_path);
-            }
             else
                 icon.set_icon(null);
         }
 
+        bool cover_has_changed (Album new_album) {
+            // TODO check if the previous cover photo has been deleted
+            return icon.is_empty ();
+        }
+
         private string parse_date_label(DateTime time){
        
             string datetime = "";

=== modified file 'src/widgets/EmbeddedAlert.vala'
--- src/widgets/EmbeddedAlert.vala	2013-03-25 18:07:06 +0000
+++ src/widgets/EmbeddedAlert.vala	2013-05-09 08:34:32 +0000
@@ -131,7 +131,6 @@
                 case Gtk.MessageType.WARNING:
                     image.set_from_icon_name ("dialog-warning", Gtk.IconSize.DIALOG);
                     break;
-                    break;
                 case Gtk.MessageType.INFO:
                     image.set_from_icon_name ("dialog-information", Gtk.IconSize.DIALOG);
                     break;

=== modified file 'src/widgets/Icon.vala'
--- src/widgets/Icon.vala	2013-03-18 03:04:12 +0000
+++ src/widgets/Icon.vala	2013-05-09 08:34:32 +0000
@@ -317,6 +317,10 @@
         this.queue_draw();
     }
 
+    public bool is_empty () {
+        return state == IconState.EMPTY;
+    }
+
     /*public new StyleContext get_style_context() {
         return style_context;
     }*/