Skip to content
Permalink
Browse files

merge from trunk r10950:11000

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11133 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder
wonder committed Jul 21, 2009
1 parent c1379b5 commit 386d5c4057d7dfdf628c3e66ea577a31bc2930c3
Showing with 166,856 additions and 118,037 deletions.
  1. +1 −0 debian/qgis.install
  2. +6,011 −3,658 i18n/qgis_ar.ts
  3. +3,224 −1,325 i18n/qgis_cs_CZ.ts
  4. +2,285 −1,273 i18n/qgis_de.ts
  5. +5,840 −3,466 i18n/qgis_el_GR.ts
  6. +2,970 −1,380 i18n/qgis_es.ts
  7. +2,728 −1,375 i18n/qgis_fr.ts
  8. +5,804 −3,430 i18n/qgis_he.ts
  9. +2,962 −1,387 i18n/qgis_hu.ts
  10. +6,716 −4,404 i18n/qgis_id.ts
  11. +3,219 −1,341 i18n/qgis_it.ts
  12. +7,173 −4,918 i18n/qgis_ja.ts
  13. +3,590 −1,342 i18n/qgis_ka_GE.ts
  14. +7,190 −4,889 i18n/qgis_lo.ts
  15. +5,961 −3,615 i18n/qgis_lt.ts
  16. +7,034 −4,987 i18n/qgis_lv.ts
  17. +7,184 −4,955 i18n/qgis_mn.ts
  18. +2,450 −1,451 i18n/qgis_nl.ts
  19. +2,754 −1,358 i18n/qgis_pl_PL.ts
  20. +6,940 −4,696 i18n/qgis_pt_BR.ts
  21. +6,767 −4,515 i18n/qgis_ro.ts
  22. +2,924 −1,417 i18n/qgis_ru.ts
  23. +7,130 −4,875 i18n/qgis_sk.ts
  24. +6,996 −4,703 i18n/qgis_sq_AL.ts
  25. +8,204 −5,967 i18n/qgis_sv.ts
  26. +7,229 −4,972 i18n/qgis_th.ts
  27. +7,258 −5,265 i18n/qgis_tr.ts
  28. +7,036 −8,985 i18n/qgis_vi.ts
  29. +3,406 −5,549 i18n/qgis_xh.ts
  30. +4,776 −7,075 i18n/qgis_zh_CN.ts
  31. +4,937 −7,262 i18n/qgis_zh_TW.ts
  32. +149 −723 mac/xcode/Qgis.xcodeproj/project.pbxproj
  33. +33 −28 mac/xcode/qgis_settings.xcconfig
  34. +7 −12 mac/xcode/qgis_user-template.xcconfig
  35. +5 −0 mac/xcode/src/x_qgsspatialitesourceselect.cpp
  36. +5 −0 mac/xcode/src/x_spatialite.c
  37. +5 −0 mac/xcode/src/x_sqlite3.c
  38. +25 −1 python/core/qgsvectordataprovider.sip
  39. +9 −1 python/core/qgsvectorlayer.sip
  40. +1 −1 python/plugins/mapserver_export/mapserverexport.py
  41. +1 −1 python/plugins/plugin_installer/installer_plugin.py
  42. +7 −4 scripts/update_ts_files.sh
  43. +1 −1 src/app/attributetable/qgsattributetabledialog.cpp
  44. +1 −1 src/app/attributetable/qgsattributetablememorymodel.cpp
  45. +9 −3 src/app/attributetable/qgsattributetablemodel.cpp
  46. +29 −29 src/app/composer/qgscomposer.cpp
  47. +28 −28 src/app/composer/qgscomposer.h
  48. +8 −0 src/app/composer/qgscomposeritemwidget.cpp
  49. +32 −0 src/app/composer/qgscomposermapwidget.cpp
  50. +1 −0 src/app/composer/qgscomposermapwidget.h
  51. +6 −3 src/app/legend/qgslegendlayer.cpp
  52. +132 −123 src/app/qgisapp.cpp
  53. +1 −1 src/app/qgisapp.h
  54. +8 −6 src/app/qgsattributedialog.cpp
  55. +24 −3 src/app/qgscontinuouscolordialog.cpp
  56. +54 −27 src/app/qgsgraduatedsymboldialog.cpp
  57. +3 −3 src/app/qgsmaptooladdfeature.cpp
  58. +1 −1 src/app/qgsmaptooladdisland.cpp
  59. +1 −1 src/app/qgsmaptooladdring.cpp
  60. +1 −1 src/app/qgsmaptooladdvertex.cpp
  61. +1 −1 src/app/qgsmaptooldeletepart.cpp
  62. +1 −1 src/app/qgsmaptooldeletering.cpp
  63. +1 −1 src/app/qgsmaptooldeletevertex.cpp
  64. +24 −2 src/app/qgsmaptoolidentify.cpp
  65. +2 −0 src/app/qgsmaptoolidentify.h
  66. +1 −1 src/app/qgsmaptoolmovefeature.cpp
  67. +1 −1 src/app/qgsmaptoolmovevertex.cpp
  68. +314 −284 src/app/qgsmaptoolnodetool.cpp
  69. +31 −19 src/app/qgsmaptoolnodetool.h
  70. +1 −1 src/app/qgsmaptoolsimplify.cpp
  71. +1 −1 src/app/qgsmaptoolsplitfeatures.cpp
  72. +330 −330 src/app/qgsmergeattributesdialog.cpp
  73. +90 −90 src/app/qgsundowidget.cpp
  74. +13 −13 src/app/qgsundowidget.h
  75. +54 −52 src/app/qgsuniquevaluedialog.cpp
  76. +34 −6 src/app/qgsvectorlayerproperties.cpp
  77. +1 −0 src/app/qgsvectorlayerproperties.h
  78. +20 −0 src/core/composer/qgscomposerlabel.cpp
  79. +86 −5 src/core/composer/qgscomposermap.cpp
  80. +25 −0 src/core/composer/qgscomposermap.h
  81. +9 −14 src/core/composer/qgslegendmodel.cpp
  82. +3 −3 src/core/qgsgeometry.cpp
  83. +32 −0 src/core/qgsvectordataprovider.cpp
  84. +23 −3 src/core/qgsvectordataprovider.h
  85. +143 −99 src/core/qgsvectorlayer.cpp
  86. +25 −5 src/core/qgsvectorlayer.h
  87. +26 −26 src/core/qgsvectorlayerundocommand.cpp
  88. +11 −11 src/core/qgsvectorlayerundocommand.h
  89. +5 −0 src/core/renderer/qgsuniquevaluerenderer.cpp
  90. +24 −12 src/core/symbology/qgsmarkercatalogue.cpp
  91. +1 −1 src/core/symbology/qgsmarkercatalogue.h
  92. +12 −1 src/core/symbology/qgssymbol.cpp
  93. +26 −21 src/gui/qgsmapcanvas.cpp
  94. +4 −11 src/gui/qgsmapcanvasmap.cpp
  95. +2 −1 src/plugins/CMakeLists.txt
  96. +1 −1 src/plugins/copyright_label/plugin.cpp
  97. +1 −1 src/plugins/delimited_text/qgsdelimitedtextplugin.cpp
  98. +1 −1 src/plugins/dxf2shp_converter/dxf2shpconverter.cpp
  99. +97 −0 src/plugins/evis/CMakeLists.txt
  100. +17 −0 src/plugins/evis/README.TXT
  101. +220 −0 src/plugins/evis/databaseconnection/evisdatabaseconnection.cpp
  102. +130 −0 src/plugins/evis/databaseconnection/evisdatabaseconnection.h
  103. +533 −0 src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp
  104. +90 −0 src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.h
  105. +102 −0 src/plugins/evis/databaseconnection/evisdatabaselayerfieldselectiongui.cpp
  106. +59 −0 src/plugins/evis/databaseconnection/evisdatabaselayerfieldselectiongui.h
  107. +44 −0 src/plugins/evis/databaseconnection/evisquerydefinition.cpp
  108. +151 −0 src/plugins/evis/databaseconnection/evisquerydefinition.h
  109. +179 −0 src/plugins/evis/eventbrowser/evisconfiguration.cpp
  110. +88 −0 src/plugins/evis/eventbrowser/evisconfiguration.h
  111. +1,210 −0 src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp
  112. +184 −0 src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.h
  113. +308 −0 src/plugins/evis/eventbrowser/evisimagedisplaywidget.cpp
  114. +146 −0 src/plugins/evis/eventbrowser/evisimagedisplaywidget.h
  115. +247 −0 src/plugins/evis/evis.cpp
  116. +134 −0 src/plugins/evis/evis.h
  117. +116 −0 src/plugins/evis/idtool/eviseventidtool.cpp
  118. +65 −0 src/plugins/evis/idtool/eviseventidtool.h
  119. BIN src/plugins/evis/resources/eVisDatabaseConnection.png
  120. BIN src/plugins/evis/resources/eVisEventBrowser.png
  121. BIN src/plugins/evis/resources/eVisEventIdTool.png
  122. BIN src/plugins/evis/resources/eVisHighlightSymbol.png
  123. BIN src/plugins/evis/resources/eVisPointerSymbol.png
  124. +9 −0 src/plugins/evis/resources/evis.qrc
  125. +511 −0 src/plugins/evis/ui/evisdatabaseconnectionguibase.ui
  126. +132 −0 src/plugins/evis/ui/evisdatabaselayerfieldselectionguibase.ui
  127. +1,152 −0 src/plugins/evis/ui/evisgenericeventbrowserguibase.ui
  128. +2 −2 src/plugins/gps_importer/qgsgpsplugin.cpp
  129. +1 −1 src/plugins/grass/qgsgrassbrowser.cpp
  130. +56 −0 src/plugins/grass/qgsgrassmodel.cpp
  131. +12 −8 src/plugins/grass/qgsgrassmodule.cpp
  132. +4 −0 src/plugins/interpolation/DualEdgeTriangulation.cc
  133. +1 −1 src/plugins/north_arrow/plugin.cpp
  134. +1 −1 src/plugins/quick_print/quickprintplugin.cpp
  135. +1 −1 src/plugins/scale_bar/plugin.cpp
  136. +31 −28 src/providers/ogr/qgsogrprovider.cpp
  137. +43 −42 src/providers/postgres/qgspostgresprovider.cpp
  138. +3 −3 src/providers/postgres/qgspostgresprovider.h
  139. +97 −92 src/ui/qgscomposermapwidgetbase.ui
  140. +7 −1 src/ui/qgsrasterlayerpropertiesbase.ui
  141. +7 −1 src/ui/qgsvectorlayerpropertiesbase.ui
@@ -22,6 +22,7 @@ usr/lib/qgis/libcoordinatecaptureplugin.so
usr/lib/qgis/libspatialiteprovider.so
usr/lib/qgis/liboracleplugin.so
usr/lib/qgis/libdiagramoverlay.so
usr/lib/qgis/libevis.so
usr/share/pixmaps/qgis-icon.xpm
usr/share/pixmaps/qgis-mime-icon.png
usr/share/pixmaps/qgis-mime-icon.png usr/share/icons/crystalsvg/128x128/mimetypes

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

0 comments on commit 386d5c4

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