Skip to content
Snippets Groups Projects
Commit 681bb080 authored by Michael DM Dryden's avatar Michael DM Dryden
Browse files

Merge branch 'feature/UI_Cleanup' into develop

parents cd218b7c 3ccbd799
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
dstat-interface/dstat-interface/interface/adc_pot.py
+ 1
− 1
View file @ 681bb080
......@@ -25,4 +25,4 @@ class adc_pot:
self.gain_combobox = self.builder.get_object('gain_combobox')
self.gain_combobox.pack_start(self.cell, True)
self.gain_combobox.add_attribute(self.cell, 'text', 1)
self.gain_combobox.set_active(1)
\ No newline at end of file
self.gain_combobox.set_active(2)
\ No newline at end of file
dstat-interface/dstat-interface/interface/dstatinterface.glade
+ 21
− 62
View file @ 681bb080
......@@ -52,12 +52,14 @@
<object class="GtkAboutDialog" id="aboutdialog1">
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
<property name="program_name">Dstat Interface</property>
<property name="version">0.1</property>
<property name="version">1.0</property>
<property name="copyright" translatable="yes">© Michael Dryden 2014</property>
<property name="license" translatable="yes">GNU</property>
<property name="authors">Michael Dryden</property>
<property name="authors">Michael Dryden
Thanks to Christian Fobel for help with Dropbot Plugin</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
......@@ -130,24 +132,6 @@
<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>
</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="file_save_exp">
<property name="label">Save current data...</property>
......@@ -217,44 +201,6 @@
</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>
</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>
</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>
</object>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkMenuItem" id="menuitem4">
<property name="visible">True</property>
......@@ -472,7 +418,7 @@
<property name="has_tooltip">True</property>
<property name="max_length">32</property>
<property name="invisible_char">●</property>
<property name="text" translatable="yes">file</property>
<property name="text" translatable="yes">filename</property>
<property name="caps_lock_warning">False</property>
<property name="primary_icon_stock">gtk-file</property>
<property name="primary_icon_activatable">False</property>
......@@ -601,6 +547,19 @@
<object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Serial Port:</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="serial_combobox">
<property name="visible">True</property>
......@@ -610,7 +569,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
<property name="position">1</property>
</packing>
</child>
<child>
......@@ -625,7 +584,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
<property name="position">2</property>
</packing>
</child>
<child>
......@@ -637,7 +596,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
<property name="position">3</property>
</packing>
</child>
</object>
......
dstat-interface/dstat-interface/main.py
+ 0
− 3
View file @ 681bb080
......@@ -122,17 +122,14 @@ class Main(object):
def on_window1_destroy(self, object, data=None):
""" Quit when main window closed."""
print "quit with cancel"
gtk.main_quit()
def on_gtk_quit_activate(self, menuitem, data=None):
"""Quit when Quit selected from menu."""
print "quit from menu"
gtk.main_quit()
def on_gtk_about_activate(self, menuitem, data=None):
"""Display the about window."""
print "help about selected"
self.response = self.aboutdialog.run() # waits for user to click close
self.aboutdialog.hide()
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment