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

Support GNOME 40

Browse Source
This commit is contained in:
Romain
2021-03-17 12:31:58 +00:00
parent 6cd80dcf4a
commit 3ec21e76d0
31 changed files with 611 additions and 2405 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.eslintignore
-1
View File
@@ -1 +0,0 @@
src/convenience.js
Makefile
-2
View File
@@ -28,9 +28,7 @@ build: build-clean
mkdir -p ./build
gnome-extensions pack \
--extra-source=../LICENSE \
--extra-source=./compat.js \
--extra-source=./config.js \
--extra-source=./convenience.js \
--extra-source=./utils.js \
--extra-source=./icons/ \
--extra-source=./modules/ \
src/compat.js
-114
View File
@@ -1,114 +0,0 @@
/*
Night Theme Switcher Gnome Shell extension
Copyright (C) 2020 Romain Vigier
This program is free software: you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Foundation, either version 3 of the License, or (at your option) any later
version.
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with
this program. If not, see <http s ://www.gnu.org/licenses/>.
*/
const { extensionUtils } = imports.misc;
const Me = extensionUtils.getCurrentExtension();
const shellMinorVersion = parseInt(imports.misc.config.PACKAGE_VERSION.split('.')[1]) || parseInt(imports.misc.config.PACKAGE_VERSION.split('.')[0]);
/**
* Initialize translations for a given gettext domain.
*
* @param {string} domain Gettext domain.
*/
function initTranslations(domain) {
if (shellMinorVersion <= 30)
return Me.imports.convenience.initTranslations(domain);
else
return extensionUtils.initTranslations(domain);
}
/**
* Get the Extension Manager initialization status.
*
* @returns {boolean} `true` if the Extension Manager is initialized, `false`
* otherwise.
*/
function extensionManagerInitialized() {
if (shellMinorVersion > 32)
return imports.ui.main.extensionManager._initialized;
else
return imports.ui.extensionSystem.initted;
}
/**
* Get a specific extension from the Extension Manager.
*
* @param {string} uuid UUID of the extension.
* @returns {(object|null)} The desired extension or `null` if it doesn't exist.
*/
function extensionManagerLookup(uuid) {
try {
if (shellMinorVersion > 32)
return imports.ui.main.extensionManager.lookup(uuid);
else
return extensionUtils.extensions[uuid] || null;
} catch (_) {
return null;
}
}
/**
* Get GSettings for the given schema ID.
*
* @param {(string|null)} schema The GSettings schema ID. If not given, will use
* the extension's schema ID.
*/
function getSettings(schema) {
if (shellMinorVersion <= 30)
return Me.imports.convenience.getSettings(schema);
else
return extensionUtils.getSettings(schema);
}
/**
* Get the extension's GSettings.
*/
function getExtensionSettings() {
return getSettings();
}
/**
* Get the KeyBinding AutoRepeat flag.
*/
function keyBindingAutoRepeat() {
// if version is less then 3.30 the keybinding flags are NONE
if (shellMinorVersion < 30)
return imports.gi.Meta.KeyBindingFlags.NONE;
else
return imports.gi.Meta.KeyBindingFlags.IGNORE_AUTOREPEAT;
}
/**
* Get the actor from a given subject.
*
* @param {object} subject The object to get the actor from.
*/
function getActor(subject) {
if (shellMinorVersion > 34)
return subject;
else
return subject.actor;
}
src/convenience.js
-91
View File
@@ -1,91 +0,0 @@
/*
Copyright (c) 2011-2012, Giovanni Campagna <scampa.giovanni@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the GNOME nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
const Gettext = imports.gettext;
const Gio = imports.gi.Gio;
const Config = imports.misc.config;
const ExtensionUtils = imports.misc.extensionUtils;
/**
* initTranslations:
* @domain: (optional): the gettext domain to use
*
* Initialize Gettext to load translations from extensionsdir/locale.
* If @domain is not provided, it will be taken from metadata['gettext-domain']
*/
function initTranslations(domain) {
let extension = ExtensionUtils.getCurrentExtension();
domain = domain || extension.metadata['gettext-domain'];
// check if this extension was built with "make zip-file", and thus
// has the locale files in a subfolder
// otherwise assume that extension has been installed in the
// same prefix as gnome-shell
let localeDir = extension.dir.get_child('locale');
if (localeDir.query_exists(null))
Gettext.bindtextdomain(domain, localeDir.get_path());
else
Gettext.bindtextdomain(domain, Config.LOCALEDIR);
}
/**
* getSettings:
* @schema: (optional): the GSettings schema id
*
* Builds and return a GSettings schema for @schema, using schema files
* in extensionsdir/schemas. If @schema is not provided, it is taken from
* metadata['settings-schema'].
*/
function getSettings(schema) {
let extension = ExtensionUtils.getCurrentExtension();
schema = schema || extension.metadata['settings-schema'];
const GioSSS = Gio.SettingsSchemaSource;
// check if this extension was built with "make zip-file", and thus
// has the schema files in a subfolder
// otherwise assume that extension has been installed in the
// same prefix as gnome-shell (and therefore schemas are available
// in the standard folders)
let schemaDir = extension.dir.get_child('schemas');
let schemaSource;
if (schemaDir.query_exists(null))
schemaSource = GioSSS.new_from_directory(schemaDir.get_path(),
GioSSS.get_default(),
false);
else
schemaSource = GioSSS.get_default();
let schemaObj = schemaSource.lookup(schema, true);
if (!schemaObj)
throw new Error('Schema ' + schema + ' could not be found for extension '
+ extension.metadata.uuid + '. Please check your installation.');
return new Gio.Settings({ settings_schema: schemaObj });
}
src/extension.js
+3 -3
View File
@@ -20,10 +20,10 @@ this program. If not, see <http s ://www.gnu.org/licenses/>.
const { GLib } = imports.gi;
const { extensionUtils } = imports.misc;
const { extensionManager } = imports.ui.main;
const Me = extensionUtils.getCurrentExtension();
const compat = Me.imports.compat;
const { logDebug } = Me.imports.utils;
const { Settings } = Me.imports.settings.Settings;
const { Timer } = Me.imports.modules.Timer;
@@ -51,7 +51,7 @@ var commander = null;
*/
function init() {
logDebug('Initializing extension...');
compat.initTranslations(Me.metadata['gettext-domain']);
extensionUtils.initTranslations(Me.metadata['gettext-domain']);
logDebug('Extension initialized.');
}
@@ -124,7 +124,7 @@ function _waitForExtensionManager() {
return new Promise(resolve => {
logDebug('Waiting for Extension Manager initialization...');
GLib.idle_add(GLib.PRIORITY_DEFAULT_IDLE, () => {
while (!compat.extensionManagerInitialized())
while (!extensionManager._initialized)
continue;
return false;
});
src/metadata.json
+1 -1
View File
@@ -5,6 +5,6 @@
"gettext-domain": "nightthemeswitcher@romainvigier.fr",
"settings-schema": "org.gnome.shell.extensions.nightthemeswitcher",
"url": "https://gitlab.com/rmnvgr/nightthemeswitcher-gnome-shell-extension/",
"shell-version": ["3.28", "3.30", "3.32", "3.34", "3.36", "3.38"],
"shell-version": ["40"],
"version": 46
}
src/modules/TimerOndemand.js
+5 -7
View File
@@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with
this program. If not, see <http s ://www.gnu.org/licenses/>.
*/
const { Gio, GLib, Shell, St } = imports.gi;
const { Gio, GLib, Meta, Shell, St } = imports.gi;
const { extensionUtils } = imports.misc;
const Signals = imports.signals;
@@ -29,7 +29,6 @@ const Me = extensionUtils.getCurrentExtension();
const e = Me.imports.extension;
const { logDebug, findShellAggregateMenuItemPosition } = Me.imports.utils;
const { keyBindingAutoRepeat, getActor } = Me.imports.compat;
const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']);
const _ = Gettext.gettext;
@@ -129,7 +128,7 @@ var TimerOndemand = class {
main.wm.addKeybinding(
'nightthemeswitcher-ondemand-keybinding',
e.settings.time.settings,
keyBindingAutoRepeat(),
Meta.KeyBindingFlags.IGNORE_AUTOREPEAT,
Shell.ActionMode.NORMAL | Shell.ActionMode.OVERVIEW,
this._toggleTime.bind(this)
);
@@ -179,13 +178,12 @@ var TimerOndemand = class {
style_class: 'system-status-icon',
});
this._button = new PanelMenuButton(0.0);
const buttonActor = getActor(this._button);
buttonActor.add_actor(icon);
this._button.add_actor(icon);
this._button.update = () => {
icon.gicon = this._getIconForTime(e.timer.time);
};
buttonActor.connect('button-press-event', () => this._toggleTime());
buttonActor.connect('touch-event', () => this._toggleTime());
this._button.connect('button-press-event', () => this._toggleTime());
this._button.connect('touch-event', () => this._toggleTime());
main.panel.addToStatusArea('NightThemeSwitcherButton', this._button);
logDebug('Added On-demand Timer button to the panel.');
}
src/preferences/Backgrounds.js
+24 -28
View File
@@ -54,24 +54,22 @@ var BackgroundsPreferences = class {
Gio.SettingsBindFlags.DEFAULT
);
const dayChooserButton = this._builder.get_object('day_chooser_button');
const dayChooser = this._builder.get_object('day_chooser');
const dayBackgroundPreview = this._builder.get_object('day_background_preview');
const updateDayChooserUri = () => {
dayChooser.set_uri(settings.backgrounds.day);
const updateDayChooserButtonLabel = () => {
dayChooserButton.set_label(settings.backgrounds.day ? GLib.filename_display_basename(settings.backgrounds.day) : _('Choose...'));
};
settings.backgrounds.connect('day-changed', () => updateDayChooserUri());
dayChooser.connect('update-preview', () => {
const file = dayChooser.get_preview_filename();
const allowedContentTypes = ['image/jpeg', 'image/png', 'image/tiff', 'application/xml'];
if (allowedContentTypes.includes(Gio.content_type_guess(file, null)[0])) {
const pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(file, 256, 256);
dayBackgroundPreview.set_from_pixbuf(pixbuf);
}
settings.backgrounds.connect('day-changed', () => updateDayChooserButtonLabel());
dayChooser.connect('response', (_fileChooser, responseId) => {
if (responseId !== Gtk.ResponseType.ACCEPT)
return;
settings.backgrounds.day = dayChooser.get_file().get_uri();
});
dayChooser.connect('file-set', () => {
settings.backgrounds.day = dayChooser.get_uri();
dayChooserButton.connect('clicked', () => {
dayChooser.set_transient_for(dayChooserButton.get_root());
dayChooser.show();
});
updateDayChooserUri();
updateDayChooserButtonLabel();
const dayClearButton = this._builder.get_object('day_clear_button');
dayClearButton.connect('clicked', () => {
@@ -83,24 +81,22 @@ var BackgroundsPreferences = class {
settings.backgrounds.connect('day-changed', () => updateDayClearButtonSensitivity());
updateDayClearButtonSensitivity();
const nightChooserButton = this._builder.get_object('night_chooser_button');
const nightChooser = this._builder.get_object('night_chooser');
const nightBackgroundPreview = this._builder.get_object('night_background_preview');
const updateNightChooserUri = () => {
nightChooser.set_uri(settings.backgrounds.night);
const updateNightChooserButtonLabel = () => {
nightChooserButton.set_label(settings.backgrounds.night ? GLib.filename_display_basename(settings.backgrounds.night) : _('Choose...'));
};
settings.backgrounds.connect('night-changed', () => updateNightChooserUri());
nightChooser.connect('update-preview', () => {
const file = nightChooser.get_preview_filename();
const allowedContentTypes = ['image/jpeg', 'image/png', 'image/tiff', 'application/xml'];
if (allowedContentTypes.includes(Gio.content_type_guess(file, null)[0])) {
const pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(file, 256, 256);
nightBackgroundPreview.set_from_pixbuf(pixbuf);
}
settings.backgrounds.connect('night-changed', () => updateNightChooserButtonLabel());
nightChooser.connect('response', (_fileChooser, responseId) => {
if (responseId !== Gtk.ResponseType.ACCEPT)
return;
settings.backgrounds.night = nightChooser.get_file().get_uri();
});
nightChooser.connect('file-set', () => {
settings.backgrounds.night = nightChooser.get_uri();
nightChooserButton.connect('clicked', () => {
nightChooser.set_transient_for(nightChooserButton.get_root());
nightChooser.show();
});
updateNightChooserUri();
updateNightChooserButtonLabel();
const nightClearButton = this._builder.get_object('night_clear_button');
nightClearButton.connect('clicked', () => {
src/preferences/OndemandKeyboardShortcutDialog.js
+2 -19
View File
@@ -40,28 +40,16 @@ var OndemandKeyboardShortcutDialog = class {
}
_connectSettings(settings) {
this.widget.connect('key-press-event', (_widget, event) => {
const state = event.get_state()[1];
const eventController = this._builder.get_object('event-controller');
eventController.connect('key-pressed', (_widget, keyval, keycode, state) => {
let mask = state & Gtk.accelerator_get_default_mod_mask();
mask &= ~Gdk.ModifierType.LOCK_MASK;
const keycode = event.get_keycode()[1];
const eventKeyval = event.get_keyval()[1];
let keyval = Gdk.keyval_to_lower(eventKeyval);
if (mask === 0 && keyval === Gdk.KEY_Escape) {
this.widget.visible = false;
return Gdk.EVENT_STOP;
}
if (keyval === Gdk.KEY_ISO_Left_Tab)
keyval = Gdk.KEY_Tab;
if (keyval !== eventKeyval)
mask |= Gdk.ModifierType.SHIFT_MASK;
if (keyval === Gdk.KEY_Sys_Req && (mask & Gdk.ModifierType.MOD1_MASK) !== 0)
keyval = Gdk.KEY_Print;
if (
!utils.isBindingValid({ mask, keycode, keyval }) ||
!utils.isAccelValid({ mask, keyval })
@@ -78,10 +66,5 @@ var OndemandKeyboardShortcutDialog = class {
this.widget.close();
return Gdk.EVENT_STOP;
});
const cancelButton = this._builder.get_object('cancel_button');
cancelButton.connect('clicked', () => {
this.widget.close();
});
}
};
src/preferences/Schedule.js
+1 -1
View File
@@ -218,7 +218,7 @@ var SchedulePreferences = class {
settings.time.connect('ondemand-keybinding-changed', () => updateOndemandShortcutButtonLabel());
ondemandShortcutButton.connect('clicked', () => {
const dialog = new OndemandKeyboardShortcutDialog(settings);
dialog.set_transient_for(this.widget.get_toplevel());
dialog.set_transient_for(this.widget.get_root());
dialog.present();
});
updateOndemandShortcutButtonLabel();
src/preferences/ui/backgrounds.ui
+51 -212
View File
@@ -1,39 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.36.0
Copyright (C) 2020
This file is part of Night Theme Switcher.
Night Theme Switcher is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Night Theme Switcher is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Night Theme Switcher. If not, see <http://www.gnu.org/licenses/>.
Author: Romain Vigier
-->
<interface domain="nightthemeswitcher@romainvigier.fr">
<requires lib="gtk+" version="3.22"/>
<!-- interface-license-type gplv3 -->
<!-- interface-name Night Theme Switcher -->
<!-- interface-copyright 2020 -->
<!-- interface-authors Romain Vigier -->
<object class="GtkImage" id="day_background_preview">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixel_size">256</property>
<property name="icon_name">image-missing</property>
<property name="icon_size">0</property>
</object>
<requires lib="gtk" version="4.0"/>
<object class="GtkFileFilter" id="image_filter">
<mime-types>
<mime-type>image/jpeg</mime-type>
@@ -42,21 +9,24 @@ Author: Romain Vigier
<mime-type>application/xml</mime-type>
</mime-types>
</object>
<object class="GtkImage" id="night_background_preview">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixel_size">256</property>
<property name="icon_name">image-missing</property>
<property name="icon_size">0</property>
<object class="GtkFileChooserNative" id="day_chooser">
<property name="modal">1</property>
<property name="action">open</property>
<property name="title" translatable="yes">Select your background image</property>
<property name="select-multiple">0</property>
<property name="filter">image_filter</property>
</object>
<object class="GtkFileChooserNative" id="night_chooser">
<property name="modal">1</property>
<property name="action">open</property>
<property name="title" translatable="yes">Select your background image</property>
<property name="select-multiple">0</property>
<property name="filter">image_filter</property>
</object>
<object class="GtkBox" id="backgrounds">
<property name="width_request">600</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="valign">start</property>
<property name="margin_left">36</property>
<property name="margin_right">36</property>
<property name="margin_start">36</property>
<property name="margin_end">36</property>
<property name="margin_top">36</property>
@@ -66,26 +36,15 @@ Author: Romain Vigier
<property name="baseline_position">top</property>
<child>
<object class="GtkFrame" id="enabled">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<child>
<property name="child">
<object class="GtkListBox">
<property name="width_request">600</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="selection_mode">none</property>
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<child>
<property name="activatable">0</property>
<property name="child">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">16</property>
<property name="margin_right">16</property>
<property name="margin_start">16</property>
<property name="margin_end">16</property>
<property name="margin_top">16</property>
@@ -93,89 +52,48 @@ Author: Romain Vigier
<property name="spacing">30</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Switch backgrounds</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSwitch" id="enabled_switch">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">1</property>
<property name="halign">end</property>
<property name="valign">center</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</property>
</object>
</child>
</object>
</child>
<child type="label_item">
<placeholder/>
</child>
</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="choosers">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">8</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Backgrounds</property>
<attributes>
<attribute name="weight" value="bold"/>
<attribute name="weight" value="bold"></attribute>
</attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<child>
<property name="child">
<object class="GtkListBox">
<property name="width_request">600</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="selection_mode">none</property>
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<child>
<property name="activatable">0</property>
<property name="child">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">16</property>
<property name="margin_right">16</property>
<property name="margin_start">16</property>
<property name="margin_end">16</property>
<property name="margin_top">16</property>
@@ -183,91 +101,53 @@ Author: Romain Vigier
<property name="spacing">30</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Day background</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">1</property>
<property name="halign">end</property>
<property name="spacing">8</property>
<child>
<object class="GtkFileChooserButton" id="day_chooser">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="valign">center</property>
<property name="filter">image_filter</property>
<property name="preview_widget">day_background_preview</property>
<property name="use_preview_label">False</property>
<property name="title" translatable="yes">Select your background image</property>
<object class="GtkButton" id="day_chooser_button">
<property name="halign">end</property>
<property name="valign">center</property>
<property name="label" translatable="yes">Choose...</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="day_clear_button">
<property name="label" translatable="yes">Clear</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="receives_default">1</property>
<style>
<class name="destructive-action"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<style>
<class name="linked"/>
</style>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<property name="selectable">False</property>
<child>
<property name="activatable">0</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<child>
<property name="activatable">0</property>
<property name="child">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">16</property>
<property name="margin_right">16</property>
<property name="margin_start">16</property>
<property name="margin_end">16</property>
<property name="margin_top">16</property>
@@ -275,84 +155,43 @@ Author: Romain Vigier
<property name="spacing">30</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Night background</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">1</property>
<property name="halign">end</property>
<property name="spacing">8</property>
<child>
<object class="GtkFileChooserButton" id="night_chooser">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="valign">center</property>
<property name="filter">image_filter</property>
<property name="preview_widget">night_background_preview</property>
<property name="use_preview_label">False</property>
<property name="title" translatable="yes">Select your background image</property>
<object class="GtkButton" id="night_chooser_button">
<property name="halign">end</property>
<property name="valign">center</property>
<property name="label" translatable="yes">Choose...</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="night_clear_button">
<property name="label" translatable="yes">Clear</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="receives_default">1</property>
<style>
<class name="destructive-action"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<style>
<class name="linked"/>
</style>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</property>
</object>
</child>
</object>
</child>
<child type="label_item">
<placeholder/>
</child>
</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</interface>
src/preferences/ui/commands.ui
+29 -178
View File
@@ -1,15 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.36.0 -->
<interface domain="nightthemeswitcher@romainvigier.fr">
<requires lib="gtk+" version="3.22"/>
<requires lib="gtk" version="4.0"/>
<object class="GtkBox" id="commands">
<property name="width_request">600</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="valign">start</property>
<property name="margin_left">36</property>
<property name="margin_right">36</property>
<property name="margin_start">36</property>
<property name="margin_end">36</property>
<property name="margin_top">36</property>
@@ -19,26 +14,15 @@
<property name="baseline_position">top</property>
<child>
<object class="GtkFrame" id="enabled">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<child>
<property name="child">
<object class="GtkListBox">
<property name="width_request">600</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="selection_mode">none</property>
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<child>
<property name="activatable">0</property>
<property name="child">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">16</property>
<property name="margin_right">16</property>
<property name="margin_start">16</property>
<property name="margin_end">16</property>
<property name="margin_top">16</property>
@@ -46,122 +30,68 @@
<property name="spacing">30</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Run commands</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="halign">start</property>
<property name="label" translatable="yes">&lt;small&gt;You can set custom commands that will be run when the time of the day changes.&lt;/small&gt;</property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
<property name="use_markup">1</property>
<property name="wrap">1</property>
<property name="max_width_chars">50</property>
<property name="xalign">0</property>
<style>
<class name="dim-label"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSwitch" id="enabled_switch">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">1</property>
<property name="halign">end</property>
<property name="valign">center</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</property>
</object>
</child>
</object>
</child>
<child type="label_item">
<placeholder/>
</child>
</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="entries">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">8</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Commands</property>
<attributes>
<attribute name="weight" value="bold"/>
<attribute name="weight" value="bold"></attribute>
</attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<child>
<property name="child">
<object class="GtkListBox">
<property name="width_request">600</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="selection_mode">none</property>
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<child>
<property name="activatable">0</property>
<property name="child">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">16</property>
<property name="margin_right">16</property>
<property name="margin_start">16</property>
<property name="margin_end">16</property>
<property name="margin_top">16</property>
@@ -169,93 +99,55 @@
<property name="spacing">30</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Sunrise command</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">1</property>
<property name="halign">end</property>
<child>
<object class="GtkEntry" id="sunrise_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
<property name="valign">center</property>
<property name="width_chars">28</property>
<property name="truncate_multiline">True</property>
<property name="placeholder_text" translatable="yes">notify-send "Hello sunshine!"</property>
<property name="truncate_multiline">1</property>
<property name="placeholder_text" translatable="yes">notify-send &quot;Hello sunshine!&quot;</property>
<property name="input_purpose">terminal</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="sunrise_clear_button">
<property name="label" translatable="yes">Clear</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<style>
<class name="destructive-action"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<style>
<class name="linked"/>
</style>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<property name="selectable">False</property>
<child>
<property name="activatable">0</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<child>
<property name="activatable">0</property>
<property name="child">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">16</property>
<property name="margin_right">16</property>
<property name="margin_start">16</property>
<property name="margin_end">16</property>
<property name="margin_top">16</property>
@@ -263,86 +155,45 @@
<property name="spacing">30</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Sunset command</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">1</property>
<property name="halign">end</property>
<child>
<object class="GtkEntry" id="sunset_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
<property name="valign">center</property>
<property name="width_chars">28</property>
<property name="truncate_multiline">True</property>
<property name="placeholder_text" translatable="yes">notify-send "Hello moonshine!"</property>
<property name="truncate_multiline">1</property>
<property name="placeholder_text" translatable="yes">notify-send &quot;Hello moonshine!&quot;</property>
<property name="input_purpose">terminal</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="sunset_clear_button">
<property name="label" translatable="yes">Clear</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<style>
<class name="destructive-action"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<style>
<class name="linked"/>
</style>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</property>
</object>
</child>
</object>
</child>
<child type="label_item">
<placeholder/>
</child>
</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</interface>
src/preferences/ui/cursor_theme.ui
+23 -154
View File
@@ -1,40 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.36.0
Copyright (C) 2020
This file is part of Night Theme Switcher.
Night Theme Switcher is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Night Theme Switcher is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Night Theme Switcher. If not, see <http://www.gnu.org/licenses/>.
Author: Romain Vigier
-->
<interface domain="nightthemeswitcher@romainvigier.fr">
<requires lib="gtk+" version="3.22"/>
<!-- interface-license-type gplv3 -->
<!-- interface-name Night Theme Switcher -->
<!-- interface-copyright 2020 -->
<!-- interface-authors Romain Vigier -->
<requires lib="gtk" version="4.0"/>
<object class="GtkBox" id="cursor_theme">
<property name="width_request">600</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="valign">start</property>
<property name="margin_left">36</property>
<property name="margin_right">36</property>
<property name="margin_start">36</property>
<property name="margin_end">36</property>
<property name="margin_top">36</property>
@@ -44,26 +14,15 @@ Author: Romain Vigier
<property name="baseline_position">top</property>
<child>
<object class="GtkFrame" id="enabled">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<child>
<property name="child">
<object class="GtkListBox">
<property name="width_request">600</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="selection_mode">none</property>
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<child>
<property name="activatable">0</property>
<property name="child">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">16</property>
<property name="margin_right">16</property>
<property name="margin_start">16</property>
<property name="margin_end">16</property>
<property name="margin_top">16</property>
@@ -71,90 +30,49 @@ Author: Romain Vigier
<property name="spacing">30</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Switch cursor variants</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSwitch" id="enabled_switch">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">1</property>
<property name="halign">end</property>
<property name="valign">center</property>
<property name="active">True</property>
<property name="active">1</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</property>
</object>
</child>
</object>
</child>
<child type="label_item">
<placeholder/>
</child>
</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="variants">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">8</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Variants</property>
<attributes>
<attribute name="weight" value="bold"/>
<attribute name="weight" value="bold"></attribute>
</attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<child>
<property name="child">
<object class="GtkListBox">
<property name="width_request">600</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="selection_mode">none</property>
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<child>
<property name="activatable">0</property>
<property name="child">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">16</property>
<property name="margin_right">16</property>
<property name="margin_start">16</property>
<property name="margin_end">16</property>
<property name="margin_top">16</property>
@@ -162,58 +80,35 @@ Author: Romain Vigier
<property name="spacing">30</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Day variant</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="day_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">1</property>
<property name="halign">end</property>
<property name="valign">center</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<property name="selectable">False</property>
<child>
<property name="activatable">0</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<child>
<property name="activatable">0</property>
<property name="child">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">16</property>
<property name="margin_right">16</property>
<property name="margin_start">16</property>
<property name="margin_end">16</property>
<property name="margin_top">16</property>
@@ -221,51 +116,25 @@ Author: Romain Vigier
<property name="spacing">30</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Night variant</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="night_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">1</property>
<property name="halign">end</property>
<property name="valign">center</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</property>
</object>
</child>
</object>
</child>
<child type="label_item">
<placeholder/>
</child>
</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</interface>
src/preferences/ui/gtk_theme.ui
+33 -206
View File
@@ -1,40 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.36.0
Copyright (C) 2020
This file is part of Night Theme Switcher.
Night Theme Switcher is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Night Theme Switcher is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Night Theme Switcher. If not, see <http://www.gnu.org/licenses/>.
Author: Romain Vigier
-->
<interface domain="nightthemeswitcher@romainvigier.fr">
<requires lib="gtk+" version="3.22"/>
<!-- interface-license-type gplv3 -->
<!-- interface-name Night Theme Switcher -->
<!-- interface-copyright 2020 -->
<!-- interface-authors Romain Vigier -->
<requires lib="gtk" version="4.0"/>
<object class="GtkBox" id="gtk_theme">
<property name="width_request">600</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="valign">start</property>
<property name="margin_left">36</property>
<property name="margin_right">36</property>
<property name="margin_start">36</property>
<property name="margin_end">36</property>
<property name="margin_top">36</property>
@@ -44,26 +14,15 @@ Author: Romain Vigier
<property name="baseline_position">top</property>
<child>
<object class="GtkFrame" id="enabled">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<child>
<property name="child">
<object class="GtkListBox">
<property name="width_request">600</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="selection_mode">none</property>
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<child>
<property name="activatable">0</property>
<property name="child">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">16</property>
<property name="margin_right">16</property>
<property name="margin_start">16</property>
<property name="margin_end">16</property>
<property name="margin_top">16</property>
@@ -71,68 +30,39 @@ Author: Romain Vigier
<property name="spacing">30</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Switch GTK variants</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSwitch" id="enabled_switch">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">1</property>
<property name="halign">end</property>
<property name="valign">center</property>
<property name="active">True</property>
<property name="active">1</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</property>
</object>
</child>
</object>
</child>
</property>
<child type="label_item">
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="manual">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<child>
<property name="child">
<object class="GtkListBox">
<property name="width_request">600</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="selection_mode">none</property>
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<child>
<property name="activatable">0</property>
<property name="child">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">16</property>
<property name="margin_right">16</property>
<property name="margin_start">16</property>
<property name="margin_end">16</property>
<property name="margin_top">16</property>
@@ -140,122 +70,68 @@ Author: Romain Vigier
<property name="spacing">30</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Manual variants</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
<property name="halign">start</property>
<property name="label" translatable="yes">&lt;small&gt;You can manually set variants if the extension cannot automatically detect the day and night variants of your GTK theme. Please &lt;a href="https://gitlab.com/rmnvgr/nightthemeswitcher-gnome-shell-extension/-/issues"&gt;submit a request&lt;/a&gt; to get your theme supported.&lt;/small&gt;</property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
<property name="label" translatable="yes">&lt;small&gt;You can manually set variants if the extension cannot automatically detect the day and night variants of your GTK theme. Please &lt;a href=&quot;https://gitlab.com/rmnvgr/nightthemeswitcher-gnome-shell-extension/-/issues&quot;&gt;submit a request&lt;/a&gt; to get your theme supported.&lt;/small&gt;</property>
<property name="use_markup">1</property>
<property name="wrap">1</property>
<property name="max_width_chars">50</property>
<property name="xalign">0</property>
<style>
<class name="dim-label"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSwitch" id="manual_switch">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">1</property>
<property name="halign">end</property>
<property name="valign">center</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</property>
</object>
</child>
</object>
</child>
<child type="label_item">
<placeholder/>
</child>
</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkBox" id="variants">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">8</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Manual variants</property>
<attributes>
<attribute name="weight" value="bold"/>
<attribute name="weight" value="bold"></attribute>
</attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<child>
<property name="child">
<object class="GtkListBox">
<property name="width_request">600</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="selection_mode">none</property>
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<child>
<property name="activatable">0</property>
<property name="child">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">16</property>
<property name="margin_right">16</property>
<property name="margin_start">16</property>
<property name="margin_end">16</property>
<property name="margin_top">16</property>
@@ -263,58 +139,35 @@ Author: Romain Vigier
<property name="spacing">30</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Day variant</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="day_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">1</property>
<property name="halign">end</property>
<property name="valign">center</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<property name="selectable">False</property>
<child>
<property name="activatable">0</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<child>
<property name="activatable">0</property>
<property name="child">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">16</property>
<property name="margin_right">16</property>
<property name="margin_start">16</property>
<property name="margin_end">16</property>
<property name="margin_top">16</property>
@@ -322,51 +175,25 @@ Author: Romain Vigier
<property name="spacing">30</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Night variant</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="night_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">1</property>
<property name="halign">end</property>
<property name="valign">center</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</property>
</object>
</child>
</object>
</child>
<child type="label_item">
<placeholder/>
</child>
</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
</interface>
src/preferences/ui/headerbar.ui
+31 -238
View File
@@ -1,412 +1,205 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.36.0
Copyright (C) 2020
This file is part of Night Theme Switcher.
Night Theme Switcher is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Night Theme Switcher is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Night Theme Switcher. If not, see <http://www.gnu.org/licenses/>.
Author: Romain Vigier
-->
<interface domain="nightthemeswitcher@romainvigier.fr">
<requires lib="gtk+" version="3.22"/>
<!-- interface-local-resource-path ../../icons/ -->
<!-- interface-license-type gplv3 -->
<!-- interface-name Night Theme Switcher -->
<!-- interface-copyright 2020 -->
<!-- interface-authors Romain Vigier -->
<requires lib="gtk" version="4.0"/>
<object class="GtkHeaderBar" id="headerbar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_close_button">True</property>
<child type="title">
<object class="GtkBox" id="switcher">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="homogeneous">True</property>
<property name="homogeneous">1</property>
<child>
<object class="GtkRadioButton" id="schedule_radio">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="active">True</property>
<property name="draw_indicator">False</property>
<object class="GtkToggleButton" id="schedule_radio">
<property name="focus_on_click">0</property>
<property name="active">1</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">4</property>
<property name="margin_bottom">4</property>
<property name="orientation">vertical</property>
<property name="spacing">4</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">nightthemeswitcher-schedule-symbolic</property>
<property name="icon_size">2</property>
<property name="icon_size">1</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Schedule</property>
<attributes>
<attribute name="size" value="8192"/>
<attribute name="size" value="8192"></attribute>
</attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="gtk_theme_radio">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="draw_indicator">False</property>
<object class="GtkToggleButton" id="gtk_theme_radio">
<property name="focus_on_click">0</property>
<property name="group">schedule_radio</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">4</property>
<property name="margin_bottom">4</property>
<property name="orientation">vertical</property>
<property name="spacing">4</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">nightthemeswitcher-gtktheme-symbolic</property>
<property name="icon_size">2</property>
<property name="icon_size">1</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">GTK theme</property>
<attributes>
<attribute name="size" value="8192"/>
<attribute name="size" value="8192"></attribute>
</attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="shell_theme_radio">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="draw_indicator">False</property>
<object class="GtkToggleButton" id="shell_theme_radio">
<property name="focus_on_click">0</property>
<property name="group">schedule_radio</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">4</property>
<property name="margin_bottom">4</property>
<property name="orientation">vertical</property>
<property name="spacing">4</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">nightthemeswitcher-shelltheme-symbolic</property>
<property name="icon_size">2</property>
<property name="icon_size">1</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Shell theme</property>
<attributes>
<attribute name="size" value="8192"/>
<attribute name="size" value="8192"></attribute>
</attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="icon_theme_radio">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="draw_indicator">False</property>
<object class="GtkToggleButton" id="icon_theme_radio">
<property name="focus_on_click">0</property>
<property name="group">schedule_radio</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">4</property>
<property name="margin_bottom">4</property>
<property name="orientation">vertical</property>
<property name="spacing">4</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">nightthemeswitcher-icontheme-symbolic</property>
<property name="icon_size">2</property>
<property name="icon_size">1</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Icon theme</property>
<attributes>
<attribute name="size" value="8192"/>
<attribute name="size" value="8192"></attribute>
</attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="cursor_theme_radio">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="draw_indicator">False</property>
<object class="GtkToggleButton" id="cursor_theme_radio">
<property name="focus_on_click">0</property>
<property name="group">schedule_radio</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">4</property>
<property name="margin_bottom">4</property>
<property name="orientation">vertical</property>
<property name="spacing">4</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">nightthemeswitcher-cursortheme-symbolic</property>
<property name="icon_size">2</property>
<property name="icon_size">1</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Cursor theme</property>
<attributes>
<attribute name="size" value="8192"/>
<attribute name="size" value="8192"></attribute>
</attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">4</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="backgrounds_radio">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="draw_indicator">False</property>
<object class="GtkToggleButton" id="backgrounds_radio">
<property name="focus_on_click">0</property>
<property name="group">schedule_radio</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">4</property>
<property name="margin_bottom">4</property>
<property name="orientation">vertical</property>
<property name="spacing">4</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">nightthemeswitcher-backgrounds-symbolic</property>
<property name="icon_size">2</property>
<property name="icon_size">1</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Backgrounds</property>
<attributes>
<attribute name="size" value="8192"/>
<attribute name="size" value="8192"></attribute>
</attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">5</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="commands_radio">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="draw_indicator">False</property>
<object class="GtkToggleButton" id="commands_radio">
<property name="focus_on_click">0</property>
<property name="group">schedule_radio</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">4</property>
<property name="margin_bottom">4</property>
<property name="orientation">vertical</property>
<property name="spacing">4</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">nightthemeswitcher-commands-symbolic</property>
<property name="icon_size">2</property>
<property name="icon_size">1</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Commands</property>
<attributes>
<attribute name="size" value="8192"/>
<attribute name="size" value="8192"></attribute>
</attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">6</property>
</packing>
</child>
<style>
<class name="linked"/>
src/preferences/ui/icon_theme.ui
+23 -154
View File
@@ -1,40 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.36.0
Copyright (C) 2020
This file is part of Romain Vigier.
Romain Vigier is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Romain Vigier is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Romain Vigier. If not, see <http://www.gnu.org/licenses/>.
Author: Romain Vigier
-->
<interface domain="nightthemeswitcher@romainvigier.fr">
<requires lib="gtk+" version="3.22"/>
<!-- interface-license-type gplv3 -->
<!-- interface-name Romain Vigier -->
<!-- interface-copyright 2020 -->
<!-- interface-authors Romain Vigier -->
<requires lib="gtk" version="4.0"/>
<object class="GtkBox" id="icon_theme">
<property name="width_request">600</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="valign">start</property>
<property name="margin_left">36</property>
<property name="margin_right">36</property>
<property name="margin_start">36</property>
<property name="margin_end">36</property>
<property name="margin_top">36</property>
@@ -44,26 +14,15 @@ Author: Romain Vigier
<property name="baseline_position">top</property>
<child>
<object class="GtkFrame" id="enabled">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<child>
<property name="child">
<object class="GtkListBox">
<property name="width_request">600</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="selection_mode">none</property>
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<child>
<property name="activatable">0</property>
<property name="child">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">16</property>
<property name="margin_right">16</property>
<property name="margin_start">16</property>
<property name="margin_end">16</property>
<property name="margin_top">16</property>
@@ -71,90 +30,49 @@ Author: Romain Vigier
<property name="spacing">30</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Switch icon variants</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSwitch" id="enabled_switch">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">1</property>
<property name="halign">end</property>
<property name="valign">center</property>
<property name="active">True</property>
<property name="active">1</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</property>
</object>
</child>
</object>
</child>
<child type="label_item">
<placeholder/>
</child>
</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="variants">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">8</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Variants</property>
<attributes>
<attribute name="weight" value="bold"/>
<attribute name="weight" value="bold"></attribute>
</attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<child>
<property name="child">
<object class="GtkListBox">
<property name="width_request">600</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="selection_mode">none</property>
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<child>
<property name="activatable">0</property>
<property name="child">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">16</property>
<property name="margin_right">16</property>
<property name="margin_start">16</property>
<property name="margin_end">16</property>
<property name="margin_top">16</property>
@@ -162,58 +80,35 @@ Author: Romain Vigier
<property name="spacing">30</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Day variant</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="day_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">1</property>
<property name="halign">end</property>
<property name="valign">center</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<property name="selectable">False</property>
<child>
<property name="activatable">0</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<child>
<property name="activatable">0</property>
<property name="child">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">16</property>
<property name="margin_right">16</property>
<property name="margin_start">16</property>
<property name="margin_end">16</property>
<property name="margin_top">16</property>
@@ -221,51 +116,25 @@ Author: Romain Vigier
<property name="spacing">30</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Night variant</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="night_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">1</property>
<property name="halign">end</property>
<property name="valign">center</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</property>
</object>
</child>
</object>
</child>
<child type="label_item">
<placeholder/>
</child>
</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</interface>
src/preferences/ui/ondemand_keyboard_shortcut_dialog.ui
+17 -66
View File
@@ -1,88 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.36.0
Copyright (C) 2020
This file is part of Night Theme Switcher.
Night Theme Switcher is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Night Theme Switcher is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Night Theme Switcher. If not, see <http://www.gnu.org/licenses/>.
Author: Romain Vigier
-->
<interface domain="nightthemeswitcher@romainvigier.fr">
<requires lib="gtk+" version="3.22"/>
<!-- interface-license-type gplv3 -->
<!-- interface-name Night Theme Switcher -->
<!-- interface-copyright 2020 -->
<!-- interface-authors Romain Vigier -->
<requires lib="gtk" version="4.0"/>
<object class="GtkDialog" id="dialog">
<property name="can_focus">False</property>
<property name="modal">True</property>
<property name="modal">1</property>
<property name="default_width">440</property>
<property name="default_height">200</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<child internal-child="content_area">
<object class="GtkBox">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child internal-child="action_area">
<object class="GtkButtonBox">
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="vexpand">1</property>
<property name="label" translatable="yes">Press your keyboard shortcut...</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
<child type="titlebar">
<object class="GtkHeaderBar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">Keyboard shortcut</property>
<child>
<object class="GtkButton" id="cancel_button">
<property name="label" translatable="yes">Cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="title-widget">
<object class="GtkLabel">
<property name="label" translatable="yes">Keyboard shortcut</property>
<property name="single-line-mode">1</property>
<property name="ellipsize">end</property>
<property name="width-chars">5</property>
<style>
<class name="title"/>
</style>
</object>
</child>
</property>
</object>
</child>
<child>
<object class="GtkEventControllerKey" id="event-controller"/>
</child>
</object>
</interface>
src/preferences/ui/schedule.ui
+315 -691
View File
File diff suppressed because it is too large Load Diff
src/preferences/ui/shell_theme.ui
+33 -209
View File
@@ -1,40 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.36.0
Copyright (C) 2020
This file is part of Night Theme Switcher.
Night Theme Switcher is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Night Theme Switcher is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Night Theme Switcher. If not, see <http://www.gnu.org/licenses/>.
Author: Romain Vigier
-->
<interface domain="nightthemeswitcher@romainvigier.fr">
<requires lib="gtk+" version="3.22"/>
<!-- interface-license-type gplv3 -->
<!-- interface-name Night Theme Switcher -->
<!-- interface-copyright 2020 -->
<!-- interface-authors Romain Vigier -->
<requires lib="gtk" version="4.0"/>
<object class="GtkBox" id="shell_theme">
<property name="width_request">600</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="valign">start</property>
<property name="margin_left">36</property>
<property name="margin_right">36</property>
<property name="margin_start">36</property>
<property name="margin_end">36</property>
<property name="margin_top">36</property>
@@ -44,26 +14,15 @@ Author: Romain Vigier
<property name="baseline_position">top</property>
<child>
<object class="GtkFrame" id="enabled">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<child>
<property name="child">
<object class="GtkListBox">
<property name="width_request">600</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="selection_mode">none</property>
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<child>
<property name="activatable">0</property>
<property name="child">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">16</property>
<property name="margin_right">16</property>
<property name="margin_start">16</property>
<property name="margin_end">16</property>
<property name="margin_top">16</property>
@@ -71,68 +30,36 @@ Author: Romain Vigier
<property name="spacing">30</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Switch Shell variants</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSwitch" id="enabled_switch">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">1</property>
<property name="halign">end</property>
<property name="valign">center</property>
<property name="active">True</property>
<property name="active">1</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</property>
</object>
</child>
</object>
</child>
<child type="label_item">
<placeholder/>
</child>
</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="manual">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<child>
<property name="child">
<object class="GtkListBox">
<property name="width_request">600</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="selection_mode">none</property>
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<child>
<property name="activatable">0</property>
<property name="child">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">16</property>
<property name="margin_right">16</property>
<property name="margin_start">16</property>
<property name="margin_end">16</property>
<property name="margin_top">16</property>
@@ -140,122 +67,68 @@ Author: Romain Vigier
<property name="spacing">30</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Manual variants</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
<property name="halign">start</property>
<property name="label" translatable="yes">&lt;small&gt;You can manually set variants if the extension cannot automatically detect the day and night variants of your GNOME Shell theme. Please &lt;a href="https://gitlab.com/rmnvgr/nightthemeswitcher-gnome-shell-extension/-/issues"&gt;submit a request&lt;/a&gt; to get your theme supported.&lt;/small&gt;</property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
<property name="label" translatable="yes">&lt;small&gt;You can manually set variants if the extension cannot automatically detect the day and night variants of your GNOME Shell theme. Please &lt;a href=&quot;https://gitlab.com/rmnvgr/nightthemeswitcher-gnome-shell-extension/-/issues&quot;&gt;submit a request&lt;/a&gt; to get your theme supported.&lt;/small&gt;</property>
<property name="use_markup">1</property>
<property name="wrap">1</property>
<property name="max_width_chars">50</property>
<property name="xalign">0</property>
<style>
<class name="dim-label"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSwitch" id="manual_switch">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">1</property>
<property name="halign">end</property>
<property name="valign">center</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</property>
</object>
</child>
</object>
</child>
<child type="label_item">
<placeholder/>
</child>
</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkBox" id="variants">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">8</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Manual variants</property>
<attributes>
<attribute name="weight" value="bold"/>
<attribute name="weight" value="bold"></attribute>
</attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<child>
<property name="child">
<object class="GtkListBox">
<property name="width_request">600</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="selection_mode">none</property>
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<child>
<property name="activatable">0</property>
<property name="child">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">16</property>
<property name="margin_right">16</property>
<property name="margin_start">16</property>
<property name="margin_end">16</property>
<property name="margin_top">16</property>
@@ -263,58 +136,35 @@ Author: Romain Vigier
<property name="spacing">30</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Day variant</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="day_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">1</property>
<property name="halign">end</property>
<property name="valign">center</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<property name="selectable">False</property>
<child>
<property name="activatable">0</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<child>
<property name="activatable">0</property>
<property name="child">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">16</property>
<property name="margin_right">16</property>
<property name="margin_start">16</property>
<property name="margin_end">16</property>
<property name="margin_top">16</property>
@@ -322,51 +172,25 @@ Author: Romain Vigier
<property name="spacing">30</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Night variant</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="night_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">1</property>
<property name="halign">end</property>
<property name="valign">center</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</property>
</object>
</child>
</object>
</child>
<child type="label_item">
<placeholder/>
</child>
</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
</interface>
src/prefs.js
+6 -7
View File
@@ -18,12 +18,12 @@ this program. If not, see <http s ://www.gnu.org/licenses/>.
'use strict';
const { GLib, Gtk } = imports.gi;
const { Gdk, GLib, Gtk } = imports.gi;
const { extensionUtils } = imports.misc;
const Me = extensionUtils.getCurrentExtension();
const { compat, utils } = Me.imports;
const { utils } = Me.imports;
const { Preferences } = Me.imports.preferences.Preferences;
@@ -31,9 +31,9 @@ const { Preferences } = Me.imports.preferences.Preferences;
* Initialize the preferences.
*/
function init() {
compat.initTranslations(Me.metadata.uuid);
const iconTheme = Gtk.IconTheme.get_default();
iconTheme.append_search_path(GLib.build_filenamev([Me.path, 'icons']));
extensionUtils.initTranslations(Me.metadata.uuid);
const iconTheme = Gtk.IconTheme.get_for_display(Gdk.Display.get_default());
iconTheme.add_search_path(GLib.build_filenamev([Me.path, 'icons']));
}
/**
@@ -42,8 +42,7 @@ function init() {
function buildPrefsWidget() {
const preferences = new Preferences();
GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
const window = preferences.widget.get_toplevel();
window.resize(600, 200);
const window = preferences.widget.get_root();
window.set_titlebar(preferences.headerbar);
});
return preferences.widget;
src/settings/Backgrounds.js
+1 -2
View File
@@ -21,14 +21,13 @@ const Signals = imports.signals;
const Me = extensionUtils.getCurrentExtension();
const compat = Me.imports.compat;
const { logDebug, getSettingsSchema } = Me.imports.utils;
var BackgroundsSettings = class {
constructor() {
logDebug('Initializing backgrounds settings...');
this.settings = compat.getSettings(getSettingsSchema('backgrounds'));
this.settings = extensionUtils.getSettings(getSettingsSchema('backgrounds'));
logDebug('Backgrounds settings initialized.');
}
src/settings/Commands.js
+1 -2
View File
@@ -21,14 +21,13 @@ const Signals = imports.signals;
const Me = extensionUtils.getCurrentExtension();
const compat = Me.imports.compat;
const { logDebug, getSettingsSchema } = Me.imports.utils;
var CommandsSettings = class {
constructor() {
logDebug('Initializing commands settings...');
this.settings = compat.getSettings(getSettingsSchema('commands'));
this.settings = extensionUtils.getSettings(getSettingsSchema('commands'));
logDebug('Commands settings initialized.');
}
src/settings/CursorVariants.js
+1 -2
View File
@@ -21,14 +21,13 @@ const Signals = imports.signals;
const Me = extensionUtils.getCurrentExtension();
const compat = Me.imports.compat;
const { logDebug, getSettingsSchema } = Me.imports.utils;
var CursorVariantsSettings = class {
constructor() {
logDebug('Initializing cursor variants settings...');
this.settings = compat.getSettings(getSettingsSchema('cursor-variants'));
this.settings = extensionUtils.getSettings(getSettingsSchema('cursor-variants'));
logDebug('Cursor variants settings initialized.');
}
src/settings/GtkVariants.js
+1 -2
View File
@@ -21,14 +21,13 @@ const Signals = imports.signals;
const Me = extensionUtils.getCurrentExtension();
const compat = Me.imports.compat;
const { logDebug, getSettingsSchema } = Me.imports.utils;
var GtkVariantsSettings = class {
constructor() {
logDebug('Initializing GTK variants settings...');
this.settings = compat.getSettings(getSettingsSchema('gtk-variants'));
this.settings = extensionUtils.getSettings(getSettingsSchema('gtk-variants'));
logDebug('GTK variants settings initialized.');
}
src/settings/IconVariants.js
+1 -2
View File
@@ -21,14 +21,13 @@ const Signals = imports.signals;
const Me = extensionUtils.getCurrentExtension();
const compat = Me.imports.compat;
const { logDebug, getSettingsSchema } = Me.imports.utils;
var IconVariantsSettings = class {
constructor() {
logDebug('Initializing icon variants settings...');
this.settings = compat.getSettings(getSettingsSchema('icon-variants'));
this.settings = extensionUtils.getSettings(getSettingsSchema('icon-variants'));
logDebug('Icon variants settings initialized.');
}
src/settings/Settings.js
+1 -3
View File
@@ -20,8 +20,6 @@ const { extensionUtils } = imports.misc;
const Me = extensionUtils.getCurrentExtension();
const compat = Me.imports.compat;
const { logDebug, notifyError, getSettingsSchema } = Me.imports.utils;
const { BackgroundsSettings } = Me.imports.settings.Backgrounds;
const { CommandsSettings } = Me.imports.settings.Commands;
@@ -36,7 +34,7 @@ const { TimeSettings } = Me.imports.settings.Time;
var Settings = class {
constructor() {
logDebug('Initializing settings...');
this.extension = compat.getExtensionSettings();
this.extension = extensionUtils.getSettings();
this.backgrounds = new BackgroundsSettings();
this.commands = new CommandsSettings();
this.cursorVariants = new CursorVariantsSettings();
src/settings/ShellVariants.js
+1 -2
View File
@@ -21,14 +21,13 @@ const Signals = imports.signals;
const Me = extensionUtils.getCurrentExtension();
const compat = Me.imports.compat;
const { logDebug, getSettingsSchema } = Me.imports.utils;
var ShellVariantsSettings = class {
constructor() {
logDebug('Initializing shell variants settings...');
this.settings = compat.getSettings(getSettingsSchema('shell-variants'));
this.settings = extensionUtils.getSettings(getSettingsSchema('shell-variants'));
logDebug('Shell variants settings initialized.');
}
src/settings/System.js
-1
View File
@@ -22,7 +22,6 @@ const Signals = imports.signals;
const Me = extensionUtils.getCurrentExtension();
const compat = Me.imports.compat;
const { logDebug, getUserthemesExtension, getUserthemesSettings } = Me.imports.utils;
src/settings/Time.js
+1 -2
View File
@@ -21,14 +21,13 @@ const Signals = imports.signals;
const Me = extensionUtils.getCurrentExtension();
const compat = Me.imports.compat;
const { logDebug, getSettingsSchema } = Me.imports.utils;
var TimeSettings = class {
constructor() {
logDebug('Initializing time settings...');
this.settings = compat.getSettings(getSettingsSchema('time'));
this.settings = extensionUtils.getSettings(getSettingsSchema('time'));
logDebug('Time settings initialized.');
}
src/settings/migrations/v0ToV1.js
+1 -3
View File
@@ -20,8 +20,6 @@ const { extensionUtils } = imports.misc;
const Me = extensionUtils.getCurrentExtension();
const compat = Me.imports.compat;
const { getSettingsSchema } = Me.imports.utils;
/**
@@ -30,7 +28,7 @@ const { getSettingsSchema } = Me.imports.utils;
* @param {Settings} settings The current settings.
*/
function migrate(settings) {
const oldSettings = compat.getSettings(getSettingsSchema('v0'));
const oldSettings = extensionUtils.getSettings(getSettingsSchema('v0'));
settings.gtkVariants.enabled = oldSettings.get_boolean('gtk-variants-enabled');
settings.gtkVariants.day = oldSettings.get_string('gtk-variant-day');
src/utils.js
+5 -2
View File
@@ -20,7 +20,6 @@ const { Gdk, Gio, GLib, Gtk } = imports.gi;
const { extensionUtils } = imports.misc;
const Me = extensionUtils.getCurrentExtension();
const compat = Me.imports.compat;
const config = Me.imports.config;
const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']);
@@ -177,7 +176,11 @@ function getInstalledCursorThemes() {
* it isn't installed.
*/
function getUserthemesExtension() {
return compat.extensionManagerLookup('user-theme@gnome-shell-extensions.gcampax.github.com');
try {
return imports.ui.main.extensionManager.lookup('user-theme@gnome-shell-extensions.gcampax.github.com');
} catch (_e) {
return undefined;
}
}
/**