Merge lp:~vikoadi/pantheon-photos/welcome-when-empty into lp:~pantheon-photos/pantheon-photos/trunk

[Viko Adi Rahmawan]

Use welcome empty screen for all pages

override get_view_empty_message for PhotosPage, VideosPage, trash and CollectionPage to call proper toggle_welcome_page,
now empty message will use welcome screen, on trashpage and collectionpage (tags and smarttags too) we will not show import button and change library button

[lp:~vikoadi/pantheon-photos/welcome-when-empty]

2626. By Viko Adi Rahmawan on 2014-09-27

remove commented line

2627. By Viko Adi Rahmawan on 2014-09-27

use dynamic type casting with null checking

2628. By Viko Adi Rahmawan on 2014-09-27

dont return empty string

[Rico Tzschichholz (ricotz)]

Use "return_val_if_fail" where needed "return_if_fail" is not compatible with non-void methods.

This snippet is probably applicable in most cases here.

var foo = get_bar () as Foo;
warn_if_fail (foo != null);
if (foo != null)
    foo.do_baz ();
return "bla";

where "var foo = get_bar () as Foo;" could be "unowned Foo foo = get_bar () as Foo;" if possible to avoid useless refs/unrefs.

[lp:~vikoadi/pantheon-photos/welcome-when-empty]

2629. By Viko Adi Rahmawan on 2014-09-27

destroy object properly

2630. By Viko Adi Rahmawan on 2014-09-29

change to AppWindow.get_instance instead of get_container which is not type safe

2631. By Viko Adi Rahmawan on 2014-09-29

remove type checking as AppWindow.get_get_instance is type safe

2632. By Viko Adi Rahmawan on 2014-09-29

seems to be im wrong, reverting

2633. By Viko Adi Rahmawan on 2014-09-29

merge trunk

[Viko Adi Rahmawan (vikoadi)]

i change how to get the LibraryWindow instead of using get_container now we use AppWindow.get_instance.
Does the type checking look alrigh?

[meese (meese)]

review: Approve

=== modified file 'src/CollectionPage.vala'
--- src/CollectionPage.vala	2014-09-06 19:39:38 +0000
+++ src/CollectionPage.vala	2014-09-29 15:33:04 +0000
@@ -830,7 +830,15 @@
         return base.on_ctrl_released (event);
     }
 
+    protected override string get_view_empty_message () {
+        var window = AppWindow.get_instance () as LibraryWindow;
+        warn_if_fail (window != null);
+        if (window != null)
+            window.toggle_welcome_page (true, "", _ ("No photos/videos"));
+        return _ ("No photos/videos");
+    }
+
     public override SearchViewFilter get_search_view_filter () {
         return search_filter;
     }
-}
+}
\ No newline at end of file

=== modified file 'src/Page.vala'
--- src/Page.vala	2014-09-02 19:42:49 +0000
+++ src/Page.vala	2014-09-29 15:33:04 +0000
@@ -1368,7 +1368,6 @@
     }
 
     protected virtual string get_view_empty_message () {
-        (get_container () as LibraryWindow).toggle_welcome_page (true);
         return _ ("No photos/videos");
     }
 
@@ -1448,7 +1447,10 @@
     }
 
     private void update_view_filter_message () {
-        (get_container () as LibraryWindow).toggle_welcome_page (false);
+        var window = AppWindow.get_instance () as LibraryWindow;
+        warn_if_fail (window != null);
+        if (window != null)
+            window.toggle_welcome_page (false);
 
         if (get_view ().are_items_filtered_out () && get_view ().get_count () == 0) {
             set_page_message (get_filter_no_match_message ());
@@ -2718,4 +2720,4 @@
             warning (err.message);
         }
     }
-}
+}
\ No newline at end of file

=== modified file 'src/library/LibraryWindow.vala'
--- src/library/LibraryWindow.vala	2014-09-07 01:47:31 +0000
+++ src/library/LibraryWindow.vala	2014-09-29 15:33:04 +0000
@@ -1368,21 +1368,24 @@
         return (get_current_page () is CheckerboardPage) ? is_search_toolbar_visible : false;
     }
 
