Merge lp:~vikoadi/pantheon-photos/separate-library into lp:~pantheon-photos/pantheon-photos/trunk

[Viko Adi Rahmawan]

* Move "Video" & "RAW" to the Library section on the Sidebar
* Remove redundant "Flagged" button from search toolbar.

* Move "Video" & "RAW" to the Library section on the Sidebar
* Remove redundant "Flagged" button from search toolbar.

[meese (meese)]

Should hide the videos and raw pages when there's none in the library.Copy what the flagged page is doing with HideablePageEntry

[Viko Adi Rahmawan (vikoadi)]

I dont think it should be hidden. I think Photos, Videos and Raw Photos are like in one level. If Videos is hidden why "Photos" dont get hidden too.
Other than that, it gives clue that our Photos application can handle Videos and Raw file too. The Video sidebar in Files dont get hidden too.

[Viko Adi Rahmawan (vikoadi)]

Ofcourse Welcome screen need to be updated, but we can do that in other branch

[Danielle Foré (danrabbit)]

I see your point about Raw maybe. But I agree with Maddie about videos. I don't think we should encourage users to store videos here.

The file browser is a different kind of app, you can add arbitrary locations to the source list there. In Photos, there's a finite number of Library sources/filters that we define.

[meese (meese)]

Hmm yeah actually I agree on leaving RAW there after rereading your comment. It's a fairly big plus for a default photo app to be able to develop raws and users should know about.

[lp:~vikoadi/pantheon-photos/separate-library]

2610. By Viko Adi Rahmawan on 2014-09-21

hide VideosPage if its empty

2611. By Viko Adi Rahmawan on 2014-09-21

rearrage page, now its Photos, Raw Photos, then Videos

2612. By Viko Adi Rahmawan on 2014-09-21

merge trunk

[Viko Adi Rahmawan (vikoadi)]

What shoul i copyrighted the newly added files? Pantheon Photos Developers?

[lp:~vikoadi/pantheon-photos/separate-library]

2613. By Viko Adi Rahmawan on 2014-09-21

fix little typo

[Danielle Foré (danrabbit)]

The most convenient/defensible long term would probably be "elementary, LLC". But you could do photos developers or even yourself. It's up to you how you want to assign copyright.

[lp:~vikoadi/pantheon-photos/separate-library]

2614. By Viko Adi Rahmawan on 2014-09-23

add copyright to files

[Viko Adi Rahmawan (vikoadi)]

Ready for review

[meese (meese)]

looks good

review: Approve

=== modified file 'src/Resources.vala'
--- src/Resources.vala	2014-09-08 04:47:32 +0000
+++ src/Resources.vala	2014-09-23 03:15:33 +0000
@@ -118,10 +118,12 @@
 public const string ICON_IMPORTING = "go-down";
 public const string ICON_LAST_IMPORT = "document-open-recent";
 public const string ICON_MISSING_FILES = "process-stop";
-public const string ICON_PHOTOS = "folder-pictures";
+public const string ICON_PHOTOS_PAGE = "folder-pictures";
 public const string ICON_SINGLE_PHOTO = "image-x-generic";
 public const string ICON_TRASH_EMPTY = "user-trash";
 public const string ICON_TRASH_FULL = "user-trash-full";
+public const string ICON_VIDEOS_PAGE = "folder-videos";
+public const string ICON_RAW_PAGE = "accessories-camera";
 public const string ICON_FLAGGED_PAGE = "edit-flag";
 
 public const string ROTATE_CW_MENU = _("Rotate _Right");

=== modified file 'src/SearchFilter.vala'
--- src/SearchFilter.vala	2014-08-27 06:20:32 +0000
+++ src/SearchFilter.vala	2014-09-23 03:15:33 +0000
@@ -346,15 +346,7 @@
     private Gtk.ComboBoxText rating_button;
     private SearchViewFilter? search_filter = null;
     private Gtk.Toolbar toolbar;
-    private Gtk.Label label_type;
-    private Gtk.Label label_flagged;
     private Gtk.Label label_rating;
