Skip to content
Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information
luipir committed Aug 28, 2013
2 parents 3e27811 + 4c73b65 commit 6b2fa67442a9035f98ab27edb7dacea753d089c5
Showing with 81,998 additions and 79,258 deletions.
  1. +0 −1,822 Doxyfile
  2. +3 −36 cmake_templates/Doxyfile.in
  3. +0 −5 debian/rules
  4. +54 −54 doc/TRANSLATORS
  5. +1,112 −1,195 i18n/qgis_af.ts
  6. +1,112 −1,195 i18n/qgis_ar.ts
  7. +1,114 −1,183 i18n/qgis_bg.ts
  8. +1,109 −1,192 i18n/qgis_bn.ts
  9. +1,149 −1,123 i18n/qgis_bs_BA.ts
  10. +1,112 −1,195 i18n/qgis_ca_ES.ts
  11. +1,151 −1,117 i18n/qgis_cs_CZ.ts
  12. +1,165 −717 i18n/qgis_da_DK.ts
  13. +1,407 −1,330 i18n/qgis_de.ts
  14. +1,114 −1,183 i18n/qgis_el_GR.ts
  15. +1,112 −1,195 i18n/qgis_en.ts
  16. +1,458 −498 i18n/qgis_es.ts
  17. +1,120 −1,162 i18n/qgis_et_EE.ts
  18. +1,163 −1,115 i18n/qgis_eu.ts
  19. +1,118 −1,159 i18n/qgis_fa.ts
  20. +1,183 −1,135 i18n/qgis_fi.ts
  21. +3,560 −3,489 i18n/qgis_fr.ts
  22. +1,600 −694 i18n/qgis_gl.ts
  23. +1,112 −1,195 i18n/qgis_he.ts
  24. +1,117 −1,171 i18n/qgis_hr_HR.ts
  25. +1,163 −777 i18n/qgis_hu.ts
  26. +2,733 −2,669 i18n/qgis_id.ts
  27. +1,118 −1,168 i18n/qgis_is.ts
  28. +3,745 −3,348 i18n/qgis_it.ts
  29. +1,165 −722 i18n/qgis_ja.ts
  30. +1,114 −1,183 i18n/qgis_ka_GE.ts
  31. +482 −447 i18n/qgis_km.ts
  32. +1,353 −574 i18n/qgis_ko_KR.ts
  33. +1,113 −1,186 i18n/qgis_lo.ts
  34. +1,114 −1,183 i18n/qgis_lt.ts
  35. +703 −747 i18n/qgis_lv.ts
  36. +1,113 −1,189 i18n/qgis_ml_IN.ts
  37. +1,118 −1,168 i18n/qgis_mn.ts
  38. +1,412 −1,399 i18n/qgis_nb_NO.ts
  39. +885 −516 i18n/qgis_nl.ts
  40. +1,287 −1,212 i18n/qgis_pl_PL.ts
  41. +3,898 −3,582 i18n/qgis_pt_BR.ts
  42. +8,343 −8,060 i18n/qgis_pt_PT.ts
  43. +1,121 −1,147 i18n/qgis_ro.ts
  44. +1,707 −1,456 i18n/qgis_ru.ts
  45. +1,125 −1,162 i18n/qgis_sk.ts
  46. +2,310 −2,230 i18n/qgis_sl_SI.ts
  47. +1,113 −1,186 i18n/qgis_sq_AL.ts
  48. +1,119 −1,165 i18n/qgis_sr_Cyrl.ts
  49. +1,120 −1,162 i18n/qgis_sr_Latn.ts
  50. +1,150 −1,085 i18n/qgis_sv.ts
  51. +1,112 −1,195 i18n/qgis_sw.ts
  52. +1,112 −1,195 i18n/qgis_ta.ts
  53. +1,119 −1,168 i18n/qgis_th.ts
  54. +1,118 −1,168 i18n/qgis_tr.ts
  55. +1,118 −1,168 i18n/qgis_uk.ts
  56. +1,117 −1,171 i18n/qgis_vi.ts
  57. +1,112 −1,195 i18n/qgis_xh.ts
  58. +1,153 −1,110 i18n/qgis_zh_CN.ts
  59. +1,125 −1,159 i18n/qgis_zh_TW.ts
  60. +1 −1 images/images.qrc
  61. BIN images/themes/default/console/iconProcessingConsole.png
  62. BIN images/themes/default/console/iconSextanteConsole.png
  63. +1 −1 ms-windows/QGIS-Installer.nsi
  64. +115 −20 ms-windows/osgeo4w/creatensis.pl
  65. +1 −1 ms-windows/osgeo4w/package-nightly64.cmd
  66. +14 −14 python/console/console.py
  67. +2 −2 python/console/console_editor.py
  68. +5 −5 python/console/console_sci.py
  69. +2 −2 python/console/console_settings.py
  70. +0 −38 python/core/symbology-ng/qgslinesymbollayerv2.sip
  71. +1 −3 python/core/symbology-ng/qgssymbollayerv2.sip
  72. +0 −23 python/gui/symbology-ng/qgssymbollayerv2widget.sip
  73. +2 −15 python/plugins/db_manager/db_model.py
  74. +5 −1 python/plugins/db_manager/layer_preview.py
  75. +3 −0 python/plugins/fTools/tools/doPointDistance.py
  76. +1 −1 python/plugins/processing/algs/ftools/FixedDistanceBuffer.py
  77. +1 −2 python/plugins/processing/core/GeoAlgorithm.py
  78. +1 −1 python/plugins/processing/core/ProcessingConfig.py
  79. +1 −1 python/plugins/processing/exampleprovider/ExampleAlgorithm.py
  80. +1 −1 python/plugins/processing/exampleprovider/ExampleAlgorithmProvider.py
  81. 0 ...rocessing/exampleprovider/{SextanteExampleProviderPlugin.py → ProcessingExampleProviderPlugin.py}
  82. +2 −2 python/plugins/processing/exampleprovider/metadata.txt
  83. +15 −12 python/plugins/processing/gui/CouldNotLoadResultsDialog.py
  84. +11 −9 python/plugins/processing/gui/MissingDependencyDialog.py
  85. +1 −1 python/plugins/processing/gui/ProcessingToolbox.py
  86. BIN python/plugins/processing/images/toolbox.png
  87. +3 −3 python/plugins/processing/modeler/CalculatorModelerParametersDialog.py
  88. +1 −1 python/plugins/processing/modeler/ModelerAlgorithm.py
  89. +2 −1 python/plugins/processing/modeler/ModelerDialog.py
  90. +4 −4 python/plugins/processing/parameters/ParameterTableField.py
  91. +13 −8 python/plugins/processing/saga/SagaAlgorithm.py
  92. +6 −4 python/plugins/processing/saga/SagaAlgorithmProvider.py
  93. +1 −0 python/plugins/processing/saga/SagaUtils.py
  94. 0 python/plugins/processing/saga/description/{ShapesBuffer.txt → 2.0.8_ShapesBuffer.txt}
  95. +11 −0 python/plugins/processing/saga/description/2.1_ShapesBuffer.txt
  96. +4 −5 python/plugins/processing/saga/description/CatchmentArea(Mass-FluxMethod).txt
  97. +1 −1 python/plugins/processing/saga/description/SplitShapesLayerRandomly.txt
  98. +0 −4 python/plugins/processing/saga/description/ThiessenPolygons.txt
  99. +3 −3 python/plugins/processing/saga/ext/supervisedclassification.py
  100. +1 −1 resources/context_help/HeatmapGui
  101. +0 −32 resources/context_help/MapServerExport
  102. +2 −2 resources/context_help/PythonConsole
  103. +1 −1 resources/function_help/ceil
  104. +1 −1 resources/function_help/floor
  105. +1 −1 resources/function_help/ln
  106. +1 −1 resources/function_help/toint
  107. +1 −1 resources/function_help/toreal
  108. +1 −1 resources/function_help/tostring
  109. +1 −1 resources/function_help/xat
  110. +1 −1 resources/function_help/yat
  111. +9 −2 src/app/CMakeLists.txt
  112. +23 −2 src/app/main.cpp
  113. +21 −18 src/app/qgisapp.cpp
  114. +4 −2 src/app/qgsabout.cpp
  115. +1 −1 src/app/qgsmaptooladdfeature.cpp
  116. +1 −1 src/app/qgsmaptooladdpart.cpp
  117. +2 −2 src/app/qgsmaptooladdring.cpp
  118. +1 −1 src/app/qgsmaptooledit.h
  119. +3 −3 src/app/qgsmaptoollabel.cpp
  120. +1 −1 src/app/qgsmaptoolmovefeature.cpp
  121. +1 −1 src/app/qgsmaptoolreshape.cpp
  122. +1 −1 src/app/qgsmaptoolrotatefeature.cpp
  123. +1 −1 src/app/qgsmaptoolrotatelabel.cpp
  124. +1 −1 src/app/qgsmaptoolsimplify.cpp
  125. +1 −1 src/app/qgsnewspatialitelayerdialog.cpp
  126. +1 −1 src/app/qgsoptions.cpp
  127. +3 −3 src/app/qgsprojectproperties.cpp
  128. +24 −8 src/core/composer/qgslegendmodel.cpp
  129. +2 −2 src/core/qgsmaprenderer.cpp
  130. +1 −1 src/core/qgspallabeling.cpp
  131. +9 −2 src/core/qgsvectorfilewriter.cpp
  132. +10 −10 src/core/qgsvectorlayerfeatureiterator.cpp
  133. +14 −16 src/core/raster/qgsrasterlayer.cpp
  134. +18 −15 src/core/raster/qgsrasterrenderer.cpp
  135. +0 −152 src/core/symbology-ng/qgslinesymbollayerv2.cpp
  136. +0 −42 src/core/symbology-ng/qgslinesymbollayerv2.h
  137. +0 −2 src/core/symbology-ng/qgssymbollayerv2registry.cpp
  138. +25 −0 src/gui/attributetable/qgsdualview.cpp
  139. +9 −0 src/gui/attributetable/qgsdualview.h
  140. +1 −1 src/gui/attributetable/qgsfeaturelistview.h
  141. +2 −2 src/gui/qgsattributedialog.cpp
  142. +1 −0 src/gui/qgsformannotationitem.cpp
  143. +1 −1 src/gui/qgsmessagebaritem.cpp
  144. +2 −1 src/gui/qgsnewvectorlayerdialog.cpp
  145. +0 −1 src/gui/symbology-ng/qgslayerpropertieswidget.cpp
  146. +0 −57 src/gui/symbology-ng/qgssymbollayerv2widget.cpp
  147. +0 −28 src/gui/symbology-ng/qgssymbollayerv2widget.h
  148. +8 −0 src/mapserver/CMakeLists.txt
  149. +12 −0 src/mapserver/qgis_map_serv.cpp
  150. +24 −11 src/plugins/coordinate_capture/coordinatecapture.cpp
  151. +2 −0 src/plugins/coordinate_capture/coordinatecapture.h
  152. +2 −2 src/plugins/roadgraph/shortestpathwidget.cpp
  153. +5 −0 src/plugins/spit/qgsshapefile.cpp
  154. +3 −3 src/plugins/topology/checkDock.cpp
  155. +5 −5 src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
  156. +1 −1 src/providers/grass/qgsgrass.cpp
  157. +1 −4 src/providers/ogr/qgsogrfeatureiterator.cpp
  158. +37 −8 src/providers/ogr/qgsogrprovider.cpp
  159. +2 −0 src/providers/ogr/qgsogrprovider.h
  160. +0 −119 src/ui/symbollayer/widget_linedecoration.ui
  161. +1 −1 tests/src/python/CMakeLists.txt
  162. +320 −0 tests/src/python/qgis_local_server.py
  163. +3 −2 tests/src/python/test_qgsissue7244.py
  164. +75 −26 tests/src/python/test_qgspallabeling_base.py
  165. +1 −1 tests/src/python/test_qgspallabeling_canvas.py
  166. +111 −0 tests/src/python/test_qgspallabeling_server.py
  167. +5 −5 tests/src/python/test_qgspallabeling_tests.py
  168. +6 −5 tests/src/python/test_qgsspatialiteprovider.py
  169. +2 −24 tests/src/python/test_qgssymbollayerv2.py
  170. +14 −0 tests/src/python/utilities.py
  171. +4 −4 tests/testdata/control_images/expected_pal_canvas/sp_default_label/sp_default_label.PNGw
  172. +4 −4 tests/testdata/control_images/expected_pal_canvas/sp_text_color/sp_text_color.PNGw
  173. +4 −4 tests/testdata/control_images/expected_pal_canvas/sp_text_size_map_unit/sp_text_size_map_unit.PNGw
  174. BIN tests/testdata/control_images/expected_pal_server/sp_default_label/sp_default_label.png
  175. BIN tests/testdata/control_images/expected_pal_server/sp_text_color/sp_text_color.png
  176. BIN tests/testdata/control_images/expected_pal_server/sp_text_size_map_unit/sp_text_size_map_unit.png
  177. +21 −0 tests/testdata/labeling/aoi.qml
  178. +21 −0 tests/testdata/labeling/background.qml
  179. BIN tests/testdata/labeling/pal_features_v3.sqlite
  180. +4 −1 tests/testdata/labeling/point.qml
  181. +5 −0 tests/testdata/testdata.qrc
