From 63394a6ddc29eac797bfdd7bbb2c429d4b5ffd9f Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 12 Jun 2017 15:12:22 +0200 Subject: override_font() deprecation warning: replace by GtkCssProvider blocks. Additionally, don't hard-code Cabin font anymore, use font_name gsettings property instead. --- src/shutdown-dialog.vala | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'src/shutdown-dialog.vala') diff --git a/src/shutdown-dialog.vala b/src/shutdown-dialog.vala index cbe4d7e..6cc88e9 100644 --- a/src/shutdown-dialog.vala +++ b/src/shutdown-dialog.vala @@ -102,10 +102,9 @@ public class ShutdownDialog : Gtk.Fixed } else { - var title_label = new Gtk.Label (_("Shut Down")); + var title_label = new Gtk.Label (null); title_label.visible = true; - title_label.override_font (Pango.FontDescription.from_string ("Cantarell 15")); - title_label.override_color (Gtk.StateFlags.NORMAL, { 1.0f, 1.0f, 1.0f, 1.0f }); + title_label.set_markup ("%s".printf (AGSettings.get_string (AGSettings.KEY_TOGGLEBOX_FONT_FGCOLOR), _("Shut Down"))); title_label.set_alignment (0.0f, 0.5f); vbox.pack_start (title_label, false, false, 0); @@ -136,10 +135,9 @@ public class ShutdownDialog : Gtk.Fixed if (have_open_sessions) text = "%s\n\n%s".printf (_("Other users are currently logged in to this computer, shutting down now will also close these other sessions."), text); - var label = new Gtk.Label (text); + var label = new Gtk.Label (null); label.set_line_wrap (true); - label.override_font (Pango.FontDescription.from_string ("Cantarell 12")); - label.override_color (Gtk.StateFlags.NORMAL, { 1.0f, 1.0f, 1.0f, 1.0f }); + label.set_markup ("%s".printf (AGSettings.get_string (AGSettings.KEY_TOGGLEBOX_FONT_FGCOLOR), text)); label.set_alignment (0.0f, 0.5f); label.visible = true; vbox.pack_start (label, false, false, 0); @@ -560,7 +558,21 @@ private class DialogButton : Gtk.Button if (l != null) { l.visible = true; - l.override_font (Pango.FontDescription.from_string ("Cantarell 12")); + + var style_ctx = l.get_style_context(); + try + { + var font_provider = new Gtk.CssProvider (); + var css = "* {font-family: Cantarell; font-size: 12pt;}"; + font_provider.load_from_data (css, -1); + style_ctx.add_provider (font_provider, + Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); + } + catch (Error e) + { + debug ("Internal error loading font style (Cantarell 12pt): %s", e.message); + } + l.override_color (Gtk.StateFlags.NORMAL, { 1.0f, 1.0f, 1.0f, 0.0f }); l.override_color (Gtk.StateFlags.FOCUSED, { 1.0f, 1.0f, 1.0f, 1.0f }); l.override_color (Gtk.StateFlags.ACTIVE, { 1.0f, 1.0f, 1.0f, 1.0f }); -- cgit v1.2.3