Skip to content
Permalink
Browse files

merge from trunk r11850:11900. syncing done, hurrah!

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11901 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder
wonder committed Nov 2, 2009
1 parent 2f04214 commit 72c842ead0118efeee3877dc8c606369d308433c
Showing with 3,121 additions and 1,990 deletions.
  1. +1 −1 debian/changelog
  2. +4 −4 debian/control.hardy
  3. +3 −3 debian/control.intrepid
  4. +4 −4 debian/control.jaunty
  5. +4 −4 debian/control.karmic
  6. +4 −4 debian/control.lenny
  7. +5 −5 debian/control.sid
  8. +57 −0 debian/libqgis{QGIS_ABI}.symbols
  9. +1 −1 debian/rules
  10. +1,184 −1,082 i18n/qgis_de.ts
  11. +139 −119 i18n/qgis_fr.ts
  12. BIN images/themes/default/mActionNewComposer.png
  13. +6 −1 python/core/qgsapplication.sip
  14. +2 −0 python/core/qgscomposermap.sip
  15. +8 −0 python/core/qgscomposerpicture.sip
  16. +5 −0 python/core/qgsdataprovider.sip
  17. +34 −25 python/core/qgslabel.sip
  18. +76 −1 src/app/attributetable/qgsattributetabledialog.cpp
  19. +4 −0 src/app/attributetable/qgsattributetabledialog.h
  20. +56 −22 src/app/attributetable/qgsattributetablemodel.cpp
  21. +5 −0 src/app/attributetable/qgsattributetablemodel.h
  22. +175 −43 src/app/composer/qgscomposer.cpp
  23. +13 −18 src/app/composer/qgscomposer.h
  24. +1 −0 src/app/composer/qgscomposermapwidget.cpp
  25. +143 −5 src/app/composer/qgscomposerpicturewidget.cpp
  26. +8 −0 src/app/composer/qgscomposerpicturewidget.h
  27. +1 −2 src/app/composer/qgscomposerscalebarwidget.cpp
  28. +3 −1 src/app/ogr/qgsogrhelperfunctions.cpp
  29. +120 −30 src/app/qgisapp.cpp
  30. +18 −7 src/app/qgisapp.h
  31. +10 −6 src/app/qgisappinterface.cpp
  32. +15 −14 src/app/qgsdelattrdialog.cpp
  33. +4 −5 src/app/qgsdelattrdialog.h
  34. +46 −2 src/app/qgsfieldcalculator.cpp
  35. +5 −0 src/app/qgsfieldcalculator.h
  36. +3 −3 src/app/qgslabeldialog.cpp
  37. +1 −1 src/app/qgsvectorlayerproperties.cpp
  38. +2 −2 src/core/composer/qgscomposeritem.cpp
  39. +27 −9 src/core/composer/qgscomposermap.cpp
  40. +3 −4 src/core/composer/qgscomposermap.h
  41. +218 −55 src/core/composer/qgscomposerpicture.cpp
  42. +26 −3 src/core/composer/qgscomposerpicture.h
  43. +1 −1 src/core/composer/qgscomposition.h
  44. +6 −0 src/core/qgsdataprovider.h
  45. +5 −0 src/core/qgslabel.cpp
  46. +10 −1 src/core/qgslabel.h
  47. +6 −0 src/core/qgsmaplayer.h
  48. +7 −0 src/core/qgssearchstringlexer.ll
  49. +5 −1 src/core/qgssearchstringparser.yy
  50. +68 −7 src/core/qgssearchtreenode.cpp
  51. +16 −5 src/core/qgssearchtreenode.h
  52. +3 −3 src/core/qgsvectorlayer.cpp
  53. +1 −1 src/core/raster/qgsrasterlayer.cpp
  54. +7 −27 src/core/symbology/qgsmarkercatalogue.cpp
  55. +4 −7 src/core/symbology/qgssymbol.cpp
  56. +1 −1 src/gui/qgsquickprint.cpp
  57. +2 −0 src/providers/ogr/qgsogrprovider.h
  58. +2 −0 src/providers/postgres/qgspostgresprovider.h
  59. +2 −0 src/providers/spatialite/qgsspatialiteprovider.h
  60. +43 −12 src/ui/qgsattributetabledialog.ui
  61. +212 −210 src/ui/qgscomposerbase.ui
  62. +1 −1 src/ui/qgscomposermapwidgetbase.ui
  63. +117 −102 src/ui/qgscomposerpicturewidgetbase.ui
  64. +158 −122 src/ui/qgsfieldcalculatorbase.ui
  65. +0 −3 src/ui/qgsoptionsbase.ui
@@ -3,7 +3,7 @@ qgis (1.4.0) UNRELEASED; urgency=low
* new development version after 1.3 branch
* use templates for configuration for ABIs and distributions
* policy updated to 3.8.3
* remove README.Debian from libqgis{QGIS_ABI}-dev
* remove README.Debian from libqgis-dev
* add symbol files for shared libraries
* shorten qgis.sh