-    private Gtk.ToggleToolButton toolbtn_photos;
-    private Gtk.ToggleToolButton toolbtn_videos;
-    private Gtk.ToggleToolButton toolbtn_raw;
-    private Gtk.ToggleToolButton toolbtn_flag;
-    private Gtk.SeparatorToolItem sepr_mediatype_flagged;
-    private Gtk.SeparatorToolItem sepr_flagged_rating;
 
     public SearchFilterToolbar () {
         toolbar = new Gtk.Toolbar ();
@@ -369,60 +361,6 @@
         close_item.activate.connect ( () => close ());
         close_menu.append (close_item);
 
-        // Type label and toggles
-        label_type = new Gtk.Label (_ ("Type"));
-        Gtk.ToolItem label_type_item = new Gtk.ToolItem ();
-        label_type_item.add (label_type);
-        toolbar.insert (label_type_item, -1);
-
-        toolbtn_photos = new Gtk.ToggleToolButton ();
-        var photos_icon = new Gtk.Image.from_icon_name ("folder-pictures", Gtk.IconSize.MENU);
-        photos_icon.pixel_size = 16;
-        toolbtn_photos.set_icon_widget (photos_icon);
-        toolbtn_photos.tooltip_text = _ ("Photos");
-        toolbtn_photos.toggled.connect (on_photos_toggled);
-
-        toolbtn_videos = new Gtk.ToggleToolButton ();
-        var videos_icon = new Gtk.Image.from_icon_name ("folder-videos", Gtk.IconSize.MENU);
-        videos_icon.pixel_size = 16;
-        toolbtn_videos.set_icon_widget (videos_icon);
-        toolbtn_videos.tooltip_text = _ ("Videos");
-        toolbtn_videos.toggled.connect (on_videos_toggled);
-
-        toolbtn_raw = new Gtk.ToggleToolButton ();
-        var raw_icon = new Gtk.Image.from_icon_name ("accessories-camera", Gtk.IconSize.MENU);
-        raw_icon.pixel_size = 16;
-        toolbtn_raw.set_icon_widget (raw_icon);
-        toolbtn_raw.tooltip_text = _ ("RAW photos");
-        toolbtn_raw.toggled.connect (on_raw_toggled);
-
-        toolbar.insert (toolbtn_photos, -1);
-        toolbar.insert (toolbtn_videos, -1);
-        toolbar.insert (toolbtn_raw, -1);
-
-        // separator
-        sepr_mediatype_flagged = new Gtk.SeparatorToolItem ();
-        toolbar.insert (sepr_mediatype_flagged, -1);
-
-        // Flagged label and toggle
-        label_flagged = new Gtk.Label (_ ("Flagged"));
-        Gtk.ToolItem label_flagged_item = new Gtk.ToolItem ();
-        label_flagged_item.add (label_flagged);
-        toolbar.insert (label_flagged_item, -1);
-
-        toolbtn_flag = new Gtk.ToggleToolButton ();
-
-        var flag_icon = new Gtk.Image.from_icon_name (Resources.ICON_FLAGGED_PAGE, Gtk.IconSize.MENU);
-        flag_icon.pixel_size = 16;
-        toolbtn_flag.set_icon_widget (flag_icon);
-        toolbtn_flag.tooltip_text = _ ("Flagged");
-        toolbtn_flag.toggled.connect (on_flagged_toggled);
-        toolbar.insert (toolbtn_flag, -1);
-
-        // separator
-        sepr_flagged_rating = new Gtk.SeparatorToolItem ();
-        toolbar.insert (sepr_flagged_rating, -1);
-
         // Rating label and button
         label_rating = new Gtk.Label (_ ("Rating"));
         Gtk.ToolItem label_rating_item = new Gtk.ToolItem ();
@@ -489,22 +427,6 @@
         return false;
     }
 
-    private void on_flagged_toggled () {
-        update ();
-    }
-
-    private void on_videos_toggled () {
-        update ();
-    }
-
-    private void on_photos_toggled () {
-        update ();
-    }
-
-    private void on_raw_toggled () {
-        update ();
-    }
-
     private void on_search_text_changed () {
         update ();
     }
@@ -565,10 +487,6 @@
         assert (null != search_filter);
 
         search_filter.set_search_filter (search_entry.text);
-        search_filter.flagged = toolbtn_flag.active;
-        search_filter.show_media_video = toolbtn_videos.active;
-        search_filter.show_media_photos = toolbtn_photos.active;
-        search_filter.show_media_raw = toolbtn_raw.active;
 
         search_filter.set_rating_filter (filter);
         rating_button.tooltip_text = Resources.get_rating_filter_tooltip (filter);
@@ -580,21 +498,6 @@
         rating_button.visible = ((criteria & SearchFilterCriteria.RATING) != 0);
         label_rating.visible = ((criteria & SearchFilterCriteria.RATING) != 0);
 
