Merge pull request #3076 from Sigma1912/2.9-fix-sim-config-rack-toolchange

sim/axis/remap/rack-toolchange: Fix glade panel and remove old 'Features' entries in ini

Author: andypugh

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

@@ -33,19 +33,6 @@ PARAMETER_FILE = sim_mm.var
 SUBROUTINE_PATH = nc_subroutines:../../nc_files/remap_lib/common_nc_subs
 LOG_LEVEL = 9
 
-# optional features - a bit mask to selectively turn on experimental/dubious features
-# see
-# RETAIN_G43           0x00000001
-# OWORD_N_ARGS         0x00000002
-# INI_VARS             0x00000004
-# HAL_PIN_VARS         0x00000008
-# NO_DOWNCASE_OWORD    0x00000010
-# turn on all optional features
-
-# turn on all optional features except RETAIN_G43
-FEATURES= 30
-
-
 ON_ABORT_COMMAND= O <on_abort> call
 
 #

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

@@ -1,66 +1,62 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.38.2 -->
 <interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-requires gladevcp 0.0 -->
-  <!-- interface-naming-policy project-wide -->
+  <requires lib="gtk+" version="3.0"/>
+  <requires lib="gladevcp" version="0.0"/>
   <object class="GtkWindow" id="window1">
+    <property name="can-focus">False</property>
     <child>
+      <!-- n-columns=2 n-rows=2 -->
       <object class="HAL_Table" id="table">
         <property name="visible">True</property>
-        <property name="n_rows">2</property>
-        <property name="n_columns">2</property>
+        <property name="can-focus">False</property>
         <child>
-          <object class="HAL_LED" id="tool-flush-led">
+          <object class="HAL_LED" id="tool-lock-led">
             <property name="visible">True</property>
-            <property name="led_shape">2</property>
-            <property name="pick_color_on">#16eefaef15f5</property>
+            <property name="can-focus">False</property>
+            <property name="led-blink-rate">0</property>
+            <property name="led-shape">2</property>
+            <property name="pick-color-on">#1df5ab840e4b</property>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="right_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="bottom_attach">2</property>
-            <property name="y_options"></property>
-            <property name="x_padding">4</property>
-            <property name="y_padding">4</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
           </packing>
         </child>
         <child>
-          <object class="HAL_LED" id="tool-lock-led">
+          <object class="HAL_LED" id="tool-flush-led">
             <property name="visible">True</property>
-            <property name="led_shape">2</property>
-            <property name="pick_color_on">#ffff3ff60e08</property>
+            <property name="can-focus">False</property>
+            <property name="led-blink-rate">0</property>
+            <property name="led-shape">2</property>
+            <property name="pick-color-on">#1df5ab840e4b</property>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="right_attach">2</property>
-            <property name="y_options"></property>
-            <property name="x_padding">4</property>
-            <property name="y_padding">4</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="label1">
+          <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">tool-lock</property>
+            <property name="can-focus">False</property>
+            <property name="label" translatable="yes">tool-flush</property>
           </object>
           <packing>
-            <property name="y_options"></property>
-            <property name="x_padding">4</property>
-            <property name="y_padding">4</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="label2">
+          <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">tool-flush</property>
+            <property name="can-focus">False</property>
+            <property name="xpad">12</property>
+            <property name="label" translatable="yes">tool-lock</property>
           </object>
           <packing>
-            <property name="top_attach">1</property>
-            <property name="bottom_attach">2</property>
-            <property name="y_options"></property>
-            <property name="x_padding">4</property>
-            <property name="y_padding">4</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">0</property>
           </packing>
         </child>
       </object>