felixfoertsch/gnome-night-theme-switcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Allow disabling GTK and shell variants switching

Browse Source
This commit is contained in:
Romain
2020-06-15 14:13:37 +00:00
parent 5a0c0d7f36
commit c17f5898d6
8 changed files with 384 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/GtkTheme.js
+45 -9
View File
@@ -37,13 +37,36 @@ if ( shell_minor_version <= 30 ) {
var GtkThemePreferences = class {
constructor() {
const settings = extensionUtils.getSettings();
const label = _('GTK theme');
const description = _('The extension will try to automatically detect the day and night variants of your GTK theme.\n\nIf the theme you use isn\'t supported, please <a href="https://gitlab.com/rmnvgr/nightthemeswitcher-gnome-shell-extension/-/issues">submit a request</a>. You can also manually set variants.');
const content = new SettingsList();
content.add_row(new SettingsListRow(_('Manual variants'), new ManualGtkVariantsControl()));
content.add_row(new SettingsListRow(_('Day variant'), new TimeGtkVariantControl('day')));
content.add_row(new SettingsListRow(_('Night variant'), new TimeGtkVariantControl('night')));
content.add_row(new SettingsListRow(_('Switch GTK variants'), new GtkVariantsEnabledControl()));
const manual_variants_row = new SettingsListRow(_('Manual variants'), new ManualGtkVariantsControl());
settings.bind(
'gtk-variants-enabled',
manual_variants_row,
'sensitive',
Gio.SettingsBindFlags.DEFAULT
);
content.add_row(manual_variants_row);
const day_variant_row = new SettingsListRow(_('Day variant'), new TimeGtkVariantControl('day'));
const update_day_variant_row_sensitivity = () => day_variant_row.set_sensitive(!!(settings.get_boolean('gtk-variants-enabled') && settings.get_boolean('manual-gtk-variants')));
settings.connect('changed::gtk-variants-enabled', update_day_variant_row_sensitivity);
settings.connect('changed::manual-gtk-variants', update_day_variant_row_sensitivity)
update_day_variant_row_sensitivity();
content.add_row(day_variant_row);
const night_variant_row = new SettingsListRow(_('Night variant'), new TimeGtkVariantControl('night'));
const update_night_variant_row_sensitivity = () => night_variant_row.set_sensitive(!!(settings.get_boolean('gtk-variants-enabled') && settings.get_boolean('manual-gtk-variants')));
settings.connect('changed::gtk-variants-enabled', update_night_variant_row_sensitivity);
settings.connect('changed::manual-gtk-variants', update_night_variant_row_sensitivity)
update_night_variant_row_sensitivity();
content.add_row(night_variant_row);
return new SettingsPage(label, description, content);
}
@@ -51,6 +74,25 @@ var GtkThemePreferences = class {
}
class GtkVariantsEnabledControl {
constructor() {
const settings = extensionUtils.getSettings();
const toggle = new Gtk.Switch({
active: settings.get_boolean('gtk-variants-enabled')
});
settings.bind(
'gtk-variants-enabled',
toggle,
'active',
Gio.SettingsBindFlags.DEFAULT
);
return toggle;
}
}
class ManualGtkVariantsControl {
constructor() {
@@ -83,12 +125,6 @@ class TimeGtkVariantControl {
'active-id',
Gio.SettingsBindFlags.DEFAULT
);
settings.bind(
'manual-gtk-variants',
combo,
'sensitive',
Gio.SettingsBindFlags.DEFAULT
);
return combo;
}
src/preferences/ShellTheme.js
+46 -9
View File
@@ -37,19 +37,62 @@ if ( shell_minor_version <= 30 ) {
var ShellThemePreferences = class {
constructor() {
const settings = extensionUtils.getSettings();
const label = _('Shell theme');
const description = _('The extension will try to automatically detect the day and night variants of your GNOME Shell theme.\n\nIf the theme you use isn\'t supported, please <a href="https://gitlab.com/rmnvgr/nightthemeswitcher-gnome-shell-extension/-/issues">submit a request</a>. You can also manually set variants.');
const content = new SettingsList();
content.add_row(new SettingsListRow(_('Manual variants'), new ManualShellVariantsControl()));
content.add_row(new SettingsListRow(_('Day variant'), new TimeShellVariantControl('day')));
content.add_row(new SettingsListRow(_('Night variant'), new TimeShellVariantControl('night')));
content.add_row(new SettingsListRow(_('Switch Shell variants'), new ShellVariantsEnabledControl()));
const manual_variants_row = new SettingsListRow(_('Manual variants'), new ManualShellVariantsControl());
settings.bind(
'shell-variants-enabled',
manual_variants_row,
'sensitive',
Gio.SettingsBindFlags.DEFAULT
);
content.add_row(manual_variants_row);
const day_variant_row = new SettingsListRow(_('Day variant'), new TimeShellVariantControl('day'));
const update_day_variant_row_sensitivity = () => day_variant_row.set_sensitive(!!(settings.get_boolean('shell-variants-enabled') && settings.get_boolean('manual-shell-variants')));
settings.connect('changed::shell-variants-enabled', update_day_variant_row_sensitivity);
settings.connect('changed::manual-shell-variants', update_day_variant_row_sensitivity)
update_day_variant_row_sensitivity();
content.add_row(day_variant_row);
const night_variant_row = new SettingsListRow(_('Night variant'), new TimeShellVariantControl('night'));
const update_night_variant_row_sensitivity = () => night_variant_row.set_sensitive(!!(settings.get_boolean('shell-variants-enabled') && settings.get_boolean('manual-shell-variants')));
settings.connect('changed::shell-variants-enabled', update_night_variant_row_sensitivity);
settings.connect('changed::manual-shell-variants', update_night_variant_row_sensitivity)
update_night_variant_row_sensitivity();
content.add_row(night_variant_row);
return new SettingsPage(label, description, content);
}
}
class ShellVariantsEnabledControl {
constructor() {
const settings = extensionUtils.getSettings();
const toggle = new Gtk.Switch({
active: settings.get_boolean('shell-variants-enabled')
});
settings.bind(
'shell-variants-enabled',
toggle,
'active',
Gio.SettingsBindFlags.DEFAULT
);
return toggle;
}
}
class ManualShellVariantsControl {
constructor() {
@@ -82,12 +125,6 @@ class TimeShellVariantControl {
'active-id',
Gio.SettingsBindFlags.DEFAULT
);
settings.bind(
'manual-shell-variants',
combo,
'sensitive',
Gio.SettingsBindFlags.DEFAULT
);
return combo;
}