Merge lp:~philip.scott/pantheon-photos/dark-app into lp:~pantheon-photos/pantheon-photos/trunk

[Felipe Escoto]

Use dark theme for the main Photos app

Dark app?

[Danielle Foré (danrabbit)]

I think this needs to be put on hold because we have some unsolved issues, specifically certain icons not using the symbolic variant or being otherwise unlegible on a dark background. We haven't done any testing here at all. So I would say hold until Loki +1 and then we don't have to worry about breaking things as much since we'll have time to fix them

[lp:~philip.scott/pantheon-photos/dark-app]

2979. By Corentin Noël on 2016-07-31

Use latest Google Photo API

2980. By Launchpad Translations on behalf of pantheon-photos on 2016-08-01

Launchpad automatic translations update.

2981. By Felipe Escoto on 2016-08-01

Dark app MVP

[Danielle Foré (danrabbit)]

Gonna reject this since it contains some stuff that doesn't apply anymore

review: Disapprove

Unmerged revisions

2981. By Felipe Escoto on 2016-08-01

Dark app MVP

=== modified file 'src/Application.vala'
--- src/Application.vala	2016-06-27 10:37:18 +0000
+++ src/Application.vala	2016-08-01 21:27:43 +0000
@@ -46,6 +46,7 @@
         about_artists = {};
         about_translators = _("translator-credits");
         about_license_type = Gtk.License.LGPL_2_1;
+        Gtk.Settings.get_default().set("gtk-application-prefer-dark-theme", true);
     }
 
     private Application (bool is_direct) {
@@ -60,7 +61,6 @@
             app_icon = "multimedia-photo-viewer";
             app_launcher = "pantheon-photos-viewer.desktop";
             program_name = _("Photo Viewer");
-            Gtk.Settings.get_default().set("gtk-application-prefer-dark-theme", true);
             flags = GLib.ApplicationFlags.HANDLES_OPEN | GLib.ApplicationFlags.NON_UNIQUE;
         } else {
             // we've been invoked in library mode; set up for uniqueness and handling

=== modified file 'src/CollectionPage.vala'
--- src/CollectionPage.vala	2014-09-29 15:08:44 +0000
+++ src/CollectionPage.vala	2016-08-01 21:27:43 +0000
@@ -69,7 +69,7 @@
             connect_slider (zoom_slider_assembly);
             get_toolbar ().insert (zoom_slider_assembly, -1);
 
-            Gtk.Image start_image = new Gtk.Image.from_icon_name ("media-playback-start", Gtk.IconSize.LARGE_TOOLBAR);
+            Gtk.Image start_image = new Gtk.Image.from_icon_name ("media-playback-start-symbolic", Gtk.IconSize.LARGE_TOOLBAR);
             Gtk.ToolButton slideshow_button = new Gtk.ToolButton (start_image, _("S_lideshow"));
             slideshow_button.set_tooltip_text (_("Play a slideshow"));
             slideshow_button.clicked.connect (on_slideshow);
@@ -841,4 +841,4 @@
     public override SearchViewFilter get_search_view_filter () {
         return search_filter;
     }
-}
\ No newline at end of file
+}

=== modified file 'src/PhotoPage.vala'
--- src/PhotoPage.vala	2016-02-10 07:45:46 +0000
+++ src/PhotoPage.vala	2016-08-01 21:27:43 +0000
@@ -385,7 +385,7 @@
         public override void repaint () {
             host_page.repaint ();
         }
-        
+
         public override unowned Gtk.StyleContext get_style_context () {
             return host_page.canvas.get_style_context ();
         }
@@ -839,7 +839,7 @@
             enhance_button.clicked.disconnect (on_enhance);
             enhance_button.active = get_photo ().is_enhanced ();
             enhance_button.clicked.connect (on_enhance);
-        } else 
+        } else
             set_action_sensitive ("Enhance", false);
     }
 
@@ -908,7 +908,7 @@
         // check if the photo altered while away
         if (has_photo () && pixbuf_dirty)
             replace_photo (get_photo ());
-            
+
         var app = AppWindow.get_instance () as LibraryWindow;
         update_sidebar_action (!app.is_metadata_sidebar_visible ());
     }
