diff --git a/data/gresource.xml b/data/gresource.xml
index 6a9d485e7..55b2f7393 100644
--- a/data/gresource.xml
+++ b/data/gresource.xml
@@ -1,10 +1,12 @@
- LocationMarker.svg
EditableLabel.css
EntryPopover.css
SourceRow.css
TaskRow.css
+
+ LocationMarker.svg
+
diff --git a/src/Application.vala b/src/Application.vala
index 385b18786..f60ae11ba 100644
--- a/src/Application.vala
+++ b/src/Application.vala
@@ -53,6 +53,21 @@ public class Tasks.Application : Gtk.Application {
GLib.Intl.textdomain (GETTEXT_PACKAGE);
add_main_option_entries (OPTIONS);
+ }
+
+ protected override void startup () {
+ base.startup ();
+
+ Hdy.init ();
+
+ unowned var granite_settings = Granite.Settings.get_default ();
+ unowned var gtk_settings = Gtk.Settings.get_default ();
+
+ gtk_settings.gtk_application_prefer_dark_theme = granite_settings.prefers_color_scheme == DARK;
+
+ granite_settings.notify["prefers-color-scheme"].connect ((obj) => {
+ gtk_settings.gtk_application_prefer_dark_theme = ((Granite.Settings) obj).prefers_color_scheme == DARK;
+ });
var quit_action = new SimpleAction ("quit", null);
quit_action.activate.connect (() => {
@@ -101,15 +116,6 @@ public class Tasks.Application : Gtk.Application {
main_window.maximize ();
}
- var granite_settings = Granite.Settings.get_default ();
- var gtk_settings = Gtk.Settings.get_default ();
-
- gtk_settings.gtk_application_prefer_dark_theme = granite_settings.prefers_color_scheme == Granite.Settings.ColorScheme.DARK;
-
- granite_settings.notify["prefers-color-scheme"].connect (() => {
- gtk_settings.gtk_application_prefer_dark_theme = granite_settings.prefers_color_scheme == Granite.Settings.ColorScheme.DARK;
- });
-
main_window.show_all ();
}
diff --git a/src/MainWindow.vala b/src/MainWindow.vala
index 7b81c9129..572c21288 100644
--- a/src/MainWindow.vala
+++ b/src/MainWindow.vala
@@ -32,11 +32,7 @@ public class Tasks.MainWindow : Hdy.ApplicationWindow {
}
static construct {
- Hdy.init ();
-
action_accelerators[ACTION_DELETE_SELECTED_LIST] = "BackSpace";
-
- Gtk.IconTheme.get_default ().add_resource_path ("/io/elementary/tasks");
}
construct {