syncing with my current work, updating to 1.2, see changelog

git-svn-id: http://svn.code.sf.net/p/pythonqt/code/trunk@46 ea8d5007-eb21-0410-b261-ccb3ea6e24a9

Author: florianlink

CHANGELOG.txt

@@ -1,3 +1,27 @@
+Version 1.2 ChangeLog:
+
+florianlink | 2009-03-30
+- unified wrapping of CPP heap objects and QVariant/MetaTypes stack objects (this made PythonQtVariantWrapper obsolete)
+- added wrapping of the whole Qt API using a modified qtscript generator
+-- this makes all non-slots of QObject derived classes available for scripting
+-- all constructors of QObject/CPP objects are available
+-- comparision based on operator= are mapped to Python compare
+-- C++ (non-QObject) classes are completely wrapped (all public methods, enums, constructors, destructor)
+-- C++ inheritance is captured and supported for automatic upcasting, automatic downcasting is an open topic
+- added delete() method to all wrapped objects to allow C++ deletion (which is handy to remove e.g. QTreeWidgetItems from a QTreeWidget) (use with care!)
+- added support for QList<int>, QList<double>, QList<builtin variants> and QVector/std::vector
+- simple template to register other types for QList/QVector/std::vector
+- added support for custom type conversion between Python<->CPP (to e.g. manually add support for types like QHash<int, QString>, which is currently not supported)
+- remove PythonQtGui, which becomes obsolete because of the complete Qt API wrapping, adapted examples
+- added PythonQt::registerCPPClass()
+- added support for placing classes in packages, default is to place a class directly into PythonQt module
+- Qt packages are called:
+-- PythonQt.Qt - contains all Qt classes that are wrapped (for convenient to avoid using the different packages below)
+-- PythonQt.QtCore - contains the core classes
+-- PythonQt.QtGui - contains the gui classes
+-- PythonQt.QtNetwork - contains the network classes
+-- ...
+- Qt namespace is now located in QtCore, so write PythonQt.QtCore.Qt instead of PythonQt.Qt in your scripts!
 
 Version 1.1 ChangeLog: 
 

README

