Save control options

[~andy/csm213a-hw] / vis / visual.ui

diff --git a/vis/visual.ui b/vis/visual.ui
index f4795b7848d82cbd7cb006f426d222df75c7a90f..e614321ae812164467744816df21d6f3bcea921f 100644 (file)
--- a/vis/visual.ui
+++ b/vis/visual.ui
@@ -2,23 +2,13 @@
 <interface>
   <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy project-wide -->
-  <object class="GtkToggleAction" id="serial_con">
-    <property name="label" translatable="yes">Serial</property>
-    <property name="stock_id">gtk-connect</property>
-    <signal name="activate" handler="on_serial" swapped="no"/>
-  </object>
-  <object class="GtkAction" id="settings_act">
-    <property name="label" translatable="yes">Settings</property>
-    <property name="stock_id">gtk-preferences</property>
-    <signal name="activate" handler="on_show" swapped="no"/>
-  </object>
   <object class="GtkAdjustment" id="a2d_adj">
     <property name="upper">100</property>
     <property name="value">1</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkAdjustment" id="accel_adj">
+  <object class="GtkAdjustment" id="acc_adj">
     <property name="upper">100</property>
     <property name="value">1</property>
     <property name="step_increment">1</property>
@@ -29,19 +19,39 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
+  <object class="GtkAdjustment" id="mag_adj">
+    <property name="upper">100</property>
+    <property name="value">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkToggleAction" id="serial_act">
+    <property name="label" translatable="yes">Serial</property>
+    <property name="stock_id">gtk-connect</property>
+    <signal name="activate" handler="on_serial" swapped="no"/>
+  </object>
+  <object class="GtkAction" id="settings_act">
+    <property name="label" translatable="yes">Settings</property>
+    <property name="stock_id">gtk-preferences</property>
+    <signal name="activate" handler="on_show" swapped="no"/>
+  </object>
+  <object class="GtkToggleAction" id="xively_act">
+    <property name="label" translatable="yes">Xively</property>
+    <property name="stock_id">gtk-connect</property>
+    <signal name="activate" handler="on_xively" swapped="no"/>
+  </object>
   <object class="GtkAdjustment" id="datab_adj">
     <property name="lower">6</property>
     <property name="upper">8</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkAdjustment" id="light_adj">
-    <property name="upper">100</property>
-    <property name="value">1</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+  <object class="GtkAction" id="flush_act">
+    <property name="label" translatable="yes">Upload</property>
+    <property name="stock_id">gtk-floppy</property>
+    <signal name="activate" handler="on_flush" swapped="no"/>
   </object>
-  <object class="GtkAdjustment" id="mag_adj">
+  <object class="GtkAdjustment" id="light_adj">
     <property name="upper">100</property>
     <property name="value">1</property>
     <property name="step_increment">1</property>
@@ -163,7 +173,7 @@
                         <property name="primary_icon_sensitive">True</property>
                         <property name="secondary_icon_sensitive">True</property>
                         <property name="adjustment">baud_adj</property>
-                        <signal name="changed" handler="on_config" swapped="no"/>
+                        <signal name="value-changed" handler="on_config" swapped="no"/>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -183,7 +193,7 @@
                         <property name="primary_icon_sensitive">True</property>
                         <property name="secondary_icon_sensitive">True</property>
                         <property name="adjustment">stopb_adj</property>
-                        <signal name="changed" handler="on_config" swapped="no"/>
+                        <signal name="value-changed" handler="on_config" swapped="no"/>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -203,7 +213,7 @@
                         <property name="primary_icon_sensitive">True</property>
                         <property name="secondary_icon_sensitive">True</property>
                         <property name="adjustment">datab_adj</property>
-                        <signal name="changed" handler="on_config" swapped="no"/>
+                        <signal name="value-changed" handler="on_config" swapped="no"/>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -405,7 +415,7 @@
                         <property name="primary_icon_sensitive">True</property>
                         <property name="secondary_icon_sensitive">True</property>
                         <property name="adjustment">rate_adj</property>
