Skip to content
Permalink
Browse files

merge from trunk r11250:11300

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11885 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder
wonder committed Nov 2, 2009
1 parent 20b599b commit 5662cdb9105a2e0fef73fb5e066eae2510a32f44
Showing with 4,571 additions and 4,073 deletions.
  1. +1 −1 debian/control
  2. +2 −2 debian/libqgis1.2.0.install
  3. +2 −3 debian/libqgis1.lintian-overrides
  4. +0 −1 debian/python-qgis.lintian-overrides
  5. +1 −1 debian/qgis-plugin-grass.install
  6. +0 −1 debian/qgis-plugin-grass.lintian-overrides
  7. +2 −0 debian/rules
  8. +3 −3 i18n/qgis_de.ts
  9. +1,716 −914 i18n/qgis_es.ts
  10. +311 −1,209 i18n/qgis_pl_PL.ts
  11. +371 −379 i18n/qgis_sv.ts
  12. +733 −124 images/icons/qgis_icon.svg
  13. +0 −749 images/icons/qgis_icon_new.svg
  14. +1 −3 mac/xcode/Qgis.xcodeproj/project.pbxproj
  15. +5 −5 mac/xcode/qgis_settings.xcconfig
  16. +8 −1 ms-windows/osgeo4w/package.cmd
  17. +1 −0 ms-windows/osgeo4w/postinstall.bat
  18. +2 −1 ms-windows/osgeo4w/preremove.bat
  19. +1 −0 python/configure.py.in
  20. +1 −1 python/core/qgscontinuouscolorrenderer.sip
  21. +1 −1 python/core/qgsgraduatedsymbolrenderer.sip
  22. +2 −2 python/core/qgsmarkercatalogue.sip
  23. +3 −1 python/core/qgsrenderer.sip
  24. +1 −1 python/core/qgssinglesymbolrenderer.sip
  25. +2 −1 python/core/qgssymbol.sip
  26. +1 −1 python/core/qgsuniquevaluerenderer.sip
  27. +0 −11 python/plugins/osm/DatabaseManager.py
  28. +3 −5 python/plugins/osm/DlgLoadOSM.py
  29. +1 −1 python/plugins/osm/DlgUploadOSM.py
  30. +608 −130 python/plugins/osm/DockWidget.py
  31. +28 −28 python/plugins/osm/DockWidget_ui.py
  32. +203 −201 python/plugins/osm/ui_files/DockWidget.ui
  33. +1 −1 python/plugins/plugin_installer/__init__.py
  34. +5 −2 python/plugins/plugin_installer/installer_data.py
  35. +1 −1 python/plugins/plugin_installer/installer_plugin.py
  36. +5 −0 src/app/composer/qgscomposerlabelwidget.cpp
  37. +15 −0 src/app/composer/qgscomposerlegendwidget.cpp
  38. +83 −25 src/app/legend/qgslegend.cpp
  39. +8 −1 src/app/legend/qgslegend.h
  40. +23 −7 src/app/qgisapp.cpp
  41. +10 −1 src/app/qgscontinuouscolordialog.cpp
  42. +3 −0 src/app/qgscontinuouscolordialog.h
  43. +11 −0 src/app/qgsgraduatedsymboldialog.cpp
  44. +3 −0 src/app/qgsgraduatedsymboldialog.h
  45. +56 −17 src/app/qgsidentifyresults.cpp
  46. +5 −0 src/app/qgslabeldialog.cpp
  47. +24 −2 src/app/qgsmaptoolnodetool.cpp
  48. +10 −1 src/app/qgssinglesymboldialog.cpp
  49. +3 −0 src/app/qgssinglesymboldialog.h
  50. +10 −0 src/app/qgsuniquevaluedialog.cpp
  51. +3 −0 src/app/qgsuniquevaluedialog.h
  52. +1 −1 src/core/qgis.h
  53. +1 −1 src/core/qgsvectordataprovider.cpp
  54. +8 −2 src/core/qgsvectorlayer.cpp
  55. +4 −2 src/core/renderer/qgscontinuouscolorrenderer.cpp
  56. +1 −1 src/core/renderer/qgscontinuouscolorrenderer.h
  57. +3 −2 src/core/renderer/qgsgraduatedsymbolrenderer.cpp
  58. +1 −1 src/core/renderer/qgsgraduatedsymbolrenderer.h
  59. +6 −1 src/core/renderer/qgsrenderer.h
  60. +2 −2 src/core/renderer/qgssinglesymbolrenderer.cpp
  61. +1 −1 src/core/renderer/qgssinglesymbolrenderer.h
  62. +3 −2 src/core/renderer/qgsuniquevaluerenderer.cpp
  63. +1 −1 src/core/renderer/qgsuniquevaluerenderer.h
  64. +7 −5 src/core/symbology/qgsmarkercatalogue.cpp
  65. +3 −3 src/core/symbology/qgsmarkercatalogue.h
  66. +22 −17 src/core/symbology/qgssymbol.cpp
  67. +9 −3 src/core/symbology/qgssymbol.h
  68. +4 −0 src/plugins/interpolation/MathUtils.h
  69. +4 −0 src/plugins/interpolation/Point3D.h
  70. +4 −0 src/plugins/interpolation/Vector3D.h
  71. +24 −2 src/providers/ogr/qgsogrprovider.cpp
  72. +5 −89 src/providers/osm/osmprovider.cpp
  73. +159 −81 src/providers/osm/osmprovider.h
  74. +4 −4 src/providers/osm/osmrenderer.cpp
  75. +1 −1 src/providers/osm/osmrenderer.h
  76. +0 −12 src/ui/qgsprojectionselectorbase.ui
