[Avida-SVN] r2706 - branches/developers/avida-edward/source/python/AvidaGui2

[kaben at myxo.css.msu.edu]

Author: kaben
Date: 2008-07-04 01:17:19 -0400 (Fri, 04 Jul 2008)
New Revision: 2706

Modified:
   branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
   branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui
   branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrganismCtrl.py
Log:
Avida-ED Control Menu: renamed menu items and changed keyboard shortcuts for population and organism viewers.
Renamed "Start" to "Run".  Removed the keyboard shortcut "Command-R" for "Start New Experiment".  Added keyboard shortcut "Command-R" for "Run", and "Space" for "Pause". Note: the keyboard shortcut "Space" doesn't appear in the menu item. I can't think of a way to fix this, because Qt seems to want to use a literal space, which is invisible.  Added the keyboard shortcut "Command-T" (for "time") for the "Next Update / Next Instruction".


Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py	2008-07-04 04:25:21 UTC (rev 2705)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py	2008-07-04 05:17:19 UTC (rev 2706)
@@ -751,13 +751,15 @@
     pass
     
   def doPauseAvidaSlot(self):
-    self.popview_controlStartAction.setText("Start")
-    self.popview_controlStartAction.setMenuText("Start")
+    self.popview_controlStartAction.setText("Run")
+    self.popview_controlStartAction.setMenuText("Run")
+    self.popview_controlStartAction.setAccel(QKeySequence("Ctrl+R"))
     self.startStatus = True
     
   def doStartAvidaSlot(self):
     self.popview_controlStartAction.setText("Pause")
     self.popview_controlStartAction.setMenuText("Pause")
+    self.popview_controlStartAction.setAccel(QKeySequence("Space"))
     self.startStatus = False
     
   def startQuitProcessSlot(self):

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui	2008-07-04 04:25:21 UTC (rev 2705)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui	2008-07-04 05:17:19 UTC (rev 2706)
@@ -362,6 +362,10 @@
         <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>
@@ -465,6 +469,10 @@
         <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>
@@ -824,11 +832,14 @@
             <cstring>popview_controlStartAction</cstring>
         </property>
         <property name="text">
-            <string>Start</string>
+            <string>Run</string>
         </property>
         <property name="menuText">
-            <string>Start</string>
+            <string>Run</string>
         </property>
+        <property name="accel">
+            <string>Ctrl+R</string>
+        </property>
     </action>
     <action>
         <property name="name">
@@ -840,6 +851,9 @@
         <property name="menuText">
             <string>Next Update</string>
         </property>
+        <property name="accel">
+            <string>Ctrl+T</string>
+        </property>
     </action>
     <action>
         <property name="name">
@@ -886,7 +900,7 @@
             <string>Start new experiment with empty petri dish</string>
         </property>
         <property name="accel">
-            <string>Ctrl+R</string>
+            <string></string>
         </property>
     </action>
     <action>
@@ -1040,11 +1054,14 @@
             <cstring>orgview_controlStartAction</cstring>
         </property>
         <property name="text">
-            <string>Start</string>
+            <string>Run</string>
         </property>
         <property name="menuText">
-            <string>Start</string>
+            <string>Run</string>
         </property>
+        <property name="accel">
+            <string>Ctrl+R</string>
+        </property>
     </action>
     <action>
         <property name="name">
@@ -1056,6 +1073,9 @@
         <property name="menuText">
             <string>Next Instruction</string>
         </property>
+        <property name="accel">
+            <string>Ctrl+T</string>
+        </property>
     </action>
     <action>
         <property name="name">

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrganismCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrganismCtrl.py	2008-07-04 04:25:21 UTC (rev 2705)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrganismCtrl.py	2008-07-04 05:17:19 UTC (rev 2706)
@@ -48,10 +48,12 @@
   def orgScopeStartedSlot(self):
     self.workspace_ctrl.orgview_controlStartAction.setText("Pause")
     self.workspace_ctrl.orgview_controlStartAction.setMenuText("Pause")
+    self.workspace_ctrl.orgview_controlStartAction.setAccel(QKeySequence("Space"))
     self.startStatus = False
   def orgScopePausedSlot(self):
-    self.workspace_ctrl.orgview_controlStartAction.setText("Start")
-    self.workspace_ctrl.orgview_controlStartAction.setMenuText("Start")
+    self.workspace_ctrl.orgview_controlStartAction.setText("Run")
+    self.workspace_ctrl.orgview_controlStartAction.setMenuText("Run")
+    self.workspace_ctrl.orgview_controlStartAction.setAccel(QKeySequence("Ctrl+R"))
     self.startStatus = True
 
   def aboutToBeLowered(self, workspace_ctrl):