-        label_flagged.visible = ((criteria & SearchFilterCriteria.FLAG) != 0);
-        toolbtn_flag.visible = ((criteria & SearchFilterCriteria.FLAG) != 0);
-
-        label_type.visible = ((criteria & SearchFilterCriteria.MEDIA) != 0);
-        toolbtn_photos.visible = ((criteria & SearchFilterCriteria.MEDIA) != 0);
-        toolbtn_videos.visible = ((criteria & SearchFilterCriteria.MEDIA) != 0);
-        toolbtn_raw.visible = ((criteria & SearchFilterCriteria.MEDIA) != 0);
-
-        // Ticket #3290, part IV - ensure that the separators
-        // are shown and/or hidden as needed.
-        sepr_mediatype_flagged.visible = (label_type.visible && label_flagged.visible);
-
-        sepr_flagged_rating.visible = ((label_type.visible && label_rating.visible) ||
-                                       (label_flagged.visible && label_rating.visible));
-
         // Send update to view collection.
         search_filter.refresh ();
     }

=== modified file 'src/library/Branch.vala'
--- src/library/Branch.vala	2014-08-08 21:13:09 +0000
+++ src/library/Branch.vala	2014-09-23 03:15:33 +0000
@@ -11,6 +11,14 @@
         get;
         private set;
     }
+    public Library.VideosEntry videos_entry {
+        get;
+        private set;
+    }
+    public Library.RawsEntry raws_entry {
+        get;
+        private set;
+    }
     public Library.FlaggedSidebarEntry flagged_entry {
         get;
         private set;
@@ -37,6 +45,8 @@
     // outside the app.
     private enum EntryPosition {
         PHOTOS,
+        RAWS,
+        VIDEOS,
         FLAGGED,
         LAST_IMPORTED,
         IMPORT_QUEUE,
@@ -49,6 +59,8 @@
               Sidebar.Branch.Options.STARTUP_OPEN_GROUPING, comparator);
 
         photos_entry = new Library.PhotosEntry ();
+        videos_entry = new Library.VideosEntry ();
+        raws_entry = new Library.RawsEntry ();
         trash_entry = new Library.TrashSidebarEntry ();
         last_imported_entry = new Library.LastImportSidebarEntry ();
         flagged_entry = new Library.FlaggedSidebarEntry ();
@@ -56,8 +68,12 @@
         import_queue_entry = new Library.ImportQueueSidebarEntry ();
 
         insert (photos_entry, EntryPosition.PHOTOS);
+        insert (raws_entry, EntryPosition.RAWS);
         insert (trash_entry, EntryPosition.TRASH);
 
+        videos_entry.visibility_changed.connect (on_videos_visibility_changed);
+        on_videos_visibility_changed ();
+
         flagged_entry.visibility_changed.connect (on_flagged_visibility_changed);
         on_flagged_visibility_changed ();
 
@@ -76,6 +92,10 @@
         graft (get_root (), entry);
     }
 
+    private void on_videos_visibility_changed () {
+        update_entry_visibility (videos_entry, EntryPosition.VIDEOS);
+    }
+
     private void on_flagged_visibility_changed () {
         update_entry_visibility (flagged_entry, EntryPosition.FLAGGED);
     }
@@ -106,25 +126,6 @@
     }
 }
 
-public class Library.PhotosEntry : Sidebar.SimplePageEntry {
-    private Icon icon = new ThemedIcon (Resources.ICON_PHOTOS);
-
-    public PhotosEntry () {
-    }
-
-    public override string get_sidebar_name () {
-        return _ ("Photos");
-    }
-
-    public override Icon? get_sidebar_icon () {
-        return icon;
-    }
-
-    protected override Page create_page () {
-        return new Library.MainPage ();
-    }
-}
-
 public abstract class Library.HideablePageEntry : Sidebar.SimplePageEntry {
     // container branch should listen to this signal
     public signal void visibility_changed (bool visible);
@@ -144,24 +145,4 @@
 
     public HideablePageEntry () {
     }
-}
-
-public class Library.MainPage : CollectionPage {
-    public const string NAME = _ ("Library");
-
-    public MainPage (ProgressMonitor? monitor = null) {
-        base (NAME);
-
-        foreach (MediaSourceCollection sources in MediaCollectionRegistry.get_instance ().get_all ())
-            get_view ().monitor_source_collection (sources, new CollectionViewManager (this), null, null, monitor);
-    }
-
-    protected override void get_config_photos_sort (out bool sort_order, out int sort_by) {
-        Config.Facade.get_instance ().get_library_photos_sort (out sort_order, out sort_by);
-    }
-
-    protected override void set_config_photos_sort (bool sort_order, int sort_by) {
-        Config.Facade.get_instance ().set_library_photos_sort (sort_order, sort_by);
-    }
-}
-
+}
\ No newline at end of file