@@ -5,10 +5,22 @@ PythonQt is a dynamic Python (http://www.python.org) binding for Qt (http://www.
 It offers an easy way to embed the Python scripting language into
 your Qt applications. It makes heavy use of the QMetaObject system and thus requires Qt4.x.
 
-Licensing
----------
+Licensing of PythonQt
+---------------------
 PythonQt is distributed under the LGPL license.
 
+Licensing of Generator
+----------------------
+The build system of PythonQt makes use of a patched version of the GPL'ed QtScript generator,
+located in the "generator" directory.
+
+See http://labs.trolltech.com/page/Projects/QtScript/Generator for details of the original project.
+
+The PythonQt wrappers generated by the generator are distributed under the LGPL, they are not restriced by the GPL.
+
+The generated wrappers are pre-generated and checked-in for Qt 4.5, so you only need to build and run the
+generator when you want to build additional wrappers or you want to upgrade/downgrade to an newer Qt version.
+
 Documentation
 -------------
 

build/PythonQtGui.prf

@@ -0,0 +1,13 @@
+# profile for non-mevis users to link to PythonQt_QtAll
+
+INCLUDEPATH += $$PWD/../extensions/PythonQt_QtAll
+
+# check if debug or release
+CONFIG(debug, debug|release) {
+  DEBUG_EXT = _d 
+} else {
+  DEBUG_EXT = 
+}
+
+win32::LIBS += $$PWD/../lib/PythonQt_QtAll$${DEBUG_EXT}.lib
+unix::LIBS += -L$$PWD/../lib -lPythonQt_QtAll$${DEBUG_EXT}

build/PythonQt_QtAll.prf

@@ -23,7 +23,7 @@ PROJECT_NAME           = PythonQt
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.1
+PROJECT_NUMBER         = 1.2
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

doxygen/doc.cfg

@@ -7,7 +7,7 @@ int main (int argc, char* argv[]) {
     PythonQtObjectPtr mainModule = PythonQt::self()->getMainModule();
     mainModule.evalScript(QString("import sys\n"));
     Q_ASSERT(!mainModule.isNull());
-    { 
+    {
       // evaluate a python file embedded in executable as resource:
       mainModule.evalFile(":eyed3tagger.py");
       // create an object, hold onto its reference
@@ -18,9 +18,8 @@ int main (int argc, char* argv[]) {
       Q_ASSERT(fn.toString() == QString("t.mp3"));
       // tag goes out of scope, reference count decremented.
     }
-    {  
+    {
       // Allow the python system path to recognize QFile paths in the sys.path
-      //QFileImportInterface qfii;
       PythonQt::self()->setImporter(NULL);
       // append the Qt resource root directory to the sys.path
       mainModule.evalScript("sys.path.append(':')\n");
@@ -30,7 +29,7 @@ int main (int argc, char* argv[]) {
       tag.call("setFileName", QVariantList() << "t.mp3");
       QVariant fn = tag.call("fileName", QVariantList());
       Q_ASSERT(fn.toString() == QString("t.mp3"));
-    } 
+    }
     { // alternative using import and loading it as a real module from sys.path
       // import sys first
       mainModule.evalScript(QString("sys.path.append('%1')\n").arg(QDir::currentPath()));

examples/CPPPyWrapperExample/CPPPyWrapperExample.cpp

@@ -1,11 +1,15 @@
-CONFIG += debug
-VPATH += 
-INCLUDEPATH += . $$(PYTHONQT_ROOT)/src /usr/include/python2.5
 
-SOURCES += CPPPyWrapperExample.cpp
+TARGET   = CPPPyWrapperExample
+TEMPLATE = app
 
-mac { CONFIG -= app_bundle }
+mac:CONFIG -= app_bundle
 
-LIBS += -L$$(PYTHONQT_ROOT)/lib -lPythonQt_d  -lutil
+DESTDIR           = ../../lib
+
+include ( ../../build/common.prf )  
+include ( ../../build/PythonQt.prf )  
+
+SOURCES +=                    \
+  CPPPyWrapperExample.cpp        
 
 RESOURCES += CPPPyWrapperExample.qrc

examples/CPPPyWrapperExample/CPPPyWrapperExample.pro

@@ -67,7 +67,7 @@ class CustomObjectWrapper : public QObject {
 
 public slots:
   // add a constructor
-  QVariant new_CustomObject(const QString& first, const QString& last) { return qVariantFromValue(CustomObject(first, last)); }
+  CustomObject* new_CustomObject(const QString& first, const QString& last) { return new CustomObject(first, last); }
 
   // add access methods
 

examples/PyCustomMetaTypeExample/CustomObject.h

@@ -1,4 +1,4 @@
-from PythonQt import *
+from PythonQt import CustomObject
 
 # create a new object
 custom = CustomObject("John","Doe")

examples/PyCustomMetaTypeExample/example.py

@@ -57,7 +57,7 @@ int main( int argc, char **argv )
   // register the type with QMetaType
   qRegisterMetaType<CustomObject>("CustomObject");
   // add a wrapper object for the new variant type
-  PythonQt::self()->addVariantWrapper("CustomObject", new CustomObjectWrapper());
+  PythonQt::self()->registerCPPWrapper("CustomObject","","", PythonQtCreateObject<CustomObjectWrapper>);
 
   mainContext.evalFile(":example.py");
 

examples/PyCustomMetaTypeExample/main.cpp

@@ -7,11 +7,13 @@
 TARGET   = PyGuiExample
 TEMPLATE = app
 
+mac:CONFIG -= app_bundle
+
 DESTDIR           = ../../lib
 
 include ( ../../build/common.prf )  
 include ( ../../build/PythonQt.prf )  
-include ( ../../build/PythonQtGui.prf )  
+include ( ../../build/PythonQt_QtAll.prf )  
 
 SOURCES +=                    \
   main.cpp        

examples/PyGuiExample/PyGuiExample.pro

@@ -1,4 +1,4 @@
-from PythonQt import *
+from PythonQt.QtGui import *
 
 group = QGroupBox()
 box = QVBoxLayout(group)

examples/PyGuiExample/example.py

@@ -40,7 +40,7 @@
 //----------------------------------------------------------------------------------
 
 #include "PythonQt.h"
-#include "PythonQtGui.h"
+#include "PythonQt_QtAll.h"
 #include "gui/PythonQtScriptingConsole.h"
 
 #include <QApplication>
@@ -55,7 +55,7 @@ int main( int argc, char **argv )
   QApplication qapp(argc, argv);
 
   PythonQt::init(PythonQt::IgnoreSiteModule | PythonQt::RedirectStdOut);
-  PythonQtGui::init();
+  PythonQt_QtAll::init();
 
   PythonQtObjectPtr  mainContext = PythonQt::self()->getMainModule();
   PythonQtScriptingConsole console(NULL, mainContext);

examples/PyGuiExample/main.cpp

@@ -9,9 +9,11 @@ TEMPLATE = app
 
 DESTDIR           = ../../lib
 
+mac:CONFIG-= app_bundle
+
 include ( ../../build/common.prf )  
 include ( ../../build/PythonQt.prf )  
-include ( ../../build/PythonQtGui.prf )  
+include ( ../../build/PythonQt_QtAll.prf )  
 
 HEADERS +=                    \
   PyExampleObject.h             

examples/PyScriptingConsole/PyScriptingConsole.pro

@@ -1,4 +1,4 @@
-from PythonQt import *
+from PythonQt.QtGui import *
 
 group = QGroupBox()
 box = QVBoxLayout(group)

examples/PyScriptingConsole/example.py

@@ -40,7 +40,8 @@
 //----------------------------------------------------------------------------------
 
 #include "PythonQt.h"
-#include "PythonQtGui.h"
+#include "PythonQt_QtAll.h"
+
 #include "PyExampleObject.h"
 #include "gui/PythonQtScriptingConsole.h"
 
@@ -56,7 +57,7 @@ int main( int argc, char **argv )
   QApplication qapp(argc, argv);
 
   PythonQt::init(PythonQt::IgnoreSiteModule | PythonQt::RedirectStdOut);
-  PythonQtGui::init();
+  PythonQt_QtAll::init();
 
   PythonQtObjectPtr  mainContext = PythonQt::self()->getMainModule();
   PythonQtScriptingConsole console(NULL, mainContext);

examples/PyScriptingConsole/main.cpp

@@ -1,5 +1,6 @@
 TEMPLATE = subdirs
-SUBDIRS = PyGettingStarted \
+SUBDIRS = CPPPyWrapperExample \
+          PyGettingStarted \
           PyCPPWrapperExample \
           PyCustomMetaTypeExample \
           PyGuiExample \