1,822 Doxyfile

This file was deleted.

@@ -283,22 +283,6 @@ SUBGROUPING = YES

TYPEDEF_HIDES_STRUCT = NO

# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
# determine which symbols to keep in memory and which to flush to disk.
# When the cache is full, less often used symbols will be written to disk.
# For small to medium size projects (<1000 input files) the default value is
# probably good enough. For larger projects a too small cache size can cause
# doxygen to be busy swapping symbols to and from disk most of the time
# causing a significant performance penality.
# If the system has enough physical memory increasing the cache will improve the
# performance by keeping more symbols in memory. Note that the value works on
# a logarithmic scale so increasing the size by one will rougly double the
# memory usage. The cache size is given by this formula:
# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
# corresponding to a cache size of 2^16 = 65536 symbols

SYMBOL_CACHE_SIZE = 0

#---------------------------------------------------------------------------
# Build related configuration options
#---------------------------------------------------------------------------
@@ -493,12 +477,6 @@ MAX_INITIALIZER_LINES = 30

SHOW_USED_FILES = YES

# If the sources in your project are distributed over multiple directories
# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
# in the documentation. The default is NO.

SHOW_DIRECTORIES = NO

# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
# This will remove the Files entry from the Quick Index and from the
# Folder Tree View (if specified). The default is YES.
@@ -868,12 +846,6 @@ HTML_COLORSTYLE_GAMMA = 80

