X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=vis%2Fvisual.ui;h=32e83c41229b0928d3d764998bbb827466d61359;hb=e3f519bd2a6e48fc959006fba76996fa88db2530;hp=6ef41b13bd2e2f923c8ba52ca8f6b81c251a58a5;hpb=ab2b73de6d936912d16fc75de708d554fa5f4fa6;p=~andy%2Fcsm213a-hw

diff --git a/vis/visual.ui b/vis/visual.ui
index 6ef41b1..32e83c4 100644
--- a/vis/visual.ui
+++ b/vis/visual.ui
@@ -2,21 +2,6 @@
 <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="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="GtkAdjustment" id="a2d_adj">
     <property name="upper">100</property>
     <property name="value">1</property>
@@ -40,6 +25,11 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
+  <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="light_adj">
     <property name="upper">100</property>
     <property name="value">1</property>
@@ -52,7 +42,27 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
+  <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="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="GtkTextBuffer" id="serial_buf"/>
+  <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="GtkDialog" id="settings">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -163,6 +173,7 @@
                         <property name="primary_icon_sensitive">True</property>
                         <property name="secondary_icon_sensitive">True</property>
                         <property name="adjustment">baud_adj</property>
+                        <signal name="value-changed" handler="on_config" swapped="no"/>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -182,6 +193,7 @@
                         <property name="primary_icon_sensitive">True</property>
                         <property name="secondary_icon_sensitive">True</property>
                         <property name="adjustment">stopb_adj</property>
+                        <signal name="value-changed" handler="on_config" swapped="no"/>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -201,6 +213,7 @@
                         <property name="primary_icon_sensitive">True</property>
                         <property name="secondary_icon_sensitive">True</property>
                         <property name="adjustment">datab_adj</property>
+                        <signal name="value-changed" handler="on_config" swapped="no"/>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -234,6 +247,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 +279,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,11 +327,12 @@
                     <property name="n_columns">2</property>
                     <property name="column_spacing">20</property>
                     <child>
-                      <object class="GtkLabel" id="user_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">Username</property>
+                        <property name="ypad">8</property>
+                        <property name="label" translatable="yes">Feed ID</property>
                       </object>
                       <packing>
                         <property name="x_options">GTK_FILL</property>
@@ -324,35 +340,7 @@
                       </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">
-                        <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">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 +349,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 +358,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 +367,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 +378,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="value-changed" handler="on_config" swapped="no"/>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -460,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>
@@ -472,7 +491,29 @@
             </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>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <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>
@@ -483,7 +524,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkSeparatorToolItem" id="sep">
+              <object class="GtkSeparatorToolItem" id="sep1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
               </object>
@@ -790,6 +831,7 @@
                   <object class="GtkHBox" id="accel_val">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="homogeneous">True</property>
                     <child>
                       <object class="GtkLabel" id="accx">
                         <property name="visible">True</property>
@@ -842,6 +884,7 @@
                   <object class="GtkHBox" id="mag_val">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="homogeneous">True</property>
                     <child>
                       <object class="GtkLabel" id="magx">
                         <property name="visible">True</property>
@@ -1159,7 +1202,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>
@@ -1170,6 +1213,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>
@@ -1179,7 +1234,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>
@@ -1192,4 +1247,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>