Changeset 260 for nodebox/branches/try-qt

Timestamp:

12/04/07 17:21:07 (13 months ago)

Author:

fdb

Message:

Undo/redo support, window menu

Files:

• nodebox/branches/try-qt/nodebox/gui/qt/__init__.py (modified) (7 diffs)

nodebox/branches/try-qt/nodebox/gui/qt/__init__.py

@@ -91 +91 @@
     def __init__(self, parent=None):
         QTextEdit.__init__(self, parent)
-        self.connect
         
     def mousePressEvent(self, event):
@@ -110 +109 @@
         QWidget.__init__(self)
 
+        self.createGUI()
         self.createMenu()
-        self.createGUI()
 
         self.namespace = {}
@@ -148 +147 @@
 
         self.editMenu = QMenu(self.tr("&Edit"), self)
-        self.editMenu.addAction(self.tr("&Undo"), self, SLOT("doUndo()"), QKeySequence("Ctrl+Z"))
-        self.editMenu.addAction(self.tr("&Redo"), self, SLOT("doRedo()"), QKeySequence("Ctrl+Shift+Z"))
+        self.editMenu.addAction(self.tr("&Undo"), self.codeView, SLOT("undo()"), QKeySequence("Ctrl+Z"))
+        self.editMenu.addAction(self.tr("&Redo"), self.codeView, SLOT("redo()"), QKeySequence("Ctrl+Shift+Z"))
         self.editMenu.addSeparator()
         self.menuBar.addMenu(self.editMenu)
@@ -157 +156 @@
         self.runAction = self.pythonMenu.addAction(self.tr("&Stop"), self, SLOT("doStop()"), QKeySequence("Ctrl+."))
         self.menuBar.addMenu(self.pythonMenu)
+
+        self.windowMenu = QMenu(self.tr("&Window"), self)
+        self.windowMenu.addAction(self.tr("&Minimize"), self, SLOT("showMinimized()"), QKeySequence("Ctrl+M"))
+        self.windowMenu.addAction(self.tr("&Zoom"), self, SLOT("showMaximized()"))
+        self.windowMenu.addSeparator()
+        self.windowMenu.addAction(self.tr("&Bring All to Front"), self, SLOT("showNormal()"), QKeySequence("Ctrl+Shift+Z")) # TODO: Correct behaviour
+        self.windowMenu.addSeparator()
+        # TODO: List of all windows
+        self.menuBar.addMenu(self.windowMenu)
 
     def createGUI(self):
@@ -169 +177 @@
         self.graphicsView = NodeBoxGraphicsView()
         self.graphicsView.document = self
+        self.graphicsView.resize(1000, 1000)
         self.graphicsScroll = QScrollArea()
         self.graphicsScroll.setWidget(self.graphicsView)
@@ -198 +207 @@
         self.setLayout(mainLayout)
 
-        self.setWindowTitle(self.tr("NodeBox"))
+        self.setWindowTitle(self.tr("Untitled"))
+        self.resize(800, 600)
         
     @pyqtSignature("")
@@ -305 +315 @@
 
     def _runScript(self, compile=True, newSeed=True):
-        print "_runScript"
         if not self.cleanRun(self._execScript):
             pass
 
         # Check whether we are dealing with animation
-        print "speed", self.canvas.speed
         if self.canvas.speed is not None:
             if not self.namespace.has_key("draw"):