-    public void toggle_welcome_page (bool show) {
-        if (show == true && welcome_page == null) {
-            welcome_page = new Granite.Widgets.Welcome (_ ("Add Some Photos"), _ ("No photos were found in your library."));
-            welcome_page.append ("document-import", _ ("Import Photos"), _ ("Copy photos from a folder or external device."));
-            welcome_page.append ("folder-pictures", _ ("Change Library Folder"), _ ("Choose where to keep your photos."));
-            welcome_page.activated.connect ((index) => {
-                switch (index) {
-                case 0:
-                    on_file_import ();
-                    break;
-                case 1:
-                    on_preferences ();
-                    break;
-                }
-            });
+    public void toggle_welcome_page (bool show, string title = "", string subtitle = "", bool show_import = false) {
+        if (show == true) {
+            welcome_page = null;
+            welcome_page = new Granite.Widgets.Welcome (title, subtitle);
+            if (show_import) {
+                welcome_page.append ("document-import", _ ("Import Photos"), _ ("Copy photos from a folder or external device."));
+                welcome_page.append ("folder-pictures", _ ("Change Library Folder"), _ ("Choose where to keep your photos."));
+                welcome_page.activated.connect ((index) => {
+                    switch (index) {
+                    case 0:
+                        on_file_import ();
+                        break;
+                    case 1:
+                        on_preferences ();
+                        break;
+                    }
+                });
+            }
         }
 
         right_frame.remove (welcome_page);

=== modified file 'src/library/PhotosPage.vala'
--- src/library/PhotosPage.vala	2014-09-23 03:13:45 +0000
+++ src/library/PhotosPage.vala	2014-09-29 15:33:04 +0000
@@ -43,6 +43,14 @@
             get_view ().monitor_source_collection (sources, view_manager, null, null, monitor);
     }
 
+    protected override string get_view_empty_message () {
+        var window = AppWindow.get_instance () as LibraryWindow;
+        warn_if_fail (window != null);
+        if (window != null)
+            window.toggle_welcome_page (true, _ ("Add Some Photos"),_("No Photos were found in your library."), true);
+        return _ ("No photos/videos");
+    }
+
     private class PhotosSearchViewFilter : CollectionPage.CollectionSearchViewFilter {
         public override uint get_criteria () {
             return SearchFilterCriteria.TEXT | SearchFilterCriteria.MEDIA |

=== modified file 'src/library/RawsPage.vala'
--- src/library/RawsPage.vala	2014-09-23 03:13:45 +0000
+++ src/library/RawsPage.vala	2014-09-29 15:33:04 +0000
@@ -43,6 +43,14 @@
             get_view ().monitor_source_collection (sources, view_manager, null, null, monitor);
     }
 
+    protected override string get_view_empty_message () {
+        var window = AppWindow.get_instance () as LibraryWindow;
+        warn_if_fail (window != null);
+        if (window != null)
+            window.toggle_welcome_page (true, _ ("Add Some Photos"),_("No Photos were found in your library."), true);
+        return _ ("No photos/videos");
+    }
+
     private class RawsSearchViewFilter : CollectionPage.CollectionSearchViewFilter {
         public override uint get_criteria () {
             return SearchFilterCriteria.TEXT | SearchFilterCriteria.MEDIA |

=== modified file 'src/library/TrashPage.vala'
--- src/library/TrashPage.vala	2014-09-27 23:06:48 +0000
+++ src/library/TrashPage.vala	2014-09-29 15:33:04 +0000
@@ -165,6 +165,10 @@
     }
 
     protected override string get_view_empty_message () {
+        var window = AppWindow.get_instance () as LibraryWindow;
+        warn_if_fail (window != null);
+        if (window != null)
+            window.toggle_welcome_page (true, "", _ ("Trash is empty"));
         return _ ("Trash is empty");
     }