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

[kaben at myxo.css.msu.edu]

Author: kaben
Date: 2008-06-08 21:09:53 -0400 (Sun, 08 Jun 2008)
New Revision: 2618

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/pyHelpScreenCtrl.py
Log:
Now using Control-N instead of Shift-Control-N as the keyboard shortcut for New Workspace. Also added some convenience features to help browser.



Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py	2008-06-08 23:57:01 UTC (rev 2617)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py	2008-06-09 01:09:53 UTC (rev 2618)
@@ -244,6 +244,7 @@
 
   def __init__(self, parent = None, name = None, fl = 0):
     pyEduWorkspaceView.__init__(self,parent,name,fl)
+    self.help_screen = None
     # print "pyEduWorkspaceCtrl.__init__(): Not implemented yet"
 
   # public slot
@@ -657,26 +658,36 @@
 
   def helpIndex(self):
     home = QDir("./documentation/index.html").absPath()
-    help_screen = pyHelpScreenCtrl(home, ".", None)
+    if self.help_screen is not None:
+      self.help_screen.setSource(home)
+    else:
+      self.help_screen = pyHelpScreenCtrl(home, ".", None)
     #help_dialog.showDialog()
-    help_screen.show()
+    self.help_screen.show()
 
   def helpChanges(self):
     home = QDir("./documentation/changes.html").absPath()
-    help_screen = pyHelpScreenCtrl(home, ".", None)
-    help_screen.show()
+    if self.help_screen is not None:
+      self.help_screen.setSource(home)
+    else:
+      self.help_screen = pyHelpScreenCtrl(home, ".", None)
+    self.help_screen.show()
 
   def helpKnownBugs(self):
     home = QDir("./documentation/bugs.html").absPath()
-    help_screen = pyHelpScreenCtrl(home, ".", None)
-    help_screen.show()
+    if self.help_screen is not None:
+      descr("calling setSource")
+      self.help_screen.setSource(home)
+    else:
+      self.help_screen = pyHelpScreenCtrl(home, ".", None)
+    self.help_screen.show()
 
   # public slot
 
   def helpContents(self):
     pass
-    #help_dialog = pyHelpScreenCtrl()
-    #help_dialog.showDialog()
+    #self.help_dialog = pyHelpScreenCtrl()
+    #self.help_dialog.showDialog()
 
   # public slot
 

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui	2008-06-08 23:57:01 UTC (rev 2617)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui	2008-06-09 01:09:53 UTC (rev 2618)
@@ -341,6 +341,8 @@
         <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>
@@ -428,6 +430,8 @@
         <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>
@@ -447,7 +451,7 @@
             <string>&amp;New Workspace</string>
         </property>
         <property name="accel">
-            <string>Ctrl+Shift+N</string>
+            <string>Ctrl+N</string>
         </property>
     </action>
     <action>

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyHelpScreenCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyHelpScreenCtrl.py	2008-06-08 23:57:01 UTC (rev 2617)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyHelpScreenCtrl.py	2008-06-09 01:09:53 UTC (rev 2618)
@@ -16,7 +16,7 @@
     QMainWindow.__init__(self,parent,name,fl)
 
     self.browser = QTextBrowser(self)
-    descr("path:", path)
+    #descr("path:", path)
     #self.browser.mimeSourceFactory().setFilePath(QString(path))
     #self.connect(self.browser, PYSIGNAL("sourceChanged"), self.sourceChangedSlot)
     self.setCentralWidget(self.browser)
@@ -24,34 +24,42 @@
     if not home == "":
       self.browser.setSource(home)
 
+    self.resize(800, 600)
 
-    #toolbar = QToolBar(self)
-    #self.addDockWindow(toolbar, "Toolbar")
+    file = QPopupMenu(self)
+    file.insertItem("&Close", self.hide, QKeySequence("Ctrl+W"))
 
-    #back_button = QToolButton(Qt.LeftArrow, toolbar)
-    #self.connect(back_button, SIGNAL("clicked()"), self.browser.backward)
 
-    #forward_button = QToolButton(Qt.RightArrow, toolbar)
-    #self.connect(forward_button, SIGNAL("clicked()"), self.browser.forward)
+    self.menuBar().insertItem("&File", file)
 
-    #home_button = QToolButton(toolbar)
-    #home_button.setTextLabel("Home")
-    #home_button.setUsesTextLabel(True)
-    #self.connect(home_button, SIGNAL("clicked()"), self.browser.home)
+    toolbar = QToolBar(self)
+    self.addDockWindow(toolbar, "Toolbar")
 
+    back_button = QToolButton(Qt.LeftArrow, toolbar)
+    self.connect(back_button, SIGNAL("clicked()"), self.browser.backward)
+
+    forward_button = QToolButton(Qt.RightArrow, toolbar)
+    self.connect(forward_button, SIGNAL("clicked()"), self.browser.forward)
+
+    home_button = QToolButton(toolbar)
+    home_button.setTextLabel("Reload")
+    home_button.setUsesTextLabel(True)
+    self.connect(home_button, SIGNAL("clicked()"), self.browser.reload)
+
     #toolbar.addSeparator()
 
     #self.path_combo = QComboBox(True, toolbar)
     #toolbar.setStretchableWidget(path_combo)
-    #self.setRightJustification(True)
-    #self.setDockEnabled(Qt.DockLeft, False)
+    self.setRightJustification(True)
+    self.setDockEnabled(Qt.DockLeft, False)
     #self.setDockEnabled(Qt.DockRight, False)
     #
 
     #self.path_combo.insertItem(home)
     self.browser.setFocus()
 
-    self.setGeometry(50, 50, 800, 600)
+  def setSource(self, source):
+    self.browser.setSource(source)
 
   def __del__(self):
     descr("deleting...")