Merge branch 'main' into feature/esm-modules

This commit is contained in:
Simon Schneegans
2023-08-18 05:47:31 +02:00
42 changed files with 2460 additions and 1896 deletions
+23 -7
View File
@@ -78,17 +78,33 @@ SPDX-License-Identifier: GPL-3.0-or-later
<child>
<object class="AdwActionRow">
<property name="title" translatable="yes">Color</property>
<property name="activatable-widget">wisps-color</property>
<child>
<object class="GtkColorButton" id="wisps-color">
<property name="use_alpha">0</property>
<property name="show_editor">1</property>
<property name="width-request">250</property>
<property name="valign">center</property>
<object class="GtkBox">
<style>
<class name="linked" />
</style>
<child>
<object class="GtkColorButton" id="wisps-color-1">
<property name="show_editor">1</property>
<property name="valign">center</property>
</object>
</child>
<child>
<object class="GtkColorButton" id="wisps-color-2">
<property name="show_editor">1</property>
<property name="valign">center</property>
</object>
</child>
<child>
<object class="GtkColorButton" id="wisps-color-3">
<property name="show_editor">1</property>
<property name="valign">center</property>
</object>
</child>
</object>
</child>
<child>
<object class="GtkButton" id="reset-wisps-color">
<object class="GtkButton" id="reset-wisps-colors">
<property name="icon-name">edit-clear-symbolic</property>
<property name="valign">center</property>
<property name="tooltip-text" translatable="yes">Reset to Default Value</property>
+6
View File
@@ -51,6 +51,12 @@ SPDX-License-Identifier: GPL-3.0-or-later
</item>
</submenu>
</section>
<section>
<item>
<attribute name="label" translatable="yes">Open Effect-Profile Directory</attribute>
<attribute name="action">prefs.profile-dir</attribute>
</item>
</section>
<section>
<item>
<attribute name="label" translatable="yes">About Burn-My-Windows</attribute>