elementary OS

Merge lp:~tombeckmann/elementaryos/os-patch-geary-trust-icon-names into lp:~elementary-os/elementaryos/os-patch-geary-trusty

  1. os-patch-geary-trust-icon-names
  2. Merge into os-patch-geary-trusty
Proposed by Tom Beckmann
Status: Merged
Merged at revision: 2
Proposed branch: lp:~tombeckmann/elementaryos/os-patch-geary-trust-icon-names
Merge into: lp:~elementary-os/elementaryos/os-patch-geary-trusty
Diff against target: 259 lines (+34/-44)
7 files modified
src/client/application/geary-controller.vala (+4/-4)
src/client/components/main-toolbar.vala (+9/-11)
src/client/composer/composer-window.vala (+2/-7)
src/client/folder-list/folder-list-account-branch.vala (+1/-3)
src/client/folder-list/folder-list-folder-entry.vala (+10/-11)
src/client/folder-list/folder-list-search-branch.vala (+1/-1)
ui/composer.glade (+7/-7)
To merge this branch: bzr merge lp:~tombeckmann/elementaryos/os-patch-geary-trust-icon-names
Reviewer Review Type Date Requested Status
elementary OS team Pending
Review via email: mp+214505@code.launchpad.net

Description of the change

This replaces all the symbolic icon names with non-symbolic ones: http://imagebin.org/304227

