From 1af87cd5e37a8e0a4e665fe0862045dfd1615b5f Mon Sep 17 00:00:00 2001
From: Simon Schneegans <code@simonschneegans.de>
Date: Sat, 8 Jan 2022 13:51:59 +0100
Subject: [PATCH] :wrench: Gtk3 fixes

---
 resources/ui/gtk3/fire.ui  |  30 ++++-
 resources/ui/gtk3/prefs.ui | 263 +++++++++++++++++++------------------
 2 files changed, 166 insertions(+), 127 deletions(-)

diff --git a/resources/ui/gtk3/fire.ui b/resources/ui/gtk3/fire.ui
index d8d9aa5..93a3e61 100644
--- a/resources/ui/gtk3/fire.ui
+++ b/resources/ui/gtk3/fire.ui
@@ -53,7 +53,22 @@
                     <child>
                       <object class="GtkMenuButton" id="fire-preset-button">
                         <property name="relief">none</property>
-                        <property name="label">Choose a Preset</property>
+                        <child>
+                          <object class="GtkBox">
+                            <property name="spacing">8</property>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="label" translatable="yes">Choose a Preset</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkImage">
+                                <property name="icon-name">pan-down-symbolic</property>
+                                <property name="icon-size">1</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>
@@ -124,6 +139,10 @@
 
             <child>
               <object class="GtkListBoxRow">
+                <property name="margin-start">10</property>
+                <property name="margin-end">10</property>
+                <property name="margin-top">10</property>
+                <property name="margin-bottom">10</property>
                 <property name="activatable">0</property>
                 <child>
                   <object class="GtkBox">
@@ -168,6 +187,10 @@
 
             <child>
               <object class="GtkListBoxRow">
+                <property name="margin-start">10</property>
+                <property name="margin-end">10</property>
+                <property name="margin-top">10</property>
+                <property name="margin-bottom">10</property>
                 <property name="activatable">0</property>
                 <child>
                   <object class="GtkBox">
@@ -226,9 +249,14 @@
 
             <child>
               <object class="GtkListBoxRow">
+                <property name="margin-start">10</property>
+                <property name="margin-end">10</property>
+                <property name="margin-top">10</property>
+                <property name="margin-bottom">10</property>
                 <property name="activatable">0</property>
                 <child>
                   <object class="GtkBox">
+                    <property name="spacing">8</property>
                     <child>
                       <object class="GtkLabel">
                         <property name="label" translatable="yes">Gradient</property>
diff --git a/resources/ui/gtk3/prefs.ui b/resources/ui/gtk3/prefs.ui
index 93815a3..9703f23 100644
--- a/resources/ui/gtk3/prefs.ui
+++ b/resources/ui/gtk3/prefs.ui
@@ -46,170 +46,181 @@
     </child>
     <child>
       <object class="GtkStack" id="main-stack">
+        <property name="transition-type">slide-up-down</property>
+        <property name="hexpand">1</property>
+
         <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <property name="margin-start">60</property>
-            <property name="margin-end">60</property>
-            <property name="margin-top">30</property>
-            <property name="margin-bottom">30</property>
 
-            <child>
-              <object class="GtkFrame">
+          <object class="GtkStackPage">
+            <property name="title">General Options</property>
+            <property name="child">
+
+              <object class="GtkBox">
+                <property name="orientation">vertical</property>
+                <property name="margin-start">60</property>
+                <property name="margin-end">60</property>
+                <property name="margin-top">30</property>
+                <property name="margin-bottom">30</property>
+
                 <child>
-                  <object class="GtkListBox">
-                    <property name="selection-mode">none</property>
-
+                  <object class="GtkFrame">
                     <child>
-                      <object class="GtkListBoxRow">
-                        <property name="margin-start">10</property>
-                        <property name="margin-end">10</property>
-                        <property name="margin-top">10</property>
-                        <property name="margin-bottom">10</property>
-                        <property name="activatable">0</property>
+                      <object class="GtkListBox">
+                        <property name="selection-mode">none</property>
+
                         <child>
-                          <object class="GtkBox">
-                            <property name="spacing">8</property>
+                          <object class="GtkListBoxRow">
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
+                            <property name="activatable">0</property>
                             <child>
-                              <object class="GtkLabel">
-                                <property name="label" translatable="yes">Close Window Animation</property>
-                                <property name="xalign">0</property>
-                                <property name="halign">start</property>
-                                <property name="valign">center</property>
-                                <property name="hexpand">1</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkComboBox" id="close-animation">
-                                <property name="valign">center</property>
-                                <property name="model">animation-mode-list</property>
-                                <property name="id_column">1</property>
-                                <property name="active_id">fire</property>
+                              <object class="GtkBox">
+                                <property name="spacing">8</property>
                                 <child>
