Use GTK 3.14 rtl icon support

https://bugzilla.gnome.org/show_bug.cgi?id=769533
This commit is contained in:
Jeremy Bicha 2016-08-05 00:20:09 -04:00 committed by Michael Gratton
parent 254297cd59
commit 509b669532
17 changed files with 20 additions and 31 deletions

View file

@ -8,20 +8,20 @@ set(ICON_FILES
edit-symbolic.svg edit-symbolic.svg
format-text-remove-symbolic.svg format-text-remove-symbolic.svg
mail-drafts-symbolic.svg mail-drafts-symbolic.svg
mail-drafts-rtl-symbolic.svg mail-drafts-symbolic-rtl.svg
mail-forward-symbolic.svg mail-forward-symbolic.svg
mail-forward-rtl-symbolic.svg mail-forward-symbolic-rtl.svg
mail-inbox-symbolic.svg mail-inbox-symbolic.svg
mail-outbox-symbolic.svg mail-outbox-symbolic.svg
mail-reply-all-symbolic.svg mail-reply-all-symbolic.svg
mail-reply-all-rtl-symbolic.svg mail-reply-all-symbolic-rtl.svg
mail-reply-sender-symbolic.svg mail-reply-sender-symbolic.svg
mail-reply-sender-rtl-symbolic.svg mail-reply-sender-symbolic-rtl.svg
mail-sent-symbolic.svg mail-sent-symbolic.svg
mail-sent-rtl-symbolic.svg mail-sent-symbolic-rtl.svg
marker-symbolic.svg marker-symbolic.svg
tag-symbolic.svg tag-symbolic.svg
tag-rtl-symbolic.svg tag-symbolic-rtl.svg
) )
install(FILES ${ICON_FILES} DESTINATION ${ICONS_DEST}) install(FILES ${ICON_FILES} DESTINATION ${ICONS_DEST})

0
icons/close-symbolic.svg Executable file → Normal file
View file

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Before After
Before After

0
icons/mail-archive-symbolic.svg Executable file → Normal file
View file

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Before After
Before After

0
icons/mail-reply-sender-symbolic.svg Executable file → Normal file
View file

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Before After
Before After

0
icons/mail-sent-symbolic.svg Executable file → Normal file
View file

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Before After
Before After

0
icons/tag-symbolic.svg Executable file → Normal file
View file

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Before After
Before After

0
icons/text-x-generic-symbolic.svg Executable file → Normal file
View file

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Before After
Before After

View file

