From 26be08e37d736e3c81888e326cef1c5d022faa60 Mon Sep 17 00:00:00 2001
From: Michael Dryden <mdryden@chem.utoronto.ca>
Date: Fri, 18 Apr 2014 03:19:53 -0400
Subject: [PATCH] More interface work.

---
 dstatInterface/dstatInterface.glade           | 409 ++++++++++++++++++
 .../dstatInterface.xcodeproj/project.pbxproj  |   6 +-
 .../UserInterfaceState.xcuserstate            | Bin 18040 -> 17648 bytes
 dstatInterface/glade1.py                      |  85 +++-
 dstatInterface/test1.glade                    | 282 ++++--------
 dstatInterface/test2.py                       | 106 +++++
 6 files changed, 686 insertions(+), 202 deletions(-)
 create mode 100644 dstatInterface/dstatInterface.glade
 create mode 100644 dstatInterface/test2.py

diff --git a/dstatInterface/dstatInterface.glade b/dstatInterface/dstatInterface.glade
new file mode 100644
index 0000000..1f44d93
--- /dev/null
+++ b/dstatInterface/dstatInterface.glade
@@ -0,0 +1,409 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.24"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkListStore" id="ExpComboListStore">
+    <columns>
+      <!-- column-name index -->
+      <column type="guint"/>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0">0</col>
+        <col id="1" translatable="yes">Chronoamperometry</col>
+      </row>
+      <row>
+        <col id="0">1</col>
+        <col id="1" translatable="yes">Linear Sweep Voltammetry</col>
+      </row>
+      <row>
+        <col id="0">2</col>
+        <col id="1" translatable="yes">Cyclic Voltammetry</col>
+      </row>
+      <row>
+        <col id="0">3</col>
+        <col id="1" translatable="yes">Square Wave Voltammetry</col>
+      </row>
+      <row>
+        <col id="0">4</col>
+        <col id="1" translatable="yes">AC Voltammetry</col>
+      </row>
+      <row>
+        <col id="0">5</col>
+        <col id="1" translatable="yes">Photodiode</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkAboutDialog" id="aboutdialog1">
+    <property name="can_focus">False</property>
+    <property name="border_width">5</property>
+    <property name="type_hint">dialog</property>
+    <property name="program_name">Dstat Interface</property>
+    <property name="version">0.1</property>
+    <property name="copyright" translatable="yes">© Michael Dryden 2014</property>
+    <property name="license" translatable="yes">GNU</property>
+    <property name="authors">Michael Dryden</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkTextBuffer" id="databuffer1"/>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="yalign">0.47999998927116394</property>
+    <property name="stock">gtk-missing-image</property>
+  </object>
+  <object class="GtkWindow" id="window1">
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="title" translatable="yes">Main</property>
+    <property name="default_width">800</property>
+    <property name="default_height">500</property>
+    <signal name="destroy" handler="on_window1_destroy" swapped="no"/>
+    <child>
+      <object class="GtkVBox" id="vbox1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child>
+          <object class="GtkMenuBar" id="menubar1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkMenuItem" id="menuitem1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">_File</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="menu1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkImageMenuItem" id="gtk_new">
+                        <property name="label">gtk-new</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="on_gtk_new_activate" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="gtk-open">
+                        <property name="label">gtk-open</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="gtk-save">
+                        <property name="label">gtk-save</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="gtk-save-as">
+                        <property name="label">gtk-save-as</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="gtk_quit">
+                        <property name="label">gtk-quit</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="on_gtk_quit_activate" swapped="no"/>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="menuitem2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">_Edit</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="menu2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkImageMenuItem" id="imagemenuitem7">
+                        <property name="label">gtk-copy</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="imagemenuitem8">
+                        <property name="label">gtk-paste</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="gtk_view">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">_View</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="menu5">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkImageMenuItem" id="push_status">
+                        <property name="label">Push Status</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_stock">False</property>
+                        <signal name="activate" handler="on_push_status_activate" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="pop_status">
+                        <property name="label">Pop Status</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_stock">False</property>
+                        <signal name="activate" handler="on_pop_status_activate" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="clear_status">
+                        <property name="label">Clear Status</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_stock">False</property>
+                        <signal name="activate" handler="on_clear_status_activate" swapped="no"/>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="menuitem4">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">_Help</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="menu3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkImageMenuItem" id="gtk_about">
+                        <property name="label">gtk-about</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="on_gtk_about_activate" swapped="no"/>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHPaned" id="hpaned1">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <child>
+              <object class="GtkVBox" id="vbox2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <child>
+                  <object class="GtkVBox" id="vbox3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkLabel" id="label7">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Experiment</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="padding">10</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBox" id="expcombobox">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="model">ExpComboListStore</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkScrolledWindow" id="scrolledwindow2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hscrollbar_policy">never</property>
+                    <property name="vscrollbar_policy">automatic</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="resize">False</property>
+                <property name="shrink">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkNotebook" id="notebook1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <child>
+                  <object class="GtkLabel" id="label4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">label</property>
+                  </object>
+                </child>
+                <child type="tab">
+                  <object class="GtkLabel" id="label2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">page 1</property>
+                  </object>
+                  <packing>
+                    <property name="tab_fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkScrolledWindow" id="scrolledwindow1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hscrollbar_policy">automatic</property>
+                    <property name="vscrollbar_policy">automatic</property>
+                    <child>
+                      <object class="GtkTextView" id="datatextview1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="editable">False</property>
+                        <property name="buffer">databuffer1</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child type="tab">
+                  <object class="GtkLabel" id="label3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">page 2</property>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child type="tab">
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="resize">True</property>
+                <property name="shrink">True</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkStatusbar" id="statusbar">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">2</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/dstatInterface/dstatInterface.xcodeproj/project.pbxproj b/dstatInterface/dstatInterface.xcodeproj/project.pbxproj
index 457e665..f497925 100644
--- a/dstatInterface/dstatInterface.xcodeproj/project.pbxproj
+++ b/dstatInterface/dstatInterface.xcodeproj/project.pbxproj
@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXFileReference section */
+		5FAED9CD1900FBDA00A9DDD4 /* dstatInterface.glade */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = dstatInterface.glade; sourceTree = "<group>"; };
+		5FAED9CE1900FE6B00A9DDD4 /* test2.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = test2.py; sourceTree = "<group>"; };
 		5FDC0DFD18FDAD79003F857A /* main.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = main.py; sourceTree = "<group>"; };
 		5FDC1E4218FF9572007AD04D /* glade1.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = glade1.py; sourceTree = "<group>"; };
 		5FDC1E4318FF9A95007AD04D /* test1.glade */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = test1.glade; sourceTree = "<group>"; };
