Skip to content

Commit 331543e

Browse files
andypughandypugh
committed
Gladevcp: Update the .ui and .glade files in the sample configs to Gtk+3.0
Signed-off-by: andypugh <andy@bodgesoc.org>
1 parent 87fa030 commit 331543e

39 files changed

Lines changed: 3137 additions & 2196 deletions

File tree

‎configs/apps/gladevcp/by-widget/combobox.ui‎

Lines changed: 35 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,47 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- Generated with glade 3.40.0 -->
23
<interface>
3-
<requires lib="gtk+" version="2.16"/>
4-
<!-- interface-requires gladevcp 0.0 -->
5-
<!-- interface-naming-policy project-wide -->
4+
<requires lib="gtk+" version="3.0"/>
5+
<requires lib="gladevcp" version="0.0"/>
6+
<object class="GtkListStore" id="liststore1">
7+
<columns>
8+
<!-- column-name myfloat -->
9+
<column type="gfloat"/>
10+
<!-- column-name description -->
11+
<column type="gchararray"/>
12+
</columns>
13+
<data>
14+
<row>
15+
<col id="0">3.1400001049041748</col>
16+
<col id="1" translatable="yes">Pi </col>
17+
</row>
18+
<row>
19+
<col id="0">2.7182817459106445</col>
20+
<col id="1" translatable="yes">e</col>
21+
</row>
22+
<row>
23+
<col id="0">42</col>
24+
<col id="1" translatable="yes">The Answer</col>
25+
</row>
26+
</data>
27+
</object>
628
<object class="GtkWindow" id="window1">
7-
<property name="width_request">150</property>
8-
<property name="height_request">50</property>
9-
<signal name="destroy" handler="on_destroy"/>
29+
<property name="width-request">150</property>
30+
<property name="height-request">50</property>
31+
<property name="can-focus">False</property>
32+
<signal name="destroy" handler="on_destroy" swapped="no"/>
1033
<child>
1134
<object class="GtkVBox" id="vbox1">
1235
<property name="visible">True</property>
36+
<property name="can-focus">False</property>
1337
<child>
1438
<object class="HAL_ComboBox" id="hal_combobox1">
1539
<property name="visible">True</property>
40+
<property name="can-focus">False</property>
1641
<property name="model">liststore1</property>
1742
<property name="active">2</property>
1843
<property name="column">0</property>
19-
<signal name="changed" handler="on_changed"/>
44+
<signal name="changed" handler="on_changed" swapped="no"/>
2045
<child>
2146
<object class="GtkCellRendererText" id="cellrenderertext1"/>
2247
<attributes>
@@ -25,32 +50,12 @@
2550
</child>
2651
</object>
2752
<packing>
53+
<property name="expand">True</property>
54+
<property name="fill">True</property>
2855
<property name="position">0</property>
2956
</packing>
3057
</child>
3158
</object>
3259
</child>
3360
</object>
34-
<object class="GtkListStore" id="liststore1">
35-
<columns>
36-
<!-- column-name myfloat -->
37-
<column type="gfloat"/>
38-
<!-- column-name description -->
39-
<column type="gchararray"/>
40-
</columns>
41-
<data>
42-
<row>
43-
<col id="0">3.1400001049041748</col>
44-
<col id="1" translatable="yes">Pi </col>
45-
</row>
46-
<row>
47-
<col id="0">2.7182817459106445</col>
48-
<col id="1" translatable="yes">e</col>
49-
</row>
50-
<row>
51-
<col id="0">42</col>
52-
<col id="1" translatable="yes">The Answer</col>
53-
</row>
54-
</data>
55-
</object>
5661
</interface>

