From 302ffc4fdc20485481a35b9ecc1dc18eebc8008c Mon Sep 17 00:00:00 2001 From: Eric Gregory Date: Fri, 27 Sep 2013 17:05:28 -0700 Subject: [PATCH] Closes #7365 Draft saving notifications are now less distracting --- src/client/composer/composer-window.vala | 6 ++++++ src/client/util/util-gtk.vala | 12 ++++++++++++ src/client/views/conversation-find-bar.vala | 10 +--------- ui/composer.glade | 3 +++ 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/client/composer/composer-window.vala b/src/client/composer/composer-window.vala index ecfd2973..93deb319 100644 --- a/src/client/composer/composer-window.vala +++ b/src/client/composer/composer-window.vala @@ -83,6 +83,11 @@ public class ComposerWindow : Gtk.Window { """; + private const string draft_save_label_style = """ + .draft-save-label { + color: shade (@bg_color, 0.6); + }"""; + private const int DRAFT_TIMEOUT_MSEC = 2000; // 2 seconds public const string ATTACHMENT_KEYWORDS_GENERIC = ".doc|.pdf|.xls|.ppt|.rtf|.pps"; @@ -235,6 +240,7 @@ public class ComposerWindow : Gtk.Window { subject_entry = builder.get_object("subject") as Gtk.Entry; Gtk.Alignment message_area = builder.get_object("message area") as Gtk.Alignment; draft_save_label = (Gtk.Label) builder.get_object("draft_save_label"); + GtkUtil.apply_style(draft_save_label, draft_save_label_style); actions = builder.get_object("compose actions") as Gtk.ActionGroup; // Can only happen after actions exits compose_as_html = GearyApplication.instance.config.compose_as_html; diff --git a/src/client/util/util-gtk.vala b/src/client/util/util-gtk.vala index 13d9c8de..b245cf01 100644 --- a/src/client/util/util-gtk.vala +++ b/src/client/util/util-gtk.vala @@ -108,4 +108,16 @@ void set_source_color_from_string(Cairo.Context ctx, string spec) { ctx.set_source_rgb(rgba.red, rgba.green, rgba.blue); } +void apply_style(Gtk.Widget widget, string style) { + try { + Gtk.CssProvider style_provider = new Gtk.CssProvider(); + style_provider.load_from_data(style, -1); + + Gtk.StyleContext style_context = widget.get_style_context(); + style_context.add_provider(style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); + } catch (Error e) { + warning("Could not load style: %s", e.message); + } +} + } diff --git a/src/client/views/conversation-find-bar.vala b/src/client/views/conversation-find-bar.vala index 9faa7c8b..e8707588 100644 --- a/src/client/views/conversation-find-bar.vala +++ b/src/client/views/conversation-find-bar.vala @@ -49,15 +49,7 @@ public class ConversationFindBar : Gtk.Layout { entry.buffer.deleted_text.connect(on_entry_buffer_deleted_text); entry.activate.connect(on_entry_activate); - try { - Gtk.CssProvider style_provider = new Gtk.CssProvider(); - style_provider.load_from_data(entry_not_found_style, -1); - - Gtk.StyleContext style_context = entry.get_style_context(); - style_context.add_provider(style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); - } catch (Error e) { - warning("Could not load built-in style for find bar entry: %s", e.message); - } + GtkUtil.apply_style(entry, entry_not_found_style); result_label = (Gtk.Label) builder.get_object("label: result"); update_result_label(); diff --git a/ui/composer.glade b/ui/composer.glade index 8c2e4a55..f35c9b67 100644 --- a/ui/composer.glade +++ b/ui/composer.glade @@ -559,6 +559,9 @@ True False 0 + False