Skip to content

Commit 4f0ad03

Browse files
committed
Fix glade panel and remove depricated 'Features' entries in ini
1 parent db761ea commit 4f0ad03

2 files changed

Lines changed: 32 additions & 49 deletions

File tree

configs/sim/axis/remap/rack-toolchange/racktoolchange.ini

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,6 @@ PARAMETER_FILE = sim_mm.var
3333
SUBROUTINE_PATH = nc_subroutines:../../nc_files/remap_lib/common_nc_subs
3434
LOG_LEVEL = 9
3535

36-
# optional features - a bit mask to selectively turn on experimental/dubious features
37-
# see
38-
# RETAIN_G43 0x00000001
39-
# OWORD_N_ARGS 0x00000002
40-
# INI_VARS 0x00000004
41-
# HAL_PIN_VARS 0x00000008
42-
# NO_DOWNCASE_OWORD 0x00000010
43-
# turn on all optional features
44-
45-
# turn on all optional features except RETAIN_G43
46-
FEATURES= 30
47-
48-
4936
ON_ABORT_COMMAND= O <on_abort> call
5037

5138
#

configs/sim/axis/remap/rack-toolchange/racktoolchange.ui

Lines changed: 32 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,62 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- Generated with glade 3.38.2 -->
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"/>
66
<object class="GtkWindow" id="window1">
7+
<property name="can-focus">False</property>
78
<child>
9+
<!-- n-columns=2 n-rows=2 -->
810
<object class="HAL_Table" id="table">
911
<property name="visible">True</property>
10-
<property name="n_rows">2</property>
11-
<property name="n_columns">2</property>
12+
<property name="can-focus">False</property>
1213
<child>
13-
<object class="HAL_LED" id="tool-flush-led">
14+
<object class="HAL_LED" id="tool-lock-led">
1415
<property name="visible">True</property>
15-
<property name="led_shape">2</property>
16-
<property name="pick_color_on">#16eefaef15f5</property>
16+
<property name="can-focus">False</property>
17+
<property name="led-blink-rate">0</property>
18+
<property name="led-shape">2</property>
19+
<property name="pick-color-on">#1df5ab840e4b</property>
1720
</object>
1821
<packing>
19-
<property name="left_attach">1</property>
20-
<property name="right_attach">2</property>
21-
<property name="top_attach">1</property>
22-
<property name="bottom_attach">2</property>
23-
<property name="y_options"></property>
24-
<property name="x_padding">4</property>
25-
<property name="y_padding">4</property>
22+
<property name="left-attach">0</property>
23+
<property name="top-attach">0</property>
2624
</packing>
2725
</child>
2826
<child>
29-
<object class="HAL_LED" id="tool-lock-led">
27+
<object class="HAL_LED" id="tool-flush-led">
3028
<property name="visible">True</property>
31-
<property name="led_shape">2</property>
32-
<property name="pick_color_on">#ffff3ff60e08</property>
29+
<property name="can-focus">False</property>
30+
<property name="led-blink-rate">0</property>
31+
<property name="led-shape">2</property>
32+
<property name="pick-color-on">#1df5ab840e4b</property>
3333
</object>
3434
<packing>
35-
<property name="left_attach">1</property>
36-
<property name="right_attach">2</property>
37-
<property name="y_options"></property>
38-
<property name="x_padding">4</property>
39-
<property name="y_padding">4</property>
35+
<property name="left-attach">0</property>
36+
<property name="top-attach">1</property>
4037
</packing>
4138
</child>
4239
<child>
43-
<object class="GtkLabel" id="label1">
40+
<object class="GtkLabel" id="label2">
4441
<property name="visible">True</property>
45-
<property name="label" translatable="yes">tool-lock</property>
42+
<property name="can-focus">False</property>
43+
<property name="label" translatable="yes">tool-flush</property>
4644
</object>
4745
<packing>
48-
<property name="y_options"></property>
49-
<property name="x_padding">4</property>
50-
<property name="y_padding">4</property>
46+
<property name="left-attach">1</property>
47+
<property name="top-attach">1</property>
5148
</packing>
5249
</child>
5350
<child>
54-
<object class="GtkLabel" id="label2">
51+
<object class="GtkLabel" id="label1">
5552
<property name="visible">True</property>
56-
<property name="label" translatable="yes">tool-flush</property>
53+
<property name="can-focus">False</property>
54+
<property name="xpad">12</property>
55+
<property name="label" translatable="yes">tool-lock</property>
5756
</object>
5857
<packing>
59-
<property name="top_attach">1</property>
60-
<property name="bottom_attach">2</property>
61-
<property name="y_options"></property>
62-
<property name="x_padding">4</property>
63-
<property name="y_padding">4</property>
58+
<property name="left-attach">1</property>
59+
<property name="top-attach">0</property>
6460
</packing>
6561
</child>
6662
</object>

0 commit comments

Comments
 (0)