From 91daabd791c033eb1361d1547009683b2dd91917 Mon Sep 17 00:00:00 2001 From: Simon Schneegans Date: Sat, 8 Jan 2022 13:24:54 +0100 Subject: [PATCH] :recycle: Split settings to separate ui files --- prefs.js | 14 +- resources/ui/gtk3/prefs.ui | 2 +- resources/ui/gtk4/fire.ui | 270 +++++++++++++ resources/ui/gtk4/matrix.ui | 188 +++++++++ resources/ui/gtk4/prefs.ui | 747 +----------------------------------- resources/ui/gtk4/trex.ui | 200 ++++++++++ resources/ui/gtk4/tv.ui | 63 +++ 7 files changed, 735 insertions(+), 749 deletions(-) create mode 100644 resources/ui/gtk4/fire.ui create mode 100644 resources/ui/gtk4/matrix.ui create mode 100644 resources/ui/gtk4/trex.ui create mode 100644 resources/ui/gtk4/tv.ui diff --git a/prefs.js b/prefs.js index d39d906..4073dba 100644 --- a/prefs.js +++ b/prefs.js @@ -32,15 +32,25 @@ var PreferencesDialog = class PreferencesDialog { this._resources = Gio.Resource.load(Me.path + '/resources/burn-my-windows.gresource'); Gio.resources_register(this._resources); + // Store a reference to the settings object. + this._settings = ExtensionUtils.getSettings(); + // Load the user interface file. this._builder = new Gtk.Builder(); this._builder.add_from_resource(`/ui/${utils.isGTK4() ? 'gtk4' : 'gtk3'}/prefs.ui`); + this._builder.add_from_resource(`/ui/${utils.isGTK4() ? 'gtk4' : 'gtk3'}/fire.ui`); + this._builder.add_from_resource(`/ui/${utils.isGTK4() ? 'gtk4' : 'gtk3'}/matrix.ui`); + this._builder.add_from_resource(`/ui/${utils.isGTK4() ? 'gtk4' : 'gtk3'}/tv.ui`); + this._builder.add_from_resource(`/ui/${utils.isGTK4() ? 'gtk4' : 'gtk3'}/trex.ui`); // This is our top-level widget which we will return later. this._widget = this._builder.get_object('settings-widget'); - // Store a reference to the settings object. - this._settings = ExtensionUtils.getSettings(); + const stack = this._builder.get_object('main-stack'); + stack.add_titled(this._builder.get_object('fire-prefs'), 'fire', 'Fire'); + stack.add_titled(this._builder.get_object('matrix-prefs'), 'matrix', 'Matrix'); + stack.add_titled(this._builder.get_object('trex-prefs'), 'trex', 'T-Rex Attack'); + stack.add_titled(this._builder.get_object('tv-prefs'), 'tv', 'TV Effect'); // Bind all properties. this._bindCombobox('close-animation'); diff --git a/resources/ui/gtk3/prefs.ui b/resources/ui/gtk3/prefs.ui index e02b59d..f531341 100644 --- a/resources/ui/gtk3/prefs.ui +++ b/resources/ui/gtk3/prefs.ui @@ -1,5 +1,5 @@ - + diff --git a/resources/ui/gtk4/fire.ui b/resources/ui/gtk4/fire.ui new file mode 100644 index 0000000..6e28e38 --- /dev/null +++ b/resources/ui/gtk4/fire.ui @@ -0,0 +1,270 @@ + + + + + vertical + 60 + 60 + 60 + 60 + + + + 20 + + + none + 1 + + + + + 0 + + + + + Presets + 0 + start + center + 1 + + + + + Choose a Preset + 0 + + + + + + + + + + + + + + + + none + 1 + + + + + 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 + + + + + edit-clear-symbolic + Reset to Default Value + + + + + + + + + + + 0 + + + + + Gradient + 0 + start + center + 1 + + + + + 1 + 1 + + + + + 1 + 1 + + + + + 1 + 1 + + + + + 1 + 1 + + + + + 1 + 1 + + + + + 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 new file mode 100644 index 0000000..d7eed91 --- /dev/null +++ b/resources/ui/gtk4/matrix.ui @@ -0,0 +1,188 @@ + + + + + vertical + 60 + 60 + 60 + 60 + + + + + + none + 1 + + + + + 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 + + + + + Trail Color + 0 + start + center + 1 + + + + + 0 + 1 + + + + + edit-clear-symbolic + Reset to Default Value + + + + + + + + + + + 0 + + + + + Tip Color + 0 + start + center + 1 + + + + + 0 + 1 + + + + + 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 index 857d2f8..19a77a6 100644 --- a/resources/ui/gtk4/prefs.ui +++ b/resources/ui/gtk4/prefs.ui @@ -1,5 +1,5 @@ - + @@ -229,751 +229,6 @@ - - - Fire - - - - vertical - 60 - 60 - 60 - 60 - - - - 20 - - - none - 1 - - - - - 0 - - - - - Presets - 0 - start - center - 1 - - - - - Choose a Preset - 0 - - - - - - - - - - - - - - - - - none - 1 - - - - - 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 - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Gradient - 0 - start - center - 1 - - - - - 1 - 1 - - - - - 1 - 1 - - - - - 1 - 1 - - - - - 1 - 1 - - - - - 1 - 1 - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - - - - - - - - - - - - - Matrix - - - - vertical - 60 - 60 - 60 - 60 - - - - - - none - 1 - - - - - 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 - - - - - Trail Color - 0 - start - center - 1 - - - - - 0 - 1 - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - 0 - - - - - Tip Color - 0 - start - center - 1 - - - - - 0 - 1 - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - - - - - - - - - - - - - TV Effect - - - - vertical - 60 - 60 - 60 - 60 - - - - - - none - 1 - - - - - 0 - - - - - Color - 0 - start - center - 1 - - - - - 0 - 1 - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - - - - - - - - - - - - - T-Rex Attack - - - - vertical - 60 - 60 - 60 - 60 - - - - - - none - 1 - - - - - 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 - - - - - edit-clear-symbolic - Reset to Default Value - - - - - - - - - - - - - - - - - - - diff --git a/resources/ui/gtk4/trex.ui b/resources/ui/gtk4/trex.ui new file mode 100644 index 0000000..14d20d3 --- /dev/null +++ b/resources/ui/gtk4/trex.ui @@ -0,0 +1,200 @@ + + + + + vertical + 60 + 60 + 60 + 60 + + + + + + none + 1 + + + + + 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 + + + + + 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 new file mode 100644 index 0000000..150712e --- /dev/null +++ b/resources/ui/gtk4/tv.ui @@ -0,0 +1,63 @@ + + + + + vertical + 60 + 60 + 60 + 60 + + + + + + none + 1 + + + + + 0 + + + + + Color + 0 + start + center + 1 + + + + + 0 + 1 + + + + + edit-clear-symbolic + Reset to Default Value + + + + + + + + + + + + + + + + + \ No newline at end of file