Skip to content

Commit a96b9de

Browse files
C0rn3jC0rn3j
committed
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
1 parent e3e25d2 commit a96b9de

32 files changed

+3818
-3018
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Windows:
4444

4545
### Dependencies
4646
- Python 3.8+
47-
- GTK 3.22+
47+
- GTK 3.24+
4848
- [PyGObject](https://live.gnome.org/PyGObject)
4949
- [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)
5050
- [setuptools](https://pypi.python.org/pypi/setuptools)

‎glade/about.glade‎

Lines changed: 33 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- Generated with glade 3.20.4 -->
3-
<interface>
4-
<requires lib="gtk+" version="3.10"/>
2+
<!-- Generated with glade 3.40.0 -->
3+
<interface domain="">
4+
<requires lib="gtk+" version="3.24"/>
55
<object class="GtkDialog" id="Dialog">
6-
<property name="can_focus">False</property>
6+
<property name="can-focus">False</property>
77
<property name="title" translatable="yes">About SC Controller</property>
8-
<property name="window_position">center-on-parent</property>
8+
<property name="window-position">center-on-parent</property>
99
<property name="icon">../images/sc-controller-small.svg</property>
10-
<property name="type_hint">dialog</property>
10+
<property name="type-hint">dialog</property>
1111
<signal name="response" handler="on_dialog_response" swapped="no"/>
1212
<child internal-child="vbox">
1313
<object class="GtkBox" id="vb1">
14-
<property name="can_focus">False</property>
14+
<property name="can-focus">False</property>
1515
<property name="orientation">vertical</property>
1616
<property name="spacing">2</property>
1717
<child internal-child="action_area">
1818
<object class="GtkButtonBox" id="vb2">
19-
<property name="can_focus">False</property>
20-
<property name="layout_style">end</property>
19+
<property name="can-focus">False</property>
20+
<property name="layout-style">end</property>
2121
<child>
2222
<object class="GtkButton" id="btnClose">
2323
<property name="label">gtk-close</property>
2424
<property name="visible">True</property>
25-
<property name="can_focus">True</property>
26-
<property name="receives_default">True</property>
27-
<property name="use_stock">True</property>
25+
<property name="can-focus">True</property>
26+
<property name="receives-default">True</property>
27+
<property name="use-stock">True</property>
2828
<signal name="clicked" handler="on_dialog_response" swapped="no"/>
2929
</object>
3030
<packing>
@@ -43,17 +43,17 @@
4343
<child>
4444
<object class="GtkBox" id="vb3">
4545
<property name="visible">True</property>
46-
<property name="can_focus">False</property>
47-
<property name="margin_left">50</property>
48-
<property name="margin_right">50</property>
49-
<property name="margin_top">10</property>
50-
<property name="margin_bottom">10</property>
46+
<property name="can-focus">False</property>
47+
<property name="margin-left">50</property>
48+
<property name="margin-right">50</property>
49+
<property name="margin-top">10</property>
50+
<property name="margin-bottom">10</property>
5151
<property name="orientation">vertical</property>
5252
<child>
5353
<object class="GtkImage" id="image1">
5454
<property name="visible">True</property>
55-
<property name="can_focus">False</property>
56-
<property name="margin_bottom">10</property>
55+
<property name="can-focus">False</property>
56+
<property name="margin-bottom">10</property>
5757
<property name="pixbuf">../images/sc-controller-small.svg</property>
5858
</object>
5959
<packing>
@@ -65,9 +65,9 @@
6565
<child>
6666
<object class="GtkLabel" id="label1">
6767
<property name="visible">True</property>
68-
<property name="can_focus">False</property>
68+
<property name="can-focus">False</property>
6969
<property name="label" translatable="yes">&lt;span size="large"&gt;&lt;b&gt;SC Controller&lt;/b&gt;&lt;/span&gt;</property>
70-
<property name="use_markup">True</property>
70+
<property name="use-markup">True</property>
7171
<property name="justify">center</property>
7272
</object>
7373
<packing>
@@ -79,9 +79,9 @@
7979
<child>
8080
<object class="GtkLabel" id="lblVersion">
8181
<property name="visible">True</property>
82-
<property name="can_focus">False</property>
83-
<property name="margin_top">5</property>
84-
<property name="margin_bottom">10</property>
82+
<property name="can-focus">False</property>
83+
<property name="margin-top">5</property>
84+
<property name="margin-bottom">10</property>
8585
<property name="label" translatable="yes">(version)</property>
8686
</object>
8787
<packing>
@@ -93,10 +93,10 @@
9393
<child>
9494
<object class="GtkLabel" id="label4">
9595
<property name="visible">True</property>
96-
<property name="can_focus">False</property>
97-
<property name="margin_bottom">20</property>
96+
<property name="can-focus">False</property>
97+
<property name="margin-bottom">20</property>
9898
<property name="label" translatable="yes">User-mode driver and GTK3 based GUI for the Steam Controller, DS4 and similar controllers</property>
99-
<property name="use_markup">True</property>
99+
<property name="use-markup">True</property>
100100
<property name="justify">center</property>
101101
</object>
102102
<packing>
@@ -108,8 +108,8 @@
108108
<child>
109109
<object class="GtkLabel" id="label3">
110110
<property name="visible">True</property>
111-
<property name="can_focus">True</property>
112-
<property name="margin_bottom">25</property>
111+
<property name="can-focus">True</property>
112+
<property name="margin-bottom">25</property>
113113
<property name="label" translatable="yes">
114114
&lt;b&gt;Code&amp;amp;UI © 2016-2023 Kozec&lt;/b&gt;
115115
&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
122122
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;
123123

124124
</property>
125-
<property name="use_markup">True</property>
125+
<property name="use-markup">True</property>
126126
<property name="justify">center</property>
127127
<property name="yalign">0</property>
128128
</object>
@@ -135,11 +135,11 @@ Donation links for Kozec, who is the original developer, can be found &lt;a href
135135
<child>
136136
<object class="GtkLabel" id="label2">
137137
<property name="visible">True</property>
138-
<property name="can_focus">True</property>
139-
<property name="margin_top">10</property>
138+
<property name="can-focus">True</property>
139+
<property name="margin-top">10</property>
140140
<property name="label" translatable="yes">&lt;small&gt;This program comes with absolutely no warranty.
141141
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>
142-
<property name="use_markup">True</property>
142+
<property name="use-markup">True</property>
143143
<property name="justify">center</property>
144144
<property name="yalign">1</property>
145145
</object>
@@ -158,8 +158,5 @@ See the &lt;a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html"&gt;GN
158158
</child>
159159
</object>
160160
</child>
161-
<child>
162-
<placeholder/>
163-
</child>
164161
</object>
165162
</interface>

‎glade/action_editor.glade‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!-- Generated with glade 3.40.0 -->
33
<interface>
4-
<requires lib="gtk+" version="3.22"/>
4+
<requires lib="gtk+" version="3.24"/>
55
<object class="GtkAdjustment" id="adjDeadzoneLower">
66
<property name="upper">32766</property>
77
<property name="step-increment">1</property>

‎glade/ae/axis.glade‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- Generated with glade 3.20.0 -->
2+
<!-- Generated with glade 3.40.0 -->
33
<interface>
4-
<requires lib="gtk+" version="3.10"/>
4+
<requires lib="gtk+" version="3.24"/>
5+
<!-- n-columns=3 n-rows=3 -->
56
<object class="GtkGrid" id="axis">
67
<property name="visible">True</property>
7-
<property name="can_focus">False</property>
8+
<property name="can-focus">False</property>
89
<child>
910
<object class="GtkLabel" id="label9">
1011
<property name="visible">True</property>
11-
<property name="can_focus">False</property>
12-
<property name="margin_top">5</property>
13-
<property name="margin_bottom">5</property>
12+
<property name="can-focus">False</property>
13+
<property name="margin-top">5</property>
14+
<property name="margin-bottom">5</property>
1415
<property name="label" translatable="yes">click on axis or trigger</property>
1516
<property name="xalign">1</property>
1617
<attributes>
1718
<attribute name="style" value="italic"/>
1819
</attributes>
1920
</object>
2021
<packing>
21-
<property name="left_attach">0</property>
22-
<property name="top_attach">1</property>
22+
<property name="left-attach">0</property>
23+
<property name="top-attach">1</property>
2324
<property name="width">2</property>
2425
</packing>
2526
</child>
@@ -29,5 +30,20 @@
2930
<child>
3031
<placeholder/>
3132
</child>
33+
<child>
34+
<placeholder/>
35+
</child>
36+
<child>
37+
<placeholder/>
38+
</child>
39+
<child>
40+
<placeholder/>
41+
</child>
42+
<child>
43+
<placeholder/>
44+
</child>
45+
<child>
46+
<placeholder/>
47+
</child>
3248
</object>
3349
</interface>

0 commit comments

Comments
 (0)