[Avida-SVN] r2664 - branches/developers/avida-edward/source/python/AvidaGui2
kaben at myxo.css.msu.edu
kaben at myxo.css.msu.edu
Sat Jun 21 11:02:28 PDT 2008
Author: kaben
Date: 2008-06-21 14:02:27 -0400 (Sat, 21 Jun 2008)
New Revision: 2664
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:
Avida-ED Help Menu: Removed changelog and known-bugs; restored dialogs stating "help is being written".
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py 2008-06-20 19:24:16 UTC (rev 2663)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py 2008-06-21 18:02:27 UTC (rev 2664)
@@ -658,37 +658,38 @@
# public slot
def helpIndex(self):
- home = QDir("./documentation/index.html").absPath()
- if self.help_screen is not None:
- self.help_screen.setSource(home)
- else:
- self.help_screen = pyHelpScreenCtrl(home, ".", None)
- #help_dialog.showDialog()
- self.help_screen.show()
+ self.help_dialog = pyHelpScreenCtrl()
+ self.help_dialog.showDialog()
+ # home = QDir("./documentation/index.html").absPath()
+ # if self.help_screen is not None:
+ # self.help_screen.setSource(home)
+ # else:
+ # self.help_screen = pyHelpScreenCtrl(home, ".", None)
+ # #help_dialog.showDialog()
+ # self.help_screen.show()
- def helpChanges(self):
- home = QDir("./documentation/changes.html").absPath()
- if self.help_screen is not None:
- self.help_screen.setSource(home)
- else:
- self.help_screen = pyHelpScreenCtrl(home, ".", None)
- self.help_screen.show()
+ #def helpChanges(self):
+ # home = QDir("./documentation/changes.html").absPath()
+ # 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()
- 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()
+ #def helpKnownBugs(self):
+ # home = QDir("./documentation/bugs.html").absPath()
+ # 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
- #self.help_dialog = pyHelpScreenCtrl()
- #self.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-20 19:24:16 UTC (rev 2663)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui 2008-06-21 18:02:27 UTC (rev 2664)
@@ -229,8 +229,6 @@
<item text="&Help" name="helpMenu">
<action name="helpIndexAction"/>
<action name="helpContentsAction"/>
- <action name="helpChangesAction"/>
- <action name="helpKnownBugsAction"/>
<separator/>
<action name="helpAboutAction"/>
</item>
@@ -343,6 +341,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>
@@ -432,6 +436,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/pyHelpScreenCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyHelpScreenCtrl.py 2008-06-20 19:24:16 UTC (rev 2663)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyHelpScreenCtrl.py 2008-06-21 18:02:27 UTC (rev 2664)
@@ -4,62 +4,62 @@
# Simple class to pop up help message. Place holder for a real help sysem
-#class pyHelpScreenCtrl (pyHelpScreenView):
-# def __init__(self):
-# pyHelpScreenView.__init__(self)
-#
-# def showDialog(self):
-# self.exec_loop()
+class pyHelpScreenCtrl (pyHelpScreenView):
+ def __init__(self):
+ pyHelpScreenView.__init__(self)
-class pyHelpScreenCtrl(QMainWindow):
- def __init__(self, home, path, parent = None, name = None, fl = 0):
- QMainWindow.__init__(self,parent,name,fl)
+ def showDialog(self):
+ self.exec_loop()
- self.browser = QTextBrowser(self)
- #descr("path:", path)
- #self.browser.mimeSourceFactory().setFilePath(QString(path))
- #self.connect(self.browser, PYSIGNAL("sourceChanged"), self.sourceChangedSlot)
- self.setCentralWidget(self.browser)
-
- if not home == "":
- self.browser.setSource(home)
-
- self.resize(800, 600)
-
- file = QPopupMenu(self)
- file.insertItem("&Close", self.hide, QKeySequence("Ctrl+W"))
-
-
- self.menuBar().insertItem("&File", file)
-
- 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.setDockEnabled(Qt.DockRight, False)
- #
-
- #self.path_combo.insertItem(home)
- self.browser.setFocus()
-
- def setSource(self, source):
- self.browser.setSource(source)
-
- def __del__(self):
- descr("deleting...")
+#class pyHelpScreenCtrl(QMainWindow):
+# def __init__(self, home, path, parent = None, name = None, fl = 0):
+# QMainWindow.__init__(self,parent,name,fl)
+#
+# self.browser = QTextBrowser(self)
+# #descr("path:", path)
+# #self.browser.mimeSourceFactory().setFilePath(QString(path))
+# #self.connect(self.browser, PYSIGNAL("sourceChanged"), self.sourceChangedSlot)
+# self.setCentralWidget(self.browser)
+#
+# if not home == "":
+# self.browser.setSource(home)
+#
+# self.resize(800, 600)
+#
+# file = QPopupMenu(self)
+# file.insertItem("&Close", self.hide, QKeySequence("Ctrl+W"))
+#
+#
+# self.menuBar().insertItem("&File", file)
+#
+# 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.setDockEnabled(Qt.DockRight, False)
+# #
+#
+# #self.path_combo.insertItem(home)
+# self.browser.setFocus()
+#
+# def setSource(self, source):
+# self.browser.setSource(source)
+#
+# def __del__(self):
+# descr("deleting...")
More information about the Avida-cvs
mailing list