Changeset 261

Timestamp:

12/05/07 11:44:25 (13 months ago)

Author:

fdb

Message:

libdir stuff, QMainWindow instead of QWidget.

Location:

nodebox/branches/try-qt/nodebox

Files:

• graphics/qt.py (modified) (1 diff)
• gui/qt/__init__.py (modified) (14 diffs)
• util/ottobot.py (modified) (1 diff)

nodebox/branches/try-qt/nodebox/graphics/qt.py

@@ -284 +284 @@
 
     def __getitem__(self, index):
-        cmd, el = self._nsBezierPath.elementAtIndex_associatedPoints_(index)
-        return PathElement(cmd, el)
+        el = self._qpath.elementAt(index)
+        return PathElement(el)
 
     def __iter__(self):

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

@@ -7 +7 @@
 import random
 
-from PyQt4.QtGui import QApplication, QWidget, QColor, QPainter, QMenuBar, QMenu, QKeySequence, QTextEdit, QSplitter, QGridLayout, QDialog, QScrollArea, QFont, QTextCharFormat, QFileDialog, QTextCursor, QPixmap, QPrinter, QImage
+from PyQt4.QtGui import QApplication, QWidget, QColor, QPainter, QMenuBar, QMenu, QKeySequence, QTextEdit, QSplitter, QGridLayout, QDialog, QScrollArea, QFont, QTextCharFormat, QFileDialog, QTextCursor, QPixmap, QPrinter, QImage, QMainWindow
 from PyQt4.QtCore import Qt, SIGNAL, SLOT, pyqtSignature, QTimer, QRectF, QSize
 from PyQt4.QtSvg import QSvgGenerator
@@ -91 +91 @@
     def __init__(self, parent=None):
         QTextEdit.__init__(self, parent)
+        self.setLineWrapMode(QTextEdit.NoWrap)
         
     def mousePressEvent(self, event):
@@ -105 +106 @@
         #QTextCursor
 
-class NodeBoxDocument(QWidget):
+class NodeBoxDocument(QMainWindow):
     def __init__(self):
-        QWidget.__init__(self)
+        QMainWindow.__init__(self)
 
         self.createGUI()
@@ -126 +127 @@
 
     def createMenu(self):
-        self.menuBar = QMenuBar()
+        #self.menuBar = QMenuBar()
 
         self.fileMenu = QMenu(self.tr("&File"), self)
@@ -144 +145 @@
         self.fileMenu.addAction(self.tr("&Print..."), self, SLOT("doPrint()"), QKeySequence("Ctrl+P"))
         self.exitAction = self.fileMenu.addAction(self.tr("E&xit"), self, SLOT("doExit()"), QKeySequence("Ctrl+Q"))
-        self.menuBar.addMenu(self.fileMenu)
+        self.menuBar().addMenu(self.fileMenu)
 
         self.editMenu = QMenu(self.tr("&Edit"), self)
@@ -150 +151 @@
         self.editMenu.addAction(self.tr("&Redo"), self.codeView, SLOT("redo()"), QKeySequence("Ctrl+Shift+Z"))
         self.editMenu.addSeparator()
-        self.menuBar.addMenu(self.editMenu)
+        self.menuBar().addMenu(self.editMenu)
 
         self.pythonMenu = QMenu(self.tr("&Python"), self)
         self.runAction = self.pythonMenu.addAction(self.tr("&Run"), self, SLOT("doRun()"), QKeySequence("Ctrl+R"))
         self.runAction = self.pythonMenu.addAction(self.tr("&Stop"), self, SLOT("doStop()"), QKeySequence("Ctrl+."))
-        self.menuBar.addMenu(self.pythonMenu)
+        self.menuBar().addMenu(self.pythonMenu)
 
         self.windowMenu = QMenu(self.tr("&Window"), self)
@@ -164 +165 @@
         self.windowMenu.addSeparator()
         # TODO: List of all windows
-        self.menuBar.addMenu(self.windowMenu)
+        self.menuBar().addMenu(self.windowMenu)
 
     def createGUI(self):
@@ -203 +204 @@
         self.view_edit.addWidget(self.code_errors)
         
-        mainLayout = QGridLayout()
-        mainLayout.addWidget(self.view_edit)
-        self.setLayout(mainLayout)
+        #mainLayout = QGridLayout()
+        #mainLayout.addWidget(self.view_edit)
+        self.setCentralWidget(self.view_edit)
 
         self.setWindowTitle(self.tr("Untitled"))
@@ -226 +227 @@
     @pyqtSignature("")
     def doOpen(self):
-        fileName = QFileDialog.getOpenFileName(None, self.tr("Open File"), os.getenv('HOME'), "*.py")
+        global app
+        fileName = QFileDialog.getOpenFileName(None, self.tr("Open File"), app.home, "*.py")
         print "open", fileName
         if fileName is not None and len(fileName) > 0:
@@ -258 +260 @@
     @pyqtSignature("")
     def doSaveAs(self):
-        fileName = QFileDialog.getSaveFileName(self, self.tr("Save File"), os.getenv('HOME'), "*.py")
+        global app
+        fileName = QFileDialog.getSaveFileName(self, self.tr("Save File"), app.home, "*.py")
         print "save as", fileName
         if fileName is not None and len(fileName) > 0:
@@ -268 +271 @@
     @pyqtSignature("")
     def doExportAsImage(self):
+        global app
         if self.canvas is None: return
-        fileName = QFileDialog.getSaveFileName(self, self.tr("Save SVG File"), os.getenv('HOME'), "*.svg,*.pdf,*.png,*.tiff,*.jpg,*.jpeg,*.gif")
+        fileName = QFileDialog.getSaveFileName(self, self.tr("Save SVG File"), app.home, "*.svg,*.pdf,*.png,*.tiff,*.jpg,*.jpeg,*.gif")
         print "save image as ", fileName
         if fileName is not None and len(fileName) > 0:
@@ -458 +462 @@
              - The OutputFile
         """
+        global app
         self.scriptName = self.fileName
-        libDir = os.path.join(os.getenv("HOME"), "Library", "Application Support", "NodeBox")
+        libDir = app.lib
         if not self.scriptName:
-            curDir = os.getenv("HOME")
+            curDir = app.home
             self.scriptName = "<untitled>"
         else:
@@ -563 +568 @@
         QApplication.__init__(self, args)
         self.documents = []
-        
+        if sys.platform == "win32":
+            self.home = 'C:/' # os.getenv('HOME')
+            self.lib = os.path.join(self.home, "NodeBox") # os.path.join(self.home, "Library", "Application Support", "NodeBox")
+        elif sys.platform == "mac":
+            self.home = os.getenv('HOME')
+            self.lib = os.path.join(self.home, "Library", "Application Support", "NodeBox")
+        else:
+            self.home = os.getenv('HOME')
+            self.lib = os.path.join(self.home, "nodebox")
+        try:
+            if not os.path.exists(self.lib):
+                os.mkdir(self.lib)
+                f = open(os.path.join(self.lib, "README"), "w")
+                f.write("In this directory, you can put Python libraries to make them available to your scripts.\n")
+                f.close()
+        except OSError: pass
+        except IOError: pass
+            
     def newDocument(self):
         doc = NodeBoxDocument()
@@ -578 +600 @@
 if __name__ == "__main__":
     qtmain()
+

nodebox/branches/try-qt/nodebox/util/ottobot.py

@@ -1 @@
-from AppKit import NSFontManager
-
 from nodebox.util import random, choice