biipadmin/Burn-My-Windows
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🔧 Revert fire settings names

Browse Source
This commit is contained in:
Simon Schneegans
2022-01-09 13:13:34 +01:00
parent 7ec9609d7a
commit a99b682bf9
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/ui/gtk3/firePage.ui
+8 -8
View File
@@ -8,14 +8,14 @@
<property name="page-increment">100</property> <property name="page-increment">100</property>
</object> </object>
<object class="GtkAdjustment" id="fire-scale"> <object class="GtkAdjustment" id="flame-scale">
<property name="upper">3</property> <property name="upper">3</property>
<property name="lower">0.1</property> <property name="lower">0.1</property>
<property name="step-increment">0.01</property> <property name="step-increment">0.01</property>
<property name="page-increment">0.1</property> <property name="page-increment">0.1</property>
</object> </object>
<object class="GtkAdjustment" id="fire-movement-speed"> <object class="GtkAdjustment" id="flame-movement-speed">
<property name="upper">2.0</property> <property name="upper">2.0</property>
<property name="lower">-2.0</property> <property name="lower">-2.0</property>
<property name="step-increment">0.01</property> <property name="step-increment">0.01</property>
@@ -171,11 +171,11 @@
<property name="digits">2</property> <property name="digits">2</property>
<property name="value-pos">left</property> <property name="value-pos">left</property>
<property name="width-request">300</property> <property name="width-request">300</property>
<property name="adjustment">fire-scale</property> <property name="adjustment">flame-scale</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton" id="reset-fire-scale"> <object class="GtkButton" id="reset-flame-scale">
<child> <child>
<object class="GtkImage"> <object class="GtkImage">
<property name="icon-name">edit-clear-symbolic</property> <property name="icon-name">edit-clear-symbolic</property>
@@ -219,11 +219,11 @@
<property name="digits">2</property> <property name="digits">2</property>
<property name="value-pos">left</property> <property name="value-pos">left</property>
<property name="width-request">300</property> <property name="width-request">300</property>
<property name="adjustment">fire-movement-speed</property> <property name="adjustment">flame-movement-speed</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton" id="reset-fire-movement-speed"> <object class="GtkButton" id="reset-flame-movement-speed">
<child> <child>
<object class="GtkImage"> <object class="GtkImage">
<property name="icon-name">edit-clear-symbolic</property> <property name="icon-name">edit-clear-symbolic</property>
@@ -279,13 +279,13 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkSwitch" id="fire-3d-noise"> <object class="GtkSwitch" id="flame-3d-noise">
<property name="halign">end</property> <property name="halign">end</property>
<property name="valign">center</property> <property name="valign">center</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton" id="reset-fire-3d-noise"> <object class="GtkButton" id="reset-flame-3d-noise">
<child> <child>
<object class="GtkImage"> <object class="GtkImage">
<property name="icon-name">edit-clear-symbolic</property> <property name="icon-name">edit-clear-symbolic</property>
resources/ui/gtk4/firePage.ui
+6 -6
View File
@@ -127,7 +127,7 @@
<property name="value-pos">left</property> <property name="value-pos">left</property>
<property name="width-request">300</property> <property name="width-request">300</property>
<property name="adjustment"> <property name="adjustment">
<object class="GtkAdjustment" id="fire-scale"> <object class="GtkAdjustment" id="flame-scale">
<property name="upper">3</property> <property name="upper">3</property>
<property name="lower">0.1</property> <property name="lower">0.1</property>
<property name="step-increment">0.01</property> <property name="step-increment">0.01</property>
@@ -137,7 +137,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton" id="reset-fire-scale"> <object class="GtkButton" id="reset-flame-scale">
<property name="icon-name">edit-clear-symbolic</property> <property name="icon-name">edit-clear-symbolic</property>
<property name="tooltip-text">Reset to Default Value</property> <property name="tooltip-text">Reset to Default Value</property>
<style> <style>
@@ -173,7 +173,7 @@
<property name="value-pos">left</property> <property name="value-pos">left</property>
<property name="width-request">300</property> <property name="width-request">300</property>
<property name="adjustment"> <property name="adjustment">
<object class="GtkAdjustment" id="fire-movement-speed"> <object class="GtkAdjustment" id="flame-movement-speed">
<property name="upper">2.0</property> <property name="upper">2.0</property>
<property name="lower">-2.0</property> <property name="lower">-2.0</property>
<property name="step-increment">0.01</property> <property name="step-increment">0.01</property>
@@ -183,7 +183,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton" id="reset-fire-movement-speed"> <object class="GtkButton" id="reset-flame-movement-speed">
<property name="icon-name">edit-clear-symbolic</property> <property name="icon-name">edit-clear-symbolic</property>
<property name="tooltip-text">Reset to Default Value</property> <property name="tooltip-text">Reset to Default Value</property>
<style> <style>
@@ -230,13 +230,13 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkSwitch" id="fire-3d-noise"> <object class="GtkSwitch" id="flame-3d-noise">
<property name="halign">end</property> <property name="halign">end</property>
<property name="valign">center</property> <property name="valign">center</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton" id="reset-fire-3d-noise"> <object class="GtkButton" id="reset-flame-3d-noise">
<property name="icon-name">edit-clear-symbolic</property> <property name="icon-name">edit-clear-symbolic</property>
<property name="tooltip-text">Reset to Default Value</property> <property name="tooltip-text">Reset to Default Value</property>
<style> <style>
schemas/org.gnome.shell.extensions.burn-my-windows.gschema.xml
+3 -3
View File
@@ -29,19 +29,19 @@
<description>The time the fire effect takes.</description> <description>The time the fire effect takes.</description>
</key> </key>
<key name="fire-movement-speed" type="d"> <key name="flame-movement-speed" type="d">
<default>0.5</default> <default>0.5</default>
<summary>Fire Movement Speed</summary> <summary>Fire Movement Speed</summary>
<description>The speed at which the fire moves.</description> <description>The speed at which the fire moves.</description>
</key> </key>
<key name="fire-scale" type="d"> <key name="flame-scale" type="d">
<default>1.0</default> <default>1.0</default>
<summary>Fire Scale</summary> <summary>Fire Scale</summary>
<description>The size of the fire.</description> <description>The size of the fire.</description>
</key> </key>
<key name="fire-3d-noise" type="b"> <key name="flame-3d-noise" type="b">
<default>false</default> <default>false</default>
<summary>Fire 3D Noise</summary> <summary>Fire 3D Noise</summary>
<description>Use a 3D noise for the fire.</description> <description>Use a 3D noise for the fire.</description>
src/prefs/FirePage.js
+5 -5
View File
@@ -49,9 +49,9 @@ var FirePage = class FirePage extends PrefsPage {
// Bind all properties. // Bind all properties.
this._bindAdjustment('fire-animation-time'); this._bindAdjustment('fire-animation-time');
this._bindAdjustment('fire-movement-speed'); this._bindAdjustment('flame-movement-speed');
this._bindAdjustment('fire-scale'); this._bindAdjustment('flame-scale');
this._bindSwitch('fire-3d-noise'); this._bindSwitch('flame-3d-noise');
this._bindColorButton('fire-color-1'); this._bindColorButton('fire-color-1');
this._bindColorButton('fire-color-2'); this._bindColorButton('fire-color-2');
this._bindColorButton('fire-color-3'); this._bindColorButton('fire-color-3');
@@ -144,8 +144,8 @@ var FirePage = class FirePage extends PrefsPage {
// Load the preset on activation. // Load the preset on activation.
action.connect('activate', () => { action.connect('activate', () => {
this._settings.set_double('fire-movement-speed', preset.speed); this._settings.set_double('flame-movement-speed', preset.speed);
this._settings.set_double('fire-scale', preset.scale); this._settings.set_double('flame-scale', preset.scale);
this._settings.set_string('fire-color-1', preset.color1); this._settings.set_string('fire-color-1', preset.color1);
this._settings.set_string('fire-color-2', preset.color2); this._settings.set_string('fire-color-2', preset.color2);
this._settings.set_string('fire-color-3', preset.color3); this._settings.set_string('fire-color-3', preset.color3);