enable more gui sip bindings

jef-n · jef-n · commit 7f08c3724de0 · 2012-09-24T23:53:58.000+02:00
diff --git a/python/gui/gui.sip b/python/gui/gui.sip
@@ -20,7 +20,7 @@
 %Include qgsencodingfiledialog.sip
 %Include qgsexpressionbuilderdialog.sip
 %Include qgsexpressionbuilderwidget.sip
-// %Include qgsexpressionhighlighter.sip
+%Include qgsexpressionhighlighter.sip
 %Include qgsfieldvalidator.sip
 %Include qgsfiledropedit.sip
 %Include qgsformannotationitem.sip
@@ -39,7 +39,7 @@
 %Include qgsmaptool.sip
 %Include qgsmaptoolemitpoint.sip
 %Include qgsmaptoolpan.sip
-// %Include qgsmaptooltouch.sip
+%Include qgsmaptooltouch.sip
 %Include qgsmaptoolzoom.sip
 %Include qgsmessagebar.sip
 %Include qgsmessagelogviewer.sip
@@ -74,20 +74,20 @@
 
 %Include symbology-ng/qgsrendererv2widget.sip
 %Include symbology-ng/qgsbrushstylecombobox.sip
-// %Include symbology-ng/qgscategorizedsymbolrendererv2widget.sip
+%Include symbology-ng/qgscategorizedsymbolrendererv2widget.sip
 %Include symbology-ng/qgscptcitycolorrampv2dialog.sip
-// %Include symbology-ng/qgsellipsesymbollayerv2widget.sip
-// %Include symbology-ng/qgsgraduatedsymbolrendererv2widget.sip
+%Include symbology-ng/qgsellipsesymbollayerv2widget.sip
+%Include symbology-ng/qgsgraduatedsymbolrendererv2widget.sip
 %Include symbology-ng/qgslayerpropertieswidget.sip
 %Include symbology-ng/qgspenstylecombobox.sip
 %Include symbology-ng/qgspointdisplacementrendererwidget.sip
 %Include symbology-ng/qgsrendererv2propertiesdialog.sip
-// %Include symbology-ng/qgsrulebasedrendererv2widget.sip
-// %Include symbology-ng/qgssinglesymbolrendererv2widget.sip
+%Include symbology-ng/qgsrulebasedrendererv2widget.sip
+%Include symbology-ng/qgssinglesymbolrendererv2widget.sip
 %Include symbology-ng/qgssmartgroupeditordialog.sip
 %Include symbology-ng/qgsstylev2managerdialog.sip
 %Include symbology-ng/qgssymbollayerv2widget.sip
-// %Include symbology-ng/qgssymbollevelsv2dialog.sip
+%Include symbology-ng/qgssymbollevelsv2dialog.sip
 %Include symbology-ng/qgssymbolslistwidget.sip
 %Include symbology-ng/qgssymbolv2selectordialog.sip
 %Include symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.sip
diff --git a/python/gui/qgsmaptooltouch.sip b/python/gui/qgsmaptooltouch.sip
@@ -1,3 +1,4 @@
+%If (HAVE_TOUCH)
 class QgsMapToolTouch : QgsMapTool
 {
 %TypeHeaderCode
@@ -24,3 +25,4 @@ class QgsMapToolTouch : QgsMapTool
 
     virtual bool isTransient();
 };
+%End
diff --git a/python/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.sip b/python/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.sip
@@ -39,8 +39,6 @@ class QgsCategorizedSymbolRendererV2Widget : QgsRendererV2Widget
     //! populate column combo
     void populateColumns();
 
-    void populateColorRamps();
-
     void addCategory( const QgsRendererCategoryV2& cat );
 
     //! return row index for the currently selected category (-1 if on no selection)