@ -52,8 +52,6 @@ public class MainToolbar : Gtk.Box {
this.bind_property("show-close-button-right", conversation_header, "show-close-button", this.bind_property("show-close-button-right", conversation_header, "show-close-button",
BindingFlags.SYNC_CREATE); BindingFlags.SYNC_CREATE);
bool rtl = get_direction() == Gtk.TextDirection.RTL;
// Assemble mark menu. // Assemble mark menu.
GearyApplication.instance.load_ui_resource("toolbar_mark_menu.ui"); GearyApplication.instance.load_ui_resource("toolbar_mark_menu.ui");
Gtk.Menu mark_menu = (Gtk.Menu) GearyApplication.instance.ui_manager.get_widget("/ui/ToolbarMarkMenu"); Gtk.Menu mark_menu = (Gtk.Menu) GearyApplication.instance.ui_manager.get_widget("/ui/ToolbarMarkMenu");
@ -91,20 +89,20 @@ public class MainToolbar : Gtk.Box {
// Reply buttons // Reply buttons
insert.clear(); insert.clear();
insert.add(conversation_header.create_toolbar_button(rtl ? "mail-reply-sender-rtl-symbolic" insert.add(conversation_header.create_toolbar_button("mail-reply-sender-symbolic",
: "mail-reply-sender-symbolic", GearyController.ACTION_REPLY_TO_MESSAGE)); GearyController.ACTION_REPLY_TO_MESSAGE));
insert.add(conversation_header.create_toolbar_button(rtl ? "mail-reply-all-rtl-symbolic" insert.add(conversation_header.create_toolbar_button("mail-reply-all-symbolic",
: "mail-reply-all-symbolic", GearyController.ACTION_REPLY_ALL_MESSAGE)); GearyController.ACTION_REPLY_ALL_MESSAGE));
insert.add(conversation_header.create_toolbar_button(rtl ? "mail-forward-rtl-symbolic" insert.add(conversation_header.create_toolbar_button("mail-forward-symbolic",
: "mail-forward-symbolic", GearyController.ACTION_FORWARD_MESSAGE)); GearyController.ACTION_FORWARD_MESSAGE));
conversation_header.add_start(conversation_header.create_pill_buttons(insert)); conversation_header.add_start(conversation_header.create_pill_buttons(insert));
// Mark, copy, move. // Mark, copy, move.
insert.clear(); insert.clear();
insert.add(conversation_header.create_menu_button("marker-symbolic", mark_menu, insert.add(conversation_header.create_menu_button("marker-symbolic", mark_menu,
GearyController.ACTION_MARK_AS_MENU)); GearyController.ACTION_MARK_AS_MENU));
insert.add(conversation_header.create_popover_button(rtl ? "tag-rtl-symbolic" : "tag-symbolic", insert.add(conversation_header.create_popover_button("tag-symbolic", copy_folder_menu,
copy_folder_menu, GearyController.ACTION_COPY_MENU)); GearyController.ACTION_COPY_MENU));
insert.add(conversation_header.create_popover_button("folder-symbolic", move_folder_menu, insert.add(conversation_header.create_popover_button("folder-symbolic", move_folder_menu,
GearyController.ACTION_MOVE_MENU)); GearyController.ACTION_MOVE_MENU));
conversation_header.add_start(conversation_header.create_pill_buttons(insert)); conversation_header.add_start(conversation_header.create_pill_buttons(insert));

View file

@ -396,13 +396,8 @@ public class ComposerWidget : Gtk.EventBox {
bcc_entry.changed.connect(validate_send_button); bcc_entry.changed.connect(validate_send_button);
reply_to_entry.changed.connect(validate_send_button); reply_to_entry.changed.connect(validate_send_button);
if (get_direction () == Gtk.TextDirection.RTL) {
actions.get_action(ACTION_INDENT).icon_name = "format-indent-more-rtl-symbolic";
actions.get_action(ACTION_OUTDENT).icon_name = "format-indent-less-rtl-symbolic";
} else {
actions.get_action(ACTION_INDENT).icon_name = "format-indent-more-symbolic"; actions.get_action(ACTION_INDENT).icon_name = "format-indent-more-symbolic";
actions.get_action(ACTION_OUTDENT).icon_name = "format-indent-less-symbolic"; actions.get_action(ACTION_OUTDENT).icon_name = "format-indent-less-symbolic";
}
composer_toolbar = new ComposerToolbar(actions, menu); composer_toolbar = new ComposerToolbar(actions, menu);
Gtk.Alignment toolbar_area = (Gtk.Alignment) builder.get_object("toolbar area"); Gtk.Alignment toolbar_area = (Gtk.Alignment) builder.get_object("toolbar area");

View file

@ -14,10 +14,8 @@ public class FolderList.AccountBranch : Sidebar.Branch {
base(new Sidebar.Header(account.information.nickname), base(new Sidebar.Header(account.information.nickname),
Sidebar.Branch.Options.NONE, normal_folder_comparator, special_folder_comparator); Sidebar.Branch.Options.NONE, normal_folder_comparator, special_folder_comparator);
bool rtl = Gtk.Widget.get_default_direction() == Gtk.TextDirection.RTL;
this.account = account; this.account = account;
user_folder_group = new SpecialGrouping(2, "", rtl ? "tag-rtl-symbolic" : "tag-symbolic"); user_folder_group = new SpecialGrouping(2, "", "tag-symbolic");
folder_entries = new Gee.HashMap<Geary.FolderPath, FolderEntry>(); folder_entries = new Gee.HashMap<Geary.FolderPath, FolderEntry>();
account.information.notify["nickname"].connect(on_nicknamed_changed); account.information.notify["nickname"].connect(on_nicknamed_changed);

View file

@ -46,20 +46,18 @@ public class FolderList.FolderEntry : FolderList.AbstractFolderEntry, Sidebar.In
} }
public override string? get_sidebar_icon() { public override string? get_sidebar_icon() {
bool rtl = Gtk.Widget.get_default_direction() == Gtk.TextDirection.RTL;
switch (folder.special_folder_type) { switch (folder.special_folder_type) {
case Geary.SpecialFolderType.NONE: case Geary.SpecialFolderType.NONE:
return rtl ? "tag-rtl-symbolic" : "tag-symbolic"; return "tag-symbolic";
case Geary.SpecialFolderType.INBOX: case Geary.SpecialFolderType.INBOX:
return "mail-inbox-symbolic"; return "mail-inbox-symbolic";
case Geary.SpecialFolderType.DRAFTS: case Geary.SpecialFolderType.DRAFTS:
return rtl ? "mail-drafts-rtl-symbolic" : "mail-drafts-symbolic"; return "mail-drafts-symbolic";
case Geary.SpecialFolderType.SENT: case Geary.SpecialFolderType.SENT:
return rtl ? "mail-sent-rtl-symbolic" : "mail-sent-symbolic"; return "mail-sent-symbolic";
case Geary.SpecialFolderType.FLAGGED: case Geary.SpecialFolderType.FLAGGED:
return "starred-symbolic"; return "starred-symbolic";