[Avida-cvs] [avida-svn] r625 - branches/developers/avida-edward/source/python/AvidaGui2
baerb@myxo.css.msu.edu
baerb at myxo.css.msu.edu
Tue Apr 18 13:14:07 PDT 2006
Author: baerb
Date: 2006-04-18 16:14:07 -0400 (Tue, 18 Apr 2006)
New Revision: 625
Modified:
branches/developers/avida-edward/source/python/AvidaGui2/pyBeforeStartingCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyBeforeStartingView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeDialogCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeDialogView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_PetriDishView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyQuitDialogCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyQuitDialogView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyRightClickDialogCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyRightClickDialogView.ui
branches/developers/avida-edward/source/python/AvidaGui2/to-do_list
Log:
Fixed to-do list.
Got keyboard keys to work with the dialog screens on os-x (already worked
under windows).
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyBeforeStartingCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyBeforeStartingCtrl.py 2006-04-18 19:22:48 UTC (rev 624)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyBeforeStartingCtrl.py 2006-04-18 20:14:07 UTC (rev 625)
@@ -21,11 +21,12 @@
PYSIGNAL("workspaceNewSig"))
self.connect(self.CreateNewPushButton, SIGNAL("clicked()"),
self.closeDialog)
+ self.connect(self.CancelPushButton, SIGNAL("clicked()"),
+ self.closeDialog)
def showDialog(self):
self.exec_loop()
dialog_result = self.result()
- print "BDB pyBeforeStgartingCtrl:showDialog dialog_result = " + str(dialog_result)
def closeDialog(self):
- self.done(1)
\ No newline at end of file
+ self.done(1)
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyBeforeStartingView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyBeforeStartingView.ui 2006-04-18 19:22:48 UTC (rev 624)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyBeforeStartingView.ui 2006-04-18 20:14:07 UTC (rev 625)
@@ -9,7 +9,7 @@
<x>0</x>
<y>0</y>
<width>224</width>
- <height>100</height>
+ <height>136</height>
</rect>
</property>
<property name="paletteBackgroundColor">
@@ -31,7 +31,7 @@
<x>0</x>
<y>0</y>
<width>222</width>
- <height>92</height>
+ <height>130</height>
</rect>
</property>
<property name="title">
@@ -52,9 +52,18 @@
<blue>100</blue>
</color>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>Open Existing Workspace</string>
</property>
+ <property name="toggleButton">
+ <bool>true</bool>
+ </property>
+ <property name="on">
+ <bool>false</bool>
+ </property>
</widget>
<widget class="QPushButton">
<property name="name">
@@ -67,12 +76,44 @@
<blue>100</blue>
</color>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>Create New Workspace</string>
</property>
+ <property name="toggleButton">
+ <bool>true</bool>
+ </property>
</widget>
+ <widget class="QPushButton">
+ <property name="name">
+ <cstring>CancelPushButton</cstring>
+ </property>
+ <property name="paletteBackgroundColor">
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>100</blue>
+ </color>
+ </property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
+ <property name="text">
+ <string>Cancel</string>
+ </property>
+ <property name="toggleButton">
+ <bool>true</bool>
+ </property>
+ </widget>
</vbox>
</widget>
</widget>
+<tabstops>
+ <tabstop>OpenExistingPushButton</tabstop>
+ <tabstop>CreateNewPushButton</tabstop>
+ <tabstop>CancelPushButton</tabstop>
+</tabstops>
<layoutdefaults spacing="6" margin="11"/>
</UI>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui 2006-04-18 19:22:48 UTC (rev 624)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui 2006-04-18 20:14:07 UTC (rev 625)
@@ -120,6 +120,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="paletteBackgroundColor">
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
+ </property>
<widget class="QWidget">
<property name="name">
<cstring>WStackPage</cstring>
@@ -225,6 +232,12 @@
<property type="0">-1</property>
<property type="1">pyFreezerView</property>
<property type="0">-1</property>
+ <property type="1">pyFreezerView</property>
+ <property type="0">-1</property>
+ <property type="1">pyFreezerView</property>
+ <property type="0">-1</property>
+ <property type="1">pyFreezerView</property>
+ <property type="0">-1</property>
<property type="pyFreezerView"></property>
<property type="-1">1</property>
</customwidget>
@@ -274,6 +287,12 @@
<property type="0">-1</property>
<property type="1">pyNavBarView</property>
<property type="0">-1</property>
+ <property type="1">pyNavBarView</property>
+ <property type="0">-1</property>
+ <property type="1">pyNavBarView</property>
+ <property type="0">-1</property>
+ <property type="1">pyNavBarView</property>
+ <property type="0">-1</property>
<property type="pyNavBarView"></property>
<property type="-1">1</property>
</customwidget>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeDialogCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeDialogCtrl.py 2006-04-18 19:22:48 UTC (rev 624)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeDialogCtrl.py 2006-04-18 20:14:07 UTC (rev 625)
@@ -19,10 +19,7 @@
else:
self.FullRadioButton.setEnabled(True)
while (found_valid_name == False and dialog_result > 0):
- self.show()
self.exec_loop()
- # while (self.exec_loop() and self.result() == 0):
- # pass
dialog_result = self.result()
tmp_name = str(self.FileNameLineEdit.text())
if dialog_result == 0:
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeDialogView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeDialogView.ui 2006-04-18 19:22:48 UTC (rev 624)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeDialogView.ui 2006-04-18 20:14:07 UTC (rev 625)
@@ -34,11 +34,20 @@
<property name="name">
<cstring>FileNameLineEdit</cstring>
</property>
+ <property name="frameShape">
+ <enum>LineEditPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>Sunken</enum>
+ </property>
</widget>
<widget class="QButtonGroup">
<property name="name">
<cstring>FullEmptyButtonGroup</cstring>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="frameShape">
<enum>NoFrame</enum>
</property>
@@ -53,6 +62,9 @@
<property name="name">
<cstring>EmptyRadioButton</cstring>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>Empty Petri Dish</string>
</property>
@@ -67,6 +79,9 @@
<property name="enabled">
<bool>false</bool>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>Full Petri Dish</string>
</property>
@@ -78,16 +93,28 @@
<property name="enabled">
<bool>false</bool>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>Highlighted Organism</string>
</property>
</widget>
</hbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="QButtonGroup">
<property name="name">
- <cstring>layout1</cstring>
+ <cstring>FreezeCancelButtonGroup</cstring>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
+ <property name="frameShape">
+ <enum>NoFrame</enum>
+ </property>
+ <property name="title">
+ <string></string>
+ </property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
@@ -96,6 +123,9 @@
<property name="name">
<cstring>SaveToFreezerPushButton</cstring>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>Freeze</string>
</property>
@@ -104,6 +134,9 @@
<property name="name">
<cstring>CancelPushButton</cstring>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>Cancel</string>
</property>
@@ -114,17 +147,23 @@
</widget>
<connections>
<connection>
- <sender>SaveToFreezerPushButton</sender>
+ <sender>CancelPushButton</sender>
<signal>clicked()</signal>
<receiver>pyFreezeDialogView</receiver>
- <slot>accept()</slot>
+ <slot>reject()</slot>
</connection>
<connection>
- <sender>CancelPushButton</sender>
+ <sender>SaveToFreezerPushButton</sender>
<signal>clicked()</signal>
<receiver>pyFreezeDialogView</receiver>
- <slot>reject()</slot>
+ <slot>accept()</slot>
</connection>
</connections>
+<tabstops>
+ <tabstop>FileNameLineEdit</tabstop>
+ <tabstop>EmptyRadioButton</tabstop>
+ <tabstop>SaveToFreezerPushButton</tabstop>
+ <tabstop>CancelPushButton</tabstop>
+</tabstops>
<layoutdefaults spacing="6" margin="11"/>
</UI>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_PetriDishView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_PetriDishView.ui 2006-04-18 19:22:48 UTC (rev 624)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_PetriDishView.ui 2006-04-18 20:14:07 UTC (rev 625)
@@ -16,6 +16,13 @@
<height>318</height>
</rect>
</property>
+ <property name="paletteBackgroundColor">
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
+ </property>
<property name="caption">
<string>pyOneAna_PetriDishView</string>
</property>
@@ -284,6 +291,16 @@
<property type="0">-1</property>
<property type="1">pyPetriDishCtrl</property>
<property type="0">-1</property>
+ <property type="1">pyPetriDishCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyPetriDishCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyPetriDishCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyPetriDishCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyPetriDishCtrl</property>
+ <property type="0">-1</property>
<property type="pyPetriDishCtrl"></property>
<property type="-1">1</property>
</customwidget>
@@ -339,6 +356,16 @@
<property type="0">-1</property>
<property type="1">pyGradientScaleCtrl</property>
<property type="0">-1</property>
+ <property type="1">pyGradientScaleCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyGradientScaleCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyGradientScaleCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyGradientScaleCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyGradientScaleCtrl</property>
+ <property type="0">-1</property>
<property type="pyGradientScaleCtrl"></property>
<property type="-1">1</property>
</customwidget>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py 2006-04-18 19:22:48 UTC (rev 624)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py 2006-04-18 20:14:07 UTC (rev 625)
@@ -34,8 +34,6 @@
PYSIGNAL("freezeDishPhaseISig"),
self.m_petri_dish_ctrl.extractPopulationSlot)
self.connect(self.m_session_mdl.m_session_mdtr,
- PYSIGNAL("freezeDishPhaseISig"), self.freezeDishPhaseISlot)
- self.connect(self.m_session_mdl.m_session_mdtr,
PYSIGNAL("setAvidaSig"), self.setAvidaSlot)
self.connect(self.m_petri_dish_toggle, SIGNAL("clicked()"),
self.ToggleDishSlot)
@@ -172,14 +170,6 @@
if (not self.dishDisabled):
self.PopulationTextLabel.setText(dishName)
- # Dummy routine
-
- def freezeDishPhaseISlot(self, send_reset_signal = False, send_quit_signal = False):
- descr()
- print "in pyOnePop_PetriDishCtrl recieved freezeDishPhaseISig"
- print "send_reset_signal = " + str(send_reset_signal)
- print "send_quit_signal = " + str(send_quit_signal)
-
def petriDropped(self, e):
descr()
# Try to decode to the data you understand...
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishView.ui 2006-04-18 19:22:48 UTC (rev 624)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishView.ui 2006-04-18 20:14:07 UTC (rev 625)
@@ -36,6 +36,13 @@
<property name="name">
<cstring>OnPop_PetriFrame</cstring>
</property>
+ <property name="paletteForegroundColor">
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ </property>
<property name="frameShape">
<enum>GroupBoxPanel</enum>
</property>
@@ -464,6 +471,16 @@
<property type="0">-1</property>
<property type="1">pyPetriDishCtrl</property>
<property type="0">-1</property>
+ <property type="1">pyPetriDishCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyPetriDishCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyPetriDishCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyPetriDishCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyPetriDishCtrl</property>
+ <property type="0">-1</property>
<property type="pyPetriDishCtrl"></property>
<property type="-1">1</property>
</customwidget>
@@ -519,6 +536,16 @@
<property type="0">-1</property>
<property type="1">pyGradientScaleCtrl</property>
<property type="0">-1</property>
+ <property type="1">pyGradientScaleCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyGradientScaleCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyGradientScaleCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyGradientScaleCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyGradientScaleCtrl</property>
+ <property type="0">-1</property>
<property type="pyGradientScaleCtrl"></property>
<property type="-1">1</property>
</customwidget>
@@ -574,6 +601,16 @@
<property type="0">-1</property>
<property type="1">pyLiveControlsCtrl</property>
<property type="0">-1</property>
+ <property type="1">pyLiveControlsCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyLiveControlsCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyLiveControlsCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyLiveControlsCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyLiveControlsCtrl</property>
+ <property type="0">-1</property>
<property type="pyLiveControlsCtrl"></property>
<property type="-1">1</property>
</customwidget>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureCtrl.py 2006-04-18 19:22:48 UTC (rev 624)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureCtrl.py 2006-04-18 20:14:07 UTC (rev 625)
@@ -278,6 +278,7 @@
# self.StopAtSpinBox.setEnabled(False)
# self.StopManuallyRadioButton.setEnabled(False)
# self.StopAtRadioButton.setEnabled(False)
+ # self.StopHeadTextLabel.setEnabled(False)
self.WorldSizeSlider.setEnabled(False)
self.RandomGeneratedRadioButton.setEnabled(False)
@@ -311,7 +312,6 @@
self.RandomHeadTextLabel.setEnabled(False)
self.AncestorHeadTextLabel.setEnabled(False)
self.BirthHeadTextLabel.setEnabled(False)
- self.StopHeadTextLabel.setEnabled(False)
self.DishDisabled = True
self.m_session_mdl.m_session_mdtr.emit(
PYSIGNAL("doDisablePetriDishSig"), ())
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureView.ui 2006-04-18 19:22:48 UTC (rev 624)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureView.ui 2006-04-18 20:14:07 UTC (rev 625)
@@ -106,6 +106,9 @@
<font>
</font>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="minValue">
<number>-300</number>
</property>
@@ -198,6 +201,9 @@
<font>
</font>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="minValue">
<number>1</number>
</property>
@@ -386,6 +392,9 @@
<property name="name">
<cstring>TasksToRewardGroup</cstring>
</property>
+ <property name="focusPolicy">
+ <enum>NoFocus</enum>
+ </property>
<property name="frameShape">
<enum>NoFrame</enum>
</property>
@@ -406,6 +415,9 @@
<property name="name">
<cstring>NandCheckBox</cstring>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>nand</string>
</property>
@@ -417,6 +429,9 @@
<property name="name">
<cstring>OrnCheckBox</cstring>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>ornot</string>
</property>
@@ -428,6 +443,9 @@
<property name="name">
<cstring>AndCheckBox</cstring>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>and</string>
</property>
@@ -439,6 +457,9 @@
<property name="name">
<cstring>OrCheckBox</cstring>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>or</string>
</property>
@@ -450,6 +471,9 @@
<property name="name">
<cstring>NorCheckBox</cstring>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>nor</string>
</property>
@@ -485,6 +509,9 @@
<property name="name">
<cstring>NotCheckBox</cstring>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>not</string>
</property>
@@ -534,6 +561,9 @@
<property name="name">
<cstring>XorCheckBox</cstring>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>xor</string>
</property>
@@ -545,6 +575,9 @@
<property name="name">
<cstring>AndnCheckBox</cstring>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>andnot</string>
</property>
@@ -610,6 +643,9 @@
<property name="name">
<cstring>EquCheckBox</cstring>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>equals</string>
</property>
@@ -683,6 +719,9 @@
<property name="name">
<cstring>RandomButtonGroup</cstring>
</property>
+ <property name="focusPolicy">
+ <enum>NoFocus</enum>
+ </property>
<property name="frameShape">
<enum>NoFrame</enum>
</property>
@@ -718,6 +757,9 @@
<font>
</font>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>No</string>
</property>
@@ -733,6 +775,9 @@
<font>
</font>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>Yes</string>
</property>
@@ -817,6 +862,9 @@
<property name="name">
<cstring>BirthButtonGroup</cstring>
</property>
+ <property name="focusPolicy">
+ <enum>NoFocus</enum>
+ </property>
<property name="frameShadow">
<enum>Plain</enum>
</property>
@@ -858,6 +906,9 @@
<font>
</font>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>Nearby their parent</string>
</property>
@@ -873,6 +924,9 @@
<font>
</font>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>Anywhere, randomly</string>
</property>
@@ -957,6 +1011,9 @@
<property name="name">
<cstring>StopButtonGroup</cstring>
</property>
+ <property name="focusPolicy">
+ <enum>NoFocus</enum>
+ </property>
<property name="frameShadow">
<enum>Plain</enum>
</property>
@@ -1006,6 +1063,9 @@
<font>
</font>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>Manually</string>
</property>
@@ -1033,6 +1093,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>At</string>
</property>
@@ -1112,6 +1175,9 @@
<font>
</font>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>Freeze Petri Dish</string>
</property>
@@ -1126,5 +1192,27 @@
<slot><No)</slot>
</connection>
</connections>
+<tabstops>
+ <tabstop>MutationSlider</tabstop>
+ <tabstop>WorldSizeSlider</tabstop>
+ <tabstop>AncestorComboBox</tabstop>
+ <tabstop>NotCheckBox</tabstop>
+ <tabstop>NandCheckBox</tabstop>
+ <tabstop>AndCheckBox</tabstop>
+ <tabstop>OrnCheckBox</tabstop>
+ <tabstop>OrCheckBox</tabstop>
+ <tabstop>AndnCheckBox</tabstop>
+ <tabstop>NorCheckBox</tabstop>
+ <tabstop>XorCheckBox</tabstop>
+ <tabstop>EquCheckBox</tabstop>
+ <tabstop>RandomGeneratedRadioButton</tabstop>
+ <tabstop>RandomFixedRadioButton</tabstop>
+ <tabstop>LocalBirthRadioButton</tabstop>
+ <tabstop>MassActionRadioButton</tabstop>
+ <tabstop>StopManuallyRadioButton</tabstop>
+ <tabstop>StopAtRadioButton</tabstop>
+ <tabstop>StopAtSpinBox</tabstop>
+ <tabstop>SavePetriPushButton</tabstop>
+</tabstops>
<layoutdefaults spacing="6" margin="11"/>
</UI>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyQuitDialogCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyQuitDialogCtrl.py 2006-04-18 19:22:48 UTC (rev 624)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyQuitDialogCtrl.py 2006-04-18 20:14:07 UTC (rev 625)
@@ -26,7 +26,6 @@
def showDialog(self):
dialog_result = 1
while (dialog_result > 0):
- self.show()
self.exec_loop()
# while (self.exec_loop() and self.result() == 0):
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyQuitDialogView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyQuitDialogView.ui 2006-04-18 19:22:48 UTC (rev 624)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyQuitDialogView.ui 2006-04-18 20:14:07 UTC (rev 625)
@@ -42,6 +42,9 @@
<property name="name">
<cstring>SaveToFreezerPushButton</cstring>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>Freeze and Quit</string>
</property>
@@ -50,6 +53,9 @@
<property name="name">
<cstring>QuitPushButton</cstring>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>Quit</string>
</property>
@@ -58,6 +64,9 @@
<property name="name">
<cstring>CancelPushButton</cstring>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>Cancel</string>
</property>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyRightClickDialogCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyRightClickDialogCtrl.py 2006-04-18 19:22:48 UTC (rev 624)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyRightClickDialogCtrl.py 2006-04-18 20:14:07 UTC (rev 625)
@@ -44,7 +44,6 @@
def showDialog(self):
self.change = False
self.open_obj = False
- # self.show()
self.exec_loop()
dialog_result = self.result()
new_name_core = str(self.NewNameLineEdit.text())
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyRightClickDialogView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyRightClickDialogView.ui 2006-04-18 19:22:48 UTC (rev 624)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyRightClickDialogView.ui 2006-04-18 20:14:07 UTC (rev 625)
@@ -62,6 +62,9 @@
<blue>100</blue>
</color>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>delete</string>
</property>
@@ -85,6 +88,9 @@
<blue>100</blue>
</color>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>rename</string>
</property>
@@ -107,6 +113,9 @@
<blue>100</blue>
</color>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>export</string>
</property>
@@ -122,6 +131,9 @@
<blue>100</blue>
</color>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>open</string>
</property>
@@ -140,6 +152,9 @@
<blue>100</blue>
</color>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>Confirm</string>
</property>
@@ -155,6 +170,9 @@
<blue>100</blue>
</color>
</property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
<property name="text">
<string>Cancel</string>
</property>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/to-do_list
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/to-do_list 2006-04-18 19:22:48 UTC (rev 624)
+++ branches/developers/avida-edward/source/python/AvidaGui2/to-do_list 2006-04-18 20:14:07 UTC (rev 625)
@@ -7,18 +7,15 @@
Priority High
-16-Jan-06 Get file system finished
+16-Jan-06 Get file system finished -- Make one big database file?
-16-Jan-06 Initial location of workspace box (ie before user can run program they must chose (or create) a workspace).
-
-
Priority Medium
18-Apr-06 Replace "Viewers" buttons icons.
18-Apr-06 Make "freeze full petri dish" be default.
-16-Jan-06 Freeze button on bottom of main screen.
+18-Apr-06 Remove query screen at the beginning of the program, make users choose this the first time a file is saved.
Priority Low
@@ -121,8 +118,13 @@
27-Feb-06 Change Navigation -> Viewer
+16-Jan-06 Initial location of workspace box (ie before user can run program they must chose (or create) a workspace). -- Finished 06-Apr-06
+16-Jan-06 Freeze button on bottom of main screen. -- Finished 06-Apr-06
+
+
+
************Kaben******************
* 23-Jan-06 Get program to run on all Macs -- Finished 27-Jan-06
More information about the Avida-cvs
mailing list