‎configs/apps/gladevcp/by-widget/combobox_manual_list.ui‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- Generated with glade 3.40.0 -->
23
<interface>
3-
<!-- interface-requires gladevcp 0.0 -->
4-
<requires lib="gtk+" version="2.16"/>
5-
<!-- interface-naming-policy project-wide -->
4+
<requires lib="gtk+" version="3.0"/>
5+
<requires lib="gladevcp" version="0.0"/>
66
<object class="GtkWindow" id="window1">
7-
<property name="default_width">70</property>
8-
<property name="default_height">30</property>
7+
<property name="can-focus">False</property>
8+
<property name="default-width">70</property>
9+
<property name="default-height">30</property>
910
<child>
1011
<object class="GtkVBox" id="vbox1">
1112
<property name="visible">True</property>
13+
<property name="can-focus">False</property>
1214
<child>
1315
<object class="HAL_ComboBox" id="hal_combobox1">
1416
<property name="visible">True</property>
15-
<signal name="changed" handler="on_changed"/>
17+
<property name="can-focus">False</property>
18+
<signal name="changed" handler="on_changed" swapped="no"/>
1619
</object>
1720
<packing>
21+
<property name="expand">True</property>
22+
<property name="fill">True</property>
1823
<property name="position">0</property>
1924
</packing>
2025
</child>

‎configs/apps/gladevcp/by-widget/radio.ui‎

