[Avida-SVN] r1678 - branches/developers/avida-edward/source/python/AvidaGui2
baerb at myxo.css.msu.edu
baerb at myxo.css.msu.edu
Wed Jun 13 14:00:25 PDT 2007
Author: baerb
Date: 2007-06-13 17:00:25 -0400 (Wed, 13 Jun 2007)
New Revision: 1678
Added:
branches/developers/avida-edward/source/python/AvidaGui2/avida-ED-icon.png
Modified:
branches/developers/avida-edward/source/python/AvidaGui2/Get_Avida_ED_version.py
branches/developers/avida-edward/source/python/AvidaGui2/pyAboutScreenCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyLiveControlsCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyLiveControlsView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyNavBarCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyRightClickDialogCtrl.py
Log:
Minor interface changes.
Now we have an about screen removed the version number from the main window.
Modified: branches/developers/avida-edward/source/python/AvidaGui2/Get_Avida_ED_version.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/Get_Avida_ED_version.py 2007-06-13 20:47:13 UTC (rev 1677)
+++ branches/developers/avida-edward/source/python/AvidaGui2/Get_Avida_ED_version.py 2007-06-13 21:00:25 UTC (rev 1678)
@@ -1,8 +1,8 @@
-avida_ed_version_string = 'Avida-ED v2.0'
+avida_ed_version_string = 'Avida-ED v1.0 '
try:
import Avida_ED_version
reload(Avida_ED_version)
- avida_ed_version_string += '.%s' % Avida_ED_version.svn_revision_string
+ avida_ed_version_string += '(build %s)' % Avida_ED_version.svn_revision_string
except:
avida_ed_version_string += '.(unknown)'
Added: branches/developers/avida-edward/source/python/AvidaGui2/avida-ED-icon.png
===================================================================
(Binary files differ)
Property changes on: branches/developers/avida-edward/source/python/AvidaGui2/avida-ED-icon.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyAboutScreenCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyAboutScreenCtrl.py 2007-06-13 20:47:13 UTC (rev 1677)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyAboutScreenCtrl.py 2007-06-13 21:00:25 UTC (rev 1678)
@@ -11,11 +11,10 @@
# in the original about screen the location for version is held with "xxx"
# find this string and replace it with the actual version number
- tmp_ver_str = avida_ed_version_string[9:]
tmp_help_str = str(self.AboutInfoTextLabel.text())
version_loc = tmp_help_str.find("xxx")
if (version_loc > 1):
- new_help_str = tmp_help_str[:version_loc] + tmp_ver_str + tmp_help_str[version_loc+3:]
+ new_help_str = tmp_help_str[:version_loc] + avida_ed_version_string + tmp_help_str[version_loc+3:]
self.AboutInfoTextLabel.setText(new_help_str)
def showDialog(self):
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py 2007-06-13 20:47:13 UTC (rev 1677)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py 2007-06-13 21:00:25 UTC (rev 1678)
@@ -2,7 +2,7 @@
from descr import *
-from Get_Avida_ED_version import avida_ed_version_string
+# from Get_Avida_ED_version import avida_ed_version_string
from pyEduWorkspaceView import pyEduWorkspaceView
from pyMdtr import pyMdtr
from pyOneAnalyzeCtrl import pyOneAnalyzeCtrl
@@ -45,9 +45,9 @@
if (session_mdl.directory_chosen == False):
- self.setCaption('%s - %s' % (avida_ed_version_string, "Unnamed Workspace") )
+ self.setCaption('%s - %s' % ("Avida-ED", "Unnamed Workspace") )
else:
- self.setCaption('%s - %s' % (avida_ed_version_string, os.path.basename(os.path.splitext(self.m_session_mdl.m_current_workspace)[0])) )
+ self.setCaption('%s - %s' % ("Avida-ED", os.path.basename(os.path.splitext(self.m_session_mdl.m_current_workspace)[0])) )
while self.m_widget_stack.visibleWidget():
self.m_widget_stack.removeWidget(self.m_widget_stack.visibleWidget())
@@ -316,7 +316,7 @@
self.m_session_mdl.m_current_workspace = str(new_dir)
self.m_session_mdl.m_current_freezer = os.path.join(new_dir, "freezer")
self.m_session_mdl.directory_chosen = True
- self.setCaption('%s - %s' % (avida_ed_version_string, os.path.basename(os.path.splitext(self.m_session_mdl.m_current_workspace)[0])) )
+ self.setCaption('%s - %s' % ("Avida-ED", os.path.basename(os.path.splitext(self.m_session_mdl.m_current_workspace)[0])) )
self.m_session_mdl.m_session_mdtr.emit(
PYSIGNAL("doRefreshFreezerInventorySig"), ())
created = True
@@ -369,7 +369,7 @@
self.m_session_mdl.m_current_workspace = str(workspace_dir)
self.m_session_mdl.m_current_freezer = os.path.join(self.m_session_mdl.m_current_workspace, "freezer")
self.m_session_mdl.directory_chosen = True
- self.setCaption('%s - %s' % (avida_ed_version_string, os.path.basename(os.path.splitext(self.m_session_mdl.m_current_workspace)[0])) )
+ self.setCaption('%s - %s' % ("Avida-ED", os.path.basename(os.path.splitext(self.m_session_mdl.m_current_workspace)[0])) )
self.m_session_mdl.m_session_mdtr.emit(
PYSIGNAL("doRefreshFreezerInventorySig"), ())
@@ -422,7 +422,7 @@
self.m_session_mdl.m_current_workspace = str(new_dir)
self.m_session_mdl.m_current_freezer = os.path.join(new_dir, "freezer")
#self.setCaption(self.m_session_mdl.m_current_workspace)
- self.setCaption('%s - %s' % (avida_ed_version_string, os.path.basename(os.path.splitext(self.m_session_mdl.m_current_workspace)[0])) )
+ self.setCaption('%s - %s' % ("Avida-ED", os.path.basename(os.path.splitext(self.m_session_mdl.m_current_workspace)[0])) )
self.m_session_mdl.m_session_mdtr.emit(
PYSIGNAL("doRefreshFreezerInventorySig"), ())
created = True
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyLiveControlsCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyLiveControlsCtrl.py 2007-06-13 20:47:13 UTC (rev 1677)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyLiveControlsCtrl.py 2007-06-13 21:00:25 UTC (rev 1678)
@@ -38,11 +38,9 @@
def setAvidaSlot(self, avida):
- print "pyLiveControlsCtrl.setAvidaSlot() ..."
old_avida = self.m_avida
self.m_avida = avida
if(old_avida):
- print "pyLiveControlsCtrl.setAvidaSlot() disconnecting old_avida ..."
self.disconnect(
self.m_avida.m_avida_thread_mdtr, PYSIGNAL("AvidaUpdatedSig"),
self.avidaUpdatedSlot)
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyLiveControlsView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyLiveControlsView.ui 2007-06-13 20:47:13 UTC (rev 1677)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyLiveControlsView.ui 2007-06-13 21:00:25 UTC (rev 1678)
@@ -114,6 +114,14 @@
<property name="name">
<cstring>m_pause_button</cstring>
</property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="text">
<string></string>
</property>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyNavBarCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyNavBarCtrl.py 2007-06-13 20:47:13 UTC (rev 1677)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyNavBarCtrl.py 2007-06-13 21:00:25 UTC (rev 1678)
@@ -33,7 +33,6 @@
# dropped_item_name is a string...a file name or raw genotype
- print type(e)
descr("in contentsDrop event")
descr("dropped_item_name is: ", str(dropped_item_name))
test_item_name = 'jeff'
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyRightClickDialogCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyRightClickDialogCtrl.py 2007-06-13 20:47:13 UTC (rev 1677)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyRightClickDialogCtrl.py 2007-06-13 21:00:25 UTC (rev 1678)
@@ -36,7 +36,10 @@
self.OpenRadioButton.setDisabled(True)
self.OpenRadioButton.setChecked(False)
else:
- self.setCaption(self.file_ext.lstrip('.') + " dish: " + self.item_name)
+ if self.file_ext.endswith("full"):
+ self.setCaption("populated dish: " + self.item_name)
+ elif self.file_ext.endswith("empty"):
+ self.setCaption("configured dish: " + self.item_name)
self.DeleteFlag = 1
self.RenameFlag = 2
self.SaveAsFlag = 3
More information about the Avida-cvs
mailing list