HTML_TIMESTAMP = YES

# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
# files or namespaces will be aligned in HTML using tables. If set to
# NO a bullet list will be used.

HTML_ALIGN_MEMBERS = YES

# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
# documentation will contain sections that can be hidden and shown after the
# page has loaded. For this to work a browser that supports
@@ -1054,11 +1026,6 @@ ENUM_VALUES_PER_LINE = 4

GENERATE_TREEVIEW = NO

# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
# and Class Hierarchy pages using a tree view instead of an ordered list.

USE_INLINE_TREES = NO

# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
# used to set the initial width (in pixels) of the frame in which the tree
# is shown.
@@ -1507,7 +1474,7 @@ DOT_NUM_THREADS = 0
# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
# containing the font.

DOT_FONTNAME = FreeSans.ttf
DOT_FONTNAME = FreeSansQGIS.ttf

# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
# The default size is 10pt.
@@ -1519,7 +1486,7 @@ DOT_FONTSIZE = 10
# different font using DOT_FONTNAME you can set the path where dot
# can find it using this tag.

DOT_FONTPATH =
DOT_FONTPATH = @CMAKE_SOURCE_DIR@/tests/testdata/font

# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
# will generate a graph for each documented class showing the direct and
@@ -1618,7 +1585,7 @@ DOTFILE_DIRS =
# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.

