From f2768216db782933d804706bc51540d881628f5d Mon Sep 17 00:00:00 2001 From: Simon Schneegans Date: Mon, 7 Aug 2023 13:21:50 +0200 Subject: [PATCH] :fire: Remove backwards compatibility code --- extension.js | 42 +-- prefs.js | 490 ++++++++-------------------- resources/css/gtk3.css | 23 -- resources/css/gtk4.css | 26 -- resources/ui/gtk3/apparition.ui | 281 ---------------- resources/ui/gtk3/doom.ui | 229 ------------- resources/ui/gtk3/energize-a.ui | 167 ---------- resources/ui/gtk3/energize-b.ui | 168 ---------- resources/ui/gtk3/fire.ui | 337 ------------------- resources/ui/gtk3/glide.ui | 281 ---------------- resources/ui/gtk3/glitch.ui | 271 ---------------- resources/ui/gtk3/hexagon.ui | 320 ------------------ resources/ui/gtk3/incinerate.ui | 278 ---------------- resources/ui/gtk3/pixel-wheel.ui | 177 ---------- resources/ui/gtk3/pixel-wipe.ui | 132 -------- resources/ui/gtk3/pixelate.ui | 177 ---------- resources/ui/gtk3/portal.ui | 271 ---------------- resources/ui/gtk3/prefs.ui | 519 ------------------------------ resources/ui/gtk3/tv-glitch.ui | 271 ---------------- resources/ui/gtk3/tv.ui | 115 ------- resources/ui/gtk3/wisps.ui | 167 ---------- resources/ui/gtk4/apparition.ui | 249 -------------- resources/ui/gtk4/broken-glass.ui | 259 --------------- resources/ui/gtk4/doom.ui | 203 ------------ resources/ui/gtk4/energize-a.ui | 150 --------- resources/ui/gtk4/energize-b.ui | 150 --------- resources/ui/gtk4/fire.ui | 295 ----------------- resources/ui/gtk4/glide.ui | 252 --------------- resources/ui/gtk4/glitch.ui | 242 -------------- resources/ui/gtk4/hexagon.ui | 288 ----------------- resources/ui/gtk4/incinerate.ui | 251 --------------- resources/ui/gtk4/matrix.ui | 279 ---------------- resources/ui/gtk4/paint-brush.ui | 113 ------- resources/ui/gtk4/pixel-wheel.ui | 159 --------- resources/ui/gtk4/pixel-wipe.ui | 113 ------- resources/ui/gtk4/pixelate.ui | 159 --------- resources/ui/gtk4/portal.ui | 242 -------------- resources/ui/gtk4/prefs.ui | 475 --------------------------- resources/ui/gtk4/snap.ui | 150 --------- resources/ui/gtk4/trex.ui | 242 -------------- resources/ui/gtk4/tv-glitch.ui | 242 -------------- resources/ui/gtk4/tv.ui | 104 ------ resources/ui/gtk4/wisps.ui | 150 --------- src/ProfileManager.js | 2 +- src/Shader.js | 8 +- src/effects/Fire.js | 3 +- src/utils.js | 29 +- 47 files changed, 145 insertions(+), 9406 deletions(-) delete mode 100644 resources/css/gtk3.css delete mode 100644 resources/css/gtk4.css delete mode 100644 resources/ui/gtk3/apparition.ui delete mode 100644 resources/ui/gtk3/doom.ui delete mode 100644 resources/ui/gtk3/energize-a.ui delete mode 100644 resources/ui/gtk3/energize-b.ui delete mode 100644 resources/ui/gtk3/fire.ui delete mode 100644 resources/ui/gtk3/glide.ui delete mode 100644 resources/ui/gtk3/glitch.ui delete mode 100644 resources/ui/gtk3/hexagon.ui delete mode 100644 resources/ui/gtk3/incinerate.ui delete mode 100644 resources/ui/gtk3/pixel-wheel.ui delete mode 100644 resources/ui/gtk3/pixel-wipe.ui delete mode 100644 resources/ui/gtk3/pixelate.ui delete mode 100644 resources/ui/gtk3/portal.ui delete mode 100644 resources/ui/gtk3/prefs.ui delete mode 100644 resources/ui/gtk3/tv-glitch.ui delete mode 100644 resources/ui/gtk3/tv.ui delete mode 100644 resources/ui/gtk3/wisps.ui delete mode 100644 resources/ui/gtk4/apparition.ui delete mode 100644 resources/ui/gtk4/broken-glass.ui delete mode 100644 resources/ui/gtk4/doom.ui delete mode 100644 resources/ui/gtk4/energize-a.ui delete mode 100644 resources/ui/gtk4/energize-b.ui delete mode 100644 resources/ui/gtk4/fire.ui delete mode 100644 resources/ui/gtk4/glide.ui delete mode 100644 resources/ui/gtk4/glitch.ui delete mode 100644 resources/ui/gtk4/hexagon.ui delete mode 100644 resources/ui/gtk4/incinerate.ui delete mode 100644 resources/ui/gtk4/matrix.ui delete mode 100644 resources/ui/gtk4/paint-brush.ui delete mode 100644 resources/ui/gtk4/pixel-wheel.ui delete mode 100644 resources/ui/gtk4/pixel-wipe.ui delete mode 100644 resources/ui/gtk4/pixelate.ui delete mode 100644 resources/ui/gtk4/portal.ui delete mode 100644 resources/ui/gtk4/prefs.ui delete mode 100644 resources/ui/gtk4/snap.ui delete mode 100644 resources/ui/gtk4/trex.ui delete mode 100644 resources/ui/gtk4/tv-glitch.ui delete mode 100644 resources/ui/gtk4/tv.ui delete mode 100644 resources/ui/gtk4/wisps.ui diff --git a/extension.js b/extension.js index b32f939..c03e6a6 100644 --- a/extension.js +++ b/extension.js @@ -20,7 +20,7 @@ import Meta from 'gi://Meta'; import {fromVersion26} from './src/migrate.js'; import {ProfileManager} from './src/ProfileManager.js'; import {WindowPicker} from './src/WindowPicker.js'; -import {getStringResource, shellVersionIs, shellVersionIsAtLeast} from './src/utils.js'; +import {getStringResource} from './src/utils.js'; import Apparition from './src/effects/Apparition.js'; import BrokenGlass from './src/effects/BrokenGlass.js'; @@ -250,21 +250,9 @@ export default class BurnMyWindows extends Extension { // of the actor. However, if we are in the overview, we have to enlarge the clone of // the window as well. Workspace.prototype._addWindowClone = function(...params) { - const clone = extensionThis._origAddWindowClone.apply(this, params); - - // The parameters of this method changed a bit through the versions... - let realWindow, container; - - if (shellVersionIs(3, 36)) { - container = clone[0]; - realWindow = container.realWindow; - } else if (shellVersionIs(3, 38)) { - container = clone._windowContainer; - realWindow = params[0].get_compositor_private(); - } else { - container = clone.window_container; - realWindow = params[0].get_compositor_private(); - } + const clone = extensionThis._origAddWindowClone.apply(this, params); + const container = clone.window_container; + const realWindow = params[0].get_compositor_private(); // Store the overview clone as temporary members of the real window actor. When we // set up the effect, we will check for the existence of these and enlarge the clone @@ -278,16 +266,6 @@ export default class BurnMyWindows extends Extension { delete realWindow._bmwOverviewCloneContainer; }); - // This is actually needed for the window-close animation on GNOME Shell 3.36. - // On GNOME 3.36, the window clone's 'destroy' handler only calls _removeWindowClone - // but not _doRemoveWindow. The latter is required to trigger the repositioning of - // the overview window layout. Therefore we call this method in addition. - // https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/gnome-3-36/js/ui/workspace.js#L1877 - // https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/workspace.js#L1363 - if (shellVersionIs(3, 36)) { - container.connect('destroy', () => this._doRemoveWindow(container.metaWindow)); - } - return clone; }; @@ -512,7 +490,7 @@ export default class BurnMyWindows extends Extension { } // If the profile is still matching, we also check the color scheme. - if (matches && profileColorScheme != 0 && shellVersionIsAtLeast(42, 0)) { + if (matches && profileColorScheme != 0) { const colorScheme = this._shellSettings.get_string('color-scheme'); matches &= (profileColorScheme == 1 && colorScheme == 'default') || (profileColorScheme == 2 && colorScheme == 'prefer-dark'); @@ -591,7 +569,7 @@ export default class BurnMyWindows extends Extension { // If we are in the overview, we have to enlarge the window's clone as well. We also // disable the clone's overlay (e.g. its icon, name, and close button) during the // animation. - if (actor._bmwOverviewClone && shellVersionIsAtLeast(3, 38)) { + if (actor._bmwOverviewClone) { actor._bmwOverviewClone.overlayEnabled = false; actor._bmwOverviewCloneContainer.set_pivot_point(0.5, 0.5); actor._bmwOverviewCloneContainer.scale_x = actorScale.x; @@ -608,7 +586,7 @@ export default class BurnMyWindows extends Extension { const endID = shader.connect('end-animation', () => { shader.disconnect(endID); - if (actor._bmwOverviewClone && shellVersionIsAtLeast(3, 38)) { + if (actor._bmwOverviewClone) { actor._bmwOverviewClone.overlayEnabled = true; actor._bmwOverviewCloneContainer.scale_x = 1.0; actor._bmwOverviewCloneContainer.scale_y = 1.0; @@ -646,10 +624,8 @@ export default class BurnMyWindows extends Extension { return true; } - // This was called "realWindow" in GNOME 3.36. - const propertyName = shellVersionIs(3, 36) ? 'realWindow' : '_windowActor'; - const actor = workspace._windows[index][propertyName]; - const shader = actor.get_effect('burn-my-windows-effect'); + const actor = workspace._windows[index]._windowActor; + const shader = actor.get_effect('burn-my-windows-effect'); return shader == null; } diff --git a/prefs.js b/prefs.js index d47c0cd..7e10ed7 100644 --- a/prefs.js +++ b/prefs.js @@ -20,7 +20,7 @@ import GLib from 'gi://GLib'; import Gdk from 'gi://Gdk'; import Adw from 'gi://Adw'; -import {isADW, isGTK4, getUIDir, getStringResource, shellVersionIsAtLeast} from './src/utils.js'; +import {getUIDir, getStringResource, shellVersionIsAtLeast} from './src/utils.js'; import {ProfileManager} from './src/ProfileManager.js'; import Apparition from './src/effects/Apparition.js'; @@ -90,27 +90,8 @@ export default class BurnMyWindowsPreferences extends ExtensionPreferences { Gio.Resource.load(this.path + '/resources/burn-my-windows.gresource'); Gio.resources_register(this._resources); - // Load the CSS file for the settings dialog. If using libadwaita, we do not need an - // additional style sheet. - if (!isADW()) { - const provider = Gtk.CssProvider.new(); - if (isGTK4()) { - provider.load_from_resource('/css/gtk4.css'); - Gtk.StyleContext.add_provider_for_display( - Gdk.Display.get_default(), provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); - } else { - provider.load_from_resource('/css/gtk3.css'); - Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), provider, - Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); - } - } - // Make sure custom icons are found. - if (isGTK4()) { - Gtk.IconTheme.get_for_display(Gdk.Display.get_default()).add_resource_path('/img'); - } else { - Gtk.IconTheme.get_default().add_resource_path('/img'); - } + Gtk.IconTheme.get_for_display(Gdk.Display.get_default()).add_resource_path('/img'); // Load the general user interface files. this._builder = new Gtk.Builder(); @@ -147,19 +128,8 @@ export default class BurnMyWindowsPreferences extends ExtensionPreferences { } let powerProfileRow = this._builder.get_object('profile-power-profile'); - if (!isADW()) { - powerProfileRow = powerProfileRow.get_parent().get_parent(); - } powerProfileRow.set_visible(hasPowerProfiles); - // The global color scheme is only available starting with GNOME Shell 42. We hide the - // corresponding settings row on older versions. - let colorSchemeRow = this._builder.get_object('profile-color-scheme'); - if (!isADW()) { - colorSchemeRow = colorSchemeRow.get_parent().get_parent(); - } - colorSchemeRow.set_visible(shellVersionIsAtLeast(42, 0)); - // Wire up the window picker of the profile editor. Whenever the app-chooser button is // clicked, we call a method of the extension which will initiate the window picking. this._builder.get_object('profile-choose-app-button').connect('clicked', () => { @@ -196,22 +166,6 @@ export default class BurnMyWindowsPreferences extends ExtensionPreferences { } }); - // If using libadwaita, the visibility of the profile-editor Adw.Flap is controlled - // using bindings in the ui file. On GTK3 and GTK4 we have to wire up this toggling - // here since we are using a Gtk.Stack instead of an Adw.Flap. - if (!isADW()) { - const profileEditorButton = this._builder.get_object('edit-profile-button'); - profileEditorButton.connect('toggled', b => { - if (b.active) { - this._builder.get_object('general-prefs') - .set_visible_child(this._builder.get_object('profile-editor')); - } else { - this._builder.get_object('general-prefs') - .set_visible_child(this._builder.get_object('effect-editor')); - } - }); - } - // This is our top-level widget which we will return later. this._widget = this._builder.get_object('general-prefs'); @@ -235,25 +189,6 @@ export default class BurnMyWindowsPreferences extends ExtensionPreferences { // accordion-like behavior of the effect settings. this._effectRows = []; - if (!isADW()) { - group.connect('row-activated', (g, row) => { - this._effectRows.forEach(r => { - if (r == row) { - if (r._revealer.get_reveal_child()) { - r._revealer.set_reveal_child(false); - r._arrow.get_style_context().remove_class('revealed'); - } else { - r._revealer.set_reveal_child(true); - r._arrow.get_style_context().add_class('revealed'); - } - } else { - r._revealer.set_reveal_child(false); - r._arrow.get_style_context().remove_class('revealed'); - } - }); - }); - } - // Now add all the rows. this._ALL_EFFECTS.forEach(effect => { const [minMajor, minMinor] = effect.getMinShellVersion(); @@ -276,12 +211,7 @@ export default class BurnMyWindowsPreferences extends ExtensionPreferences { } // The preview button. - let previewButton; - if (isGTK4()) { - previewButton = Gtk.Button.new_from_icon_name('bmw-preview-symbolic'); - } else { - previewButton = Gtk.Button.new_from_icon_name('bmw-preview-symbolic', 1); - } + let previewButton = Gtk.Button.new_from_icon_name('bmw-preview-symbolic'); previewButton.get_style_context().add_class('circular'); previewButton.get_style_context().add_class('flat'); previewButton.set_tooltip_text(_('Preview this effect')); @@ -295,98 +225,52 @@ export default class BurnMyWindowsPreferences extends ExtensionPreferences { button.set_valign(Gtk.Align.CENTER); this._builder.expose_object(`${effect.getNick()}-enable-effect`, button); - if (isADW()) { - - let row; - if (hasPrefs) { - - // Add the effect's preferences (if any). - row = this._builder.get_object(`${effect.getNick()}-prefs`); - } else if (isADW()) { - row = Adw.ActionRow.new(); - } - - // On older versions of Adw (e.g. on GNOME Shell <43), the set_use_markup() does - // not yet exist. - if (row.set_use_markup) { - row.set_title('' + effect.getLabel() + ''); - row.set_use_markup(true); - } else { - row.set_title(effect.getLabel()); - } - - // Un-expand any previously expanded effect row. This way we ensure that there - // is only one expanded row at any time. - if (hasPrefs) { - row.connect('notify::expanded', currentRow => { - if (currentRow.get_expanded()) { - this._effectRows.forEach(row => { - if (row != currentRow) { - row.set_expanded(false); - } - }); - } - }); - this._effectRows.push(row); - row.add_action(button); - } else { - row.add_suffix(button); - } - - row.add_prefix(previewButton); - - group.add(row); - + let row; + if (hasPrefs) { + // Add the effect's preferences (if any). + row = this._builder.get_object(`${effect.getNick()}-prefs`); } else { - - const row = new Gtk.ListBoxRow(); - row.get_style_context().add_class('effect-row'); - - const container = new Gtk.Box({orientation: Gtk.Orientation.VERTICAL}); - - const header = new Gtk.Box({spacing: 12}); - header.get_style_context().add_class('effect-row-header'); - - const label = new Gtk.Label( - {label: effect.getLabel(), hexpand: true, halign: Gtk.Align.START}); - label.get_style_context().add_class('heading'); - - this.gtkBoxAppend(header, previewButton); - this.gtkBoxAppend(header, label); - this.gtkBoxAppend(header, button); - this.gtkBoxAppend(container, header); - - if (hasPrefs) { - const revealer = this._builder.get_object(`${effect.getNick()}-prefs`); - const arrow = new Gtk.Image({icon_name: 'go-down-symbolic'}); - arrow.get_style_context().add_class('revealer-arrow'); - this.gtkBoxAppend(header, arrow); - this.gtkBoxAppend(container, revealer); - row._revealer = revealer; - row._arrow = arrow; - - row.set_activatable(true); - this._effectRows.push(row); - } else { - row.set_activatable(false); - } - - if (isGTK4()) { - row.set_child(container); - group.append(row); - } else { - row.add(container); - group.add(row); - } + row = Adw.ActionRow.new(); } + + // On older versions of Adw (e.g. on GNOME Shell <43), the set_use_markup() does + // not yet exist. + if (row.set_use_markup) { + row.set_title('' + effect.getLabel() + ''); + row.set_use_markup(true); + } else { + row.set_title(effect.getLabel()); + } + + // Un-expand any previously expanded effect row. This way we ensure that there + // is only one expanded row at any time. + if (hasPrefs) { + row.connect('notify::expanded', currentRow => { + if (currentRow.get_expanded()) { + this._effectRows.forEach(row => { + if (row != currentRow) { + row.set_expanded(false); + } + }); + } + }); + this._effectRows.push(row); + row.add_action(button); + } else { + row.add_suffix(button); + } + + row.add_prefix(previewButton); + + group.add(row); } }); // Some things can only be done once the widget is shown as we do not have access to // the toplevel widget before. this._widget.connect('realize', (widget) => { - const window = isGTK4() ? widget.get_root() : widget.get_toplevel(); + const window = widget.get_root(); // Show the version number in the title bar. window.set_title(`Burn-My-Windows ${this.metadata.version}`); @@ -402,25 +286,16 @@ export default class BurnMyWindowsPreferences extends ExtensionPreferences { GLib.timeout_add(GLib.PRIORITY_DEFAULT, 2000, () => { this._showUpdateInfoTimeout = 0; - if (isADW()) { - const toast = Adw.Toast.new(_('Burn-My-Windows has been updated!')); - toast.set_button_label(_('View Changelog')); - toast.set_action_name('prefs.changelog'); - toast.set_timeout(0); + const toast = Adw.Toast.new(_('Burn-My-Windows has been updated!')); + toast.set_button_label(_('View Changelog')); + toast.set_action_name('prefs.changelog'); + toast.set_timeout(0); - toast.connect('dismissed', - () => this._settings.set_int('last-prefs-version', - this.metadata.version)); + toast.connect( + 'dismissed', + () => this._settings.set_int('last-prefs-version', this.metadata.version)); - window.add_toast(toast); - } else { - const infoBar = this._builder.get_object('update-info'); - infoBar.connect('response', i => { - this._settings.set_int('last-prefs-version', this.metadata.version); - i.set_revealed(false); - }); - infoBar.set_revealed(true); - } + window.add_toast(toast); return false; }); @@ -467,11 +342,7 @@ GitHub: https://github.com/spon } ]); - if (isGTK4()) { - dialog.show(); - } else { - dialog.show_all(); - } + dialog.show(); } }); @@ -486,39 +357,28 @@ GitHub: https://github.com/spon // Starting with GNOME Shell 42, we have to hack our way through the widget tree // of the Adw.PreferencesWindow... - if (isADW()) { - const header = this._findWidgetByType(window.get_content(), Adw.HeaderBar); - header.pack_start(menu); - header.set_title_widget(this._builder.get_object('profile-button')); + const header = this._findWidgetByType(window.get_content(), Adw.HeaderBar); + header.pack_start(menu); + header.set_title_widget(this._builder.get_object('profile-button')); - // GNOME Shell extensions are forced to use a AdwPreferencesWindow. This already - // includes a Gtk.ScrolledWindow as well as an Adw.Clamp. For the profile - // editing, we want to use an Adw.Flap which reveals itself from the top. This - // needs to be inserted in the widget hierarchy above the Adw.Clamp, else it - // would look ugly. Therefore, we fiddle around with the internal widgets... - const flap = this._builder.get_object('profile-editor-flap'); - const clamp = this._findWidgetByType(window.get_content(), Adw.Clamp); - const viewport = clamp.get_parent(); - viewport.get_parent().set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.NEVER); - viewport.set_child(flap); + // GNOME Shell extensions are forced to use a AdwPreferencesWindow. This already + // includes a Gtk.ScrolledWindow as well as an Adw.Clamp. For the profile + // editing, we want to use an Adw.Flap which reveals itself from the top. This + // needs to be inserted in the widget hierarchy above the Adw.Clamp, else it + // would look ugly. Therefore, we fiddle around with the internal widgets... + const flap = this._builder.get_object('profile-editor-flap'); + const clamp = this._findWidgetByType(window.get_content(), Adw.Clamp); + const viewport = clamp.get_parent(); + viewport.get_parent().set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.NEVER); + viewport.set_child(flap); - const scrolledWindow = Gtk.ScrolledWindow.new(); - scrolledWindow.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC); - scrolledWindow.set_propagate_natural_height(true); - scrolledWindow.set_vexpand(true); - scrolledWindow.set_child(clamp); + const scrolledWindow = Gtk.ScrolledWindow.new(); + scrolledWindow.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC); + scrolledWindow.set_propagate_natural_height(true); + scrolledWindow.set_vexpand(true); + scrolledWindow.set_child(clamp); - flap.set_content(scrolledWindow); - - } else if (isGTK4()) { - window.get_titlebar().pack_start(menu); - window.get_titlebar().set_title_widget( - this._builder.get_object('profile-button')); - } else { - window.get_titlebar().pack_start(menu); - window.get_titlebar().set_custom_title( - this._builder.get_object('profile-button')); - } + flap.set_content(scrolledWindow); const addURIAction = (name, uri) => { const action = Gio.SimpleAction.new(name, null); @@ -567,71 +427,34 @@ GitHub: https://github.com/spon const sponsors = this._getJSONResource('/credits/sponsors.json'); let dialog; - // We try to use the special Adw.AboutWindow if it is available. - if (isADW() && Adw.AboutWindow) { - let formatSponsors = (sponsors) => { - return sponsors.map(s => { - if (s.url == '') - return s.name; - else - return `${s.name} ${s.url}`; - }); - }; + let formatSponsors = (sponsors) => { + return sponsors.map(s => { + if (s.url == '') + return s.name; + else + return `${s.name} ${s.url}`; + }); + }; - dialog = new Adw.AboutWindow({transient_for: window, modal: true}); - dialog.set_application_icon('burn-my-windows-symbolic'); - dialog.set_application_name('Burn-My-Windows'); - dialog.set_version(`${this.metadata.version}`); - dialog.set_developer_name('Simon Schneegans'); - dialog.set_issue_url('https://github.com/Schneegans/Burn-My-Windows/issues'); - if (sponsors.gold.length > 0) { - dialog.add_credit_section(_('Gold Sponsors'), - formatSponsors(sponsors.gold)); - } - if (sponsors.silver.length > 0) { - dialog.add_credit_section(_('Silver Sponsors'), - formatSponsors(sponsors.silver)); - } - if (sponsors.bronze.length > 0) { - dialog.add_credit_section(_('Bronze Sponsors'), - formatSponsors(sponsors.bronze)); - } - if (sponsors.past.length > 0) { - dialog.add_credit_section(_('Past Sponsors'), - formatSponsors(sponsors.past)); - } - - } else { - - let formatSponsors = (sponsors) => { - return sponsors.map(s => { - if (s.url == '') - return s.name; - else - return `${s.name}`; - }); - }; - - dialog = new Gtk.AboutDialog({transient_for: window, modal: true}); - dialog.set_logo_icon_name('burn-my-windows-symbolic'); - dialog.set_program_name(`Burn-My-Windows ${this.metadata.version}`); - dialog.set_authors(['Simon Schneegans']); - if (sponsors.gold.length > 0) { - dialog.add_credit_section(_('Gold Sponsors'), - formatSponsors(sponsors.gold)); - } - if (sponsors.silver.length > 0) { - dialog.add_credit_section(_('Silver Sponsors'), - formatSponsors(sponsors.silver)); - } - if (sponsors.bronze.length > 0) { - dialog.add_credit_section(_('Bronze Sponsors'), - formatSponsors(sponsors.bronze)); - } - if (sponsors.past.length > 0) { - dialog.add_credit_section(_('Past Sponsors'), - formatSponsors(sponsors.past)); - } + dialog = new Adw.AboutWindow({transient_for: window, modal: true}); + dialog.set_application_icon('burn-my-windows-symbolic'); + dialog.set_application_name('Burn-My-Windows'); + dialog.set_version(`${this.metadata.version}`); + dialog.set_developer_name('Simon Schneegans'); + dialog.set_issue_url('https://github.com/Schneegans/Burn-My-Windows/issues'); + if (sponsors.gold.length > 0) { + dialog.add_credit_section(_('Gold Sponsors'), formatSponsors(sponsors.gold)); + } + if (sponsors.silver.length > 0) { + dialog.add_credit_section(_('Silver Sponsors'), + formatSponsors(sponsors.silver)); + } + if (sponsors.bronze.length > 0) { + dialog.add_credit_section(_('Bronze Sponsors'), + formatSponsors(sponsors.bronze)); + } + if (sponsors.past.length > 0) { + dialog.add_credit_section(_('Past Sponsors'), formatSponsors(sponsors.past)); } dialog.set_translator_credits([...translators].join('\n')); @@ -639,11 +462,7 @@ GitHub: https://github.com/spon dialog.set_website('https://github.com/Schneegans/Burn-My-Windows'); dialog.set_license_type(Gtk.License.GPL_3_0); - if (isGTK4()) { - dialog.show(); - } else { - dialog.show_all(); - } + dialog.show(); }); group.add_action(aboutAction); @@ -728,11 +547,6 @@ GitHub: https://github.com/spon } }); - // Show the widgets on GTK3. - if (!isGTK4()) { - this._widget.show_all(); - } - window.add(this._widget); } @@ -814,17 +628,6 @@ GitHub: https://github.com/spon this._bindResetButton(settingsKey); } - // ----------------------------------------------------------------- GTK3 / GTK4 helpers - - // Appends the given child widget to the given Gtk.Box. - gtkBoxAppend(box, child) { - if (isGTK4()) { - box.append(child); - } else { - box.pack_start(child, false, true, 0); - } - } - // ----------------------------------------------------------------------- private stuff // This loads all settings from the profile given in the settings key 'active-profile'. @@ -863,20 +666,11 @@ GitHub: https://github.com/spon updateProfileButtonMenuIfChanged('profile-high-priority'); this.bindEntry('profile-app'); - - if (isADW()) { - this.bindComboRow('profile-animation-type'); - this.bindComboRow('profile-window-type'); - this.bindComboRow('profile-color-scheme'); - this.bindComboRow('profile-power-mode'); - this.bindComboRow('profile-power-profile'); - } else { - this.bindComboBox('profile-animation-type'); - this.bindComboBox('profile-window-type'); - this.bindComboBox('profile-color-scheme'); - this.bindComboBox('profile-power-mode'); - this.bindComboBox('profile-power-profile'); - } + this.bindComboRow('profile-animation-type'); + this.bindComboRow('profile-window-type'); + this.bindComboRow('profile-color-scheme'); + this.bindComboRow('profile-power-mode'); + this.bindComboRow('profile-power-profile'); this.bindSwitch('profile-high-priority'); // Connect all effect settings. @@ -1047,14 +841,12 @@ GitHub: https://github.com/spon default_width: 800, default_height: 450, modal: true, - transient_for: isGTK4() ? this._widget.get_root() : this._widget.get_toplevel() + transient_for: this._widget.get_root() }); // Add a header bar to the window. - if (isGTK4()) { - const header = Gtk.HeaderBar.new(); - window.set_titlebar(header); - } + const header = Gtk.HeaderBar.new(); + window.set_titlebar(header); const box = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL, @@ -1074,16 +866,11 @@ GitHub: https://github.com/spon pixel_size: 128, }); - this.gtkBoxAppend(box, image); - this.gtkBoxAppend(box, label); + box.append(image); + box.append(label); - if (isGTK4()) { - window.set_child(box); - window.show(); - } else { - window.add(box); - window.show_all(); - } + window.set_child(box); + window.show(); } // Helper function to show a message dialog. The dialog is modal and has a title, a @@ -1092,53 +879,28 @@ GitHub: https://github.com/spon // called when the button is clicked. // This method works on GTK3, GTK4, and libadwaita. _createMessageDialog(title, message, window, buttons) { - let dialog; + let dialog = new Adw.MessageDialog({ + heading: title, + body: message, + body_use_markup: true, + modal: true, + }); - if (isADW() && Adw.MessageDialog) { - dialog = new Adw.MessageDialog({ - heading: title, - body: message, - body_use_markup: true, - modal: true, - }); + buttons.forEach((button, i) => { + const response = i.toString(); + dialog.add_response(response, button.label); - buttons.forEach((button, i) => { - const response = i.toString(); - dialog.add_response(response, button.label); + if (button.default) { + dialog.set_default_response(response); + dialog.set_close_response(response); + } - if (button.default) { - dialog.set_default_response(response); - dialog.set_close_response(response); - } - - if (button.destructive) { - dialog.set_response_appearance(response, Adw.ResponseAppearance.DESTRUCTIVE); - } - }); - - } else { - - dialog = new Gtk.MessageDialog({ - text: title, - secondary_text: message, - secondary_use_markup: true, - modal: true, - title: '', - }); - - buttons.forEach((button, i) => { - dialog.add_button(button.label, i); - - if (button.default) { - dialog.set_default_response(i); - } - }); - } - - if (isGTK4()) { - dialog.set_hide_on_close(true); - } + if (button.destructive) { + dialog.set_response_appearance(response, Adw.ResponseAppearance.DESTRUCTIVE); + } + }); + dialog.set_hide_on_close(true); dialog.set_transient_for(window); // If the dialog is closed or a button is clicked, we hide the dialog and call the diff --git a/resources/css/gtk3.css b/resources/css/gtk3.css deleted file mode 100644 index 6a69c48..0000000 --- a/resources/css/gtk3.css +++ /dev/null @@ -1,23 +0,0 @@ -/* -SPDX-FileCopyrightText: Simon Schneegans -SPDX-License-Identifier: CC0-1.0 -*/ - -row { - padding: 8px; -} - -.effect-row { - padding: 0; -} - -.effect-row-header, -.effect-row list { - padding: 8px; - border: 0 solid @borders; - border-bottom-width: 1px; -} - -.revealer-arrow { - margin-right: 6px; -} \ No newline at end of file diff --git a/resources/css/gtk4.css b/resources/css/gtk4.css deleted file mode 100644 index dece072..0000000 --- a/resources/css/gtk4.css +++ /dev/null @@ -1,26 +0,0 @@ -/* -SPDX-FileCopyrightText: Simon Schneegans -SPDX-License-Identifier: CC0-1.0 -*/ - -/* These are only used if not using libadwaita */ - -.effect-row { - padding: 0; -} - -.effect-row-header, -.effect-row list { - padding: 8px; - border: 0 solid @borders; - border-bottom-width: 1px; -} - -.revealer-arrow { - margin-right: 6px; - transition: transform 250ms; -} - -.revealer-arrow.revealed { - transform: rotate(180deg); -} \ No newline at end of file diff --git a/resources/ui/gtk3/apparition.ui b/resources/ui/gtk3/apparition.ui deleted file mode 100644 index d217042..0000000 --- a/resources/ui/gtk3/apparition.ui +++ /dev/null @@ -1,281 +0,0 @@ - - - - - - - - 2000 - 100 - 10 - 100 - - - - 1 - 0 - 0.01 - 0.1 - - - - 10 - -10 - 0.1 - 1 - - - - 10 - 0 - 0.1 - 1 - - - - 1 - 0 - 0.01 - 0.1 - - - - - - - none - - - - 0 - - - 8 - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - apparition-animation-time - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Randomness - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - apparition-randomness - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Twirl Intensity - 0 - start - center - 1 - - - - - end - center - 1 - 1 - left - 300 - apparition-twirl-intensity - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Shake Intensity - 0 - start - center - 1 - - - - - end - center - 1 - 1 - left - 300 - apparition-shake-intensity - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Suction Intensity - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - apparition-suction-intensity - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk3/doom.ui b/resources/ui/gtk3/doom.ui deleted file mode 100644 index 2bf8fc3..0000000 --- a/resources/ui/gtk3/doom.ui +++ /dev/null @@ -1,229 +0,0 @@ - - - - - - - - 10000 - 100 - 1 - 100 - - - - 50 - 1 - 1 - 10 - - - - 50 - 1 - 1 - 10 - - - - 50 - 1 - 1 - 10 - - - - - - - none - - - - 0 - - - 8 - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - doom-animation-time - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Horizontal Scale - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - doom-horizontal-scale - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Vertical Scale - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - doom-vertical-scale - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Pixel Size - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - doom-pixel-size - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk3/energize-a.ui b/resources/ui/gtk3/energize-a.ui deleted file mode 100644 index 10ffe58..0000000 --- a/resources/ui/gtk3/energize-a.ui +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - - 10000 - 100 - 1 - 100 - - - - 10 - 0.1 - 0.01 - 0.1 - - - - - - - none - - - - 0 - - - 8 - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - energize-a-animation-time - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Scale - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - energize-a-scale - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - - - Color - 0 - start - center - 1 - - - - - 0 - 1 - 8 - 8 - 250 - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk3/energize-b.ui b/resources/ui/gtk3/energize-b.ui deleted file mode 100644 index 8e8709f..0000000 --- a/resources/ui/gtk3/energize-b.ui +++ /dev/null @@ -1,168 +0,0 @@ - - - - - - - - 10000 - 100 - 1 - 100 - - - - 10 - 0.1 - 0.01 - 0.1 - - - - - - - none - - - - 0 - - - 8 - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - energize-b-animation-time - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Scale - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - energize-b-scale - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - - - Color - 0 - start - center - 1 - - - - - 0 - 1 - 8 - 8 - 250 - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk3/fire.ui b/resources/ui/gtk3/fire.ui deleted file mode 100644 index 010fb6a..0000000 --- a/resources/ui/gtk3/fire.ui +++ /dev/null @@ -1,337 +0,0 @@ - - - - - - - - 10000 - 100 - 1 - 100 - - - - 3 - 0.1 - 0.01 - 0.1 - - - - 2.0 - -2.0 - 0.01 - 0.1 - - - - - - - none - - - - 0 - - - - - Presets - 0 - start - center - 1 - - - - - - - 8 - - - Choose a Preset - - - - - pan-down-symbolic - 1 - - - - - - - - - - - - - - 0 - - - 8 - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - fire-animation-time - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - - - Scale - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - fire-scale - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - - - Speed - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - fire-movement-speed - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - - - vertical - 3 - - - 3D Noise - 0 - start - center - 1 - - - - - Creates a more dynamic fire but requires more GPU power. - 0 - start - center - 1 - - - - - - - - end - center - 8 - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Gradient - 0 - start - center - 1 - - - - - 1 - 1 - - - - - 1 - 1 - - - - - 1 - 1 - - - - - 1 - 1 - - - - - 1 - 1 - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk3/glide.ui b/resources/ui/gtk3/glide.ui deleted file mode 100644 index 57a259c..0000000 --- a/resources/ui/gtk3/glide.ui +++ /dev/null @@ -1,281 +0,0 @@ - - - - - - - - 2000 - 100 - 1 - 100 - - - - 1 - 0.1 - 0.01 - 0.1 - - - - 1 - 0 - 0.01 - 0.1 - - - - 1 - -1 - 0.01 - 0.1 - - - - 1 - -1 - 0.01 - 0.1 - - - - - - - none - - - - 0 - - - 8 - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - glide-animation-time - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Scale - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - glide-scale - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Squish - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - glide-squish - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Tilt - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - glide-tilt - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Shift - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - glide-shift - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk3/glitch.ui b/resources/ui/gtk3/glitch.ui deleted file mode 100644 index a8c45c3..0000000 --- a/resources/ui/gtk3/glitch.ui +++ /dev/null @@ -1,271 +0,0 @@ - - - - - - - - 2000 - 100 - 1 - 100 - - - - 10 - 0.1 - 0.01 - 0.1 - - - - 10 - 0.1 - 0.01 - 0.1 - - - - 10 - 0.1 - 0.01 - 0.1 - - - - - - - none - - - - 0 - - - 8 - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - glitch-animation-time - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Scale - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - glitch-scale - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Strength - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - glitch-strength - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Speed - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - glitch-speed - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - - - Color - 0 - start - center - 1 - - - - - 1 - 1 - 8 - 8 - 250 - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk3/hexagon.ui b/resources/ui/gtk3/hexagon.ui deleted file mode 100644 index 5b4bd68..0000000 --- a/resources/ui/gtk3/hexagon.ui +++ /dev/null @@ -1,320 +0,0 @@ - - - - - - - - 10000 - 100 - 1 - 100 - - - - 10 - 0.1 - 0.01 - 0.1 - - - - 10 - 0 - 0.1 - 1 - - - - - - - none - - - - 0 - - - 8 - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - hexagon-animation-time - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Scale - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - hexagon-scale - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Mesh Line Width - 0 - start - center - 1 - - - - - end - center - 1 - 1 - left - 300 - hexagon-line-width - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - - - Line Color - 0 - start - center - 1 - - - - - 1 - 1 - 8 - 8 - 250 - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - - - Glow Color - 0 - start - center - 1 - - - - - 1 - 1 - 8 - 8 - 250 - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - - - vertical - 3 - - - Additive Blending - 0 - start - center - 1 - - - - - You may want to enable this for dark window themes. - 0 - start - center - 1 - - - - - - - - end - center - 8 - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk3/incinerate.ui b/resources/ui/gtk3/incinerate.ui deleted file mode 100644 index c31d869..0000000 --- a/resources/ui/gtk3/incinerate.ui +++ /dev/null @@ -1,278 +0,0 @@ - - - - - - - - 10000 - 100 - 1 - 100 - - - - 10 - 0.1 - 0.01 - 0.1 - - - - 1 - 0 - 0.01 - 0.1 - - - - - - - none - - - - 0 - - - 8 - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - incinerate-animation-time - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Scale - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - incinerate-scale - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Turbulence - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - incinerate-turbulence - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - - - vertical - 3 - - - Start at Pointer - 0 - start - center - 1 - - - - - If disabled, a random location will be chosen. - 0 - start - center - 1 - - - - - - - - end - center - 8 - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - - - Color - 0 - start - center - 1 - - - - - 0 - 1 - 8 - 8 - 250 - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk3/pixel-wheel.ui b/resources/ui/gtk3/pixel-wheel.ui deleted file mode 100644 index 90866dc..0000000 --- a/resources/ui/gtk3/pixel-wheel.ui +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - - 2000 - 100 - 1 - 100 - - - - 50 - 1 - 1 - 10 - - - - 50 - 1 - 1 - 10 - - - - - - - none - - - - 0 - - - 8 - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - pixel-wheel-animation-time - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Spoke Count - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - pixel-wheel-spoke-count - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Pixel Size - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - pixel-wheel-pixel-size - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk3/pixel-wipe.ui b/resources/ui/gtk3/pixel-wipe.ui deleted file mode 100644 index 297fbe5..0000000 --- a/resources/ui/gtk3/pixel-wipe.ui +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - 5000 - 100 - 1 - 100 - - - - 360 - 0 - 1 - 10 - - - - 50 - 1 - 1 - 10 - - - - - - - none - - - - 0 - - - 8 - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - pixel-wipe-animation-time - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Pixel Size - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - pixel-wipe-pixel-size - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk3/pixelate.ui b/resources/ui/gtk3/pixelate.ui deleted file mode 100644 index 1deacb5..0000000 --- a/resources/ui/gtk3/pixelate.ui +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - - 10000 - 100 - 1 - 100 - - - - 100 - 1 - 1 - 10 - - - - 50 - 1 - 1 - 10 - - - - - - - none - - - - 0 - - - 8 - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - pixelate-animation-time - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Noise - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - pixelate-noise - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Pixel Size - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - pixelate-pixel-size - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk3/portal.ui b/resources/ui/gtk3/portal.ui deleted file mode 100644 index 128347f..0000000 --- a/resources/ui/gtk3/portal.ui +++ /dev/null @@ -1,271 +0,0 @@ - - - - - - - - 5000 - 500 - 1 - 100 - - - - 2 - -2 - 0.1 - 1 - - - - 2 - -2 - 0.1 - 1 - - - - 100 - 1 - 1 - 10 - - - - - - - none - - - - 0 - - - 8 - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - portal-animation-time - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Rotation Speed - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - portal-rotation-speed - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Whirling - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - portal-whirling - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Details - 0 - start - center - 1 - - - - - end - center - 1 - 1 - left - 300 - portal-details - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - - - Color - 0 - start - center - 1 - - - - - 0 - 1 - 8 - 8 - 250 - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk3/prefs.ui b/resources/ui/gtk3/prefs.ui deleted file mode 100644 index d7d1654..0000000 --- a/resources/ui/gtk3/prefs.ui +++ /dev/null @@ -1,519 +0,0 @@ - - - - - - - - - - main-menu - 1 - - - heart-filled-symbolic - 1 - 1 - - - - - - - center - 1 - - - profile-menu - 1 - - - 1 - 6 - - - 1 - - - - - pan-down-symbolic - 1 - 1 - - - - - - - - - center - 1 - - - bmw-edit-profile-symbolic - 1 - 1 - - - - - - - - - over-down-up - - - - vertical - - - - info - false - true - - - - - Burn-My-Windows has been updated! - 6 - - - - - - - - - View Changelog - prefs.changelog - - - - - - update-info-button - - - - - - - never - true - - - - vertical - 20 - 20 - 20 - 20 - 5 - - - - - - - vertical - 5 - true - - - - Effect Selection - start - - - - - - - If multiple are selected, one is chosen randomly. - start - - - - - - - - - center - - - - - All - - - - - - None - - - - - - - - - - - - - none - - - - - - - - - - - - - - - - - vertical - 20 - 20 - 20 - 20 - 5 - - - - - Effect Profile Constraints - start - - - - - - - Define when the current effect settings should be used. - start - - - - - - 5 - 15 - - - none - - - - - - 0 - - - - - Application - 0 - start - center - 1 - - - - - - center - - - - - 300 - Any - - - - - - center - - - bmw-select-app-symbolic - 1 - - - - - - - - - - - - - - 0 - - - - - Animation Type - 0 - start - center - 1 - - - - - 200 - - Any - Opening Windows - Closing Windows - - - - - - - - - - - 0 - - - - - Window Type - 0 - start - center - 1 - - - - - 200 - - Any - Normal Windows - Dialog Windows - - - - - - - - - - - 0 - - - - - Color Scheme - 0 - start - center - 1 - - - - - 200 - - Any - Default Color Scheme - Dark Color Scheme - - - - - - - - - - - 0 - - - - - Power Mode - 0 - start - center - 1 - - - - - 200 - - Any - On Battery - Plugged In - - - - - - - - - - - 0 - - - - - Power Profile - 0 - start - center - 1 - - - - - 200 - - Any - Power-Saver Mode - Balanced Mode - Performance Mode - Power Saver or Balanced - Balanced or Performance - - - - - - - - - - - - - - - - Advanced Profile Options - start - - - - - - - 5 - 15 - - - none - - - - - - 0 - - - - - vertical - 3 - - - High Priority - 0 - start - center - 1 - - - - - Use this profile even if there are better matching profiles. - 0 - start - center - 1 - end - - - - - - - - center - - - - - - - - - - - - - - - prefs.profile-delete - Delete this Profile... - start - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk3/tv-glitch.ui b/resources/ui/gtk3/tv-glitch.ui deleted file mode 100644 index c2a8518..0000000 --- a/resources/ui/gtk3/tv-glitch.ui +++ /dev/null @@ -1,271 +0,0 @@ - - - - - - - - 2000 - 100 - 1 - 100 - - - - 10 - 0.1 - 0.01 - 0.1 - - - - 10 - 0.1 - 0.01 - 0.1 - - - - 10 - 0.1 - 0.01 - 0.1 - - - - - - - none - - - - 0 - - - 8 - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - tv-glitch-animation-time - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Scale - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - tv-glitch-scale - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Strength - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - tv-glitch-strength - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Speed - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - tv-glitch-speed - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - - - Color - 0 - start - center - 1 - - - - - 1 - 1 - 8 - 8 - 250 - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk3/tv.ui b/resources/ui/gtk3/tv.ui deleted file mode 100644 index 66edc99..0000000 --- a/resources/ui/gtk3/tv.ui +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - 10000 - 100 - 1 - 100 - - - - - - - none - - - - 0 - - - 8 - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - tv-animation-time - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - - - Color - 0 - start - center - 1 - - - - - 1 - 1 - 8 - 8 - 250 - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk3/wisps.ui b/resources/ui/gtk3/wisps.ui deleted file mode 100644 index 5029d44..0000000 --- a/resources/ui/gtk3/wisps.ui +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - - 10000 - 100 - 1 - 100 - - - - 10 - 0.1 - 0.01 - 0.1 - - - - - - - none - - - - 0 - - - 8 - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - wisps-animation-time - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - 8 - - - Scale - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - wisps-scale - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - 0 - - - - - Color - 0 - start - center - 1 - - - - - 0 - 1 - 8 - 8 - 250 - - - - - - - edit-clear-symbolic - 1 - - - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk4/apparition.ui b/resources/ui/gtk4/apparition.ui deleted file mode 100644 index 87da821..0000000 --- a/resources/ui/gtk4/apparition.ui +++ /dev/null @@ -1,249 +0,0 @@ - - - - - - - - - - none - - - - 0 - - - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - - - 2000 - 100 - 10 - 100 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Randomness - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 1 - 0 - 0.01 - 0.1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Twirl Intensity - 0 - start - center - 1 - - - - - end - center - 1 - 1 - left - 300 - - - 10 - -10 - 0.1 - 1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Shake Intensity - 0 - start - center - 1 - - - - - end - center - 1 - 1 - left - 300 - - - 10 - 0 - 0.1 - 1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Suction Intensity - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 1 - 0 - 0.01 - 0.1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk4/broken-glass.ui b/resources/ui/gtk4/broken-glass.ui deleted file mode 100644 index ab57fa4..0000000 --- a/resources/ui/gtk4/broken-glass.ui +++ /dev/null @@ -1,259 +0,0 @@ - - - - - - - - - - none - - - - 0 - - - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - - - 10000 - 100 - 1 - 100 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Scale - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 5 - 0.2 - 0.01 - 0.1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Gravity - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 2.0 - -2.0 - 0.01 - 0.1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Blow Force - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 2.0 - -2.0 - 0.01 - 0.1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - vertical - 3 - - - Shatter From Pointer Location - 0 - start - center - 1 - - - - - The shards will fly away from where your mouse pointer was when closing the window. - 0 - start - center - 1 - 1 - - - - - - - - end - center - 8 - 8 - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk4/doom.ui b/resources/ui/gtk4/doom.ui deleted file mode 100644 index eca1717..0000000 --- a/resources/ui/gtk4/doom.ui +++ /dev/null @@ -1,203 +0,0 @@ - - - - - - - - - - none - - - - 0 - - - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - - - 10000 - 100 - 1 - 100 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Horizontal Scale - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 50 - 1 - 1 - 10 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Vertical Scale - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 50 - 1 - 1 - 10 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Pixel Size - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - - - 50 - 1 - 1 - 10 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk4/energize-a.ui b/resources/ui/gtk4/energize-a.ui deleted file mode 100644 index 19e1ee6..0000000 --- a/resources/ui/gtk4/energize-a.ui +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - - - - - - none - - - - 0 - - - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - - - 10000 - 100 - 1 - 100 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Scale - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 10 - 0.1 - 0.01 - 0.1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Color - 0 - start - center - 1 - - - - - 0 - 1 - 8 - 8 - 250 - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk4/energize-b.ui b/resources/ui/gtk4/energize-b.ui deleted file mode 100644 index ae77456..0000000 --- a/resources/ui/gtk4/energize-b.ui +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - - - - - - none - - - - 0 - - - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - - - 10000 - 100 - 1 - 100 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Scale - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 10 - 0.1 - 0.01 - 0.1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Color - 0 - start - center - 1 - - - - - 0 - 1 - 8 - 8 - 250 - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk4/fire.ui b/resources/ui/gtk4/fire.ui deleted file mode 100644 index 9b77741..0000000 --- a/resources/ui/gtk4/fire.ui +++ /dev/null @@ -1,295 +0,0 @@ - - - - - - - - - - none - - - - 0 - - - - - Presets - 0 - start - center - 1 - - - - - Choose a Preset - - - - - - - - - - 0 - - - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - - - 10000 - 100 - 1 - 100 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Scale - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 3 - 0.1 - 0.01 - 0.1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Speed - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 2.0 - -2.0 - 0.01 - 0.1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - vertical - 3 - - - 3D Noise - 0 - start - center - 1 - - - - - Creates a more dynamic fire but requires more GPU power. - 0 - start - center - 1 - - - - - - - - end - center - 8 - 8 - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Gradient - 0 - start - center - 1 - - - - - 1 - 1 - - - - - 1 - 1 - - - - - 1 - 1 - - - - - 1 - 1 - - - - - 1 - 1 - 8 - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk4/glide.ui b/resources/ui/gtk4/glide.ui deleted file mode 100644 index 24d998e..0000000 --- a/resources/ui/gtk4/glide.ui +++ /dev/null @@ -1,252 +0,0 @@ - - - - - - - - - - - none - - - - 0 - - - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - - - 2000 - 100 - 1 - 100 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Scale - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 1 - 0.1 - 0.01 - 0.1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Squish - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 1 - 0 - 0.01 - 0.1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Tilt - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 1 - -1 - 0.01 - 0.1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Shift - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 1 - -1 - 0.01 - 0.1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk4/glitch.ui b/resources/ui/gtk4/glitch.ui deleted file mode 100644 index 7701849..0000000 --- a/resources/ui/gtk4/glitch.ui +++ /dev/null @@ -1,242 +0,0 @@ - - - - - - - - - - - none - - - - 0 - - - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - - - 2000 - 100 - 1 - 100 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Scale - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 10 - 0.1 - 0.01 - 0.1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Strength - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 10 - 0.1 - 0.01 - 0.1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Speed - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 10 - 0.1 - 0.01 - 0.1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Color - 0 - start - center - 1 - - - - - 1 - 1 - 8 - 8 - 250 - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk4/hexagon.ui b/resources/ui/gtk4/hexagon.ui deleted file mode 100644 index 8469298..0000000 --- a/resources/ui/gtk4/hexagon.ui +++ /dev/null @@ -1,288 +0,0 @@ - - - - - - - - - - - none - - - - 0 - - - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - - - 10000 - 100 - 1 - 100 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Scale - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 10 - 0.1 - 0.01 - 0.1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Mesh Line Width - 0 - start - center - 1 - - - - - end - center - 1 - 1 - left - 300 - - - 10 - 0 - 0.1 - 1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Line Color - 0 - start - center - 1 - - - - - 1 - 1 - 8 - 8 - 250 - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Glow Color - 0 - start - center - 1 - - - - - 1 - 1 - 8 - 8 - 250 - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - vertical - 3 - - - Additive Blending - 0 - start - center - 1 - - - - - You may want to enable this for dark window themes. - 0 - start - center - 1 - - - - - - - - end - center - 8 - 8 - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk4/incinerate.ui b/resources/ui/gtk4/incinerate.ui deleted file mode 100644 index 88a6136..0000000 --- a/resources/ui/gtk4/incinerate.ui +++ /dev/null @@ -1,251 +0,0 @@ - - - - - - - - - - - none - - - - 0 - - - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - - - 10000 - 100 - 1 - 100 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Scale - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 10 - 0.1 - 0.01 - 0.1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Turbulence - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 1 - 0 - 0.01 - 0.1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - vertical - 3 - - - Start at Pointer - 0 - start - center - 1 - - - - - If disabled, a random location will be chosen. - 0 - start - center - 1 - - - - - - - - end - center - 8 - 8 - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Color - 0 - start - center - 1 - - - - - 0 - 1 - 8 - 8 - 250 - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk4/matrix.ui b/resources/ui/gtk4/matrix.ui deleted file mode 100644 index f441d5e..0000000 --- a/resources/ui/gtk4/matrix.ui +++ /dev/null @@ -1,279 +0,0 @@ - - - - - - - - - - - none - - - - 0 - - - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - - - 10000 - 100 - 1 - 100 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Scale - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - - - 50 - 5 - 1 - 5 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Randomness - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 1.0 - 0.0 - 0.01 - 0.1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Vertical Overshooting - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 1.0 - 0.0 - 0.01 - 0.1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Trail Color - 0 - start - center - 1 - - - - - 0 - 1 - 8 - 8 - 250 - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Tip Color - 0 - start - center - 1 - - - - - 0 - 1 - 8 - 8 - 250 - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk4/paint-brush.ui b/resources/ui/gtk4/paint-brush.ui deleted file mode 100644 index 206f457..0000000 --- a/resources/ui/gtk4/paint-brush.ui +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - none - - - - 0 - - - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - - - 10000 - 100 - 1 - 100 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Brush Size - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - - - 4 - 1 - 1 - 1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk4/pixel-wheel.ui b/resources/ui/gtk4/pixel-wheel.ui deleted file mode 100644 index 4dcdd4a..0000000 --- a/resources/ui/gtk4/pixel-wheel.ui +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - - - - none - - - - 0 - - - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - - - 2000 - 100 - 1 - 100 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Spoke Count - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - - - 50 - 1 - 1 - 10 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Pixel Size - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - - - 50 - 1 - 1 - 10 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk4/pixel-wipe.ui b/resources/ui/gtk4/pixel-wipe.ui deleted file mode 100644 index 67549cc..0000000 --- a/resources/ui/gtk4/pixel-wipe.ui +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - none - - - - 0 - - - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - - - 5000 - 100 - 1 - 100 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Pixel Size - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - - - 50 - 1 - 1 - 10 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk4/pixelate.ui b/resources/ui/gtk4/pixelate.ui deleted file mode 100644 index 6dc5d58..0000000 --- a/resources/ui/gtk4/pixelate.ui +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - - - - none - - - - 0 - - - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - - - 10000 - 100 - 1 - 100 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Noise - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - - - 100 - 1 - 1 - 10 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Pixel Size - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - - - 50 - 1 - 1 - 10 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk4/portal.ui b/resources/ui/gtk4/portal.ui deleted file mode 100644 index f339557..0000000 --- a/resources/ui/gtk4/portal.ui +++ /dev/null @@ -1,242 +0,0 @@ - - - - - - - - - - - none - - - - 0 - - - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - - - 5000 - 500 - 1 - 100 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Whirling - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 2 - -2 - 0.1 - 1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Rotation Speed - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 2 - -2 - 0.1 - 1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Details - 0 - start - center - 1 - - - - - end - center - 1 - 1 - left - 300 - - - 100 - 1 - 1 - 10 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Color - 0 - start - center - 1 - - - - - 0 - 1 - 8 - 8 - 250 - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk4/prefs.ui b/resources/ui/gtk4/prefs.ui deleted file mode 100644 index 393c8d4..0000000 --- a/resources/ui/gtk4/prefs.ui +++ /dev/null @@ -1,475 +0,0 @@ - - - - - - - - - - main-menu - heart-filled-symbolic - - - - - center - - - profile-menu - - - - - bmw-edit-profile-symbolic - center - - - - - - - over-down-up - - - - vertical - - - - info - false - true - - - Burn-My-Windows has been updated! - 6 - - - - - View Changelog - prefs.changelog - - - - update-info-button - - - - - - - never - true - - - - vertical - 20 - 20 - 20 - 20 - 5 - - - - - - - vertical - 5 - true - - - - Effect Selection - start - - - - - - - If multiple are selected, one is chosen randomly. - start - - - - - - - - - center - - - - - All - - - - - - None - - - - - - - - - - - 6 - - - none - - - - - - - - - - - - - - - - - - vertical - 20 - 20 - 20 - 20 - 5 - - - - - Effect Profile Constraints - start - - - - - - - Define when the current effect settings should be used. - start - - - - - - 5 - 15 - - - none - 1 - - - - - 0 - - - - - Application - 0 - start - center - 1 - - - - - - center - - - - - 300 - Any - - - - - - bmw-select-app-symbolic - center - - - - - - - - - - - - 0 - - - - - Animation Type - 0 - start - center - 1 - - - - - 200 - - Any - Opening Windows - Closing Windows - - - - - - - - - - - 0 - - - - - Window Type - 0 - start - center - 1 - - - - - 200 - - Any - Normal Windows - Dialog Windows - - - - - - - - - - - 0 - - - - - Color Scheme - 0 - start - center - 1 - - - - - 200 - - Any - Default Color Scheme - Dark Color Scheme - - - - - - - - - - - 0 - - - - - Power Mode - 0 - start - center - 1 - - - - - 200 - - Any - On Battery - Plugged In - - - - - - - - - - - 0 - - - - - Power Profile - 0 - start - center - 1 - - - - - 200 - - Any - Power-Saver Mode - Balanced Mode - Performance Mode - Power Saver or Balanced - Balanced or Performance - - - - - - - - - - - - - - - - Advanced Profile Options - start - - - - - - - 5 - 15 - - - none - 1 - - - - - 0 - - - - - vertical - 3 - - - High Priority - 0 - start - center - 1 - - - - - Use this profile even if there are better matching profiles. - 0 - start - center - 1 - end - - - - - - - - center - - - - - - - - - - - - - - - prefs.profile-delete - Delete this Profile... - start - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk4/snap.ui b/resources/ui/gtk4/snap.ui deleted file mode 100644 index 0756361..0000000 --- a/resources/ui/gtk4/snap.ui +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - - - - - - none - - - - 0 - - - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - - - 10000 - 500 - 10 - 100 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Scale - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 20 - 0.1 - 0.01 - 0.1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Color - 0 - start - center - 1 - - - - - 1 - 1 - 8 - 8 - 250 - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk4/trex.ui b/resources/ui/gtk4/trex.ui deleted file mode 100644 index c90903d..0000000 --- a/resources/ui/gtk4/trex.ui +++ /dev/null @@ -1,242 +0,0 @@ - - - - - - - - - - - none - - - - 0 - - - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - - - 10000 - 100 - 1 - 100 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Claw Scratch Scale - 0 - start - center - 1 - - - - - end - center - 1 - 1 - left - 300 - - - 10 - 0.1 - 0.1 - 1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Claw Scratch Count - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - - - 50 - 1 - 1 - 10 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Warp Effect - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 1 - 0 - 0.01 - 0.1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Flash Color - 0 - start - center - 1 - - - - - 1 - 1 - 8 - 8 - 250 - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk4/tv-glitch.ui b/resources/ui/gtk4/tv-glitch.ui deleted file mode 100644 index 858bec1..0000000 --- a/resources/ui/gtk4/tv-glitch.ui +++ /dev/null @@ -1,242 +0,0 @@ - - - - - - - - - - - none - - - - 0 - - - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - - - 2000 - 100 - 1 - 100 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Scale - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 10 - 0.1 - 0.01 - 0.1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Strength - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 10 - 0.1 - 0.01 - 0.1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Speed - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 10 - 0.1 - 0.01 - 0.1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Color - 0 - start - center - 1 - - - - - 1 - 1 - 8 - 8 - 250 - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk4/tv.ui b/resources/ui/gtk4/tv.ui deleted file mode 100644 index f345a4a..0000000 --- a/resources/ui/gtk4/tv.ui +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - none - - - - 0 - - - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - - - 10000 - 100 - 1 - 100 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Color - 0 - start - center - 1 - - - - - 1 - 1 - 8 - 8 - 250 - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ui/gtk4/wisps.ui b/resources/ui/gtk4/wisps.ui deleted file mode 100644 index e5d3a37..0000000 --- a/resources/ui/gtk4/wisps.ui +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - - - - - - none - - - - 0 - - - - - Animation Time [ms] - 0 - start - center - 1 - - - - - end - center - 1 - 0 - left - 300 - - - 10000 - 100 - 1 - 100 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Scale - 0 - start - center - 1 - - - - - end - center - 1 - 2 - left - 300 - - - 10 - 0.1 - 0.01 - 0.1 - - - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Color - 0 - start - center - 1 - - - - - 0 - 1 - 8 - 8 - 250 - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/ProfileManager.js b/src/ProfileManager.js index 38201d1..91233be 100644 --- a/src/ProfileManager.js +++ b/src/ProfileManager.js @@ -12,7 +12,7 @@ // SPDX-FileCopyrightText: Simon Schneegans // SPDX-License-Identifier: GPL-3.0-or-later -//'use strict'; +'use strict'; import Gio from 'gi://Gio'; import GLib from 'gi://GLib'; diff --git a/src/Shader.js b/src/Shader.js index 11369df..87126e5 100644 --- a/src/Shader.js +++ b/src/Shader.js @@ -20,7 +20,7 @@ import GObject from 'gi://GObject'; import Clutter from 'gi://Clutter'; import Meta from 'gi://Meta'; -import {shellVersionIsAtLeast, getStringResource} from './utils.js'; +import {getStringResource} from './utils.js'; ////////////////////////////////////////////////////////////////////////////////////////// // This is the base class for all shaders of Burn-My-Windows. It automagically loads // @@ -186,10 +186,8 @@ export var Shader = GObject.registerClass( // to undo this. It is a pity that we have to do this here, as it is not really // required to be done each frame. But it's the only place where we can do it. // https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2650 - if (shellVersionIsAtLeast(44, 2)) { - this.get_pipeline().set_blend( - 'RGBA = ADD (SRC_COLOR * (SRC_COLOR[A]), DST_COLOR * (1-SRC_COLOR[A]))'); - } + this.get_pipeline().set_blend( + 'RGBA = ADD (SRC_COLOR * (SRC_COLOR[A]), DST_COLOR * (1-SRC_COLOR[A]))'); this.set_uniform_float(this._uProgress, 1, [this._progress]); super.vfunc_paint_target(...params); diff --git a/src/effects/Fire.js b/src/effects/Fire.js index b819774..5237f2f 100644 --- a/src/effects/Fire.js +++ b/src/effects/Fire.js @@ -19,7 +19,6 @@ import Gio from 'gi://Gio'; const _ = imports.gettext.domain('burn-my-windows').gettext; import {ShaderFactory} from '../ShaderFactory.js'; -import {isGTK4} from '../utils.js'; ////////////////////////////////////////////////////////////////////////////////////////// // This effect is a homage to the good old Compiz days. However, it is implemented // @@ -225,7 +224,7 @@ export default class Effect { dialog.getBuilder().get_object('fire-preset-button').set_menu_model(menu); - const root = isGTK4() ? widget.get_root() : widget.get_toplevel(); + const root = widget.get_root(); root.insert_action_group(groupName, group); }); } diff --git a/src/utils.js b/src/utils.js index 1c5b0c6..6742f8c 100644 --- a/src/utils.js +++ b/src/utils.js @@ -15,9 +15,7 @@ 'use strict'; import Gio from 'gi://Gio'; -import Gtk from 'gi://Gtk'; import GLib from 'gi://GLib'; -import Adw from 'gi://Adw'; // Returns the given argument, except for "alpha", "beta", and "rc". In these cases -3, // -2, and -1 are returned respectively. @@ -40,38 +38,21 @@ const [GS_MAJOR, GS_MINOR] = Config.PACKAGE_VERSION.split('.').map(toNumericVers // the standard log() functionality by prepending the extension's name and the location // where the message was logged. As the extensions name is part of the location, you // can more effectively watch the log output of GNOME Shell: -// journalctl -f -o cat | grep -E 'particle-effects|' -// This method is based on a similar script from the Fly-Pie GNOME Shell extension which -// os published under the MIT License (https://github.com/Schneegans/Fly-Pie). +// journalctl -f -o cat | grep -E 'burn-my-windows|' export function debug(message) { const stack = new Error().stack.split('\n'); // Remove debug() function call from stack. stack.shift(); - // Find the index of the extension directory (e.g. particles@schneegans.github.com) in - // the stack entry. We do not want to print the entire absolute file path. - // const extensionRoot = stack[0].indexOf(Extension.uuid); - log('[' + stack[0] + '] ' + message); - // log('[' + stack[0].slice(extensionRoot) + '] ' + message); } -// This method simply returns true if we are currently using GTK4. -export function isGTK4() { - return Gtk.get_major_version() == 4; -} - -// Starting with GNOME Shell 42, the settings dialog uses libadwaita (at least most of -// the time - it seems that pop!_OS does not support libadwaita even on GNOME 42). -export function isADW() { - return Adw && shellVersionIsAtLeast(42, 'beta'); -} - -// This method returns 'gtk3', 'gtk4', or 'adw' depending on the currently used GTK / and -// or libadwaita version. +// Currently, the extension supports only one set of UI files. In the past, there were +// three different sets for GTK3, GTK4, and Adwaita. This method returns the name of the +// current UI directory. It's still here since it might be useful in the future. export function getUIDir() { - return isADW() ? 'adw' : (isGTK4() ? 'gtk4' : 'gtk3'); + return 'adw'; } // This method returns true if the current GNOME Shell version matches the given