Merge lp:~elementary-apps/pantheon-photos/remove-title-option into lp:~pantheon-photos/pantheon-photos/trunk

[Danielle Foré]

Remove option to hide photo titles

We don't allow hiding item titles in other views (Files, Videos, Music)

[Corentin Noël (tintou)]

This option should maybe disappear from the DConf but I don't think it's a good idea to show per-photo names, it might be a "convenient" alternative to show a popover with the photo name if you really want to but the name is still available when clicking on a photo.
I think people have to name albums but no single photos.

review: Disapprove

Unmerged revisions

3139. By Danielle Foré on 2017-01-27

remove option to hide titles

=== modified file 'data/ui/media.ui'
--- data/ui/media.ui	2016-09-20 00:44:41 +0000
+++ data/ui/media.ui	2017-01-27 03:10:46 +0000
@@ -3,7 +3,6 @@
         <menuitem name="DisplaySidebar" action="CommonDisplaySidebar" />
         <menuitem name="DisplayMetadataSidebar" action="CommonDisplayMetadataSidebar" /> 
         <separator />
-        <menuitem name="ViewTitle" action="ViewTitle" />
         <menuitem name="ViewComment" action="ViewComment" />
         <menuitem name="ViewTags" action="ViewTags" />
         <separator />

=== modified file 'schemas/org.pantheon.photos.gschema.xml'
--- schemas/org.pantheon.photos.gschema.xml	2016-09-20 02:34:17 +0000
+++ schemas/org.pantheon.photos.gschema.xml	2017-01-27 03:10:46 +0000
@@ -47,12 +47,6 @@
         <description>True if the Search/Filter Toolbar is to be displayed, false otherwise.</description>
     </key>
     
-    <key name="display-photo-titles" type="b">
-        <default>false</default>
-        <summary>display photo titles</summary>
-        <description>True if photo titles are to be displayed beneath thumbnails in collection views, false otherwise.</description>
-    </key>
-    
     <key name="display-photo-comments" type="b">
         <default>false</default>
         <summary>display photo comments</summary>

=== modified file 'src/CheckerboardLayout.vala'
--- src/CheckerboardLayout.vala	2017-01-26 22:15:26 +0000
+++ src/CheckerboardLayout.vala	2017-01-27 03:10:46 +0000
@@ -110,8 +110,6 @@
 
 public abstract class CheckerboardItem : ThumbnailView {
     // Collection properties CheckerboardItem understands
-    // SHOW_TITLES (bool)
-    public const string PROP_SHOW_TITLES = "show-titles";
     // SHOW_COMMENTS (bool)
     public const string PROP_SHOW_COMMENTS = "show-comments";
     // SHOW_SUBTITLES (bool)
@@ -129,7 +127,6 @@
 
     private bool exposure = false;
     private CheckerboardItemText? title = null;
-    private bool title_visible = true;
     private CheckerboardItemText? comment = null;
     private bool comment_visible = true;
     private CheckerboardItemText? subtitle = null;
@@ -179,11 +176,8 @@
             return;
 
         title = new CheckerboardItemText (text, alignment, marked_up);
-
-        if (title_visible) {
-            recalc_size ("set_title");
-            notify_view_altered ();
-        }
+        recalc_size ("set_title");
+        notify_view_altered ();
     }
 
     public void clear_title () {
@@ -191,20 +185,7 @@
             return;
 
         title = null;
-
-        if (title_visible) {
-            recalc_size ("clear_title");
-            notify_view_altered ();
-        }
-    }
-
-    private void set_title_visible (bool visible) {
-        if (title_visible == visible)
-            return;
-
-        title_visible = visible;
-
-        recalc_size ("set_title_visible");
+        recalc_size ("clear_title");
         notify_view_altered ();
     }
 
