Showing with 7,268 additions and 6,566 deletions.
  1. +3 −3 CMakeLists.txt
  2. +2 −2 i18n/qgis_de.ts
  3. +1 −0 images/images.qrc
  4. BIN images/themes/default/mActionOffsetCurve.png
  5. +1 −0 python/core/qgsvectorlayer.sip
  6. +13 −3 src/app/CMakeLists.txt
  7. +0 −3 src/app/legend/qgslegendlayer.cpp
  8. +742 −0 src/app/nodetool/qgsmaptoolnodetool.cpp
  9. +153 −0 src/app/nodetool/qgsmaptoolnodetool.h
  10. +572 −0 src/app/nodetool/qgsselectedfeature.cpp
  11. +228 −0 src/app/nodetool/qgsselectedfeature.h
  12. +97 −0 src/app/nodetool/qgsvertexentry.cpp
  13. +69 −0 src/app/nodetool/qgsvertexentry.h
  14. +21 −40 src/app/qgisapp.cpp
  15. +4 −3 src/app/qgisapp.h
  16. +10 −10 src/app/qgsattributetabledialog.cpp
  17. +1 −0 src/app/qgsattributetabledialog.h
  18. +0 −82 src/app/qgsbookmarkitem.cpp
  19. +0 −54 src/app/qgsbookmarkitem.h
  20. +147 −237 src/app/qgsbookmarks.cpp
  21. +18 −19 src/app/qgsbookmarks.h
  22. +1 −1 src/app/qgsmaptoolmovefeature.cpp
  23. +0 −1,454 src/app/qgsmaptoolnodetool.cpp
  24. +0 −393 src/app/qgsmaptoolnodetool.h
  25. +489 −0 src/app/qgsmaptooloffsetcurve.cpp
  26. +82 −0 src/app/qgsmaptooloffsetcurve.h
  27. +12 −0 src/app/qgsoptions.cpp
  28. +0 −2 src/core/CMakeLists.txt
  29. +2 −1 src/core/qgis.h
  30. +56 −0 src/core/qgsdatasourceuri.cpp
  31. +14 −3 src/core/qgsdatasourceuri.h
  32. +0 −308 src/core/qgsdbtablemodel.cpp
  33. +31 −5 src/core/qgsgeometry.cpp
  34. +5 −1 src/core/qgsgeometry.h
  35. +70 −21 src/core/qgsvectorlayer.cpp
  36. +1 −0 src/core/qgsvectorlayer.h
  37. +0 −2 src/gui/attributetable/qgsattributetablefiltermodel.h
  38. +20 −4 src/gui/attributetable/qgsattributetablememorymodel.cpp
  39. +47 −16 src/gui/attributetable/qgsattributetablemodel.cpp
  40. +2 −0 src/gui/attributetable/qgsattributetablemodel.h
  41. +5 −1 src/gui/attributetable/qgsattributetableview.cpp
  42. +3 −0 src/gui/attributetable/qgsattributetableview.h
  43. +1 −1 src/gui/qgsmapcanvas.cpp
  44. +1 −2 src/gui/qgsmapcanvassnapper.h
  45. +2 −0 src/plugins/spit/CMakeLists.txt
  46. +1 −0 src/providers/memory/qgsmemoryprovider.cpp
  47. +30 −26 src/providers/ogr/qgsogrprovider.cpp
  48. +6 −2 src/providers/postgres/CMakeLists.txt
  49. +65 −0 src/providers/postgres/qgscolumntypethread.cpp
  50. +53 −0 src/providers/postgres/qgscolumntypethread.h
  51. +53 −0 src/providers/postgres/qgsdbfilterproxymodel.cpp
  52. +39 −0 src/providers/postgres/qgsdbfilterproxymodel.h
  53. +7 −53 src/providers/postgres/qgspgnewconnection.cpp
  54. +186 −279 src/providers/postgres/qgspgsourceselect.cpp
  55. +20 −104 src/providers/postgres/qgspgsourceselect.h
  56. +385 −0 src/providers/postgres/qgspgtablemodel.cpp
  57. +17 −13 src/{core/qgsdbtablemodel.h → providers/postgres/qgspgtablemodel.h}
  58. +1,442 −0 src/providers/postgres/qgspostgresconn.cpp
  59. +250 −0 src/providers/postgres/qgspostgresconn.h
  60. +0 −132 src/providers/postgres/qgspostgresconnection.cpp
  61. +0 −51 src/providers/postgres/qgspostgresconnection.h
  62. +137 −84 src/providers/postgres/qgspostgresdataitems.cpp
  63. +42 −34 src/providers/postgres/qgspostgresdataitems.h
  64. +1,449 −2,701 src/providers/postgres/qgspostgresprovider.cpp
  65. +63 −344 src/providers/postgres/qgspostgresprovider.h
  66. +6 −6 src/providers/spatialite/qgsspatialiteprovider.cpp
  67. +15 −1 src/ui/qgisapp.ui
  68. +23 −42 src/ui/qgsbookmarksbase.ui
  69. +53 −23 src/ui/qgsoptionsbase.ui
  70. 0 {src/providers/postgres → tests/testdata}/create_test_tables
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
SET(CPACK_PACKAGE_VERSION_MAJOR "1")
SET(CPACK_PACKAGE_VERSION_MINOR "9")
SET(CPACK_PACKAGE_VERSION_PATCH "90")
SET(CPACK_PACKAGE_VERSION_MINOR "8")
SET(CPACK_PACKAGE_VERSION_PATCH "0")
SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
SET(RELEASE_NAME "Alpha")
SET(RELEASE_NAME "master")
SET(PROJECT_VERSION ${COMPLETE_VERSION})
PROJECT(qgis${PROJECT_VERSION})
IF (APPLE)
Expand Down
4 changes: 2 additions & 2 deletions i18n/qgis_de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26654,7 +26654,7 @@ Fehler:%3
</message>
<message>
<location filename="../src/providers/postgres/qgspostgresconn.cpp" line="729"/>
<source>Errornous query: %1 returned %2 [%3]</source>
<source>Erroneous query: %1 returned %2 [%3]</source>
<translation>Fehlerhafte Abfrage: %1 ergab %2 [%3]</translation>
</message>
<message>
Expand Down Expand Up @@ -30256,7 +30256,7 @@ p, li { white-space: pre-wrap; }
</message>
<message numerus="yes">
<location filename="../src/app/nodetool/qgsselectedfeature.cpp" line="224"/>
<source>Validation finished (%n error(s) gefunden).</source>
<source>Validation finished (%n error(s) found).</source>
<comment>number of geometry errors</comment>
<translation>
<numerusform>Prüfung abgeschlossen (ein Fehler gefunden).</numerusform>
Expand Down
1 change: 1 addition & 0 deletions images/images.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@
<file>themes/default/mActionNewFolder.png</file>
<file>themes/default/mActionNewVectorLayer.png</file>
<file>themes/default/mActionNodeTool.png</file>
<file>themes/default/mActionOffsetCurve.png</file>
<file>themes/default/mActionOpenTable.png</file>
<file>themes/default/mActionOptions.png</file>
<file>themes/default/mActionPan.png</file>
Expand Down
Binary file added images/themes/default/mActionOffsetCurve.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions python/core/qgsvectorlayer.sip
Original file line number Diff line number Diff line change
Expand Up @@ -675,6 +675,7 @@ signals:
void layerDeleted();