=== added file 'src/library/PhotosPage.vala'
--- src/library/PhotosPage.vala	1970-01-01 00:00:00 +0000
+++ src/library/PhotosPage.vala	2014-09-23 03:15:33 +0000
@@ -0,0 +1,66 @@
+/* Copyright 2014 Pantheon Photos Developer (http://launchpad.net/pantheon-photos)
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ */
+
+public class Library.PhotosEntry : Sidebar.SimplePageEntry {
+    protected Icon icon = new ThemedIcon (Resources.ICON_PHOTOS_PAGE);
+
+    public override string get_sidebar_name () {
+        return _ ("Photos");
+    }
+
+    public override Icon? get_sidebar_icon () {
+        return icon;
+    }
+
+    protected override Page create_page () {
+        return new Library.PhotosPage ();
+    }
+}
+
+public class Library.PhotosPage : CollectionPage {
+    public const string NAME = _ ("Photos");
+
+    private class PhotosViewManager : CollectionViewManager {
+        public PhotosViewManager (Library.PhotosPage owner) {
+            base (owner);
+        }
+
+        public override bool include_in_view (DataSource source) {
+            Photo photo = (Photo) source;
+            return source is Photo && photo != null && photo.get_master_file_format () != PhotoFileFormat.RAW;
+        }
+    }
+
+    public PhotosPage (ProgressMonitor? monitor = null) {
+        base (NAME);
+
+        view_manager = new PhotosViewManager (this);
+
+        foreach (MediaSourceCollection sources in MediaCollectionRegistry.get_instance ().get_all ())
+            get_view ().monitor_source_collection (sources, view_manager, null, null, monitor);
+    }
+
+    private class PhotosSearchViewFilter : CollectionPage.CollectionSearchViewFilter {
+        public override uint get_criteria () {
+            return SearchFilterCriteria.TEXT | SearchFilterCriteria.MEDIA |
+                   SearchFilterCriteria.RATING;
+        }
+    }
+
+    private ViewManager view_manager;
+    private PhotosSearchViewFilter search_filter = new PhotosSearchViewFilter ();
+
+    protected override void get_config_photos_sort (out bool sort_order, out int sort_by) {
+        Config.Facade.get_instance ().get_library_photos_sort (out sort_order, out sort_by);
+    }
+
+    protected override void set_config_photos_sort (bool sort_order, int sort_by) {
+        Config.Facade.get_instance ().set_library_photos_sort (sort_order, sort_by);
+    }
+    public override SearchViewFilter get_search_view_filter () {
+        return search_filter;
+    }
+}
\ No newline at end of file

=== added file 'src/library/RawsPage.vala'
--- src/library/RawsPage.vala	1970-01-01 00:00:00 +0000
+++ src/library/RawsPage.vala	2014-09-23 03:15:33 +0000
@@ -0,0 +1,66 @@
+/* Copyright 2014 Pantheon Photos Developer (http://launchpad.net/pantheon-photos)
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ */
+
+public class Library.RawsEntry : Sidebar.SimplePageEntry {
+    protected Icon icon = new ThemedIcon (Resources.ICON_RAW_PAGE);
+
+    public override string get_sidebar_name () {
+        return _ ("RAW Photos");
+    }
+
+    public override Icon? get_sidebar_icon () {
+        return icon;
+    }
+
+    protected override Page create_page () {
+        return new Library.RawsPage ();
+    }
+}
+
+public class Library.RawsPage : CollectionPage {
+    public const string NAME = _ ("Raws");
+
+    private class RawsViewManager : CollectionViewManager {
+        public RawsViewManager (Library.RawsPage owner) {
+            base (owner);
+        }
+
+        public override bool include_in_view (DataSource source) {
+            Photo photo = (Photo) source;
+            return photo != null && photo.get_master_file_format () == PhotoFileFormat.RAW;
+        }
+    }
+
+    public RawsPage (ProgressMonitor? monitor = null) {
+        base (NAME);
+
+        view_manager = new RawsViewManager (this);
+
+        foreach (MediaSourceCollection sources in MediaCollectionRegistry.get_instance ().get_all ())
+            get_view ().monitor_source_collection (sources, view_manager, null, null, monitor);
+    }
+
+    private class RawsSearchViewFilter : CollectionPage.CollectionSearchViewFilter {
+        public override uint get_criteria () {
+            return SearchFilterCriteria.TEXT | SearchFilterCriteria.MEDIA |
+                   SearchFilterCriteria.RATING;
+        }
+    }
+
+    private ViewManager view_manager;
+    private RawsSearchViewFilter search_filter = new RawsSearchViewFilter ();
+
+    protected override void get_config_photos_sort (out bool sort_order, out int sort_by) {
+        Config.Facade.get_instance ().get_library_photos_sort (out sort_order, out sort_by);
+    }
+
+    protected override void set_config_photos_sort (bool sort_order, int sort_by) {
+        Config.Facade.get_instance ().set_library_photos_sort (sort_order, sort_by);
+    }
+    public override SearchViewFilter get_search_view_filter () {
+        return search_filter;
+    }
+}
\ No newline at end of file