-                        <signal name="changed" handler="on_config" swapped="no"/>
+                        <signal name="value-changed" handler="on_config" swapped="no"/>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -454,11 +464,6 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkToggleAction" id="xively_con">
-    <property name="label" translatable="yes">Xively</property>
-    <property name="stock_id">gtk-connect</property>
-    <signal name="activate" handler="on_xively" swapped="no"/>
-  </object>
   <object class="GtkWindow" id="window">
     <property name="can_focus">False</property>
     <signal name="destroy" handler="on_destroy" swapped="no"/>
@@ -474,7 +479,7 @@
             <property name="toolbar_style">both</property>
             <child>
               <object class="GtkToggleToolButton" id="serial_btn">
-                <property name="related_action">serial_con</property>
+                <property name="related_action">serial_act</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="use_underline">True</property>
@@ -486,7 +491,7 @@
             </child>
             <child>
               <object class="GtkToggleToolButton" id="xively_btn">
-                <property name="related_action">xively_con</property>
+                <property name="related_action">xively_act</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="use_underline">True</property>
@@ -497,7 +502,29 @@
               </packing>
             </child>
             <child>
-              <object class="GtkSeparatorToolItem" id="sep">
+              <object class="GtkSeparatorToolItem" id="sep0">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="flush_btn">
+                <property name="related_action">flush_act</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSeparatorToolItem" id="sep1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
               </object>
@@ -538,7 +565,7 @@
                 <property name="n_columns">2</property>
                 <property name="column_spacing">20</property>
                 <child>
-                  <object class="GtkCheckButton" id="accel_btn">
+                  <object class="GtkCheckButton" id="acc_btn">
                     <property name="label" translatable="yes">Acceorometer</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -657,7 +684,7 @@
                     <property name="secondary_icon_sensitive">True</property>
                     <property name="adjustment">a2d_adj</property>
                     <property name="numeric">True</property>
-                    <signal name="change-value" handler="on_rate" swapped="no"/>
+                    <signal name="value-changed" handler="on_rate" swapped="no"/>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -668,7 +695,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkSpinButton" id="accel_spin">
+                  <object class="GtkSpinButton" id="acc_spin">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">●</property>
@@ -676,8 +703,9 @@
                     <property name="secondary_icon_activatable">False</property>
                     <property name="primary_icon_sensitive">True</property>
                     <property name="secondary_icon_sensitive">True</property>
-                    <property name="adjustment">accel_adj</property>
+                    <property name="adjustment">acc_adj</property>
                     <property name="numeric">True</property>
+                    <signal name="value-changed" handler="on_rate" swapped="no"/>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -698,7 +726,7 @@
                     <property name="secondary_icon_sensitive">True</property>
                     <property name="adjustment">mag_adj</property>
                     <property name="numeric">True</property>
-                    <signal name="change-value" handler="on_rate" swapped="no"/>
+                    <signal name="value-changed" handler="on_rate" swapped="no"/>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -719,7 +747,7 @@
                     <property name="secondary_icon_sensitive">True</property>
                     <property name="adjustment">touch_adj</property>
                     <property name="numeric">True</property>
-                    <signal name="change-value" handler="on_rate" swapped="no"/>
+                    <signal name="value-changed" handler="on_rate" swapped="no"/>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -740,7 +768,7 @@
                     <property name="secondary_icon_sensitive">True</property>
                     <property name="adjustment">light_adj</property>
                     <property name="numeric">True</property>
-                    <signal name="change-value" handler="on_rate" swapped="no"/>
+                    <signal name="value-changed" handler="on_rate" swapped="no"/>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -1175,7 +1203,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkImage" id="conn">
+              <object class="GtkImage" id="serial_con">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="stock">gtk-no</property>
@@ -1186,6 +1214,18 @@
                 <property name="position">0</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkImage" id="xively_con">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="stock">gtk-no</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkStatusbar" id="status">
                 <property name="visible">True</property>
@@ -1195,7 +1235,7 @@
               <packing>
                 <property name="expand">True</property>
                 <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
           </object>