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

[baer at myxo.css.msu.edu]

Author: baer
Date: 2008-06-10 15:43:50 -0400 (Tue, 10 Jun 2008)
New Revision: 2638

Modified:
   branches/developers/avida-edward/source/python/AvidaGui2/pyAvidaStatsInterface.py
   branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui
   branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphCtrl.py
   branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrganismCtrl.py
   branches/developers/avida-edward/source/python/AvidaGui2/pyOnePopulationCtrl.py
Log:

Changed some menu names and short cuts.



Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyAvidaStatsInterface.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyAvidaStatsInterface.py	2008-06-10 17:52:01 UTC (rev 2637)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyAvidaStatsInterface.py	2008-06-10 19:43:50 UTC (rev 2638)
@@ -69,7 +69,7 @@
   def export(self, paths):
     """Export stats to a file.  Can export multiple populations now.
     paths is a array of tuples containing short name and full path. """
-    dialog_caption = "Export Analysis"
+    dialog_caption = "Export Data"
     fd = QFileDialog.getSaveFileName("", "Text -- Excel compatible (*.txt);;CSV  -- Excel compatible (*.csv)", None,
                                      "export as", dialog_caption)
     filename = str(fd)

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui	2008-06-10 17:52:01 UTC (rev 2637)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui	2008-06-10 19:43:50 UTC (rev 2638)
@@ -507,10 +507,10 @@
             <cstring>fileExportAction</cstring>
         </property>
         <property name="text">
-            <string>Export Analysis</string>
+            <string>Export Data...</string>
         </property>
         <property name="menuText">
-            <string>&amp;Export Analysis</string>
+            <string>&amp;Export Data...</string>
         </property>
         <property name="accel">
             <string>Ctrl+E</string>
@@ -521,13 +521,13 @@
             <cstring>fileSaveImagesAction</cstring>
         </property>
         <property name="text">
-            <string>Save Images</string>
+            <string>Export Graphics...</string>
         </property>
         <property name="menuText">
-            <string>Save &amp;Images</string>
+            <string>Export &amp;Graphics...</string>
         </property>
         <property name="accel">
-            <string>Ctrl+I</string>
+            <string>Ctrl+G</string>
         </property>
     </action>
     <action>
@@ -906,8 +906,11 @@
             <string>Import Item</string>
         </property>
         <property name="menuText">
-            <string>Import Item</string>
+            <string>Import &amp;Item</string>
         </property>
+        <property name="accel">
+            <string>Ctrl+I</string>
+        </property>
         <property name="toolTip">
             <string>Import Freezer Items</string>
         </property>

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphCtrl.py	2008-06-10 17:52:01 UTC (rev 2637)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphCtrl.py	2008-06-10 19:43:50 UTC (rev 2638)
@@ -356,7 +356,7 @@
     "Export analysis data to a file"
     if len(self.m_combo_boxes) > 0:
       # Choose populations to export
-      dialog_caption = "Export Analysis"
+      dialog_caption = "Export Data"
       dialog = pyButtonListDialog(dialog_caption,
                                   "Choose populations to export",
                                   self.m_combo_boxes.keys(), True)

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrganismCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrganismCtrl.py	2008-06-10 17:52:01 UTC (rev 2637)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrganismCtrl.py	2008-06-10 19:43:50 UTC (rev 2638)
@@ -127,7 +127,7 @@
   def saveImagesSlot(self):
     "Save organism viewer to image file"
     dlg = pyButtonListDialog(
-      "Save Image",
+      "Export Graphics",
       "Choose objects to save",
       ["Organism", "Statistics", "Timeline"],
       True
@@ -157,7 +157,7 @@
   def printOrgSlot(self):
     """Print image of organism viewer"""
     dlg = pyButtonListDialog(
-      "Save Image",
+      "Export Graphics",
       "Choose objects to save",
       ["Organism", "Statistics", "Timeline"],
       True

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOnePopulationCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOnePopulationCtrl.py	2008-06-10 17:52:01 UTC (rev 2637)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOnePopulationCtrl.py	2008-06-10 19:43:50 UTC (rev 2638)
@@ -136,7 +136,7 @@
 
   def saveImagesSlot(self):
     "Save petri dish or graph to image file"
-    dlg = pyButtonListDialog("Save Image", "Choose object to save",
+    dlg = pyButtonListDialog("Export Graphics", "Choose object to save",
                              ["Petri Dish", "Graph"])
     res = dlg.showDialog()
     if len(res) == 0: