Menu
▾
▴
[Pytrainer-svn] SF.net SVN: pytrainer:[476] pytrainer/trunk
|
From: <jb...@us...> - 2010-01-16 22:14:45
|
Revision: 476
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=476&view=rev
Author: jblance
Date: 2010-01-16 22:14:16 +0000 (Sat, 16 Jan 2010)
Log Message:
-----------
Minor tweaks to unified import
Modified Paths:
--------------
pytrainer/trunk/glade/importdata.glade
pytrainer/trunk/import/tool_gant.py
pytrainer/trunk/pytrainer/gui/windowimportdata.py
pytrainer/trunk/pytrainer/main.py
Modified: pytrainer/trunk/glade/importdata.glade
===================================================================
--- pytrainer/trunk/glade/importdata.glade 2010-01-16 16:26:48 UTC (rev 475)
+++ pytrainer/trunk/glade/importdata.glade 2010-01-16 22:14:16 UTC (rev 476)
@@ -22,10 +22,47 @@
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
- <widget class="GtkFrame" id="frameImportFromDevice">
+ <widget class="GtkFrame" id="frameDeviceSelect">
<property name="visible">True</property>
<property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
+ <widget class="GtkAlignment" id="alignment5">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <widget class="GtkComboBox" id="comboboxDevice">
+ <property name="visible">True</property>
+ <property name="active">0</property>
+ <property name="items" translatable="yes">Test 1
+Test 2</property>
+ <signal name="changed" handler="on_comboboxDevice_changed"/>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="labelSelectDevice">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Select your GPS device</b></property>
+ <property name="use_markup">True</property>
+ <property name="single_line_mode">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkFrame" id="frameImportFromDevice">
+ <property name="label_xalign">0</property>
+ <child>
<widget class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="left_padding">12</property>
@@ -53,7 +90,8 @@
</child>
</widget>
<packing>
- <property name="position">1</property>
+ <property name="pack_type">end</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -71,7 +109,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="padding">10</property>
+ <property name="padding">5</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
@@ -88,6 +126,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="padding">5</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
@@ -97,7 +136,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -247,7 +286,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="padding">10</property>
+ <property name="padding">5</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
@@ -264,6 +303,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="padding">5</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
@@ -393,6 +433,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="padding">5</property>
<property name="pack_type">end</property>
<property name="position">2</property>
</packing>
@@ -408,7 +449,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="padding">10</property>
+ <property name="padding">5</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
@@ -425,6 +466,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="padding">5</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
Modified: pytrainer/trunk/import/tool_gant.py
===================================================================
--- pytrainer/trunk/import/tool_gant.py 2010-01-16 16:26:48 UTC (rev 475)
+++ pytrainer/trunk/import/tool_gant.py 2010-01-16 22:14:16 UTC (rev 476)
@@ -38,6 +38,12 @@
return _("Gant")
def getVersion(self):
+ outstatus = commands.getstatusoutput('which gant')
+ if outstatus[0] == 0: #Found gant in path
+ path = outstatus[1]
+ return path
+ else:
+ return None
return None
def getSourceLocation(self):
Modified: pytrainer/trunk/pytrainer/gui/windowimportdata.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowimportdata.py 2010-01-16 16:26:48 UTC (rev 475)
+++ pytrainer/trunk/pytrainer/gui/windowimportdata.py 2010-01-16 22:14:16 UTC (rev 476)
@@ -34,7 +34,6 @@
self.configuration = config
self.store = None
self.processClass = None
- self.toolsDetected = False
#SimpleGladeApp.__init__(self, data_path+glade_path, root, domain)
def run(self):
@@ -70,14 +69,7 @@
return context_id
def init_gpsdevice_tab(self):
- #Only detect tools once (or if requested)
- if not self.toolsDetected:
- #Remove all components in vbox - in case of re-detection
- for child in self.vboxImportTools.get_children():
- print "removing ", child
- self.vboxImportTools.remove(child)
- self.detect_tools()
- self.toolsDetected = True
+
return
def init_file_tab(self):
@@ -111,6 +103,10 @@
"""
logging.debug('>>')
self.updateStatusbar(self.statusbarDevice, "Checking for tools")
+ #Remove all components in vbox - in case of re-detection
+ for child in self.vboxImportTools.get_children():
+ print "removing ", child
+ self.vboxImportTools.remove(child)
#Get import tool_* files
fileList = glob.glob(self.data_path+"import/tool_*.py")
for toolFile in fileList:
@@ -134,6 +130,7 @@
version.set_alignment(0,0)
if toolClass.deviceExists():
deviceExists = gtk.Label(_("GPS device found") )
+ deviceExists.set_alignment(0,0)
else:
deviceExists = gtk.Label(_("GPS device <b>not</b> found"))
deviceExists.set_alignment(0,0)
@@ -420,5 +417,7 @@
self.close_window()
def on_buttonDeviceToolRescan_clicked(self, widget):
- self.toolsDetected = False
- self.init_gpsdevice_tab()
+ self.detect_tools()
+
+ def on_comboboxDevice_changed(self, widget):
+ self.detect_tools()
Modified: pytrainer/trunk/pytrainer/main.py
===================================================================
--- pytrainer/trunk/pytrainer/main.py 2010-01-16 16:26:48 UTC (rev 475)
+++ pytrainer/trunk/pytrainer/main.py 2010-01-16 22:14:16 UTC (rev 476)
@@ -101,7 +101,7 @@
def __init__(self,filename = None, data_path = None):
logging.debug('>>')
self.data_path = data_path
- self.version ="1.7.0_svn#475"
+ self.version ="1.7.0_svn#476"
self.date = Date()
# Checking profile
self.profile = Profile(self.data_path,self)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