Lines changed: 37 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- Generated with glade 3.40.0 -->
23
<interface>
3-
<requires lib="gtk+" version="2.16"/>
4-
<!-- interface-naming-policy project-wide -->
4+
<requires lib="gtk+" version="3.0"/>
55
<object class="GtkWindow" id="window1">
6-
<signal name="destroy" handler="on_destroy"/>
6+
<property name="can-focus">False</property>
7+
<signal name="destroy" handler="on_destroy" swapped="no"/>
78
<child>
89
<object class="GtkHBox" id="hbox1">
910
<property name="visible">True</property>
11+
<property name="can-focus">False</property>
1012
<property name="spacing">2</property>
1113
<child>
1214
<object class="GtkVButtonBox" id="vbuttonbox1">
1315
<property name="visible">True</property>
14-
<property name="layout_style">spread</property>
16+
<property name="can-focus">False</property>
17+
<property name="layout-style">spread</property>
1518
<child>
1619
<object class="GtkRadioButton" id="red_rbtn">
1720
<property name="label" translatable="yes">Red</property>
1821
<property name="visible">True</property>
19-
<property name="can_focus">True</property>
20-
<property name="receives_default">False</property>
21-
<property name="yalign">0.50999999046325684</property>
22+
<property name="can-focus">True</property>
23+
<property name="receives-default">False</property>
24+
<property name="yalign">0.5099999904632568</property>
2225
<property name="active">True</property>
23-
<property name="draw_indicator">True</property>
24-
<signal name="toggled" handler="on_red_rbtn_toggled"/>
26+
<property name="draw-indicator">True</property>
27+
<signal name="toggled" handler="on_red_rbtn_toggled" swapped="no"/>
2528
</object>
2629
<packing>
2730
<property name="expand">False</property>
@@ -33,12 +36,12 @@
3336
<object class="GtkRadioButton" id="blue_rbtn">
3437
<property name="label" translatable="yes">Blue</property>
3538
<property name="visible">True</property>
36-
<property name="can_focus">True</property>
37-
<property name="receives_default">False</property>
39+
<property name="can-focus">True</property>
40+
<property name="receives-default">False</property>
3841
<property name="active">True</property>
39-
<property name="draw_indicator">True</property>
42+
<property name="draw-indicator">True</property>
4043
<property name="group">red_rbtn</property>
41-
<signal name="toggled" handler="on_blue_rbtn_toggled"/>
44+
<signal name="toggled" handler="on_blue_rbtn_toggled" swapped="no"/>
4245
</object>
4346
<packing>
4447
<property name="expand">False</property>
@@ -50,12 +53,12 @@
5053
<object class="GtkRadioButton" id="green_rbtn">
5154
<property name="label" translatable="yes">Green</property>
5255
<property name="visible">True</property>
53-
<property name="can_focus">True</property>
54-
<property name="receives_default">False</property>
56+
<property name="can-focus">True</property>
57+
<property name="receives-default">False</property>
5558
<property name="active">True</property>
56-
<property name="draw_indicator">True</property>
59+
<property name="draw-indicator">True</property>
5760
<property name="group">red_rbtn</property>
58-
<signal name="toggled" handler="on_green_rbtn_toggled"/>
61+
<signal name="toggled" handler="on_green_rbtn_toggled" swapped="no"/>
5962
</object>
6063
<packing>
6164
<property name="expand">False</property>
@@ -67,12 +70,12 @@
6770
<object class="GtkRadioButton" id="yellow_rbtn">
6871
<property name="label" translatable="yes">Yellow</property>
6972
<property name="visible">True</property>
70-
<property name="can_focus">True</property>
71-
<property name="receives_default">False</property>
73+
<property name="can-focus">True</property>
74+
<property name="receives-default">False</property>
7275
<property name="active">True</property>
73-
<property name="draw_indicator">True</property>
76+
<property name="draw-indicator">True</property>
7477
<property name="group">red_rbtn</property>
75-
<signal name="toggled" handler="on_yellow_rbtn_toggled"/>
78+
<signal name="toggled" handler="on_yellow_rbtn_toggled" swapped="no"/>
7679
</object>
7780
<packing>
7881
<property name="expand">False</property>
@@ -82,23 +85,29 @@
8285
</child>
8386
</object>
8487
<packing>
88+
<property name="expand">True</property>
89+
<property name="fill">True</property>
8590
<property name="position">0</property>
8691
</packing>
8792
</child>
8893
<child>
8994
<object class="GtkVBox" id="vbox1">
9095
<property name="visible">True</property>
96+
<property name="can-focus">False</property>
9197
<child>
9298
<object class="GtkFrame" id="frame1">
9399
<property name="visible">True</property>
94-
<property name="label_xalign">0</property>
100+
<property name="can-focus">False</property>
101+
<property name="label-xalign">0</property>
95102
<child>
96103
<object class="GtkAlignment" id="alignment1">
97104
<property name="visible">True</property>
98-
<property name="left_padding">12</property>
105+
<property name="can-focus">False</property>
106+
<property name="left-padding">12</property>
99107
<child>
100108
<object class="GtkLabel" id="color_lbl">
101109
<property name="visible">True</property>
110+
<property name="can-focus">False</property>
102111
<property name="label" translatable="yes">Unknown</property>
103112
</object>
104113
</child>
@@ -108,10 +117,10 @@
108117
<object class="GtkCheckButton" id="showoutput_btn">
109118
<property name="label" translatable="yes">Show Color Choice</property>
110119
<property name="visible">True</property>
111-
<property name="can_focus">True</property>
112-
<property name="receives_default">False</property>
113-
<property name="draw_indicator">True</property>
114-
<signal name="toggled" handler="on_showoutput_btn_toggled"/>
120+
<property name="can-focus">True</property>
121+
<property name="receives-default">False</property>
122+
<property name="draw-indicator">True</property>
123+
<signal name="toggled" handler="on_showoutput_btn_toggled" swapped="no"/>
115124
</object>
116125
</child>
117126
</object>

‎configs/apps/gladevcp/by-widget/spinbutton.ui‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,31 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- Generated with glade 3.40.0 -->
23
<interface>
3-
<requires lib="gtk+" version="2.16"/>
4-
<!-- interface-requires gladevcp 0.0 -->
5-
<!-- interface-naming-policy project-wide -->
4+
<requires lib="gtk+" version="3.0"/>
5+
<requires lib="gladevcp" version="0.0"/>
6+
<object class="GtkAdjustment" id="adjustment1">
7+
<property name="upper">100</property>
8+
<property name="step-increment">1</property>
9+
<property name="page-increment">10</property>
10+
</object>
611
<object class="GtkWindow" id="window1">
12+
<property name="can-focus">False</property>
713
<child>
814
<object class="GtkVBox" id="vbox1">
915
<property name="visible">True</property>
16+
<property name="can-focus">False</property>
1017
<child>
1118
<object class="HAL_SpinButton" id="hal_spinbutton1">
1219
<property name="visible">True</property>
13-
<property name="can_focus">True</property>
14-
<property name="invisible_char">&#x25CF;</property>
20+
<property name="can-focus">True</property>
21+
<property name="invisible-char">●</property>
1522
<property name="adjustment">adjustment1</property>
1623
<property name="digits">2</property>
17-
<signal name="realize" handler="on_spinbutton_realize"/>
24+
<signal name="realize" handler="on_spinbutton_realize" swapped="no"/>
1825
</object>
1926
<packing>
27+
<property name="expand">True</property>
28+
<property name="fill">True</property>
2029
<property name="position">0</property>
2130
</packing>
2231
</child>
@@ -29,9 +38,4 @@
2938
</object>
3039
</child>
3140
</object>
32-
<object class="GtkAdjustment" id="adjustment1">
33-
<property name="upper">100</property>
34-
<property name="step_increment">1</property>
35-
<property name="page_increment">10</property>
36-
</object>
3741
</interface>

‎configs/apps/gladevcp/class-callback/class_callback.ui‎

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,56 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- Generated with glade 3.40.0 -->
23
<interface>
3-
<!-- interface-requires gladevcp 0.0 -->
4-
<requires lib="gtk+" version="2.16"/>
5-
<!-- interface-naming-policy project-wide -->
4+
<requires lib="gtk+" version="3.0"/>
5+
<requires lib="gladevcp" version="0.0"/>
66
<object class="GtkWindow" id="window1">
7-
<property name="default_width">200</property>
8-
<property name="default_height">150</property>
7+
<property name="can-focus">False</property>
8+
<property name="default-width">200</property>
9+
<property name="default-height">150</property>
910
<child>
1011
<object class="GtkVBox" id="vbox1">
1112
<property name="visible">True</property>
13+
<property name="can-focus">False</property>
1214
<child>
1315
<object class="HAL_Button" id="button">
1416
<property name="label" translatable="yes">Take lap time</property>
1517
<property name="visible">True</property>
16-
<property name="can_focus">True</property>
17-
<property name="receives_default">True</property>
18-
<signal name="pressed" handler="on_button_press"/>
18+
<property name="can-focus">True</property>
19+
<property name="receives-default">True</property>
20+
<signal name="pressed" handler="on_button_press" swapped="no"/>
1921
</object>
2022
<packing>
23+
<property name="expand">True</property>
24+
<property name="fill">True</property>
2125
<property name="position">0</property>
2226
</packing>
2327
</child>
2428
<child>
2529
<object class="GtkLabel" id="message">
2630
<property name="visible">True</property>
31+
<property name="can-focus">False</property>
2732
</object>
2833
<packing>
34+
<property name="expand">True</property>
35+
<property name="fill">True</property>
2936
<property name="position">1</property>
3037
</packing>
3138
</child>
3239
<child>
3340
<object class="HAL_HBar" id="hal_hbar1">
3441
<property name="visible">True</property>
35-
<property name="z1_color">#ffffffff0000</property>
42+
<property name="can-focus">False</property>
43+
<property name="bg-color">#bebebebebebe</property>
3644
<property name="max">60</property>
37-
<property name="z2_color">#ffff00000000</property>
38-
<property name="z0_border">0.60000002384185791</property>
39-
<property name="z1_border">0.80000001192092896</property>
40-
<property name="bg_color">#bebebebebebe</property>
41-
<property name="z0_color">#0000ffff0000</property>
45+
<property name="z0-border">0.6000000238418579</property>
46+
<property name="z0-color">#0000ffff0000</property>
47+
<property name="z1-border">0.8000000119209289</property>
48+
<property name="z1-color">#ffffffff0000</property>
49+
<property name="z2-color">#ffff00000000</property>
4250
</object>
4351
<packing>
52+
<property name="expand">True</property>
53+
<property name="fill">True</property>
4454
<property name="position">2</property>
4555
</packing>
4656
</child>

0 commit comments

Comments
 (0)