Bump GTK requirement to 3.24(2019~) from 3.22 and do so in all Glade …

…files too They were set for random versions like 3.10 and last saved in an old Glade version
git-developer · Oct 4, 2024 · a96b9de · a96b9de
1 parent e3e25d2
commit a96b9de
Show file tree

Hide file tree

Showing 32 changed files with 3,818 additions and 3,018 deletions.
diff --git a/README.md b/README.md
@@ -44,7 +44,7 @@ Windows:
 
 ### Dependencies
   - Python 3.8+
-  - GTK 3.22+
+  - GTK 3.24+
   - [PyGObject](https://live.gnome.org/PyGObject)
   - [python-gi-cairo](https://packages.debian.org/sid/python-gi-cairo) and [gir1.2-rsvg-2.0](https://packages.debian.org/sid/gir1.2-rsvg-2.0) on Debian-based distributions (included in PyGObject elsewhere)
   - [setuptools](https://pypi.python.org/pypi/setuptools)

diff --git a/glade/about.glade b/glade/about.glade
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.4 -->
-<interface>
-  <requires lib="gtk+" version="3.10"/>
+<!-- Generated with glade 3.40.0 -->
+<interface domain="">
+  <requires lib="gtk+" version="3.24"/>
   <object class="GtkDialog" id="Dialog">
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="title" translatable="yes">About SC Controller</property>
-    <property name="window_position">center-on-parent</property>
+    <property name="window-position">center-on-parent</property>
     <property name="icon">../images/sc-controller-small.svg</property>
-    <property name="type_hint">dialog</property>
+    <property name="type-hint">dialog</property>
     <signal name="response" handler="on_dialog_response" swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkBox" id="vb1">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="vb2">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
+            <property name="can-focus">False</property>
+            <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="btnClose">
                 <property name="label">gtk-close</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
+                <property name="use-stock">True</property>
                 <signal name="clicked" handler="on_dialog_response" swapped="no"/>
               </object>
               <packing>
@@ -43,17 +43,17 @@
         <child>
           <object class="GtkBox" id="vb3">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_left">50</property>
-            <property name="margin_right">50</property>
-            <property name="margin_top">10</property>
-            <property name="margin_bottom">10</property>
+            <property name="can-focus">False</property>
+            <property name="margin-left">50</property>
+            <property name="margin-right">50</property>
+            <property name="margin-top">10</property>
+            <property name="margin-bottom">10</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkImage" id="image1">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_bottom">10</property>
+                <property name="can-focus">False</property>
+                <property name="margin-bottom">10</property>
                 <property name="pixbuf">../images/sc-controller-small.svg</property>
               </object>
               <packing>
@@ -65,9 +65,9 @@
             <child>
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes">&lt;span size="large"&gt;&lt;b&gt;SC Controller&lt;/b&gt;&lt;/span&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="use-markup">True</property>
                 <property name="justify">center</property>
               </object>
               <packing>
@@ -79,9 +79,9 @@
             <child>
               <object class="GtkLabel" id="lblVersion">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_top">5</property>
-                <property name="margin_bottom">10</property>
+                <property name="can-focus">False</property>
+                <property name="margin-top">5</property>
+                <property name="margin-bottom">10</property>
                 <property name="label" translatable="yes">(version)</property>
               </object>
               <packing>
@@ -93,10 +93,10 @@
             <child>
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_bottom">20</property>
+                <property name="can-focus">False</property>
+                <property name="margin-bottom">20</property>
                 <property name="label" translatable="yes">User-mode driver and GTK3 based GUI for the Steam Controller, DS4 and similar controllers</property>
-                <property name="use_markup">True</property>
+                <property name="use-markup">True</property>
                 <property name="justify">center</property>
               </object>
               <packing>
@@ -108,8 +108,8 @@
             <child>
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="margin_bottom">25</property>
+                <property name="can-focus">True</property>
+                <property name="margin-bottom">25</property>
                 <property name="label" translatable="yes">
 &lt;b&gt;Code&amp;amp;UI © 2016-2023 Kozec&lt;/b&gt;
 &lt;b&gt;Python 3 port&amp;amp;Maintenance © 2020-2024 Ryochan7&lt;/b&gt;
@@ -122,7 +122,7 @@ If you like what I am doing, you can become a supporter on &lt;a href="https://k
 Donation links for Kozec, who is the original developer, can be found &lt;a href="https://github.com/kozec/sc-controller?tab=readme-ov-file#like-what-im-doing"&gt;here&lt;/a&gt;
 
 </property>
-                <property name="use_markup">True</property>
+                <property name="use-markup">True</property>
                 <property name="justify">center</property>
                 <property name="yalign">0</property>
               </object>
@@ -135,11 +135,11 @@ Donation links for Kozec, who is the original developer, can be found &lt;a href
             <child>
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="margin_top">10</property>
+                <property name="can-focus">True</property>
+                <property name="margin-top">10</property>
                 <property name="label" translatable="yes">&lt;small&gt;This program comes with absolutely no warranty.
 See the &lt;a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html"&gt;GNU General Public License, version 2&lt;/a&gt; for details.&lt;/small&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="use-markup">True</property>
                 <property name="justify">center</property>
                 <property name="yalign">1</property>
               </object>
@@ -158,8 +158,5 @@ See the &lt;a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html"&gt;GN
         </child>
       </object>
     </child>
-    <child>
-      <placeholder/>
-    </child>
   </object>
 </interface>
diff --git a/glade/action_editor.glade b/glade/action_editor.glade
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.40.0 -->
 <interface>
-  <requires lib="gtk+" version="3.22"/>
+  <requires lib="gtk+" version="3.24"/>
   <object class="GtkAdjustment" id="adjDeadzoneLower">
     <property name="upper">32766</property>
     <property name="step-increment">1</property>

diff --git a/glade/ae/axis.glade b/glade/ae/axis.glade
@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.40.0 -->
 <interface>
-  <requires lib="gtk+" version="3.10"/>
+  <requires lib="gtk+" version="3.24"/>
+  <!-- n-columns=3 n-rows=3 -->
   <object class="GtkGrid" id="axis">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
       <object class="GtkLabel" id="label9">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_top">5</property>
-        <property name="margin_bottom">5</property>
+        <property name="can-focus">False</property>
+        <property name="margin-top">5</property>
+        <property name="margin-bottom">5</property>
         <property name="label" translatable="yes">click on axis or trigger</property>
         <property name="xalign">1</property>
         <attributes>
           <attribute name="style" value="italic"/>
         </attributes>
       </object>
       <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">1</property>
+        <property name="left-attach">0</property>
+        <property name="top-attach">1</property>
         <property name="width">2</property>
       </packing>
     </child>
@@ -29,5 +30,20 @@
     <child>
       <placeholder/>
     </child>
+    <child>
+      <placeholder/>
+    </child>
+    <child>
+      <placeholder/>
+    </child>
+    <child>
+      <placeholder/>
+    </child>
+    <child>
+      <placeholder/>
+    </child>
+    <child>
+      <placeholder/>
+    </child>
   </object>
 </interface>