=== added file 'src/library/VideosPage.vala'
--- src/library/VideosPage.vala	1970-01-01 00:00:00 +0000
+++ src/library/VideosPage.vala	2014-09-23 03:15:33 +0000
@@ -0,0 +1,85 @@
+/* Copyright 2014 Pantheon Photos Developer (http://launchpad.net/pantheon-photos)
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ */
+
+public class Library.VideosEntry :  Library.HideablePageEntry {
+    protected Icon icon = new ThemedIcon (Resources.ICON_VIDEOS_PAGE);
+
+    public VideosEntry () {
+        Video.global.items_added.connect (on_item_altered);
+        Video.global.items_removed.connect (on_item_altered);
+
+        visible = has_video ();
+    }
+
+    ~VideosEntry () {
+        Video.global.items_added.disconnect (on_item_altered);
+        Video.global.items_removed.disconnect (on_item_altered);
+    }
+
+    public override string get_sidebar_name () {
+        return _ ("Videos");
+    }
+
+    public override Icon? get_sidebar_icon () {
+        return icon;
+    }
+
+    protected override Page create_page () {
+        return new Library.VideosPage ();
+    }
+
+    private bool has_video () {
+        return Video.global.get_count () > 0;
+    }
+
+    private void on_item_altered (Gee.Iterable<DataObject> items) {
+        visible = has_video ();
+    }
+}
+
+public class Library.VideosPage : CollectionPage {
+    public const string NAME = _ ("Videos");
+
+    private class VideosViewManager : CollectionViewManager {
+        public VideosViewManager (Library.VideosPage owner) {
+            base (owner);
+        }
+
+        public override bool include_in_view (DataSource source) {
+            return source is Video;
+        }
+    }
+
+    public VideosPage (ProgressMonitor? monitor = null) {
+        base (NAME);
+
+        view_manager = new VideosViewManager (this);
+
+        foreach (MediaSourceCollection sources in MediaCollectionRegistry.get_instance ().get_all ())
+            get_view ().monitor_source_collection (sources, view_manager, null, null, monitor);
+    }
+
+    private class VideosSearchViewFilter : CollectionPage.CollectionSearchViewFilter {
+        public override uint get_criteria () {
+            return SearchFilterCriteria.TEXT | SearchFilterCriteria.MEDIA |
+                   SearchFilterCriteria.RATING;
+        }
+    }
+
+    private ViewManager view_manager;
+    private VideosSearchViewFilter search_filter = new VideosSearchViewFilter ();
+
+    protected override void get_config_photos_sort (out bool sort_order, out int sort_by) {
+        Config.Facade.get_instance ().get_library_photos_sort (out sort_order, out sort_by);
+    }
+
+    protected override void set_config_photos_sort (bool sort_order, int sort_by) {
+        Config.Facade.get_instance ().set_library_photos_sort (sort_order, sort_by);
+    }
+    public override SearchViewFilter get_search_view_filter () {
+        return search_filter;
+    }
+}
\ No newline at end of file

=== modified file 'src/library/mk/library.mk'
--- src/library/mk/library.mk	2014-08-28 06:02:48 +0000
+++ src/library/mk/library.mk	2014-09-23 03:15:33 +0000
@@ -13,6 +13,9 @@
 UNIT_FILES := \
 	LibraryWindow.vala \
 	Branch.vala \
+	PhotosPage.vala \
+	VideosPage.vala \
+	RawsPage.vala \
 	TrashSidebarEntry.vala \
 	OfflineSidebarEntry.vala \
 	FlaggedSidebarEntry.vala \
@@ -49,4 +52,3 @@
 
 # unitize.mk must be called at the end of each UNIT_DIR.mk file.
 include unitize.mk
-