DOT_GRAPH_MAX_NODES = 50
DOT_GRAPH_MAX_NODES = 150

# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
# graphs generated by dot. A depth value of 3 means that only nodes reachable
@@ -203,11 +203,6 @@ install: build
# remove unwanted files
! [ -f debian/tmp/usr/share/qgis/doc/api/installdox ] || rm debian/tmp/usr/share/qgis/doc/api/installdox
! [ -f debian/tmp/usr/share/qgis/doc/api/jquery.js ] || ln -sf /usr/share/javascript/jquery/jquery.js debian/tmp/usr/share/qgis/doc/api/jquery.js
! [ -f debian/tmp/usr/share/qgis/python/plugins/sextante/help/_static/jquery.js ] || ln -sf /usr/share/javascript/jquery/jquery.js debian/tmp/usr/share/qgis/python/plugins/sextante/help/_static/jquery.js
! [ -f debian/tmp/usr/share/qgis/python/helpConsole/js/jquery-1.8.2.min.js ] || ln -sf /usr/share/javascript/jquery/jquery.js debian/tmp/usr/share/qgis/python/helpConsole/js/jquery-1.8.2.min.js
ifeq (,$(findstring $(DISTRIBUTION),"squeeze lucid"))
! [ -f debian/tmp/usr/share/qgis/python/plugins/sextante/help/_static/underscore.js ] || ln -sf /usr/share/javascript/underscore/underscore.js debian/tmp/usr/share/qgis/python/plugins/sextante/help/_static/underscore.js
endif

# Install menu pixmap
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps

0 comments on commit 6b2fa67

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