Skip to content
Permalink
Browse files
Merge branch 'master' of https://github.com/qgis/Quantum-GIS
  • Loading branch information
volaya committed Nov 30, 2012
2 parents 6d71876 + 1a7ccd0 commit b35aedc888462cfdfe4becd082ea508a282e72ff
Showing with 2,673 additions and 1,118 deletions.
  1. +2 −0 cmake_templates/qgsconfig.h.in
  2. +4 −3 doc/msvc.t2t
  3. +6 −6 i18n/qgis_de.ts
  4. +5 −5 i18n/qgis_fr.ts
  5. +5 −0 i18n/qgis_it.ts
  6. +173 −158 i18n/qgis_pt_PT.ts
  7. +0 −1 python/console/console.py
  8. +5 −10 python/console/console_sci.py
  9. +2 −0 python/core/qgspallabeling.sip
  10. +8 −7 python/core/qgsvectorfilewriter.sip
  11. +3 −2 python/core/symbology-ng/qgssvgcache.sip
  12. +5 −1 python/gui/qgisinterface.sip
  13. +6 −1 python/gui/qgslegendinterface.sip
  14. +0 −16 python/plugins/db_manager/db_manager.py
  15. +2 −11 python/plugins/db_manager/db_plugins/info_model.py
  16. +4 −5 python/plugins/db_manager/db_plugins/postgis/connector.py
  17. +28 −0 python/plugins/db_manager/db_plugins/postgis/info_model.py
  18. +1 −1 python/plugins/db_manager/db_plugins/spatialite/connector.py
  19. +0 −20 python/plugins/db_manager/db_plugins/spatialite/info_model.py
  20. +8 −6 python/plugins/db_manager/dlg_import_vector.py
  21. +11 −1 python/plugins/db_manager/info_viewer.py
  22. +115 −39 python/plugins/fTools/tools/doValidate.py
  23. +11 −2 python/plugins/fTools/tools/doVisual.py
  24. +85 −38 python/plugins/fTools/tools/frmVisual.ui
  25. +44 −2 src/app/composer/qgscomposerlegendwidget.cpp
  26. +3 −0 src/app/composer/qgscomposerlegendwidget.h
  27. +5 −0 src/app/legend/qgsapplegendinterface.cpp
  28. +4 −1 src/app/legend/qgsapplegendinterface.h
  29. +41 −39 src/app/legend/qgslayerorder.cpp
  30. +0 −1 src/app/legend/qgslayerorder.h
  31. +204 −10 src/app/legend/qgslegend.cpp
  32. +22 −3 src/app/legend/qgslegend.h
  33. +6 −0 src/app/legend/qgslegendgroup.cpp
  34. +16 −0 src/app/legend/qgslegendgroup.h
  35. +23 −1 src/app/main.cpp
  36. +36 −3 src/app/qgisapp.cpp
  37. +8 −4 src/app/qgisapp.h
  38. +2 −0 src/app/qgisappinterface.cpp
  39. +5 −1 src/app/qgisappinterface.h
  40. +1 −1 src/app/qgsattributeactiondialog.cpp
  41. +47 −33 src/app/qgsbrowserdockwidget.cpp
  42. +3 −1 src/app/qgsbrowserdockwidget.h
  43. +9 −0 src/app/qgslabelinggui.cpp
  44. +15 −10 src/app/qgsmaptoolidentify.cpp
  45. +1 −0 src/core/CMakeLists.txt
  46. +3 −0 src/core/composer/qgscomposeritemcommand.h
  47. +507 −401 src/core/composer/qgscomposerlegend.cpp
  48. +70 −51 src/core/composer/qgscomposerlegend.h
  49. +4 −1 src/core/pal/feature.cpp
  50. +6 −3 src/core/pal/feature.h
  51. +8 −25 src/core/qgsdataitem.cpp
  52. +31 −3 src/core/qgspallabeling.cpp
  53. +2 −0 src/core/qgspallabeling.h
  54. +2 −0 src/core/qgsproject.cpp
  55. +3 −0 src/core/qgsproject.h
  56. +4 −1 src/core/qgsvectorfilewriter.cpp
  57. +14 −1 src/core/qgsvectorfilewriter.h
  58. +30 −2 src/core/qgsvectorlayerimport.cpp
  59. +2 −6 src/core/symbology-ng/qgsfillsymbollayerv2.cpp
  60. +21 −1 src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
  61. +131 −15 src/core/symbology-ng/qgssvgcache.cpp
  62. +16 −2 src/core/symbology-ng/qgssvgcache.h
  63. +5 −1 src/gui/qgisinterface.h
  64. +6 −1 src/gui/qgslegendinterface.h
  65. +13 −0 src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
  66. +57 −7 src/gui/symbology-ng/qgssymbollayerv2widget.cpp
  67. +3 −1 src/gui/symbology-ng/qgssymbollayerv2widget.h
  68. +4 −2 src/mapserver/qgspostrequesthandler.cpp
  69. +229 −41 src/mapserver/qgsprojectparser.cpp
  70. +9 −0 src/mapserver/qgsprojectparser.h
  71. +6 −7 src/mapserver/qgswfsserver.cpp
  72. +118 −27 src/mapserver/qgswmsserver.cpp
  73. +12 −0 src/mapserver/qgswmsserver.h
  74. +21 −7 src/providers/gdal/qgsgdaldataitems.cpp
  75. +21 −7 src/providers/ogr/qgsogrdataitems.cpp
  76. +1 −1 src/providers/ogr/qgsogrprovider.cpp
  77. +1 −1 src/python/qgspythonutilsimpl.cpp
  78. +46 −19 src/ui/qgscomposerlegendwidgetbase.ui
  79. +138 −2 src/ui/qgslabelingguibase.ui
  80. +106 −1 tests/src/python/test_qgsgeometry.py
  81. +10 −10 tests/src/python/test_qgsmemoryprovider.py
  82. +4 −26 tests/src/python/test_qgsvectorfilewriter.py
  83. +25 −2 tests/src/python/utilities.py
