[Avida-cvs] [Avida2-svn] r102 - in trunk/source/python/AvidaGui2: .
AvidaEd.xcode
baerb at myxo.css.msu.edu
baerb at myxo.css.msu.edu
Tue Apr 5 12:39:00 PDT 2005
Author: baerb
Date: 2005-04-05 15:39:00 -0400 (Tue, 05 Apr 2005)
New Revision: 102
Modified:
trunk/source/python/AvidaGui2/AvidaEd.xcode/project.pbxproj
trunk/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
trunk/source/python/AvidaGui2/pyOnePop_GraphView.ui
trunk/source/python/AvidaGui2/pyPetriConfigureView.ui
trunk/source/python/AvidaGui2/pyTemporaryReloads.py
trunk/source/python/AvidaGui2/untar_in_resource_directory.tar
Log:
Minor cosmedic changes
Modified: trunk/source/python/AvidaGui2/AvidaEd.xcode/project.pbxproj
===================================================================
--- trunk/source/python/AvidaGui2/AvidaEd.xcode/project.pbxproj 2005-04-05 19:36:53 UTC (rev 101)
+++ trunk/source/python/AvidaGui2/AvidaEd.xcode/project.pbxproj 2005-04-05 19:39:00 UTC (rev 102)
@@ -5,6 +5,28 @@
};
objectVersion = 39;
objects = {
+ 990666F407FDD01F0095D195 = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = text.script.python;
+ path = pyQuitDialogCtrl.py;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 990666F507FDD01F0095D195 = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = text;
+ path = pyQuitDialogView.ui;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 990666F807FDD03D0095D195 = {
+ fileRef = 990666F507FDD01F0095D195;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
99AC419907DF44CF00594A3D = {
fileEncoding = 4;
isa = PBXFileReference;
@@ -152,6 +174,8 @@
};
DC0BFDB007DDB49200AAE422 = {
children = (
+ 990666F407FDD01F0095D195,
+ 990666F507FDD01F0095D195,
DC3A63F907DD02DE00A043AD,
DC0BFE7407DDD78500AAE422,
DC3A63F507DD02DE00A043AD,
@@ -582,6 +606,7 @@
DC0BFF3007DE17DB00AAE422 = {
buildActionMask = 2147483647;
files = (
+ 990666F807FDD03D0095D195,
DC0BFF4B07DE1AE800AAE422,
DC0BFF4C07DE1AE800AAE422,
DC0BFF4D07DE1AE800AAE422,
Modified: trunk/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyEduWorkspaceCtrl.py 2005-04-05 19:36:53 UTC (rev 101)
+++ trunk/source/python/AvidaGui2/pyEduWorkspaceCtrl.py 2005-04-05 19:39:00 UTC (rev 102)
@@ -9,6 +9,7 @@
from pyTwoOrganismCtrl import pyTwoOrganismCtrl
from pyTwoPopulationCtrl import pyTwoPopulationCtrl
from pyPetriConfigureCtrl import pyPetriConfigureCtrl
+from pyQuitDialogCtrl import pyQuitDialogCtrl
from qt import *
@@ -53,7 +54,8 @@
self.m_one_population_ctrl.construct(self.m_session_mdl)
self.m_one_organism_ctrl.construct(self.m_session_mdl)
- self.connect(self, PYSIGNAL("quitAvidaPhaseISig"), qApp, SLOT("quit()"))
+ self.connect(self, PYSIGNAL("quitAvidaPhaseISig"), self.startQuitProcessSlot)
+ self.connect(self, PYSIGNAL("quitAvidaPhaseIISig"), qApp, SLOT("quit()"))
self.connect(self.m_nav_bar_ctrl.m_list_view, SIGNAL("clicked(QListViewItem *)"), self.navBarItemClickedSlot)
self.connect(self.m_widget_stack, SIGNAL("aboutToShow(QWidget *)"), self.ctrlAboutToShowSlot)
# self.connect(self.fileOpenFreezerAction,SIGNAL("activated()"),self.freezerOpenSlot)
@@ -84,6 +86,7 @@
self.m_nav_bar_ctrl.m_one_population_cli.setState(QCheckListItem.On)
self.m_widget_stack.raiseWidget(self.m_one_population_ctrl)
+ self.splitter1.setSizes([100])
self.show()
@@ -266,4 +269,8 @@
self.controlStartAction.text = "Pause"
self.controlStartAction.menuText = "Pause"
self.startStatus = False
+
+ def startQuitProcessSlot(self):
+ m_quit_avida_ed = pyQuitDialogCtrl
+ self.emit(PYSIGNAL("quitAvidaPhaseIISig"), ())
Modified: trunk/source/python/AvidaGui2/pyOnePop_GraphView.ui
===================================================================
--- trunk/source/python/AvidaGui2/pyOnePop_GraphView.ui 2005-04-05 19:36:53 UTC (rev 101)
+++ trunk/source/python/AvidaGui2/pyOnePop_GraphView.ui 2005-04-05 19:39:00 UTC (rev 102)
@@ -10,7 +10,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>153</width>
+ <width>147</width>
<height>202</height>
</rect>
</property>
@@ -24,192 +24,208 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QLayoutWidget">
+ <widget class="QFrame">
<property name="name">
- <cstring>layout210</cstring>
+ <cstring>frame18</cstring>
</property>
- <hbox>
+ <property name="frameShape">
+ <enum>GroupBoxPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>Sunken</enum>
+ </property>
+ <vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <spacer>
+ <widget class="QLayoutWidget">
<property name="name">
- <cstring>spacer152</cstring>
+ <cstring>layout210</cstring>
</property>
- <property name="orientation">
- <enum>Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>Minimum</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>1</width>
- <height>32</height>
- </size>
- </property>
- </spacer>
- <widget class="QLabel">
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <spacer>
+ <property name="name">
+ <cstring>spacer152</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Minimum</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>1</width>
+ <height>32</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel9_2</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>3</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string></string>
+ </property>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout178</cstring>
+ </property>
+ <vbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <spacer>
+ <property name="name">
+ <cstring>spacer126</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Minimum</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>1</width>
+ <height>1</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="QToolButton">
+ <property name="name">
+ <cstring>toolButton31_2</cstring>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string></string>
+ </property>
+ <property name="iconSet">
+ <iconset>image0</iconset>
+ </property>
+ </widget>
+ <spacer>
+ <property name="name">
+ <cstring>spacer126_2</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Minimum</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>1</width>
+ <height>1</height>
+ </size>
+ </property>
+ </spacer>
+ </vbox>
+ </widget>
+ </hbox>
+ </widget>
+ <widget class="pyGraphCtrl">
<property name="name">
- <cstring>textLabel9_2</cstring>
+ <cstring>m_graph_ctrl</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>3</hsizetype>
- <vsizetype>5</vsizetype>
+ <vsizetype>3</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="font">
- <font>
- <pointsize>11</pointsize>
- </font>
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>100</height>
+ </size>
</property>
- <property name="text">
- <string></string>
- </property>
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout178</cstring>
+ <cstring>layout262</cstring>
</property>
- <vbox>
+ <hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
<spacer>
<property name="name">
- <cstring>spacer126</cstring>
+ <cstring>spacer200_2</cstring>
</property>
<property name="orientation">
- <enum>Vertical</enum>
+ <enum>Horizontal</enum>
</property>
<property name="sizeType">
- <enum>Minimum</enum>
+ <enum>Expanding</enum>
</property>
<property name="sizeHint">
<size>
- <width>1</width>
- <height>1</height>
+ <width>10</width>
+ <height>10</height>
</size>
</property>
</spacer>
- <widget class="QToolButton">
+ <widget class="QComboBox">
+ <item>
+ <property name="text">
+ <string>Merit</string>
+ </property>
+ </item>
<property name="name">
- <cstring>toolButton31_2</cstring>
+ <cstring>m_combo_box</cstring>
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <pointsize>11</pointsize>
</font>
</property>
- <property name="text">
- <string></string>
- </property>
- <property name="iconSet">
- <iconset>image0</iconset>
- </property>
</widget>
<spacer>
<property name="name">
- <cstring>spacer126_2</cstring>
+ <cstring>spacer200</cstring>
</property>
<property name="orientation">
- <enum>Vertical</enum>
+ <enum>Horizontal</enum>
</property>
<property name="sizeType">
- <enum>Minimum</enum>
+ <enum>Expanding</enum>
</property>
<property name="sizeHint">
<size>
- <width>1</width>
- <height>1</height>
+ <width>10</width>
+ <height>10</height>
</size>
</property>
</spacer>
- </vbox>
+ </hbox>
</widget>
- </hbox>
+ </vbox>
</widget>
- <widget class="pyGraphCtrl">
- <property name="name">
- <cstring>m_graph_ctrl</cstring>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>3</hsizetype>
- <vsizetype>3</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>100</width>
- <height>100</height>
- </size>
- </property>
- </widget>
- <widget class="QLayoutWidget">
- <property name="name">
- <cstring>layout262</cstring>
- </property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <spacer>
- <property name="name">
- <cstring>spacer200_2</cstring>
- </property>
- <property name="orientation">
- <enum>Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>10</width>
- <height>10</height>
- </size>
- </property>
- </spacer>
- <widget class="QComboBox">
- <item>
- <property name="text">
- <string>Merit</string>
- </property>
- </item>
- <property name="name">
- <cstring>m_combo_box</cstring>
- </property>
- <property name="font">
- <font>
- <pointsize>11</pointsize>
- </font>
- </property>
- </widget>
- <spacer>
- <property name="name">
- <cstring>spacer200</cstring>
- </property>
- <property name="orientation">
- <enum>Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>10</width>
- <height>10</height>
- </size>
- </property>
- </spacer>
- </hbox>
- </widget>
</vbox>
</widget>
<customwidgets>
Modified: trunk/source/python/AvidaGui2/pyPetriConfigureView.ui
===================================================================
--- trunk/source/python/AvidaGui2/pyPetriConfigureView.ui 2005-04-05 19:36:53 UTC (rev 101)
+++ trunk/source/python/AvidaGui2/pyPetriConfigureView.ui 2005-04-05 19:39:00 UTC (rev 102)
@@ -81,7 +81,7 @@
</font>
</property>
<property name="text">
- <string>Mutation Rate</string>
+ <string>Per Site Mutation Rate</string>
</property>
<property name="alignment">
<set>AlignCenter</set>
Modified: trunk/source/python/AvidaGui2/pyTemporaryReloads.py
===================================================================
--- trunk/source/python/AvidaGui2/pyTemporaryReloads.py 2005-04-05 19:36:53 UTC (rev 101)
+++ trunk/source/python/AvidaGui2/pyTemporaryReloads.py 2005-04-05 19:39:00 UTC (rev 102)
@@ -65,6 +65,8 @@
"AvidaGui2.pyPetriConfigureCtrl",
"AvidaGui2.pyPetriDishView",
"AvidaGui2.pyPetriDishCtrl",
+ "AvidaGui2.pyQuitDialogView",
+ "AvidaGui2.pyQuitDialogCtrl",
"AvidaGui2.pyReadFreezer",
"AvidaGui2.pyTimelineView",
"AvidaGui2.pyTimelineCtrl",
Modified: trunk/source/python/AvidaGui2/untar_in_resource_directory.tar
===================================================================
(Binary files differ)
More information about the Avida-cvs
mailing list