@@ -284,16 +265,10 @@
     }
 
     protected override void notify_membership_changed (DataCollection? collection) {
-        bool title_visible = (bool) get_collection_property (PROP_SHOW_TITLES, true);
         bool comment_visible = (bool) get_collection_property (PROP_SHOW_COMMENTS, true);
         bool subtitle_visible = (bool) get_collection_property (PROP_SHOW_SUBTITLES, false);
 
         bool altered = false;
-        if (this.title_visible != title_visible) {
-            this.title_visible = title_visible;
-            altered = true;
-        }
-
         if (this.comment_visible != comment_visible) {
             this.comment_visible = comment_visible;
             altered = true;
@@ -314,14 +289,9 @@
 
     protected override void notify_collection_property_set (string name, Value? old, Value val) {
         switch (name) {
-        case PROP_SHOW_TITLES:
-            set_title_visible ((bool) val);
-            break;
-
         case PROP_SHOW_COMMENTS:
             set_comment_visible ((bool) val);
             break;
-
         case PROP_SHOW_SUBTITLES:
             set_subtitle_visible ((bool) val);
             break;
@@ -398,8 +368,7 @@
         Dimensions old_requisition = requisition;
 
         // only add in the text heights if they're displayed
-        int title_height = (title != null && title_visible)
-                           ? title.get_height () + LABEL_PADDING : 0;
+        int title_height = (title != null) ? title.get_height () + LABEL_PADDING : 0;
         int comment_height = (comment != null && comment_visible)
                              ? comment.get_height () + LABEL_PADDING : 0;
         int subtitle_height = (subtitle != null && subtitle_visible)
@@ -508,7 +477,7 @@
         style_context.add_class (Gtk.STYLE_CLASS_LABEL);
         // title and subtitles are LABEL_PADDING below bottom of pixbuf
         int text_y = allocation.y + FRAME_WIDTH + pixbuf_dim.height + FRAME_WIDTH + LABEL_PADDING;
-        if (title != null && title_visible) {
+        if (title != null) {
             // get the layout sized so its with is no more than the pixbuf's
             // resize the text width to be no more than the pixbuf's
             title.allocation.x = allocation.x + FRAME_WIDTH;
@@ -613,7 +582,7 @@
     }
 
     public bool query_tooltip (int x, int y, Gtk.Tooltip tooltip) {
-        if (title != null && title_visible && coord_in_rectangle (x, y, title.allocation))
+        if (title != null && coord_in_rectangle (x, y, title.allocation))
             return query_tooltip_on_text (title, tooltip);
 
         if (comment != null && comment_visible && coord_in_rectangle (x, y, comment.allocation))

=== modified file 'src/MediaPage.vala'
--- src/MediaPage.vala	2017-01-26 23:05:03 +0000
+++ src/MediaPage.vala	2017-01-27 03:10:46 +0000
@@ -165,8 +165,6 @@
         get_view ().items_altered.connect (on_media_altered);
 
         get_view ().freeze_notifications ();
-        get_view ().set_property (CheckerboardItem.PROP_SHOW_TITLES,
-                                 Config.Facade.get_instance ().get_display_photo_titles ());
         get_view ().set_property (CheckerboardItem.PROP_SHOW_COMMENTS,
                                  Config.Facade.get_instance ().get_display_photo_comments ());
         get_view ().set_property (Thumbnail.PROP_SHOW_TAGS,
@@ -258,11 +256,6 @@
     protected override Gtk.ToggleActionEntry[] init_collect_toggle_action_entries () {
         Gtk.ToggleActionEntry[] toggle_actions = base.init_collect_toggle_action_entries ();
 
-        Gtk.ToggleActionEntry titles = { "ViewTitle", null, _("_Titles"), "<Ctrl><Shift>T",
-                                         _("Display the title of each photo"), on_display_titles, Config.Facade.get_instance ().get_display_photo_titles ()
-                                       };
-        toggle_actions += titles;
-
         Gtk.ToggleActionEntry comments = { "ViewComment", null, _("_Comments"), "<Ctrl><Shift>C",
                                            _("Display the comment of each photo"), on_display_comments, Config.Facade.get_instance ().get_display_photo_comments ()
                                          };
@@ -480,7 +473,6 @@
 
         // set display options to match Configuration toggles (which can change while switched away)
         get_view ().freeze_notifications ();
-        set_display_titles (Config.Facade.get_instance ().get_display_photo_titles ());
         set_display_comments (Config.Facade.get_instance ().get_display_photo_comments ());
         set_display_tags (Config.Facade.get_instance ().get_display_photo_tags ());
         get_view ().thaw_notifications ();
@@ -599,14 +591,6 @@
         }
     }
 
-    protected virtual void on_display_titles (Gtk.Action action) {
-        bool display = ((Gtk.ToggleAction) action).get_active ();
-
-        set_display_titles (display);
-
-        Config.Facade.get_instance ().set_display_photo_titles (display);
-    }
-
     protected virtual void on_display_comments (Gtk.Action action) {
         bool display = ((Gtk.ToggleAction) action).get_active ();
 
@@ -673,14 +657,6 @@
         }
     }
 
-    protected override void set_display_titles (bool display) {
-        base.set_display_titles (display);
-
-        Gtk.ToggleAction? action = get_action ("ViewTitle") as Gtk.ToggleAction;
-        if (action != null)
-            action.set_active (display);
-    }
-
     protected override void set_display_comments (bool display) {
         base.set_display_comments (display);
 

=== modified file 'src/Page.vala'
--- src/Page.vala	2017-01-12 18:13:48 +0000
+++ src/Page.vala	2017-01-27 03:10:46 +0000
@@ -1992,12 +1992,6 @@
         }
     }
 
-    protected virtual void set_display_titles (bool display) {
-        get_view ().freeze_notifications ();
-        get_view ().set_property (CheckerboardItem.PROP_SHOW_TITLES, display);
-        get_view ().thaw_notifications ();
-    }
-
     protected virtual void set_display_comments (bool display) {
         get_view ().freeze_notifications ();
         get_view ().set_property (CheckerboardItem.PROP_SHOW_COMMENTS, display);

=== modified file 'src/PhotoPage.vala'
--- src/PhotoPage.vala	2017-01-26 15:35:50 +0000
+++ src/PhotoPage.vala	2017-01-27 03:10:46 +0000
@@ -2649,12 +2649,6 @@
         return actions;
     }
 
-    protected override Gtk.ToggleActionEntry[] init_collect_toggle_action_entries () {
-        Gtk.ToggleActionEntry[] toggle_actions = base.init_collect_toggle_action_entries ();
-
-        return toggle_actions;
-    }
-
     protected override InjectionGroup[] init_collect_injection_groups () {
         InjectionGroup[] groups = base.init_collect_injection_groups ();
 

=== modified file 'src/camera/ImportPage.vala'
--- src/camera/ImportPage.vala	2017-01-26 15:35:50 +0000
+++ src/camera/ImportPage.vala	2017-01-27 03:10:46 +0000
@@ -890,17 +890,6 @@
         ui_filenames.add ("import.ui");
     }
 
-    protected override Gtk.ToggleActionEntry[] init_collect_toggle_action_entries () {
-        Gtk.ToggleActionEntry[] toggle_actions = base.init_collect_toggle_action_entries ();
-
-        Gtk.ToggleActionEntry titles = { "ViewTitle", null, _("_Titles"), "<Ctrl><Shift>T",
-                                         _("Display the title of each photo"), on_display_titles, Config.Facade.get_instance ().get_display_photo_titles ()
-                                       };
-        toggle_actions += titles;
-
-        return toggle_actions;
-    }
-
     protected override Gtk.ActionEntry[] init_collect_action_entries () {
         Gtk.ActionEntry[] actions = base.init_collect_action_entries ();
 
@@ -980,19 +969,6 @@
         search_filter.refresh ();
     }
 
-    private void on_display_titles (Gtk.Action action) {
-        bool display = ((Gtk.ToggleAction) action).get_active ();
-
-        set_display_titles (display);
-        Config.Facade.get_instance ().set_display_photo_titles (display);
-    }
-
-    public override void switched_to () {
-        set_display_titles (Config.Facade.get_instance ().get_display_photo_titles ());
-
-        base.switched_to ();
-    }
-
     public override void ready () {
         try_refreshing_camera (false);
         hide_imported_filter.refresh ();
@@ -1806,14 +1782,6 @@
         on_view_changed ();
     }
 
-    public override void set_display_titles (bool display) {
-        base.set_display_titles (display);
-
-        Gtk.ToggleAction? action = get_action ("ViewTitle") as Gtk.ToggleAction;
-        if (action != null)
-            action.set_active (display);
-    }
-
     // Gets the search view filter for this page.
     public override SearchViewFilter get_search_view_filter () {
         return search_filter;

=== modified file 'src/config/GSettingsEngine.vala'
--- src/config/GSettingsEngine.vala	2017-01-26 22:15:26 +0000
+++ src/config/GSettingsEngine.vala	2017-01-27 03:10:46 +0000
@@ -123,7 +123,6 @@
         key_names[ConfigurableProperty.DISPLAY_METADATA_SIDEBAR] = "display-metadata-sidebar";
         key_names[ConfigurableProperty.DISPLAY_SEARCH_BAR] = "display-search-bar";
         key_names[ConfigurableProperty.DISPLAY_PHOTO_TAGS] = "display-photo-tags";
-        key_names[ConfigurableProperty.DISPLAY_PHOTO_TITLES] = "display-photo-titles";
         key_names[ConfigurableProperty.DISPLAY_PHOTO_COMMENTS] = "display-photo-comments";
         key_names[ConfigurableProperty.DISPLAY_EVENT_COMMENTS] = "display-event-comments";
         key_names[ConfigurableProperty.EVENT_PHOTOS_SORT_ASCENDING] = "event-photos-sort-ascending";