void attributeValueChanged(qint64 fid, int idx, const QVariant &);
void geometryChanged(qint64 fid, QgsGeometry & );

/** Signals emitted after committing changes
\note added in v1.6 */
Expand Down
16 changes: 13 additions & 3 deletions src/app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ SET(QGIS_APP_SRCS
qgsattributetypedialog.cpp
qgsattributetypeloaddialog.cpp
qgsattributetabledialog.cpp
qgsbookmarkitem.cpp
qgsbookmarks.cpp
qgsbrowserdockwidget.cpp
qgsclipboard.cpp
Expand All @@ -39,6 +38,7 @@ SET(QGIS_APP_SRCS
qgslabelengineconfigdialog.cpp
qgslabelinggui.cpp
qgslabelpreview.cpp

qgsmaptooladdfeature.cpp
qgsmaptooladdvertex.cpp
qgsmaptooladdpart.cpp
Expand All @@ -58,7 +58,7 @@ SET(QGIS_APP_SRCS
qgsmaptoolmovefeature.cpp
qgsmaptoolmovelabel.cpp
qgsmaptoolmovevertex.cpp
qgsmaptoolnodetool.cpp
qgsmaptooloffsetcurve.cpp
qgsmaptoolreshape.cpp
qgsmaptoolrotatelabel.cpp
qgsmaptoolrotatepointsymbols.cpp
Expand All @@ -72,6 +72,11 @@ SET(QGIS_APP_SRCS
qgsmaptoolsplitfeatures.cpp
qgsmaptooltextannotation.cpp
qgsmaptoolvertexedit.cpp

nodetool/qgsmaptoolnodetool.cpp
nodetool/qgsselectedfeature.cpp
nodetool/qgsvertexentry.cpp

qgsmeasuredialog.cpp
qgsmeasuretool.cpp
qgsmergeattributesdialog.cpp
Expand Down Expand Up @@ -181,6 +186,7 @@ SET (QGIS_APP_MOC_HDRS
qgslabelengineconfigdialog.h
qgslabelinggui.h
qgslabelpropertydialog.h

qgsmaptooladdfeature.h
qgsmaptoolcapture.h
qgsmaptooladdpart.h
Expand All @@ -196,7 +202,7 @@ SET (QGIS_APP_MOC_HDRS
qgsmaptoolmovefeature.h
qgsmaptoolmovelabel.h
qgsmaptoolmovevertex.h
qgsmaptoolnodetool.h
qgsmaptooloffsetcurve.h
qgsmaptoolreshape.h
qgsmaptoolrotatelabel.h
qgsmaptoolrotatepointsymbols.h
Expand All @@ -208,6 +214,10 @@ SET (QGIS_APP_MOC_HDRS
qgsmaptoolsimplify.h
qgsmaptoolsplitfeatures.h
qgsmaptoolvertexedit.h

nodetool/qgsmaptoolnodetool.h
nodetool/qgsselectedfeature.h

qgsmeasuredialog.h
qgsmeasuretool.h
qgsmergeattributesdialog.h
Expand Down
3 changes: 0 additions & 3 deletions src/app/legend/qgslegendlayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -378,13 +378,10 @@ QPixmap QgsLegendLayer::getOriginalPixmap()
{
case QGis::Point:
return QgisApp::getThemePixmap( "/mIconPointLayer.png" );
break;
case QGis::Line:
return QgisApp::getThemePixmap( "/mIconLineLayer.png" );
break;
case QGis::Polygon:
return QgisApp::getThemePixmap( "/mIconPolygonLayer.png" );
break;
case QGis::NoGeometry:
return QgisApp::getThemePixmap( "/mIconTableLayer.png" );
default:
Expand Down
Loading