From ab2b73de6d936912d16fc75de708d554fa5f4fa6 Mon Sep 17 00:00:00 2001
From: Andy Spencer <andy753421@gmail.com>
Date: Sun, 2 Feb 2014 09:09:45 +0000
Subject: [PATCH] Add device name

---
 vis/config.py    |  2 ++
 vis/settings.cfg |  1 +
 vis/visual.py    |  2 ++
 vis/visual.ui    | 89 +++++++++++++++++++++++++++++++++---------------
 4 files changed, 66 insertions(+), 28 deletions(-)

diff --git a/vis/config.py b/vis/config.py
index c3ea321..79da223 100644
--- a/vis/config.py
+++ b/vis/config.py
@@ -5,6 +5,7 @@ class Config:
 	filename = "settings.cfg"
 
 	defaults = {
+		'baudrate': '/dev/ttyACM0',
 		'baudrate': '9600',
 		'parity':   'N',
 		'databits': '8',
@@ -25,6 +26,7 @@ class Config:
 	def load(self):
 		self.parser.read(self.filename)
 
+		self.device   = self.parser.get('serial', 'device')
 		self.baudrate = self.parser.getint('serial', 'baudrate')
 		self.parity   = self.parser.get('serial', 'parity')
 		self.databits = self.parser.getint('serial', 'databits')
diff --git a/vis/settings.cfg b/vis/settings.cfg
index e83fece..8757c24 100644
--- a/vis/settings.cfg
+++ b/vis/settings.cfg
@@ -1,4 +1,5 @@
 [serial]
+device   = /dev/ttyACM0
 buadrate = 9600
 parity   = N
 databits = 8
diff --git a/vis/visual.py b/vis/visual.py
index f07ea0d..0b21349 100644
--- a/vis/visual.py
+++ b/vis/visual.py
@@ -66,10 +66,12 @@ class Visual:
         # Methods
 	def load_config(self):
 		# Serial settings
+		device = self.builder.get_object("device")
 		baud   = self.builder.get_object("baudrate")
 		parity = self.builder.get_object("parity")
 		datab  = self.builder.get_object("databits")
 		stopb  = self.builder.get_object("stopbits")
+		device.set_text(self.config.device)
 		baud.set_value(self.config.baudrate)
 		parity.set_text(self.config.parity)
 		datab.set_value(self.config.databits)
diff --git a/vis/visual.ui b/vis/visual.ui
index 96915df..6ef41b1 100644
--- a/vis/visual.ui
+++ b/vis/visual.ui
@@ -2,6 +2,21 @@
 <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>
@@ -38,21 +53,6 @@
     <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>
   <object class="GtkDialog" id="settings">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -108,7 +108,7 @@
                   <object class="GtkTable" id="table1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="n_rows">4</property>
+                    <property name="n_rows">5</property>
                     <property name="n_columns">2</property>
                     <property name="column_spacing">20</property>
                     <child>
@@ -119,6 +119,8 @@
                         <property name="label" translatable="yes">Baud rate</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>
@@ -131,8 +133,8 @@
                         <property name="label" translatable="yes">Stop bits</property>
                       </object>
                       <packing>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
+                        <property name="top_attach">3</property>
+                        <property name="bottom_attach">4</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options">GTK_FILL</property>
                       </packing>
@@ -145,8 +147,8 @@
                         <property name="label" translatable="yes">Data bits</property>
                       </object>
                       <packing>
-                        <property name="top_attach">3</property>
-                        <property name="bottom_attach">4</property>
+                        <property name="top_attach">4</property>
+                        <property name="bottom_attach">5</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options">GTK_FILL</property>
                       </packing>
@@ -165,6 +167,8 @@
                       <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">GTK_FILL</property>
                       </packing>
                     </child>
@@ -182,8 +186,8 @@
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
+                        <property name="top_attach">3</property>
+                        <property name="bottom_attach">4</property>
                         <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
@@ -201,8 +205,8 @@
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
-                        <property name="top_attach">3</property>
-                        <property name="bottom_attach">4</property>
+                        <property name="top_attach">4</property>
+                        <property name="bottom_attach">5</property>
                         <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
@@ -214,8 +218,8 @@
                         <property name="label" translatable="yes">Parity</property>
                       </object>
                       <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
+                        <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>
@@ -234,8 +238,37 @@
                       <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="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
+                        <property name="y_options">GTK_FILL</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="device_lbl">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Device</property>
+                      </object>
+                      <packing>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options">GTK_FILL</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="device">
+                        <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>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
                         <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
-- 
2.43.2