@@ -80,7 +80,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: qgis-plugin-grass (>= ${source:Version})
Depends: qgis-plugin-grass (>= ${source:Version}), python
Description: GRASS plugin for Quantum GIS - architecture-independent data
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -1,2 +1,2 @@
usr/lib/libqgis_core.so.*
usr/lib/libqgis_gui.so.*
usr/lib/libqgis_core.so.*.*.*
usr/lib/libqgis_gui.so.*.*.*
@@ -1,4 +1,3 @@
libqgis1: shlib-calls-exit
libqgis1: no-symbols-control-file usr/lib/libqgis_gui.so.1.1
libqgis1: no-symbols-control-file usr/lib/libqgis_core.so.1.1
libqgis1: package-name-doesnt-match-sonames libqgis-core1.1 libqgis-gui1.1
libqgis1: no-symbols-control-file usr/lib/libqgis_gui.so.1.2.0
libqgis1: no-symbols-control-file usr/lib/libqgis_core.so.1.2.0
@@ -1,3 +1,2 @@
python-qgis: package-name-doesnt-match-sonames
python-qgis: non-dev-pkg-with-shlib-symlink
python-qgis: no-symbols-control-file usr/lib/libqgispython.so.1.1
@@ -1,3 +1,3 @@
usr/lib/qgis/libgrassplugin.so
usr/lib/qgis/libgrassprovider.so
usr/lib/libqgisgrass.so.*
usr/lib/libqgisgrass.so.*.*.*
@@ -1,3 +1,2 @@
qgis-plugin-grass: binary-without-manpage
qgis-plugin-grass: package-name-doesnt-match-sonames
qgis-plugin-grass: no-symbols-control-file usr/lib/libqgisgrass.so.1.1
@@ -21,6 +21,8 @@ CMAKE_OPTS = \
-D WITH_SPATIALITE=TRUE \
-D WITH_INTERNAL_SPATIALITE=TRUE

LDFLAGS += -Wl,--as-needed -Wl,--no-undefined

ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
@@ -871,7 +871,7 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<source>Storno</source>
<translation></translation>
<translation>Abbruch</translation>
</message>
</context>
<context>
@@ -5148,7 +5148,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/ui/qgsattributeactiondialogbase.ui" line="66"/>
<location filename="../src/ui/qgsattributeactiondialogbase.ui" line="82"/>
<source>Enter the action here. This can be any program, script or command that is available on your system. When the action is invoked any set of characters that start with a % and then have the name of a field will be replaced by the value of that field. The special characters %% will be replaced by the value of the field that was selected. Double quote marks group text into single arguments to the program, script or command. Double quotes will be ignored if preceeded by a backslash</source>
<source>Enter the action here. This can be any program, script or command that is available on your system. When the action is invoked any set of characters that start with a % and then have the name of a field will be replaced by the value of that field. The special characters %% will be replaced by the value of the field that was selected. Double quote marks group text into single arguments to the program, script or command. Double quotes will be ignored if prefixed with a backslash</source>
<translation>Geben Sie hier die Aktion ein. Dies kann jedes Programm, Skript oder Kommando sein, dass in Ihrem System verfügbar ist. Wenn die Aktion ausgeführt wird jeder durch % eingeleiteter Feldname durch den Feldwert ersetzt. Die besondere Zeichenfolge %% wird durch den Wert des gewählten Felds ersetzt. Mit Anführungszeichen können mehrere Wörter zu einem Argument der Aktion zusammengefaßt werden. Für mit Backslash (\) eingeleitete Anführungszeichen gilt dies nicht.</translation>
</message>
<message>
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans Serif&apos;;&quot;&gt;This is the list of all layers available in the datasource of the active layer. You can select the layers to load. The layers will be loaded when you press &quot;OK&quot;.&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans Serif&apos;;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans Serif&apos;;&quot;&gt;The layer name is format dependant. Consult the OGR documentation or the documentation of your data format to determine the nature of the included information.&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans Serif&apos;;&quot;&gt;The layer name is format dependent. Consult the OGR documentation or the documentation of your data format to determine the nature of the included information.&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans Serif&apos;;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans Serif&apos;;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Be advised: &lt;/span&gt;selecting an already opened layer will not generate an error message and the layer will end up loaded twice!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;

0 comments on commit 5662cdb

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