Update settings

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

diff --git a/vis/visual.ui b/vis/visual.ui
index bb981763bb368af24dcb6b74300acea56002fed8..f4795b7848d82cbd7cb006f426d222df75c7a90f 100644 (file)
--- a/vis/visual.ui
+++ b/vis/visual.ui
@@ -2,6 +2,16 @@
 <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>
@@ -37,22 +47,12 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkTextBuffer" id="serial_buf"/>
-  <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="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 class="GtkAdjustment" id="rate_adj">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
   </object>
+  <object class="GtkTextBuffer" id="serial_buf"/>
   <object class="GtkDialog" id="settings">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -163,6 +163,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"/>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -182,6 +183,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"/>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -201,6 +203,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"/>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -234,6 +237,7 @@
                         <property name="secondary_icon_activatable">False</property>
                         <property name="primary_icon_sensitive">True</property>
                         <property name="secondary_icon_sensitive">True</property>
+                        <signal name="changed" handler="on_config" swapped="no"/>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -265,6 +269,7 @@
                         <property name="secondary_icon_activatable">False</property>
                         <property name="primary_icon_sensitive">True</property>
                         <property name="secondary_icon_sensitive">True</property>
+                        <signal name="changed" handler="on_config" swapped="no"/>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -312,47 +317,20 @@
                     <property name="n_columns">2</property>
                     <property name="column_spacing">20</property>
                     <child>
-                      <object class="GtkLabel" id="user_lbl">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Username</property>
-                      </object>
-                      <packing>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="pass_lbl">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Password</property>
-                      </object>
-                      <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="api_lbl">
+                      <object class="GtkLabel" id="feed_llb">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">API Key</property>
+                        <property name="ypad">8</property>
+                        <property name="label" translatable="yes">Feed ID</property>
                       </object>
                       <packing>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkEntry" id="username">
+                      <object class="GtkEntry" id="feedid">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="invisible_char">●</property>
@@ -361,6 +339,7 @@
                         <property name="secondary_icon_activatable">False</property>
                         <property name="primary_icon_sensitive">True</property>
                         <property name="secondary_icon_sensitive">True</property>
+                        <signal name="changed" handler="on_config" swapped="no"/>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -369,7 +348,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkEntry" id="password">
+                      <object class="GtkEntry" id="apikey">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="invisible_char">●</property>
@@ -378,6 +357,7 @@
                         <property name="secondary_icon_activatable">False</property>
                         <property name="primary_icon_sensitive">True</property>
                         <property name="secondary_icon_sensitive">True</property>
+                        <signal name="changed" handler="on_config" swapped="no"/>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -388,15 +368,44 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkEntry" id="apikey">
+                      <object class="GtkLabel" id="api_lbl">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">API Key</property>
+                      </object>
+                      <packing>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options">GTK_FILL</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="rate_lbl">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Max Rate</property>
+                      </object>
+                      <packing>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options">GTK_FILL</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSpinButton" id="maxrate">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="invisible_char">●</property>
-                        <property name="invisible_char_set">True</property>
                         <property name="primary_icon_activatable">False</property>
                         <property name="secondary_icon_activatable">False</property>
                         <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"/>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -445,6 +454,11 @@
     <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"/>
@@ -1194,4 +1208,12 @@
       </object>
     </child>
   </object>
+  <object class="GtkSizeGroup" id="settings_lbls">
+    <widgets>
+      <widget name="feed_llb"/>
+      <widget name="api_lbl"/>
+      <widget name="rate_lbl"/>
+      <widget name="device_lbl"/>
+    </widgets>
+  </object>
 </interface>