Merge lp:~philip.scott/pantheon-photos/dark-app into lp:~pantheon-photos/pantheon-photos/trunk
- dark-app
- Merge into trunk
Proposed by
Felipe Escoto
Status: | Rejected |
---|---|
Rejected by: | Danielle Foré |
Proposed branch: | lp:~philip.scott/pantheon-photos/dark-app |
Merge into: | lp:~pantheon-photos/pantheon-photos/trunk |
Diff against target: |
201 lines (+22/-21) 5 files modified
src/Application.vala (+1/-1) src/CollectionPage.vala (+2/-2) src/PhotoPage.vala (+14/-14) src/library/LibraryWindow.vala (+3/-2) src/sidebar/Rating.vala (+2/-2) |
To merge this branch: | bzr merge lp:~philip.scott/pantheon-photos/dark-app |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Danielle Foré | Disapprove | ||
Review via email: mp+301577@code.launchpad.net |
Commit message
Use dark theme for the main Photos app
Description of the change
Dark app?
To post a comment you must log in.
Revision history for this message
Danielle Foré (danrabbit) wrote : | # |
- 2979. By Corentin Noël
-
Use latest Google Photo API
- 2980. By Launchpad Translations on behalf of pantheon-photos
-
Launchpad automatic translations update.
- 2981. By Felipe Escoto
-
Dark app MVP
Revision history for this message
Danielle Foré (danrabbit) wrote : | # |
Gonna reject this since it contains some stuff that doesn't apply anymore
review:
Disapprove
Unmerged revisions
- 2981. By Felipe Escoto
-
Dark app MVP
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'src/Application.vala' | |||
2 | --- src/Application.vala 2016-06-27 10:37:18 +0000 | |||
3 | +++ src/Application.vala 2016-08-01 21:27:43 +0000 | |||
4 | @@ -46,6 +46,7 @@ | |||
5 | 46 | about_artists = {}; | 46 | about_artists = {}; |
6 | 47 | about_translators = _("translator-credits"); | 47 | about_translators = _("translator-credits"); |
7 | 48 | about_license_type = Gtk.License.LGPL_2_1; | 48 | about_license_type = Gtk.License.LGPL_2_1; |
8 | 49 | Gtk.Settings.get_default().set("gtk-application-prefer-dark-theme", true); | ||
9 | 49 | } | 50 | } |
10 | 50 | 51 | ||
11 | 51 | private Application (bool is_direct) { | 52 | private Application (bool is_direct) { |
12 | @@ -60,7 +61,6 @@ | |||
13 | 60 | app_icon = "multimedia-photo-viewer"; | 61 | app_icon = "multimedia-photo-viewer"; |
14 | 61 | app_launcher = "pantheon-photos-viewer.desktop"; | 62 | app_launcher = "pantheon-photos-viewer.desktop"; |
15 | 62 | program_name = _("Photo Viewer"); | 63 | program_name = _("Photo Viewer"); |
16 | 63 | Gtk.Settings.get_default().set("gtk-application-prefer-dark-theme", true); | ||
17 | 64 | flags = GLib.ApplicationFlags.HANDLES_OPEN | GLib.ApplicationFlags.NON_UNIQUE; | 64 | flags = GLib.ApplicationFlags.HANDLES_OPEN | GLib.ApplicationFlags.NON_UNIQUE; |
18 | 65 | } else { | 65 | } else { |
19 | 66 | // we've been invoked in library mode; set up for uniqueness and handling | 66 | // we've been invoked in library mode; set up for uniqueness and handling |
20 | 67 | 67 | ||
21 | === modified file 'src/CollectionPage.vala' | |||
22 | --- src/CollectionPage.vala 2014-09-29 15:08:44 +0000 | |||
23 | +++ src/CollectionPage.vala 2016-08-01 21:27:43 +0000 | |||
24 | @@ -69,7 +69,7 @@ | |||
25 | 69 | connect_slider (zoom_slider_assembly); | 69 | connect_slider (zoom_slider_assembly); |
26 | 70 | get_toolbar ().insert (zoom_slider_assembly, -1); | 70 | get_toolbar ().insert (zoom_slider_assembly, -1); |
27 | 71 | 71 | ||
29 | 72 | Gtk.Image start_image = new Gtk.Image.from_icon_name ("media-playback-start", Gtk.IconSize.LARGE_TOOLBAR); | 72 | Gtk.Image start_image = new Gtk.Image.from_icon_name ("media-playback-start-symbolic", Gtk.IconSize.LARGE_TOOLBAR); |
30 | 73 | Gtk.ToolButton slideshow_button = new Gtk.ToolButton (start_image, _("S_lideshow")); | 73 | Gtk.ToolButton slideshow_button = new Gtk.ToolButton (start_image, _("S_lideshow")); |
31 | 74 | slideshow_button.set_tooltip_text (_("Play a slideshow")); | 74 | slideshow_button.set_tooltip_text (_("Play a slideshow")); |
32 | 75 | slideshow_button.clicked.connect (on_slideshow); | 75 | slideshow_button.clicked.connect (on_slideshow); |
33 | @@ -841,4 +841,4 @@ | |||
34 | 841 | public override SearchViewFilter get_search_view_filter () { | 841 | public override SearchViewFilter get_search_view_filter () { |
35 | 842 | return search_filter; | 842 | return search_filter; |
36 | 843 | } | 843 | } |
37 | 844 | } | ||
38 | 845 | \ No newline at end of file | 844 | \ No newline at end of file |
39 | 845 | } | ||
40 | 846 | 846 | ||
41 | === modified file 'src/PhotoPage.vala' | |||
42 | --- src/PhotoPage.vala 2016-02-10 07:45:46 +0000 | |||
43 | +++ src/PhotoPage.vala 2016-08-01 21:27:43 +0000 | |||
44 | @@ -385,7 +385,7 @@ | |||
45 | 385 | public override void repaint () { | 385 | public override void repaint () { |
46 | 386 | host_page.repaint (); | 386 | host_page.repaint (); |
47 | 387 | } | 387 | } |
49 | 388 | 388 | ||
50 | 389 | public override unowned Gtk.StyleContext get_style_context () { | 389 | public override unowned Gtk.StyleContext get_style_context () { |
51 | 390 | return host_page.canvas.get_style_context (); | 390 | return host_page.canvas.get_style_context (); |
52 | 391 | } | 391 | } |
53 | @@ -839,7 +839,7 @@ | |||
54 | 839 | enhance_button.clicked.disconnect (on_enhance); | 839 | enhance_button.clicked.disconnect (on_enhance); |
55 | 840 | enhance_button.active = get_photo ().is_enhanced (); | 840 | enhance_button.active = get_photo ().is_enhanced (); |
56 | 841 | enhance_button.clicked.connect (on_enhance); | 841 | enhance_button.clicked.connect (on_enhance); |
58 | 842 | } else | 842 | } else |
59 | 843 | set_action_sensitive ("Enhance", false); | 843 | set_action_sensitive ("Enhance", false); |
60 | 844 | } | 844 | } |
61 | 845 | 845 | ||
62 | @@ -908,7 +908,7 @@ | |||
63 | 908 | // check if the photo altered while away | 908 | // check if the photo altered while away |
64 | 909 | if (has_photo () && pixbuf_dirty) | 909 | if (has_photo () && pixbuf_dirty) |
65 | 910 | replace_photo (get_photo ()); | 910 | replace_photo (get_photo ()); |
67 | 911 | 911 | ||
68 | 912 | var app = AppWindow.get_instance () as LibraryWindow; | 912 | var app = AppWindow.get_instance () as LibraryWindow; |
69 | 913 | update_sidebar_action (!app.is_metadata_sidebar_visible ()); | 913 | update_sidebar_action (!app.is_metadata_sidebar_visible ()); |
70 | 914 | } | 914 | } |
71 | @@ -2119,7 +2119,7 @@ | |||
72 | 2119 | 2119 | ||
73 | 2120 | private void on_tool_cancelled () { | 2120 | private void on_tool_cancelled () { |
74 | 2121 | deactivate_tool (); | 2121 | deactivate_tool (); |
76 | 2122 | 2122 | ||
77 | 2123 | update_enhance_action (); | 2123 | update_enhance_action (); |
78 | 2124 | restore_zoom_state (); | 2124 | restore_zoom_state (); |
79 | 2125 | repaint (); | 2125 | repaint (); |
80 | @@ -2161,7 +2161,7 @@ | |||
81 | 2161 | private void on_adjust_toggled () { | 2161 | private void on_adjust_toggled () { |
82 | 2162 | on_tool_button_toggled (adjust_button, EditingTools.AdjustTool.factory); | 2162 | on_tool_button_toggled (adjust_button, EditingTools.AdjustTool.factory); |
83 | 2163 | 2163 | ||
85 | 2164 | // with adjust tool open turn enhance into normal non toggle button | 2164 | // with adjust tool open turn enhance into normal non toggle button |
86 | 2165 | if (adjust_button.active){ | 2165 | if (adjust_button.active){ |
87 | 2166 | enhance_button.clicked.disconnect (on_enhance); | 2166 | enhance_button.clicked.disconnect (on_enhance); |
88 | 2167 | enhance_button.active = false; | 2167 | enhance_button.active = false; |
89 | @@ -2189,7 +2189,7 @@ | |||
90 | 2189 | EditingTools.AdjustTool adjust_tool = current_tool as EditingTools.AdjustTool; | 2189 | EditingTools.AdjustTool adjust_tool = current_tool as EditingTools.AdjustTool; |
91 | 2190 | if (adjust_tool != null) { | 2190 | if (adjust_tool != null) { |
92 | 2191 | adjust_tool.enhance (); | 2191 | adjust_tool.enhance (); |
94 | 2192 | // with adjust tool open turn enhance into normal non toggle button | 2192 | // with adjust tool open turn enhance into normal non toggle button |
95 | 2193 | enhance_button.clicked.disconnect (on_enhance); | 2193 | enhance_button.clicked.disconnect (on_enhance); |
96 | 2194 | enhance_button.active = false; | 2194 | enhance_button.active = false; |
97 | 2195 | enhance_button.clicked.connect (on_enhance); | 2195 | enhance_button.clicked.connect (on_enhance); |
98 | @@ -2203,7 +2203,7 @@ | |||
99 | 2203 | get_command_manager ().undo (); | 2203 | get_command_manager ().undo (); |
100 | 2204 | else { | 2204 | else { |
101 | 2205 | UnEnhanceSingleCommand command = new UnEnhanceSingleCommand (get_photo ()); | 2205 | UnEnhanceSingleCommand command = new UnEnhanceSingleCommand (get_photo ()); |
103 | 2206 | get_command_manager ().execute (command); | 2206 | get_command_manager ().execute (command); |
104 | 2207 | } | 2207 | } |
105 | 2208 | get_photo ().set_enhanced (false); | 2208 | get_photo ().set_enhanced (false); |
106 | 2209 | } else { | 2209 | } else { |
107 | @@ -2213,9 +2213,9 @@ | |||
108 | 2213 | get_command_manager ().undo (); | 2213 | get_command_manager ().undo (); |
109 | 2214 | else { | 2214 | else { |
110 | 2215 | EnhanceSingleCommand command = new EnhanceSingleCommand (get_photo ()); | 2215 | EnhanceSingleCommand command = new EnhanceSingleCommand (get_photo ()); |
114 | 2216 | get_command_manager ().execute (command); | 2216 | get_command_manager ().execute (command); |
115 | 2217 | } | 2217 | } |
116 | 2218 | get_photo ().set_enhanced (true); | 2218 | get_photo ().set_enhanced (true); |
117 | 2219 | } | 2219 | } |
118 | 2220 | 2220 | ||
119 | 2221 | update_enhance_action (); | 2221 | update_enhance_action (); |
120 | @@ -2429,7 +2429,7 @@ | |||
121 | 2429 | if (toolbar == null) { | 2429 | if (toolbar == null) { |
122 | 2430 | base.get_toolbar (); | 2430 | base.get_toolbar (); |
123 | 2431 | 2431 | ||
125 | 2432 | Gtk.Image start_image = new Gtk.Image.from_icon_name ("media-playback-start", Gtk.IconSize.LARGE_TOOLBAR); | 2432 | Gtk.Image start_image = new Gtk.Image.from_icon_name ("media-playback-start-symbolic", Gtk.IconSize.LARGE_TOOLBAR); |
126 | 2433 | Gtk.ToolButton slideshow_button = new Gtk.ToolButton (start_image, _("S_lideshow")); | 2433 | Gtk.ToolButton slideshow_button = new Gtk.ToolButton (start_image, _("S_lideshow")); |
127 | 2434 | slideshow_button.set_tooltip_text (_("Play a slideshow")); | 2434 | slideshow_button.set_tooltip_text (_("Play a slideshow")); |
128 | 2435 | slideshow_button.clicked.connect (on_slideshow); | 2435 | slideshow_button.clicked.connect (on_slideshow); |
129 | @@ -2855,7 +2855,7 @@ | |||
130 | 2855 | } else { | 2855 | } else { |
131 | 2856 | set_action_sensitive ("Flag", false); | 2856 | set_action_sensitive ("Flag", false); |
132 | 2857 | } | 2857 | } |
134 | 2858 | } | 2858 | } |
135 | 2859 | 2859 | ||
136 | 2860 | // Displays a photo from a specific CollectionPage. When the user exits this view, | 2860 | // Displays a photo from a specific CollectionPage. When the user exits this view, |
137 | 2861 | // they will be sent back to the return_page. The optional view paramters is for using | 2861 | // they will be sent back to the return_page. The optional view paramters is for using |
138 | @@ -3039,7 +3039,7 @@ | |||
139 | 3039 | break; | 3039 | break; |
140 | 3040 | 3040 | ||
141 | 3041 | case "5": | 3041 | case "5": |
143 | 3042 | on_set_rating (Rating.FIVE); | 3042 | on_set_rating (Rating.FIVE); |
144 | 3043 | break; | 3043 | break; |
145 | 3044 | 3044 | ||
146 | 3045 | case "0": | 3045 | case "0": |
147 | @@ -3341,7 +3341,7 @@ | |||
148 | 3341 | 3341 | ||
149 | 3342 | update_rating_menu_item_sensitivity (); | 3342 | update_rating_menu_item_sensitivity (); |
150 | 3343 | } | 3343 | } |
152 | 3344 | 3344 | ||
153 | 3345 | protected virtual void on_rate_rejected () { | 3345 | protected virtual void on_rate_rejected () { |
154 | 3346 | on_set_rating (Rating.REJECTED); | 3346 | on_set_rating (Rating.REJECTED); |
155 | 3347 | } | 3347 | } |
156 | 3348 | 3348 | ||
157 | === modified file 'src/library/LibraryWindow.vala' | |||
158 | --- src/library/LibraryWindow.vala 2016-01-11 23:54:43 +0000 | |||
159 | +++ src/library/LibraryWindow.vala 2016-08-01 21:27:43 +0000 | |||
160 | @@ -221,6 +221,7 @@ | |||
161 | 221 | // Find button | 221 | // Find button |
162 | 222 | Gtk.ToggleToolButton find_button = new Gtk.ToggleToolButton (); | 222 | Gtk.ToggleToolButton find_button = new Gtk.ToggleToolButton (); |
163 | 223 | find_button.set_related_action (get_common_action ("CommonDisplaySearchbar")); | 223 | find_button.set_related_action (get_common_action ("CommonDisplaySearchbar")); |
164 | 224 | find_button.set_icon_name ("edit-find-symbolic"); | ||
165 | 224 | header.pack_end (find_button); | 225 | header.pack_end (find_button); |
166 | 225 | 226 | ||
167 | 226 | top_display = new TopDisplay (); | 227 | top_display = new TopDisplay (); |
168 | @@ -383,7 +384,7 @@ | |||
169 | 383 | private Gtk.ToggleActionEntry[] create_common_toggle_actions () { | 384 | private Gtk.ToggleActionEntry[] create_common_toggle_actions () { |
170 | 384 | Gtk.ToggleActionEntry[] actions = new Gtk.ToggleActionEntry[0]; | 385 | Gtk.ToggleActionEntry[] actions = new Gtk.ToggleActionEntry[0]; |
171 | 385 | 386 | ||
173 | 386 | Gtk.ToggleActionEntry searchbar = { "CommonDisplaySearchbar", Gtk.Stock.FIND, TRANSLATABLE, | 387 | Gtk.ToggleActionEntry searchbar = { "CommonDisplaySearchbar", "", TRANSLATABLE, |
174 | 387 | "F8", TRANSLATABLE, on_display_searchbar, is_search_toolbar_visible | 388 | "F8", TRANSLATABLE, on_display_searchbar, is_search_toolbar_visible |
175 | 388 | }; | 389 | }; |
176 | 389 | searchbar.label = _ ("_Search Bar"); | 390 | searchbar.label = _ ("_Search Bar"); |
177 | @@ -1016,7 +1017,7 @@ | |||
178 | 1016 | // before switching to it | 1017 | // before switching to it |
179 | 1017 | spin_event_loop (); | 1018 | spin_event_loop (); |
180 | 1018 | } | 1019 | } |
182 | 1019 | 1020 | ||
183 | 1020 | photo_page.display_for_collection (controller, current); | 1021 | photo_page.display_for_collection (controller, current); |
184 | 1021 | switch_to_page (photo_page); | 1022 | switch_to_page (photo_page); |
185 | 1022 | } | 1023 | } |
186 | 1023 | 1024 | ||
187 | === modified file 'src/sidebar/Rating.vala' | |||
188 | --- src/sidebar/Rating.vala 2016-04-25 21:24:16 +0000 | |||
189 | +++ src/sidebar/Rating.vala 2016-08-01 21:27:43 +0000 | |||
190 | @@ -139,9 +139,9 @@ | |||
191 | 139 | * @param symbolic Whether to use symbolic icons. | 139 | * @param symbolic Whether to use symbolic icons. |
192 | 140 | * | 140 | * |
193 | 141 | */ | 141 | */ |
195 | 142 | public PhotoRatingWidget (bool centered, int size, bool symbolic = false) { | 142 | public PhotoRatingWidget (bool centered, int size, bool symbolic = true) { |
196 | 143 | this.centered = centered; | 143 | this.centered = centered; |
198 | 144 | this.renderer = new PhotoRatingRenderer (size, symbolic, get_style_context ()); | 144 | this.renderer = new PhotoRatingRenderer (size, true, get_style_context ()); |
199 | 145 | visible_window = false; | 145 | visible_window = false; |
200 | 146 | 146 | ||
201 | 147 | add_events (Gdk.EventMask.BUTTON_PRESS_MASK | 147 | add_events (Gdk.EventMask.BUTTON_PRESS_MASK |
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