Skip to content

Indicator: misc cleanup #189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danirabbit merged 2 commits into from
May 18, 2021
Merged

Indicator: misc cleanup #189

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87151b4
Indicator: misc cleanup
danirabbit Apr 22, 2021
ff9b681
Merge branch 'master' into indicator-cleanups
danirabbit May 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 11 additions & 23 deletions src/Indicator.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,37 +21,25 @@ public class Notifications.Indicator : Wingpanel.Indicator {
private const string CHILD_PATH = "/io/elementary/notifications/applications/%s/";
private const string REMEMBER_KEY = "remember";

private Gtk.Spinner? dynamic_icon = null;
private Gee.HashMap<string, Settings> app_settings_cache;
private GLib.Settings notify_settings;
private Gtk.Grid? main_box = null;
private Gtk.ModelButton clear_all_btn;
private Granite.SwitchModelButton not_disturb_switch;

private Gtk.Spinner? dynamic_icon = null;
private NotificationsList nlist;

private Gee.HashMap<string, Settings> app_settings_cache;

public static GLib.Settings notify_settings;

public Indicator () {
Object (code_name: Wingpanel.Indicator.MESSAGES);

visible = true;
Object (
code_name: Wingpanel.Indicator.MESSAGES,
visible: true
);
}

construct {
notify_settings = new GLib.Settings ("io.elementary.notifications");
app_settings_cache = new Gee.HashMap<string, Settings> ();
}

static construct {
if (GLib.SettingsSchemaSource.get_default ().lookup ("io.elementary.notifications", true) != null) {
debug ("Using io.elementary.notifications server");
notify_settings = new GLib.Settings ("io.elementary.notifications");
} else {
debug ("Using notifications in gala");
notify_settings = new GLib.Settings ("org.pantheon.desktop.gala.notifications");
}
}

public override Gtk.Widget get_display_widget () {
if (dynamic_icon == null) {
dynamic_icon = new Gtk.Spinner ();
Expand All @@ -67,7 +55,7 @@ public class Notifications.Indicator : Wingpanel.Indicator {
var provider = new Gtk.CssProvider ();
provider.load_from_resource ("io/elementary/wingpanel/notifications/indicator.css");

unowned Gtk.StyleContext dynamic_icon_style_context = dynamic_icon.get_style_context ();
unowned var dynamic_icon_style_context = dynamic_icon.get_style_context ();
dynamic_icon_style_context.add_class ("notification-icon");
dynamic_icon_style_context.add_provider (provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);

Expand Down Expand Up @@ -99,7 +87,7 @@ public class Notifications.Indicator : Wingpanel.Indicator {

public override Gtk.Widget? get_widget () {
if (main_box == null) {
not_disturb_switch = new Granite.SwitchModelButton (_("Do Not Disturb"));
var not_disturb_switch = new Granite.SwitchModelButton (_("Do Not Disturb"));
not_disturb_switch.get_style_context ().add_class (Granite.STYLE_CLASS_H4_LABEL);

var dnd_switch_separator = new Gtk.Separator (Gtk.Orientation.HORIZONTAL) {
Expand Down Expand Up @@ -199,7 +187,7 @@ public class Notifications.Indicator : Wingpanel.Indicator {
}

private void set_display_icon_name () {
var dynamic_icon_style_context = dynamic_icon.get_style_context ();
unowned var dynamic_icon_style_context = dynamic_icon.get_style_context ();
if (notify_settings.get_boolean ("do-not-disturb")) {
dynamic_icon_style_context.add_class ("disabled");
} else if (nlist != null && nlist.app_entries.size > 0) {
Expand Down