Skip to content

Made desktopfolder adapt to changes in elementaryOS 6 #328

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

Open
friberk wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Made desktopfolder adapt to changes in elementaryOS 6 #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02602a8
Adapt to eOS 6 settings schema
friberk Jul 26, 2021
c7afa83
Added eOS 6 dark mode support
friberk Jul 26, 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
1 change: 1 addition & 0 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ executable(
dependency('glib-2.0'),
dependency('gobject-2.0'),
dependency('gtk+-3.0',version:'>=3.22'),
dependency('granite', version: '>= 6.0.0'),
dependency('cairo'),
dependency('json-glib-1.0'),
dependency('gdk-pixbuf-2.0'),
Expand Down
17 changes: 15 additions & 2 deletions src/Application.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,16 @@ public class DesktopFolderApp : Gtk.Application {
* @description activate life cycle
*/
protected override void activate () {
// elementary OS 6 dark mode support
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;
});

base.activate ();
debug ("activate event");
this.hold ();
Expand Down Expand Up @@ -128,8 +138,11 @@ public class DesktopFolderApp : Gtk.Application {
if (f_check_elementary.query_exists ()) {
// it seems we can't control an error reading settings!!
// loki -> GLib.Settings elementary_files_settings = new GLib.Settings ("org.pantheon.files.preferences");
GLib.Settings elementary_files_settings = new GLib.Settings ("io.elementary.files.preferences");
single_click = elementary_files_settings.get_boolean ("single-click");

// single-click option is not available in elementary-files 6.0.0. So, set it to false by default.
// GLib.Settings elementary_files_settings = new GLib.Settings ("io.elementary.files.preferences");
// single_click = elementary_files_settings.get_boolean ("single-click");
single_click = false;
}
} catch (Error error) {
// we don't have any files settings, using default config
Expand Down