@@ -29,6 +29,8 @@
#define CMAKE_SOURCE_DIR "${CMAKE_SOURCE_DIR}"

#define QSCINTILLA_VERSION_STR "${QSCINTILLA_VERSION_STR}"
//used by Mac to find system Qt plugins when bundle is run from build directory
#define QTPLUGINSDIR "${QT_PLUGINS_DIR}"

#cmakedefine HAVE_POSTGRESQL

@@ -2,7 +2,7 @@
==Building with Microsoft Visual Studio==

This section describes how to build QGIS using Visual Studio on Windows. This
is currently also who the binary QGIS packages are made (earlier versions used
is currently also how the binary QGIS packages are made (earlier versions used
MinGW).

This section describes the setup required to allow Visual Studio to be used to
@@ -56,6 +56,7 @@ For the QGIS build you need to install following packages from OSGeo4W (select
- libspatialindex-devel
- python-qscintilla


This will also select packages the above packages depend on.

Additionally QGIS also needs the include file ``unistd.h``, which normally
@@ -105,8 +106,8 @@ git clone git://github.com/qgis/Quantum-GIS.git
Create a 'build' directory somewhere. This will be where all the build output
will be generated.

Now run ``cmake-gui`` and in the //Where is the source code:// box, browse to
the top level QGIS directory.
Now run ``cmake-gui`` (still from ``cmd``) and in the //Where is the source code://
box, browse to the top level QGIS directory.

In the //Where to build the binaries:// box, browse to the 'build' directory you
created.
@@ -1007,7 +1007,7 @@ Folgende Feldnamen sind länger als 10 Zeichen:
<message>
<location filename="../python/plugins/fTools/tools/frmVectorGrid.ui" line="26"/>
<source>Grid extent</source>
<translation>Rastergrenze</translation>
<translation>Gittergrenze von Layer</translation>
</message>
<message>
<location filename="../python/plugins/fTools/tools/frmVectorGrid.ui" line="41"/>
@@ -1017,12 +1017,12 @@ Folgende Feldnamen sind länger als 10 Zeichen:
<message>
<location filename="../python/plugins/fTools/tools/frmVectorGrid.ui" line="54"/>
<source>Update extents from canvas</source>
<translation>Layergrenzen aus aktueller Ansicht aktualisieren</translation>
<translation>Layergrenzen aus aktueller Ansicht</translation>
</message>
<message>
<location filename="../python/plugins/fTools/tools/frmVectorGrid.ui" line="169"/>
<source>Align extents and resolution to selected raster layer</source>
<translation>Ausmaße und Auflösung am gewählten Rasterlayer ausrichten</translation>
<translation>Ausmaße und Auflösung am gewählten Layer ausrichten</translation>
</message>
<message>
<location filename="../python/plugins/fTools/tools/frmVectorGrid.ui" line="179"/>
@@ -1047,12 +1047,12 @@ Folgende Feldnamen sind länger als 10 Zeichen:
<message>
<location filename="../python/plugins/fTools/tools/frmVectorGrid.ui" line="286"/>
<source>Output grid as polygons</source>
<translation>Raster als Polygone ausgeben</translation>
<translation>Gitter als Polygone ausgeben</translation>
</message>
<message>
<location filename="../python/plugins/fTools/tools/frmVectorGrid.ui" line="296"/>
<source>Output grid as lines</source>
<translation>Raster als Linien ausgeben</translation>
<translation>Gitter als Linien ausgeben</translation>
</message>
<message>
<source>Line intersections</source>
@@ -44820,7 +44820,7 @@ Base Path (i.e. keep only filename from attribute)</source>
</message>
<message>
<source>Vector grid</source>
<translation>Vektorraster</translation>
<translation>Vektorgitter</translation>
</message>
<message>
<source>Select by location</source>
@@ -16111,22 +16111,22 @@ Les classes existantes doivent-elles être effacées avant la classification ?</
<message>
<location filename="../src/ui/qgscomposerlegendwidgetbase.ui" line="74"/>
<source>Title Font...</source>
<translation>Police du tite...</translation>
<translation>Police du titre...</translation>
</message>
<message>
<location filename="../src/ui/qgscomposerlegendwidgetbase.ui" line="81"/>
<source>Group Font...</source>
<translation>Groupe de police...</translation>
<translation>Police des groupes...</translation>
</message>
<message>
<location filename="../src/ui/qgscomposerlegendwidgetbase.ui" line="88"/>
<source>Layer Font...</source>
<translation>Police de la couche...</translation>
<translation>Police des couches...</translation>
</message>
<message>
<location filename="../src/ui/qgscomposerlegendwidgetbase.ui" line="95"/>
<source>Item Font...</source>
<translation>Police de l&apos;objet...</translation>
<translation>Police des objets...</translation>
</message>
<message>
<location filename="../src/ui/qgscomposerlegendwidgetbase.ui" line="102"/>
@@ -16182,7 +16182,7 @@ Les classes existantes doivent-elles être effacées avant la classification ?</
<message>
<location filename="../src/ui/qgscomposerlegendwidgetbase.ui" line="205"/>
<source>Wrap text on</source>
<translation>Retour à la ligne activé</translation>
<translation>Activer le retour à la ligne après</translation>
</message>
<message>
<location filename="../src/ui/qgscomposerlegendwidgetbase.ui" line="240"/>
@@ -830,6 +830,11 @@ sono stati ridotti a %2 dopo la semplificazione</translation>
<source>Press Ctrl+C to copy results to the clipboard</source>
<translation>Premi Ctrl+C per copiare i risultati negli appunti</translation>
</message>
<message>
<location filename="../python/plugins/fTools/tools/frmVisual.ui" line="120"/>
<source>Save errors location</source>
<translation>Salva posizione errori</translation>
</message>
<message>
<source>Sum line lengths</source>
<translation>Somma lunghezza linee</translation>

0 comments on commit b35aedc

Please sign in to comment.