@@ -16,9 +18,11 @@
 		5FDC0DF218FDACDA003F857A = {
 			isa = PBXGroup;
 			children = (
+				5FAED9CE1900FE6B00A9DDD4 /* test2.py */,
+				5FAED9CD1900FBDA00A9DDD4 /* dstatInterface.glade */,
 				5FDC1E4318FF9A95007AD04D /* test1.glade */,
-				5FDC1E4218FF9572007AD04D /* glade1.py */,
 				5FDC0DFD18FDAD79003F857A /* main.py */,
+				5FDC1E4218FF9572007AD04D /* glade1.py */,
 			);
 			sourceTree = "<group>";
 		};
diff --git a/dstatInterface/dstatInterface.xcodeproj/project.xcworkspace/xcuserdata/mdryden.xcuserdatad/UserInterfaceState.xcuserstate b/dstatInterface/dstatInterface.xcodeproj/project.xcworkspace/xcuserdata/mdryden.xcuserdatad/UserInterfaceState.xcuserstate
index 5731221d71119316c5583725e7466c79515969aa..fe0af0358b47f2512401f9914dc1138dfb5ba042 100644
GIT binary patch
delta 7159
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
EKa^Z`6#xJL

delta 6858
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

diff --git a/dstatInterface/glade1.py b/dstatInterface/glade1.py
index 2200bb2..454320a 100644
--- a/dstatInterface/glade1.py
+++ b/dstatInterface/glade1.py
@@ -1,6 +1,21 @@
 #!/usr/bin/env python
 
-import gtk
+import sys
+try:
+    import pygtk
+    pygtk.require('2.0')
+except:
+    pass
+try:
+    import gtk
+except:
+    print('GTK not available')
+    sys.exit(1)
+try:
+    import math
+except:
+    print('math lib missing')
+    sys.exit(1)
 
 # we can call it just about anything we want
 class Buglump:
@@ -23,6 +38,67 @@ class Buglump:
         self.response = self.aboutdialog.run() #waits for user to click close - could test response with if
         self.aboutdialog.hide()
     
+    def on_push_status_activate(self, menuitem, data=None): #adds message to top of stack
+        self.status_count += 1 #increment status_count
+        self.statusbar.push(self.context_id, "Message number %s" % str(self.status_count))
+    
+    def on_pop_status_activate(self, menuitem, data=None): #removes top message from stack
+        self.status_count -= 1
+        self.statusbar.pop(self.context_id)
+
+    def on_clear_status_activate(self, menuitem, data=None): #clears status stack
+        self.statusbar.remove_all(self.context_id)
+        self.status_count = 0
+#        while (self.status_count > 0):
+#            self.statusbar.pop(self.context_id)
+#            self.status_count -= 1
+
+    def on_sfm_button_clicked(self, button, data=None):
+        # create an instance of the entry objects
+        # so we can get and set the text values
+        self.entry1 = self.builder.get_object("entry1")
+        self.entry2 = self.builder.get_object("entry2")
+        self.result1 = self.builder.get_object("result1")
+
+        # get the text from the GtkEntry widget and convert
+        # it to a float value so we can calculate the result
+        self.sfm = float(self.entry1.get_text())
+        self.diameter = float(self.entry2.get_text())
+
+        # calculate the result convert to an int to round the number
+        # then convert to a string to set the text in our label
+        # notice the math.pi constant is used in the calculation
+        self.rpm = str(int(self.sfm * ((12/math.pi)/self.diameter)))
+
+        # debugging print
+        print "calculate rpm clicked"
+
+        # set the result label with our results
+        self.result1.set_text(self.rpm)
+
+    def on_gtk_new_activate(self, menuitem, data=None):
+        # debugging message
+        print 'File New selected'
+        
+        # create a label for the tab and using get_n_pages() to find out how
+        # many pages there is so the next page has a sequential number.
+        self.label1 = gtk.Label('Page ' + str(self.notebook.get_n_pages() + 1))
+        
+        # create a label to put into the page
+        self.label2 = gtk.Label('Hello World')
+        # If you don't show the contents of the tab it won't show up
+        self.label2.show()
+        
+        # append a page with label5 as the contents and label5 as the tab
+        self.notebook.append_page(self.label2, self.label1)
+
+    def on_notebook1_switch_page(self,  notebook, page, page_num, data=None):
+        self.tab = notebook.get_nth_page(page_num)
+        self.label = notebook.get_tab_label(self.tab).get_label()
+        self.message_id = self.statusbar.push(0, self.label)
+
+
+
     # This is our init part where we connect the signals
     def __init__(self):
         self.gladefile = "test1.glade" # store the file name
@@ -34,12 +110,17 @@ class Buglump:
         # you use this line to connect the signals.
         self.builder.connect_signals(self)
         
-        #get windows
+        #get widgets
         self.window = self.builder.get_object("window1")
         self.aboutdialog = self.builder.get_object("aboutdialog1")
+        self.statusbar = self.builder.get_object("statusbar")
+        self.notebook = self.builder.get_object("notebook1")
         
         self.window.show() # this shows the 'window1' object
 
+        self.context_id = self.statusbar.get_context_id("status") #register and get statusbar context_id for description "status"
+        self.status_count = 0 #count of messages pushed
+
 # If this is run stand alone execute the following after the 'if'
 # If this class is imported into another program the code after the 'if' will
 # not run. This makes the code more flexible.
diff --git a/dstatInterface/test1.glade b/dstatInterface/test1.glade
index 16afb80..18fc7f5 100644
--- a/dstatInterface/test1.glade
+++ b/dstatInterface/test1.glade
@@ -34,6 +34,12 @@
       </object>
     </child>
   </object>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="yalign">0.47999998927116394</property>
+    <property name="stock">gtk-missing-image</property>
+  </object>
   <object class="GtkWindow" id="window1">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
@@ -60,12 +66,13 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkImageMenuItem" id="gtk-new">
+                      <object class="GtkImageMenuItem" id="gtk_new">
                         <property name="label">gtk-new</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
+                        <signal name="activate" handler="on_gtk_new_activate" swapped="no"/>
                       </object>
                     </child>
                     <child>
@@ -142,11 +149,44 @@
               </object>
             </child>
             <child>
-              <object class="GtkMenuItem" id="menuitem3">
+              <object class="GtkMenuItem" id="gtk_view">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">_View</property>
                 <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="menu5">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkImageMenuItem" id="push_status">
+                        <property name="label">Push Status</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_stock">False</property>
+                        <signal name="activate" handler="on_push_status_activate" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="pop_status">
+                        <property name="label">Pop Status</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_stock">False</property>
+                        <signal name="activate" handler="on_pop_status_activate" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="clear_status">
+                        <property name="label">Clear Status</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_stock">False</property>
+                        <signal name="activate" handler="on_clear_status_activate" swapped="no"/>
+                      </object>
+                    </child>
+                  </object>
+                </child>
               </object>
             </child>
             <child>
@@ -193,223 +233,67 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHBox" id="hbox1">
+          <object class="GtkNotebook" id="notebook1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can_focus">True</property>
+            <signal name="switch-page" handler="on_notebook1_switch_page" swapped="no"/>
             <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow1">
+              <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">never</property>
-                <property name="vscrollbar_policy">automatic</property>
-                <child>
-                  <object class="GtkTreeView" id="treeview1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                  </object>
-                </child>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">label</property>
+              </object>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">page 1</property>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="tab_fill">False</property>
               </packing>
             </child>
             <child>
-              <object class="GtkVButtonBox" id="vbuttonbox1">
+              <object class="GtkLabel" id="label5">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="spacing">2</property>
-                <property name="homogeneous">True</property>
-                <property name="layout_style">center</property>
-                <child>
-                  <object class="GtkButton" id="button1">
-                    <property name="label">gtk-goto-top</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_stock">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="button2">
-                    <property name="label">gtk-go-up</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_stock">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="button3">
-                    <property name="label">gtk-add</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_stock">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="button4">
-                    <property name="label">gtk-remove</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_stock">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="button5">
-                    <property name="label">gtk-go-down</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_stock">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">4</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="button6">
-                    <property name="label">gtk-goto-bottom</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_stock">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">5</property>
-                  </packing>
-                </child>
+                <property name="label" translatable="yes">label</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">page 2</property>
+              </object>
+              <packing>
+                <property name="position">1</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
             <child>
-              <object class="GtkVBox" id="vbox2">
+              <object class="GtkLabel" id="label6">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkScrolledWindow" id="scrolledwindow2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
-                    <child>
-                      <object class="GtkViewport" id="viewport1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkAlignment" id="alignment1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xscale">0</property>
-                            <property name="yscale">0</property>
-                            <child>
-                              <object class="GtkFrame" id="frame1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow_type">in</property>
-                                <child>
-                                  <object class="GtkDrawingArea" id="drawingarea1">
-                                    <property name="width_request">300</property>
-                                    <property name="height_request">200</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                  </object>
-                                </child>
-                                <child type="label_item">
-                                  <placeholder/>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHButtonBox" id="hbuttonbox1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="spacing">2</property>
-                    <property name="homogeneous">True</property>
-                    <property name="layout_style">center</property>
-                    <child>
-                      <object class="GtkCheckButton" id="checkbutton1">
-                        <property name="label" translatable="yes">Show points</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="checkbutton2">
-                        <property name="label" translatable="yes">Show lines</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
+                <property name="label" translatable="yes">label</property>
+              </object>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">page 3</property>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
                 <property name="position">2</property>
+                <property name="tab_fill">False</property>
               </packing>
             </child>
           </object>
@@ -420,7 +304,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkStatusbar" id="statusbar2">
+          <object class="GtkStatusbar" id="statusbar">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">2</property>
diff --git a/dstatInterface/test2.py b/dstatInterface/test2.py
new file mode 100644
index 0000000..558c52b
--- /dev/null
+++ b/dstatInterface/test2.py
@@ -0,0 +1,106 @@
+#!/usr/bin/env python
+
+import sys
+try:
+    import pygtk
+    pygtk.require('2.0')
+except:
+    pass
+try:
+    import gtk
+except:
+    print('GTK not available')
+    sys.exit(1)
+try:
+    import math
+except:
+    print('math lib missing')
+    sys.exit(1)
+
+# we can call it just about anything we want
+class Buglump:
+    
+    # This first define is for our on_window1_destroy signal we created in the
+    # Glade designer. The print message does just that and prints to the terminal
+    # which can be useful for debugging. The 'object' if you remember is the signal
+    # class we picked from GtkObject.
+    def on_window1_destroy(self, object, data=None):
+        print "quit with cancel"
+        gtk.main_quit()
+    
+    # This is the same as above but for our menu item.
+    def on_gtk_quit_activate(self, menuitem, data=None):
+        print "quit from menu"
+        gtk.main_quit()
+    
+    def on_gtk_about_activate(self, menuitem, data=None):
+        print "help about selected"
+        self.response = self.aboutdialog.run() #waits for user to click close - could test response with if
+        self.aboutdialog.hide()
+    
+    def on_push_status_activate(self, menuitem, data=None): #adds message to top of stack
+        self.status_count += 1 #increment status_count
+        self.statusbar.push(self.context_id, "Message number %s" % str(self.status_count))
+    
+    def on_pop_status_activate(self, menuitem, data=None): #removes top message from stack
+        self.status_count -= 1
+        self.statusbar.pop(self.context_id)
+    
+    def on_clear_status_activate(self, menuitem, data=None): #clears status stack
+        self.statusbar.remove_all(self.context_id)
+        self.status_count = 0
+    #        while (self.status_count > 0):
+    #            self.statusbar.pop(self.context_id)
+    #            self.status_count -= 1
+    
+    def on_expcombobox_changed(self, widget, data=None):
+        # get the index of the changed row
+        self.index = widget.get_active()
+        
+        # get the model
+        self.model = widget.get_model()
+        
+        # retrieve the item from column 1
+        self.item = self.model[self.index][1]
+        
+        # debugging print statements
+        print "ComboBox Active Text is", self.item
+        print "ComboBox Active Index is", self.index
+    
+    # This is our init part where we connect the signals
+    def __init__(self):
+        self.gladefile = "dstatInterface.glade" # store the file name
+        self.builder = gtk.Builder() # create an instance of the gtk.Builder
+        self.builder.add_from_file(self.gladefile) # add the xml file to the Builder
+        
+        # This line does the magic of connecting the signals created in the Glade3
+        # builder to our defines above. You must have one def for each signal if
+        # you use this line to connect the signals.
+        self.builder.connect_signals(self)
+        
+        #expcombobox
+        self.expcombobox = self.builder.get_object("expcombobox")
+        self.cell = gtk.CellRendererText()
+        self.expcombobox.pack_start(self.cell, True) #pack CellRenderer into beginning of combobox cell
+        self.expcombobox.add_attribute(self.cell, 'text', 1) # text in column 1
+        self.expcombobox.set_active(0) #set initial value
+
+        
+        
+        #get widgets
+        self.window = self.builder.get_object("window1")
+        self.aboutdialog = self.builder.get_object("aboutdialog1")
+        self.statusbar = self.builder.get_object("statusbar")
+
+        
+        self.window.show() # this shows the 'window1' object
+        
+        self.context_id = self.statusbar.get_context_id("status") #register and get statusbar context_id for description "status"
+        self.status_count = 0 #count of messages pushed
+
+# If this is run stand alone execute the following after the 'if'
+# If this class is imported into another program the code after the 'if' will
+# not run. This makes the code more flexible.
+if __name__ == "__main__":
+    main = Buglump() # create an instance of our class
+    gtk.main() # run the darn thing
\ No newline at end of file
-- 
GitLab