I could rework the toolbar system to make the buttons not have a button shape or we could wait until the headerbar code is merged to geary trunk, which probably makes it look like what we want anyway.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/client/application/geary-controller.vala'
2--- src/client/application/geary-controller.vala 2014-04-07 07:51:10 +0000
3+++ src/client/application/geary-controller.vala 2014-04-07 10:19:48 +0000
4@@ -46,17 +46,17 @@
5 private const string DELETE_MESSAGE_LABEL = _("_Delete");
6 private const string DELETE_MESSAGE_TOOLTIP_SINGLE = _("Delete conversation (Shift+Delete)");
7 private const string DELETE_MESSAGE_TOOLTIP_MULTIPLE = _("Delete conversations (Shift+Delete)");
8- private const string DELETE_MESSAGE_ICON_NAME = "edit-delete-symbolic";
9+ private const string DELETE_MESSAGE_ICON_NAME = "edit-delete";
10
11 private const string TRASH_MESSAGE_LABEL = _("_Trash");
12 private const string TRASH_MESSAGE_TOOLTIP_SINGLE = _("Move conversation to trash (Delete, Backspace)");
13 private const string TRASH_MESSAGE_TOOLTIP_MULTIPLE = _("Move conversations to trash (Delete, Backspace)");
14- private const string TRASH_MESSAGE_ICON_NAME = "user-trash-symbolic";
15+ private const string TRASH_MESSAGE_ICON_NAME = "user-trash";
16
17 private const string ARCHIVE_MESSAGE_LABEL = _("_Archive");
18 private const string ARCHIVE_MESSAGE_TOOLTIP_SINGLE = _("Archive conversation (A)");
19 private const string ARCHIVE_MESSAGE_TOOLTIP_MULTIPLE = _("Archive conversations (A)");
20- private const string ARCHIVE_MESSAGE_ICON_NAME = "archive-symbolic";
21+ private const string ARCHIVE_MESSAGE_ICON_NAME = "mail-archive";
22
23 private const string MARK_AS_SPAM_LABEL = _("Mark as S_pam");
24 private const string MARK_AS_NOT_SPAM_LABEL = _("Mark as not S_pam");
25@@ -290,7 +290,7 @@
26 entries += mark_unread;
27 add_accelerator("<Shift>U", ACTION_MARK_AS_UNREAD);
28
29- Gtk.ActionEntry mark_starred = { ACTION_MARK_AS_STARRED, "star-symbolic", TRANSLATABLE, "S", null,
30+ Gtk.ActionEntry mark_starred = { ACTION_MARK_AS_STARRED, "starred", TRANSLATABLE, "S", null,
31 on_mark_as_starred };
32 mark_starred.label = _("_Star");
33 entries += mark_starred;
34
35=== modified file 'src/client/components/main-toolbar.vala'
36--- src/client/components/main-toolbar.vala 2014-04-07 07:51:10 +0000
37+++ src/client/components/main-toolbar.vala 2014-04-07 10:19:48 +0000
38@@ -6,7 +6,7 @@
39
40 // Draws the main toolbar.
41 public class MainToolbar : PillToolbar {
42- private const string ICON_CLEAR_NAME = "edit-clear-symbolic";
43+ private const string ICON_CLEAR_NAME = "edit-clear";
44 private const string ICON_CLEAR_RTL_NAME = "edit-clear-rtl-symbolic";
45 private const string DEFAULT_SEARCH_TEXT = _("Search");
46
47@@ -29,8 +29,6 @@
48 base(GearyApplication.instance.actions);
49 GearyApplication.instance.controller.account_selected.connect(on_account_changed);
50
51- bool rtl = get_direction() == Gtk.TextDirection.RTL;
52-
53 // Assemble mark menu.
54 GearyApplication.instance.load_ui_file("toolbar_mark_menu.ui");
55 Gtk.Menu mark_menu = (Gtk.Menu) GearyApplication.instance.ui_manager.get_widget("/ui/ToolbarMarkMenu");
56@@ -47,21 +45,21 @@
57 Gee.List<Gtk.Button> insert = new Gee.ArrayList<Gtk.Button>();
58
59 // Compose.
60- insert.add(create_toolbar_button("text-editor-symbolic", GearyController.ACTION_NEW_MESSAGE));
61+ insert.add(create_toolbar_button("mail-message-new", GearyController.ACTION_NEW_MESSAGE));
62 add(create_pill_buttons(insert, false));
63
64 // Reply buttons
65 insert.clear();
66- insert.add(create_toolbar_button(rtl ? "reply-rtl-symbolic" : "reply-symbolic", GearyController.ACTION_REPLY_TO_MESSAGE));
67- insert.add(create_toolbar_button(rtl ? "reply-all-rtl-symbolic" : "reply-all-symbolic", GearyController.ACTION_REPLY_ALL_MESSAGE));
68- insert.add(create_toolbar_button(rtl ? "forward-rtl-symbolic" : "forward-symbolic", GearyController.ACTION_FORWARD_MESSAGE));
69+ insert.add(create_toolbar_button("mail-reply-sender" , GearyController.ACTION_REPLY_TO_MESSAGE));
70+ insert.add(create_toolbar_button("mail-reply-all", GearyController.ACTION_REPLY_ALL_MESSAGE));
71+ insert.add(create_toolbar_button("mail-forward", GearyController.ACTION_FORWARD_MESSAGE));
72 add(create_pill_buttons(insert));
73
74 // Mark, copy, move.
75 insert.clear();
76- insert.add(create_menu_button("marker-symbolic", mark_menu, GearyController.ACTION_MARK_AS_MENU));
77- insert.add(create_menu_button(rtl ? "tag-rtl-symbolic" : "tag-symbolic", copy_folder_menu, GearyController.ACTION_COPY_MENU));
78- insert.add(create_menu_button("folder-symbolic", move_folder_menu, GearyController.ACTION_MOVE_MENU));
79+ insert.add(create_menu_button("edit-mark", mark_menu, GearyController.ACTION_MARK_AS_MENU));
80+ insert.add(create_menu_button("tag-new", copy_folder_menu, GearyController.ACTION_COPY_MENU));
81+ insert.add(create_menu_button("mail-move", move_folder_menu, GearyController.ACTION_MOVE_MENU));
82 add(create_pill_buttons(insert));
83
84 // The toolbar looks bad when you hide one of a pair of pill buttons.
85@@ -103,7 +101,7 @@
86 // Application button. If we exported an app menu, we don't need this.
87 if (!Gtk.Settings.get_default().gtk_shell_shows_app_menu) {
88 insert.clear();
89- insert.add(create_menu_button("emblem-system-symbolic", application_menu, GearyController.ACTION_GEAR_MENU));
90+ insert.add(create_menu_button("document-properties", application_menu, GearyController.ACTION_GEAR_MENU));
91 add(create_pill_buttons(insert));
92 }
93
94
95=== modified file 'src/client/composer/composer-window.vala'
96--- src/client/composer/composer-window.vala 2014-04-07 07:51:10 +0000
97+++ src/client/composer/composer-window.vala 2014-04-07 10:19:48 +0000
98@@ -272,13 +272,8 @@
99 cc_entry.changed.connect(validate_send_button);
100 bcc_entry.changed.connect(validate_send_button);
101
102- if (get_direction () == Gtk.TextDirection.RTL) {
103- actions.get_action(ACTION_INDENT).icon_name = "format-indent-more-rtl-symbolic";
104- actions.get_action(ACTION_OUTDENT).icon_name = "format-indent-less-rtl-symbolic";
105- } else {
106- actions.get_action(ACTION_INDENT).icon_name = "format-indent-more-symbolic";
107- actions.get_action(ACTION_OUTDENT).icon_name = "format-indent-less-symbolic";
108- }
109+ actions.get_action(ACTION_INDENT).icon_name = "format-indent-more";
110+ actions.get_action(ACTION_OUTDENT).icon_name = "format-indent-less";
111
112 ComposerToolbar composer_toolbar = new ComposerToolbar(actions, menu);
113 Gtk.Alignment toolbar_area = (Gtk.Alignment) builder.get_object("toolbar area");
114
115=== modified file 'src/client/folder-list/folder-list-account-branch.vala'
116--- src/client/folder-list/folder-list-account-branch.vala 2014-04-07 07:51:10 +0000
117+++ src/client/folder-list/folder-list-account-branch.vala 2014-04-07 10:19:48 +0000
118@@ -14,10 +14,8 @@
119 base(new Sidebar.Header(account.information.nickname),
120 Sidebar.Branch.Options.NONE, normal_folder_comparator, special_folder_comparator);
121
122- bool rtl = Gtk.Widget.get_default_direction() == Gtk.TextDirection.RTL;
123-
124 this.account = account;
125- user_folder_group = new SpecialGrouping(2, "", rtl ? "tag-rtl-symbolic" : "tag-symbolic");
126+ user_folder_group = new SpecialGrouping(2, "", "folder-tag");
127 folder_entries = new Gee.HashMap<Geary.FolderPath, FolderEntry>();
128
129 account.information.notify["nickname"].connect(on_nicknamed_changed);
130
131=== modified file 'src/client/folder-list/folder-list-folder-entry.vala'
132--- src/client/folder-list/folder-list-folder-entry.vala 2014-04-07 07:51:10 +0000
133+++ src/client/folder-list/folder-list-folder-entry.vala 2014-04-07 10:19:48 +0000
134@@ -44,38 +44,37 @@
135 }
136
137 public override string? get_sidebar_icon() {
138- bool rtl = Gtk.Widget.get_default_direction() == Gtk.TextDirection.RTL;
139
140 switch (folder.special_folder_type) {
141 case Geary.SpecialFolderType.NONE:
142- return rtl ? "tag-rtl-symbolic" : "tag-symbolic";
143+ return "folder-tag";
144
145 case Geary.SpecialFolderType.INBOX:
146- return "inbox-symbolic";
147+ return "mail-inbox";
148
149 case Geary.SpecialFolderType.DRAFTS:
150- return "accessories-text-editor-symbolic";
151+ return "folder-documents";
152
153 case Geary.SpecialFolderType.SENT:
154- return rtl ? "sent-rtl-symbolic" : "sent-symbolic";
155+ return "mail-sent";
156
157 case Geary.SpecialFolderType.FLAGGED:
158- return "starred-symbolic";
159+ return "starred";
160
161 case Geary.SpecialFolderType.IMPORTANT:
162- return "task-due-symbolic";
163+ return "task-due";
164
165 case Geary.SpecialFolderType.ALL_MAIL:
166- return "archive-symbolic";
167+ return "mail-archive";
168
169 case Geary.SpecialFolderType.SPAM:
170- return rtl ? "spam-rtl-symbolic" : "spam-symbolic";
171+ return "mail-mark-junk";
172
173 case Geary.SpecialFolderType.TRASH:
174- return "user-trash-symbolic";
175+ return "user-trash";
176
177 case Geary.SpecialFolderType.OUTBOX:
178- return "outbox-symbolic";
179+ return "mail-outbox";
180
181 default:
182 assert_not_reached();
183
184=== modified file 'src/client/folder-list/folder-list-search-branch.vala'
185--- src/client/folder-list/folder-list-search-branch.vala 2014-04-07 07:51:10 +0000
186+++ src/client/folder-list/folder-list-search-branch.vala 2014-04-07 10:19:48 +0000
187@@ -45,7 +45,7 @@
188 }
189
190 public override string? get_sidebar_icon() {
191- return "edit-find-symbolic";
192+ return "edit-find";
193 }
194
195 public override string to_string() {
196
197=== modified file 'ui/composer.glade'
198--- ui/composer.glade 2014-04-07 07:51:10 +0000
199+++ ui/composer.glade 2014-04-07 10:19:48 +0000
200@@ -60,7 +60,7 @@
201 <child>
202 <object class="GtkAction" id="insertlink">
203 <property name="tooltip" translatable="yes">Link (Ctrl+L)</property>
204- <property name="icon_name">insert-link-symbolic</property>
205+ <property name="icon_name">insert-link</property>
206 </object>
207 <accelerator key="l" modifiers="GDK_CONTROL_MASK"/>
208 </child>
209@@ -73,7 +73,7 @@
210 <child>
211 <object class="GtkAction" id="menu">
212 <property name="tooltip" translatable="yes">More options</property>
213- <property name="icon_name">go-down-symbolic</property>
214+ <property name="icon_name">document-properties</property>
215 </object>
216 </child>
217 <child>
218@@ -91,7 +91,7 @@
219 <child>
220 <object class="GtkAction" id="removeformat">
221 <property name="tooltip" translatable="yes">Remove formatting (Ctrl+Space)</property>
222- <property name="icon_name">format-text-remove-symbolic</property>
223+ <property name="icon_name">edit-clear</property>
224 </object>
225 <accelerator key="space" modifiers="GDK_CONTROL_MASK"/>
226 </child>
227@@ -109,28 +109,28 @@
228 <child>
229 <object class="GtkToggleAction" id="bold">
230 <property name="tooltip" translatable="yes">Bold (Ctrl+B)</property>
231- <property name="icon_name">format-text-bold-symbolic</property>
232+ <property name="icon_name">format-text-bold</property>
233 </object>
234 <accelerator key="b" modifiers="GDK_CONTROL_MASK"/>
235 </child>
236 <child>
237 <object class="GtkToggleAction" id="italic">
238 <property name="tooltip" translatable="yes">Italic (Ctrl+I)</property>
239- <property name="icon_name">format-text-italic-symbolic</property>
240+ <property name="icon_name">format-text-italic</property>
241 </object>
242 <accelerator key="i" modifiers="GDK_CONTROL_MASK"/>
243 </child>
244 <child>
245 <object class="GtkToggleAction" id="underline">
246 <property name="tooltip" translatable="yes">Underline (Ctrl+U)</property>
247- <property name="icon_name">format-text-underline-symbolic</property>
248+ <property name="icon_name">format-text-underline</property>
249 </object>
250 <accelerator key="u" modifiers="GDK_CONTROL_MASK"/>
251 </child>
252 <child>
253 <object class="GtkToggleAction" id="strikethrough">
254 <property name="tooltip" translatable="yes">Strikethrough (Ctrl+K)</property>
255- <property name="icon_name">format-text-strikethrough-symbolic</property>
256+ <property name="icon_name">format-text-strikethrough</property>
257 </object>
258 <accelerator key="k" modifiers="GDK_CONTROL_MASK"/>
259 </child>

Subscribers

People subscribed via source and target branches