@@ -2119,7 +2119,7 @@
 
     private void on_tool_cancelled () {
         deactivate_tool ();
-           
+
         update_enhance_action ();
         restore_zoom_state ();
         repaint ();
@@ -2161,7 +2161,7 @@
     private void on_adjust_toggled () {
         on_tool_button_toggled (adjust_button, EditingTools.AdjustTool.factory);
 
-        // with adjust tool open turn enhance into normal non toggle button 
+        // with adjust tool open turn enhance into normal non toggle button
         if (adjust_button.active){
             enhance_button.clicked.disconnect (on_enhance);
             enhance_button.active = false;
@@ -2189,7 +2189,7 @@
         EditingTools.AdjustTool adjust_tool = current_tool as EditingTools.AdjustTool;
         if (adjust_tool != null) {
             adjust_tool.enhance ();
-            // with adjust tool open turn enhance into normal non toggle button 
+            // with adjust tool open turn enhance into normal non toggle button
             enhance_button.clicked.disconnect (on_enhance);
             enhance_button.active = false;
             enhance_button.clicked.connect (on_enhance);
@@ -2203,7 +2203,7 @@
                 get_command_manager ().undo ();
             else {
                 UnEnhanceSingleCommand command = new UnEnhanceSingleCommand (get_photo ());
-                get_command_manager ().execute (command);       
+                get_command_manager ().execute (command);
             }
             get_photo ().set_enhanced (false);
         } else {
@@ -2213,9 +2213,9 @@
                 get_command_manager ().undo ();
             else {
                 EnhanceSingleCommand command = new EnhanceSingleCommand (get_photo ());
-                get_command_manager ().execute (command);   
-            }    
-            get_photo ().set_enhanced (true);   
+                get_command_manager ().execute (command);
+            }
+            get_photo ().set_enhanced (true);
         }
 
         update_enhance_action ();
@@ -2429,7 +2429,7 @@
         if (toolbar == null) {
             base.get_toolbar ();
 
-            Gtk.Image start_image = new Gtk.Image.from_icon_name ("media-playback-start", Gtk.IconSize.LARGE_TOOLBAR);
+            Gtk.Image start_image = new Gtk.Image.from_icon_name ("media-playback-start-symbolic", Gtk.IconSize.LARGE_TOOLBAR);
             Gtk.ToolButton slideshow_button = new Gtk.ToolButton (start_image, _("S_lideshow"));
             slideshow_button.set_tooltip_text (_("Play a slideshow"));
             slideshow_button.clicked.connect (on_slideshow);
@@ -2855,7 +2855,7 @@
         } else {
             set_action_sensitive ("Flag", false);
         }
-    }    
+    }
 
     // Displays a photo from a specific CollectionPage.  When the user exits this view,
     // they will be sent back to the return_page. The optional view paramters is for using
@@ -3039,7 +3039,7 @@
             break;
 
         case "5":
-            on_set_rating (Rating.FIVE);    
+            on_set_rating (Rating.FIVE);
             break;
 
         case "0":
@@ -3341,7 +3341,7 @@
 
         update_rating_menu_item_sensitivity ();
     }
-    
+
     protected virtual void on_rate_rejected () {
         on_set_rating (Rating.REJECTED);
     }

=== modified file 'src/library/LibraryWindow.vala'
--- src/library/LibraryWindow.vala	2016-01-11 23:54:43 +0000
+++ src/library/LibraryWindow.vala	2016-08-01 21:27:43 +0000
@@ -221,6 +221,7 @@
         // Find button
         Gtk.ToggleToolButton find_button = new Gtk.ToggleToolButton ();
         find_button.set_related_action (get_common_action ("CommonDisplaySearchbar"));
+        find_button.set_icon_name ("edit-find-symbolic");
         header.pack_end (find_button);
 
         top_display = new TopDisplay ();
@@ -383,7 +384,7 @@
     private Gtk.ToggleActionEntry[] create_common_toggle_actions () {
         Gtk.ToggleActionEntry[] actions = new Gtk.ToggleActionEntry[0];
 
-        Gtk.ToggleActionEntry searchbar = { "CommonDisplaySearchbar", Gtk.Stock.FIND, TRANSLATABLE,
+        Gtk.ToggleActionEntry searchbar = { "CommonDisplaySearchbar", "", TRANSLATABLE,
                                             "F8", TRANSLATABLE, on_display_searchbar, is_search_toolbar_visible
                                           };
         searchbar.label = _ ("_Search Bar");
@@ -1016,7 +1017,7 @@
             // before switching to it
             spin_event_loop ();
         }
-        
+
         photo_page.display_for_collection (controller, current);
         switch_to_page (photo_page);
     }

=== modified file 'src/sidebar/Rating.vala'
--- src/sidebar/Rating.vala	2016-04-25 21:24:16 +0000
+++ src/sidebar/Rating.vala	2016-08-01 21:27:43 +0000
@@ -139,9 +139,9 @@
      * @param symbolic Whether to use symbolic icons.
      *
      */
-    public PhotoRatingWidget (bool centered, int size, bool symbolic = false) {
+    public PhotoRatingWidget (bool centered, int size, bool symbolic = true) {
         this.centered = centered;
-        this.renderer = new PhotoRatingRenderer (size, symbolic, get_style_context ());
+        this.renderer = new PhotoRatingRenderer (size, true, get_style_context ());
         visible_window = false;
 
         add_events (Gdk.EventMask.BUTTON_PRESS_MASK