diff --git a/python/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.sip b/python/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.sip
@@ -1,7 +1,3 @@
-%TypeHeaderCode
-#include <qgsrendererv2widget.h>
-%End
-
 class QgsGraduatedSymbolRendererV2Widget : QgsRendererV2Widget
 {
 %TypeHeaderCode
@@ -43,8 +39,6 @@ class QgsGraduatedSymbolRendererV2Widget : QgsRendererV2Widget
     //! populate column combos in categorized and graduated page
     void populateColumns();
 
-    void populateColorRamps();
-
     //! populate ranges of graduated symbol renderer
     void populateRanges();
 
diff --git a/python/gui/symbology-ng/qgsrulebasedrendererv2widget.sip b/python/gui/symbology-ng/qgsrulebasedrendererv2widget.sip
@@ -1,4 +1,4 @@
-class QgsRuleBasedRendererV2Model : public QAbstractItemModel
+class QgsRuleBasedRendererV2Model : QAbstractItemModel
 {
 %TypeHeaderCode
 #include <qgsrulebasedrendererv2widget.h>
@@ -39,9 +39,6 @@ class QgsRuleBasedRendererV2Model : public QAbstractItemModel
 
     void willAddRules( const QModelIndex& parent, int count ); // call beginInsertRows
     void finishedAddingRules(); // call endInsertRows
-
-  protected:
-    QgsRuleBasedRendererV2* mR;
 };
 
 class QgsRuleBasedRendererV2Widget : QgsRendererV2Widget
diff --git a/python/gui/symbology-ng/qgssymbollevelsv2dialog.sip b/python/gui/symbology-ng/qgssymbollevelsv2dialog.sip
@@ -5,7 +5,7 @@ class QgsSymbolLevelsV2Dialog : QDialog
 %End
 
   public:
-    QgsSymbolLevelsV2Dialog( QList< QPair<QString, QgsSymbolV2*> > list, bool usingSymbolLevels, QWidget* parent = NULL );
+    // QgsSymbolLevelsV2Dialog( QList< QPair<QString, QgsSymbolV2*> > list, bool usingSymbolLevels, QWidget* parent = NULL );
 
     bool usingLevels() const;
 
@@ -20,4 +20,7 @@ class QgsSymbolLevelsV2Dialog : QDialog
   protected:
     void populateTable();
     void setDefaultLevels();
+
+  private:
+    QgsSymbolLevelsV2Dialog();
 };
diff --git a/src/gui/qgsexpressionhighlighter.h b/src/gui/qgsexpressionhighlighter.h
@@ -25,7 +25,7 @@
 
 class QTextDocument;
 
-class GUI_EXPORT QgsExpressionHighlighter : QSyntaxHighlighter
+class GUI_EXPORT QgsExpressionHighlighter : public QSyntaxHighlighter
 {
     Q_OBJECT
 
diff --git a/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h b/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h
@@ -62,8 +62,6 @@ class GUI_EXPORT QgsCategorizedSymbolRendererV2Widget : public QgsRendererV2Widg
     //! populate column combo
     void populateColumns();
 
-    void populateColorRamps();
-
     void addCategory( const QgsRendererCategoryV2& cat );
 
     //! return row index for the currently selected category (-1 if on no selection)
diff --git a/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h b/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h
@@ -62,8 +62,6 @@ class GUI_EXPORT QgsGraduatedSymbolRendererV2Widget : public QgsRendererV2Widget
     //! populate column combos in categorized and graduated page
     void populateColumns();
 
-    void populateColorRamps();
-
     //! populate ranges of graduated symbol renderer
     void populateRanges();
 
diff --git a/src/gui/symbology-ng/qgssymbollevelsv2dialog.h b/src/gui/symbology-ng/qgssymbollevelsv2dialog.h
@@ -27,6 +27,7 @@ class GUI_EXPORT QgsSymbolLevelsV2Dialog : public QDialog, private Ui::QgsSymbol
 {
     Q_OBJECT
   public:
+    // @note not available in python bindings
     QgsSymbolLevelsV2Dialog( QgsLegendSymbolList list, bool usingSymbolLevels, QWidget* parent = NULL );
 
     bool usingLevels() const;

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+%If (HAVE_TOUCH)`
`1`	`2`	`class QgsMapToolTouch : QgsMapTool`
`2`	`3`	`{`
`3`	`4`	`%TypeHeaderCode`
`@@ -24,3 +25,4 @@ class QgsMapToolTouch : QgsMapTool`
`24`	`25`
`25`	`26`	`virtual bool isTransient();`
`26`	`27`	`};`
	`28`	`+%End`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`
`26`	`26`	`class QTextDocument;`
`27`	`27`
`28`		`-class GUI_EXPORT QgsExpressionHighlighter : QSyntaxHighlighter`
	`28`	`+class GUI_EXPORT QgsExpressionHighlighter : public QSyntaxHighlighter`
`29`	`29`	`{`
`30`	`30`	`Q_OBJECT`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ class GUI_EXPORT QgsSymbolLevelsV2Dialog : public QDialog, private Ui::QgsSymbol`
`27`	`27`	`{`
`28`	`28`	`Q_OBJECT`
`29`	`29`	`public:`
	`30`	`+ // @note not available in python bindings`
`30`	`31`	`QgsSymbolLevelsV2Dialog( QgsLegendSymbolList list, bool usingSymbolLevels, QWidget* parent = NULL );`
`31`	`32`
`32`	`33`	`bool usingLevels() const;`