-                                  <object class="GtkCellRendererText" />
-                                  <attributes>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="reset-close-animation">
-                                <child>
-                                  <object class="GtkImage">
-                                    <property name="icon-name">edit-clear-symbolic</property>
-                                    <property name="icon-size">1</property>
+                                  <object class="GtkLabel">
+                                    <property name="label" translatable="yes">Close Window Animation</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkComboBox" id="close-animation">
+                                    <property name="valign">center</property>
+                                    <property name="model">animation-mode-list</property>
+                                    <property name="id_column">1</property>
+                                    <property name="active_id">fire</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" />
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="reset-close-animation">
+                                    <child>
+                                      <object class="GtkImage">
+                                        <property name="icon-name">edit-clear-symbolic</property>
+                                        <property name="icon-size">1</property>
+                                      </object>
+                                    </child>
+                                    <property name="tooltip-text">Reset to Default Value</property>
+                                    <style>
+                                      <class name="flat" />
+                                    </style>
                                   </object>
                                 </child>
-                                <property name="tooltip-text">Reset to Default Value</property>
-                                <style>
-                                  <class name="flat" />
-                                </style>
                               </object>
                             </child>
                           </object>
                         </child>
-                      </object>
-                    </child>
 
-                    <child>
-                      <object class="GtkListBoxRow">
-                        <property name="margin-start">10</property>
-                        <property name="margin-end">10</property>
-                        <property name="margin-top">10</property>
-                        <property name="margin-bottom">10</property>
-                        <property name="activatable">0</property>
                         <child>
-                          <object class="GtkBox">
-                            <property name="spacing">8</property>
+                          <object class="GtkListBoxRow">
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
+                            <property name="activatable">0</property>
                             <child>
-                              <object class="GtkLabel">
-                                <property name="label" translatable="yes">Animation Time [ms]</property>
-                                <property name="xalign">0</property>
-                                <property name="halign">start</property>
-                                <property name="valign">center</property>
-                                <property name="hexpand">1</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkScale">
-                                <property name="halign">end</property>
-                                <property name="valign">center</property>
-                                <property name="draw-value">1</property>
-                                <property name="digits">0</property>
-                                <property name="value-pos">left</property>
-                                <property name="width-request">300</property>
-                                <property name="adjustment">destroy-animation-time</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="reset-destroy-animation-time">
+                              <object class="GtkBox">
+                                <property name="spacing">8</property>
                                 <child>
-                                  <object class="GtkImage">
-                                    <property name="icon-name">edit-clear-symbolic</property>
-                                    <property name="icon-size">1</property>
+                                  <object class="GtkLabel">
+                                    <property name="label" translatable="yes">Animation Time [ms]</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkScale">
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                    <property name="draw-value">1</property>
+                                    <property name="digits">0</property>
+                                    <property name="value-pos">left</property>
+                                    <property name="width-request">300</property>
+                                    <property name="adjustment">destroy-animation-time</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="reset-destroy-animation-time">
+                                    <child>
+                                      <object class="GtkImage">
+                                        <property name="icon-name">edit-clear-symbolic</property>
+                                        <property name="icon-size">1</property>
+                                      </object>
+                                    </child>
+                                    <property name="tooltip-text">Reset to Default Value</property>
+                                    <style>
+                                      <class name="flat" />
+                                    </style>
                                   </object>
                                 </child>
-                                <property name="tooltip-text">Reset to Default Value</property>
-                                <style>
-                                  <class name="flat" />
-                                </style>
                               </object>
                             </child>
                           </object>
                         </child>
-                      </object>
-                    </child>
 
-                    <child>
-                      <object class="GtkListBoxRow">
-                        <property name="margin-start">10</property>
-                        <property name="margin-end">10</property>
-                        <property name="margin-top">10</property>
-                        <property name="margin-bottom">10</property>
-                        <property name="activatable">0</property>
                         <child>
-                          <object class="GtkBox">
-                            <property name="spacing">8</property>
+                          <object class="GtkListBoxRow">
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
+                            <property name="activatable">0</property>
                             <child>
-                              <object class="GtkLabel">
-                                <property name="label" translatable="yes">Also Burn Dialogs</property>
-                                <property name="xalign">0</property>
-                                <property name="halign">start</property>
-                                <property name="valign">center</property>
-                                <property name="hexpand">1</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkSwitch" id="destroy-dialogs">
-                                <property name="halign">end</property>
-                                <property name="valign">center</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="reset-destroy-dialogs">
+                              <object class="GtkBox">
+                                <property name="spacing">8</property>
                                 <child>
-                                  <object class="GtkImage">
-                                    <property name="icon-name">edit-clear-symbolic</property>
-                                    <property name="icon-size">1</property>
+                                  <object class="GtkLabel">
+                                    <property name="label" translatable="yes">Also Burn Dialogs</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkSwitch" id="destroy-dialogs">
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="reset-destroy-dialogs">
+                                    <child>
+                                      <object class="GtkImage">
+                                        <property name="icon-name">edit-clear-symbolic</property>
+                                        <property name="icon-size">1</property>
+                                      </object>
+                                    </child>
+                                    <property name="tooltip-text">Reset to Default Value</property>
+                                    <style>
+                                      <class name="flat" />
+                                    </style>
                                   </object>
                                 </child>
-                                <property name="tooltip-text">Reset to Default Value</property>
-                                <style>
-                                  <class name="flat" />
-                                </style>
                               </object>
                             </child>
                           </object>
                         </child>
+
                       </object>
                     </child>
-
                   </object>
                 </child>
-              </object>
-            </child>
 
+              </object>
+
+            </property>
           </object>
         </child>
       </object>