@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
libsm-dev, pyqt4-dev-tools
Build-Conflicts: libqgis{QGIS_ABI}-dev, qgis-dev
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.0
XS-Python-Version: current
Homepage: http://qgis.org/
@@ -50,7 +50,7 @@ Description: Quantum GIS - shared libraries
This package contains the shared core and gui library that provide an
interface for plugins and stand-alone applications.

Package: libqgis{QGIS_ABI}-dev
Package: libqgis-dev
Architecture: any
Section: libdevel
Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
@@ -59,8 +59,8 @@ Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
qt4-designer (>=4.2.0)
Provides: libqgis-dev, qgis-dev
Replaces: libqgis-dev, qgis-dev, libqgis1-dev
Provides: qgis-dev
Replaces: qgis-dev, libqgis1-dev
Description: Quantum GIS - development files
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
libsm-dev, pyqt4-dev-tools
Build-Conflicts: libqgis{QGIS_ABI}-dev, qgis-dev
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.0
XS-Python-Version: current
Homepage: http://qgis.org/
@@ -50,7 +50,7 @@ Description: Quantum GIS - shared libraries
This package contains the shared core and gui library that provide an
interface for plugins and stand-alone applications.

Package: libqgis{QGIS_ABI}-dev
Package: libqgis-dev
Architecture: any
Section: libdevel
Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
@@ -59,7 +59,7 @@ Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
qt4-designer (>=4.2.0)
Provides: libqgis-dev, qgis-dev
Provides: qgis-dev
Replaces: libqgis-dev, qgis-dev, libqgis1-dev
Description: Quantum GIS - development files
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
libsm-dev, pyqt4-dev-tools
Build-Conflicts: libqgis{QGIS_ABI}-dev, qgis-dev
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.0
XS-Python-Version: current
Homepage: http://qgis.org/
@@ -50,7 +50,7 @@ Description: Quantum GIS - shared libraries
This package contains the shared core and gui library that provide an
interface for plugins and stand-alone applications.

Package: libqgis{QGIS_ABI}-dev
Package: libqgis-dev
Architecture: any
Section: libdevel
Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
@@ -59,8 +59,8 @@ Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
qt4-designer (>=4.2.0)
Provides: libqgis-dev, qgis-dev
Replaces: libqgis-dev, qgis-dev, libqgis1-dev
Provides: qgis-dev
Replaces: qgis-dev, libqgis1-dev
Description: Quantum GIS - development files
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
libsm-dev, pyqt4-dev-tools
Build-Conflicts: libqgis{QGIS_ABI}-dev, qgis-dev
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.0
XS-Python-Version: current
Homepage: http://qgis.org/
@@ -50,7 +50,7 @@ Description: Quantum GIS - shared libraries
This package contains the shared core and gui library that provide an
interface for plugins and stand-alone applications.

Package: libqgis{QGIS_ABI}-dev
Package: libqgis-dev
Architecture: any
Section: libdevel
Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
@@ -59,8 +59,8 @@ Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
qt4-designer (>=4.2.0)
Provides: libqgis-dev, qgis-dev
Replaces: libqgis-dev, qgis-dev, libqgis1-dev
Provides: qgis-dev
Replaces: qgis-dev, libqgis1-dev
Description: Quantum GIS - development files
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
libsm-dev, pyqt4-dev-tools
Build-Conflicts: libqgis{QGIS_ABI}-dev, qgis-dev
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.0
XS-Python-Version: current
Homepage: http://qgis.org/
@@ -50,7 +50,7 @@ Description: Quantum GIS - shared libraries
This package contains the shared core and gui library that provide an
interface for plugins and stand-alone applications.

Package: libqgis{QGIS_ABI}-dev
Package: libqgis-dev
Architecture: any
Section: libdevel
Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
@@ -59,8 +59,8 @@ Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
qt4-designer (>=4.2.0)
Provides: libqgis-dev, qgis-dev
Replaces: libqgis-dev, qgis-dev, libqgis1-dev
Provides: qgis-dev
Replaces: qgis-dev, libqgis1-dev
Description: Quantum GIS - development files
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
libsm-dev, pyqt4-dev-tools
Build-Conflicts: libqgis{QGIS_ABI}-dev, qgis-dev
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.3
XS-Python-Version: current
Homepage: http://qgis.org/
@@ -50,7 +50,7 @@ Description: Quantum GIS - shared libraries
This package contains the shared core and gui library that provide an
interface for plugins and stand-alone applications.

Package: libqgis{QGIS_ABI}-dev
Package: libqgis-dev
Architecture: any
Section: libdevel
Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
@@ -59,8 +59,8 @@ Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
qt4-designer (>=4.2.0)
Provides: libqgis-dev, qgis-dev
Replaces: libqgis-dev, qgis-dev, libqgis1-dev
Provides: qgis-dev
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
Description: Quantum GIS - development files
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -70,7 +70,7 @@ Description: Quantum GIS - development files

Package: qgis-plugin-grass
Architecture: any
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.6.0-grass, grass640-5
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.6.0-grass, grass{GRASS_ABI}
Description: GRASS plugin for Quantum GIS
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.

0 comments on commit 72c842e

Please sign in to comment.
You can’t perform that action at this time.