Changeset 225

Timestamp:

11/05/07 12:14:36 (14 months ago)

Author:

fdb

Message:

New progress sheet, compatibility for leopard. Stop button doesn't work, I will need to turn around some code.

Location:

nodebox/trunk

Files:

• libs/pathmatics/setup.py (modified) (1 diff)
• src/Changes.txt (modified) (1 diff)
• src/macbuild.sh (modified) (2 diffs)
• src/nodebox/gui/mac/__init__.py (modified) (7 diffs)
• src/nodebox/gui/mac/progressbar.py (added)

nodebox/trunk/libs/pathmatics/setup.py

@@ -1 +1 @@
 from distutils.core import setup, Extension
 
-
-CFLAGS=[
-    "-DMACOSX",
-    "-DAPPLE_RUNTIME",
-    "-no-cpp-precomp",
-    "-Wno-long-double",
-    "-g",
-
-    # Loads of warning flags
-    "-Wall", "-Wstrict-prototypes", "-Wmissing-prototypes",
-    "-Wformat=2", "-W", "-Wshadow",
-    "-Wpointer-arith", #"-Wwrite-strings",
-    "-Wmissing-declarations",
-    "-Wnested-externs",
-    "-Wno-long-long",
-    "-Wno-import",
-    
-    # Universal binary flags
-    "-arch", "i386",
-    "-arch", "ppc",
-    "-isysroot", "/Developer/SDKs/MacOSX10.4u.sdk",
-    ]
-
-BASE_LDFLAGS = [
-    # Universal binary flags
-    "-arch", "i386",
-    "-arch", "ppc",
-    "-isysroot", "/Developer/SDKs/MacOSX10.4u.sdk",
-]
-
-cPathmatics = Extension("cPathmatics", sources = ["pathmatics.c"], 
-    extra_compile_args=CFLAGS, extra_link_args=BASE_LDFLAGS)
+cPathmatics = Extension("cPathmatics", sources = ["pathmatics.c"])
 
 setup (name = "pathmatics",

nodebox/trunk/src/Changes.txt

@@ -2 +2 @@
 -------------
 * Color objects still worked in CMYK when used as a fill/stroke.
+* Progress bar changed for Leopard compatibility.
 
 NodeBox 1.9.1

nodebox/trunk/src/macbuild.sh

@@ -2 +2 @@
 # Builds the NodeBox Mac OS X distribution folder.
 
+# Remove dist and build
+rm -rf dist
+rm -rf build
+
 # First, make the help files.
 cd ../helpsrc
-python2.3 makehelp.py
+python makehelp.py
 
 # Now build the application.
@@ -10 +14 @@
 # but not Python itself.
 cd ../src
-python2.3 macsetup.py py2app --semi-standalone
+python macsetup.py py2app
 
 # Due to a bug in PyObjC, the included site.py file is incorrect.

nodebox/trunk/src/nodebox/gui/mac/__init__.py

@@ -15 +15 @@
 from nodebox.gui.mac import PyDETextView
 from nodebox.gui.mac.util import errorAlert
+from nodebox.gui.mac.progressbar import ProgressBar
 from nodebox import util
 from nodebox.util import QTSupport
@@ -69 +70 @@
     # pageCount
     # pageCountAccessory
+    # When the ExportSheet is loaded, we also add:
+    # exportSheet
+    # exportSheetIndicator
 
     path = None
@@ -500 +504 @@
                 self.canvas.save(fname, format)
         elif pages > 1:
-            pb = EasyDialogs.ProgressBar(title="Generating %s PDF files..." % pages, maxval=pages)
+            pb = ProgressBar(title="Generating %s PDF files..." % pages, maxval=pages)
             try:
                 if not self.cleanRun(self._execScript): return
@@ -524 +528 @@
                         self._frame += 1
                         pb.inc()
+                        #self.exportSheetProgress.setDoubleValue_(i)
                 else:
                     if self.namespace.has_key("setup"):
@@ -542 +547 @@
                         self._frame += 1
                         pb.inc()
-
+                        #self.exportSheetProgress.setDoubleValue_(i)
             except KeyboardInterrupt:
                 pass
-            del pb
+        pb.end()
+        del pb
         self._pageNumber = 1
         self._frame = 1
@@ -645 +651 @@
         movie = None
 
-        pb = EasyDialogs.ProgressBar(title="Generating %s frames..." % frames, maxval=frames)
+        pb = ProgressBar(title="Generating %s frames..." % frames, maxval=frames)
         try:
             if not self.cleanRun(self._execScript): return
@@ -675 +681 @@
         except KeyboardInterrupt:
             pass
+        pb.end()
+        del pb
         movie.save()
         self._pageNumber = 1