Skip to content
Permalink
Browse files

Merge with master

  • Loading branch information
ccrook committed Apr 23, 2013
2 parents 02388fe + 1176bbc commit d835194ab07be8fa5f65a196e75eade22f82493c
Showing with 67,593 additions and 11,806 deletions.
  1. +44 −43 doc/TRANSLATORS
  2. +54,053 −0 i18n/qgis_bs_BA.ts
  3. +2,577 −2,046 i18n/qgis_cs_CZ.ts
  4. +2,029 −1,464 i18n/qgis_de.ts
  5. +4,674 −3,947 i18n/qgis_zh_CN.ts
  6. BIN images/flags/bs_BA.png
  7. +8 −0 images/images.qrc
  8. BIN images/themes/default/console/iconClassBrowserConsole.png
  9. BIN images/themes/default/console/iconClassTreeWidgetConsole.png
  10. BIN images/themes/default/console/iconFunctionTreeWidgetConsole.png
  11. BIN images/themes/default/console/iconMethodTreeWidgetConsole.png
  12. +12 −0 images/themes/default/propertyicons/display.svg
  13. +117 −0 images/themes/default/propertyicons/labels.svg
  14. +18 −0 images/themes/default/propertyicons/metadata.svg
  15. +1 −1 ms-windows/osgeo4w/package-nightly.cmd
  16. +1 −1 ms-windows/osgeo4w/package.cmd
  17. +97 −33 python/console/console.py
  18. +144 −26 python/console/console_editor.py
  19. +14 −0 python/core/composer/qgscomposeritem.sip
  20. +0 −1 python/core/core.sip
  21. +7 −1 python/core/qgsfield.sip
  22. +7 −0 python/core/qgsmaplayer.sip
  23. +140 −80 python/core/qgsmaplayerregistry.sip
  24. +16 −0 python/core/qgspallabeling.sip
  25. +1 −1 python/core/qgsvectordataprovider.sip
  26. +0 −30 python/core/raster/qgsfreakoutshader.sip
  27. +2 −164 python/core/raster/qgsrasterlayer.sip
  28. +1 −1 python/core/raster/qgsrasterresamplefilter.sip
  29. +0 −3 python/core/raster/qgsrastershaderfunction.sip
  30. +12 −0 python/core/symbology-ng/qgsellipsesymbollayerv2.sip
  31. +49 −0 python/core/symbology-ng/qgsfillsymbollayerv2.sip
  32. +18 −0 python/core/symbology-ng/qgslinesymbollayerv2.sip
  33. +12 −0 python/core/symbology-ng/qgsmarkersymbollayerv2.sip
  34. +28 −0 python/core/symbology-ng/qgssymbollayerv2.sip
  35. +7 −0 python/gui/qgsrubberband.sip
  36. +1 −1 python/plugins/GdalTools/tools/GdalTools_utils.py
  37. +9 −13 python/plugins/sextante/algs/ftools/Dissolve.py
  38. +6 −6 python/plugins/sextante/core/SextanteConfig.py
  39. +10 −15 python/plugins/sextante/grass/GrassUtils.py
  40. +36 −8 python/plugins/sextante/gui/ConfigDialog.py
  41. +0 −7 python/plugins/sextante/gui/ParametersPanel.py
  42. +31 −2 python/plugins/sextante/gui/SextanteToolbox.py
  43. +2 −2 python/plugins/sextante/modeler/ModelerAlgorithmProvider.py
  44. +10 −8 python/plugins/sextante/modeler/ModelerDialog.py
  45. +1 −1 python/plugins/sextante/otb/OTBAlgorithmProvider.py
  46. +17 −4 python/plugins/sextante/otb/OTBUtils.py
  47. +1 −1 python/plugins/sextante/r/RAlgorithmProvider.py
  48. +1 −1 python/plugins/sextante/saga/SagaAlgorithmProvider.py
  49. +13 −8 python/plugins/sextante/saga/SagaUtils.py
  50. +1 −1 python/plugins/sextante/script/ScriptAlgorithmProvider.py
  51. +0 −25 python/plugins/sextante/script/scripts/A_script_that_returns_a_number.py
  52. +0 −25 python/plugins/sextante/script/scripts/Create_tiling_from_vector_layer.py
  53. +0 −25 python/plugins/sextante/script/scripts/Hex_grid_from_layer_bounds.py
  54. +0 −25 python/plugins/sextante/script/scripts/Load_test_data.py
  55. +0 −25 python/plugins/sextante/script/scripts/Number_of_unique_values_in_classes.py
  56. +0 −31 python/plugins/sextante/script/scripts/Save_selected_features.py
  57. +0 −25 python/plugins/sextante/script/scripts/Split_vector_layer_by_attribute.py
  58. +0 −25 python/plugins/sextante/script/scripts/Summarize.py
  59. +17 −0 python/plugins/sextante/taudem/TauDEMUtils.py
  60. +7 −4 python/plugins/sextante/ui/SextanteToolbox.ui
  61. +1 −0 scripts/tsstat.pl
  62. +1 −1 src/analysis/network/qgsgraphanalyzer.h
  63. +1 −1 src/analysis/network/qgslinevectorlayerdirector.h
  64. +2 −1 src/app/CMakeLists.txt
  65. +42 −13 src/app/composer/qgsatlascompositionwidget.cpp
  66. +4 −1 src/app/composer/qgsatlascompositionwidget.h
  67. +5 −44 src/app/composer/qgscomposeritemwidget.cpp
  68. +4 −18 src/app/legend/qgslegend.cpp
  69. +50 −1 src/app/main.cpp
  70. +9 −0 src/app/qgisapp.cpp
  71. +11 −2 src/app/qgsattributetabledialog.cpp
  72. +1 −1 src/app/qgsfieldsproperties.cpp
  73. +1 −1 src/app/qgsmaptoolcapture.cpp
  74. +1 −1 src/app/qgsrastercalcdialog.cpp
  75. +47 −32 src/app/qgsvectorlayerproperties.cpp
  76. +3 −2 src/app/qgsvectorlayerproperties.h
  77. +0 −2 src/core/CMakeLists.txt
  78. +9 −0 src/core/composer/qgscomposerlabel.cpp
  79. +36 −18 src/core/qgsapplication.cpp
  80. +6 −4 src/core/qgscacheindex.h
  81. +35 −1 src/core/qgscacheindexfeatureid.cpp
  82. +43 −4 src/core/qgscacheindexfeatureid.h
  83. +9 −0 src/core/qgsfeaturerequest.cpp
  84. +2 −0 src/core/qgsfeaturerequest.h
  85. +18 −30 src/core/qgsmaplayerregistry.cpp
  86. +140 −79 src/core/qgsmaplayerregistry.h
  87. +38 −0 src/core/qgsmaprenderer.cpp
  88. +1 −1 src/core/qgsofflineediting.cpp
  89. +100 −63 src/core/qgspallabeling.cpp
  90. +19 −0 src/core/qgspallabeling.h
  91. +4 −0 src/core/qgsproject.cpp
  92. +2 −0 src/core/qgsproject.h
  93. +6 −3 src/core/qgsprojectfiletransform.cpp
  94. +2 −2 src/core/qgsvectordataprovider.h
  95. +25 −10 src/core/qgsvectorfilewriter.cpp
  96. +54 −60 src/core/qgsvectorlayer.cpp
  97. +1 −0 src/core/qgsvectorlayer.h
  98. +22 −5 src/core/qgsvectorlayercache.cpp
  99. +17 −1 src/core/qgsvectorlayercache.h
  100. +1 −1 src/core/raster/qgsbrightnesscontrastfilter.cpp
  101. +1 −1 src/core/raster/qgsbrightnesscontrastfilter.h
  102. +54 −2 src/core/raster/qgscontrastenhancement.cpp
  103. +2 −0 src/core/raster/qgscontrastenhancement.h
  104. +0 −123 src/core/raster/qgsfreakoutshader.cpp
  105. +0 −64 src/core/raster/qgsfreakoutshader.h
  106. +1 −1 src/core/raster/qgshuesaturationfilter.cpp
  107. +1 −1 src/core/raster/qgshuesaturationfilter.h
  108. +0 −27 src/core/raster/qgspalettedrasterrenderer.cpp
  109. +0 −2 src/core/raster/qgspalettedrasterrenderer.h
  110. +2 −5 src/core/raster/qgsrasterblock.cpp
  111. +2 −0 src/core/raster/qgsrasterinterface.cpp
  112. +102 −1,207 src/core/raster/qgsrasterlayer.cpp
  113. +24 −357 src/core/raster/qgsrasterlayer.h
  114. +1 −1 src/core/raster/qgsrasternuller.cpp
  115. +3 −3 src/core/raster/qgsrasterpipe.cpp
  116. +5 −8 src/core/raster/qgsrasterpipe.h
  117. +0 −13 src/core/raster/qgsrasterrenderer.cpp
  118. +4 −22 src/core/raster/qgsrasterrenderer.h
  119. +0 −1 src/core/raster/qgsrasterrendererregistry.cpp
  120. +0 −1 src/core/raster/qgsrasterrendererregistry.h
  121. +1 −1 src/core/raster/qgsrasterresamplefilter.cpp
  122. +1 −1 src/core/raster/qgsrasterresamplefilter.h
  123. +0 −23 src/core/raster/qgsrastertransparency.cpp
  124. +0 −1 src/core/raster/qgssinglebandpseudocolorrenderer.cpp
  125. +25 −2 src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
  126. +0 −32 src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
  127. +0 −3 src/core/symbology-ng/qgsmarkersymbollayerv2.h
  128. +27 −3 src/core/symbology-ng/qgssymbollayerv2.cpp
  129. +7 −0 src/core/symbology-ng/qgssymbollayerv2.h
  130. +1 −1 src/core/symbology-ng/qgssymbollayerv2utils.cpp
  131. +10 −3 src/gui/attributetable/qgsattributetablefiltermodel.cpp
  132. +9 −0 src/gui/attributetable/qgsattributetablefiltermodel.h
  133. +48 −9 src/gui/attributetable/qgsattributetablemodel.cpp
  134. +18 −1 src/gui/attributetable/qgsattributetablemodel.h
  135. +1 −1 src/gui/attributetable/qgsdualview.h
  136. +2 −0 src/gui/qgsmanageconnectionsdialog.cpp
  137. +2 −0 src/gui/qgsnewhttpconnection.cpp
  138. +17 −0 src/gui/qgsoptionsdialogbase.cpp
  139. +20 −4 src/gui/qgsrubberband.cpp
  140. +8 −0 src/gui/qgsrubberband.h
  141. +12 −9 src/gui/raster/qgspalettedrendererwidget.cpp
  142. +5 −4 src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp
  143. +4 −1 src/gui/symbology-ng/qgsdatadefinedsymboldialog.cpp
  144. +27 −2 src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp
  145. +2 −0 src/gui/symbology-ng/qgsellipsesymbollayerv2widget.h
  146. +24 −11 src/mapserver/qgis_map_serv.cpp
  147. +3 −0 src/mapserver/qgsprojectparser.cpp
  148. +29 −17 src/mapserver/qgswfsserver.cpp
  149. +5 −5 src/plugins/georeferencer/qgsgeorefplugingui.cpp
  150. +1 −3 src/plugins/heatmap/heatmapgui.cpp
  151. +4 −3 src/providers/gdal/qgsgdalprovider.cpp
  152. +10 −1 src/providers/ogr/qgsogrprovider.cpp
  153. +1 −1 src/providers/oracle/qgsoracleprovider.h
  154. +8 −0 src/providers/wms/qgswmsconnection.cpp
  155. +9 −5 src/providers/wms/qgswmsprovider.cpp
  156. +1 −0 src/providers/wms/qgswmsprovider.h
  157. +6 −0 src/providers/wms/qgswmssourceselect.cpp
  158. +9 −9 src/ui/qgisapp.ui
  159. +4 −4 src/ui/qgsatlascompositionwidgetbase.ui
  160. +176 −60 src/ui/qgsattributeactiondialogbase.ui
  161. +3 −3 src/ui/qgsattributetabledialog.ui
  162. +33 −13 src/ui/qgscomposeritemwidgetbase.ui
  163. +22 −77 src/ui/qgsdelimitedtextsourceselectbase.ui
  164. +20 −20 src/ui/qgsdiagrampropertiesbase.ui
  165. +7 −0 src/ui/qgsnewhttpconnectionbase.ui
  166. +2 −2 src/ui/qgsrasterhistogramwidgetbase.ui
  167. +157 −154 src/ui/qgsrasterlayerpropertiesbase.ui
  168. +29 −12 src/ui/qgsrulebasedrendererv2widget.ui
  169. +31 −30 src/ui/qgssymbolv2selectordialogbase.ui
  170. +1,420 −891 src/ui/qgsvectorlayerpropertiesbase.ui
  171. +58 −1 src/ui/symbollayer/widget_ellipse.ui
  172. +3 −3 src/ui/symbollayer/widget_symbolslist.ui
  173. +2 −0 tests/src/core/testqgsrasterfilewriter.cpp
  174. +3 −2 tests/src/core/testqgsrasterlayer.cpp
  175. +1 −0 tests/src/core/testqgsrastersublayer.cpp
  176. +37 −5 tests/src/core/testqgsvectorlayercache.cpp
  177. +1 −1 tests/src/python/test_qgsdelimitedtextprovider.py

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.

BIN +467 Bytes images/flags/bs_BA.png
Binary file not shown.
@@ -95,6 +95,10 @@
<file>themes/default/console/iconRunScriptConsole.png</file>
<file>themes/default/console/iconCommentEditorConsole.png</file>
<file>themes/default/console/iconUncommentEditorConsole.png</file>
<file>themes/default/console/iconClassTreeWidgetConsole.png</file>
<file>themes/default/console/iconMethodTreeWidgetConsole.png</file>
<file>themes/default/console/iconFunctionTreeWidgetConsole.png</file>
<file>themes/default/console/iconClassBrowserConsole.png</file>
<file>themes/default/extents.png</file>
<file>themes/default/favourites.png</file>
<file>themes/default/geographic.png</file>
@@ -370,14 +374,17 @@
<file>themes/default/propertyicons/CRS.png</file>
<file>themes/default/propertyicons/diagram.png</file>
<file>themes/default/propertyicons/digitising.png</file>
<file>themes/default/propertyicons/display.svg</file>
<file>themes/default/propertyicons/gdal.png</file>
<file>themes/default/propertyicons/general.png</file>
<file>themes/default/propertyicons/histogram.png</file>
<file>themes/default/propertyicons/join.png</file>
<file>themes/default/propertyicons/labels.png</file>
<file>themes/default/propertyicons/labels.svg</file>
<file>themes/default/propertyicons/locale.png</file>
<file>themes/default/propertyicons/map_tools.png</file>
<file>themes/default/propertyicons/metadata.png</file>
<file>themes/default/propertyicons/metadata.svg</file>
<file>themes/default/propertyicons/network_and_proxy.png</file>
<file>themes/default/propertyicons/overlay.png</file>
<file>themes/default/propertyicons/pyramids.png</file>
@@ -403,6 +410,7 @@
<file>themes/default/transp-background_8x8.png</file>
<file>themes/default/unlocked.png</file>
<file>themes/default/user.png</file>
<file>flags/bs_BA.png</file>
</qresource>
<qresource prefix="/images/tips">
<file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="19.202px" height="19.202px" viewBox="0 0 19.202 19.202" enable-background="new 0 0 19.202 19.202" xml:space="preserve">
<path opacity="0.9" fill="#F5EA90" stroke="#BD9A1D" stroke-width="0.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
M17.167,9.438c0,1.65-1.35,3-3,3h-3.421c-0.729,0.042-0.664,0.624-1.486,1.572s-3.351,2.845-3.518,2.47s0.669-1.685,1.142-2.436
c0.762-1.211,0.22-1.606,0.22-1.606H4.958c-1.65,0-3-1.35-3-3V5.021c0-1.65,1.35-3,3-3h9.208c1.65,0,3,1.35,3,3V9.438z"/>
<path fill="#FFFFFF" d="M9.958,3.906c0-0.27-0.45-0.39-1-0.39l-2.708-0.1c-2.146,0-2.885,1.605-2.885,2.885l0.1,1.407
c0,0.55,0.151,1,0.457,1c0.307,0,0.458-0.45,0.458-1l0.183-1.229c0.088-0.812,0.75-1.754,1.875-1.883l2.521-0.3
C9.508,4.296,9.958,4.176,9.958,3.906z"/>
</svg>
@@ -0,0 +1,117 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1"
id="svg5692" inkscape:export-ydpi="90" inkscape:export-filename="/mnt/home1/robert/svn/graphics/trunk/toolbar-icons/24x24/label.png" sodipodi:docname="label.svg" inkscape:version="0.47 r22583" inkscape:export-xdpi="90" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="64px" height="64px"
viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
<title id="title2883">label</title>
<defs>


<inkscape:perspective id="perspective3257" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="16 : 10.666667 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 16 : 1" inkscape:vp_z="32 : 16 : 1">
</inkscape:perspective>

<inkscape:perspective id="perspective6979" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
</inkscape:perspective>

<inkscape:perspective id="perspective7934" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
</inkscape:perspective>

<inkscape:perspective id="perspective8023" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
</inkscape:perspective>

<inkscape:perspective id="perspective8057" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
</inkscape:perspective>

<inkscape:perspective id="perspective8095" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
</inkscape:perspective>

<inkscape:perspective id="perspective8219" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
</inkscape:perspective>

<inkscape:perspective id="perspective8279" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
</inkscape:perspective>

<inkscape:perspective id="perspective3803" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
</inkscape:perspective>

<inkscape:perspective id="perspective3869" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
</inkscape:perspective>

<inkscape:perspective id="perspective3929" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
</inkscape:perspective>

<inkscape:perspective id="perspective3968" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
</inkscape:perspective>

<inkscape:perspective id="perspective4002" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
</inkscape:perspective>

<inkscape:perspective id="perspective4032" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
</inkscape:perspective>

<inkscape:perspective id="perspective4053" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
</inkscape:perspective>

<inkscape:perspective id="perspective2905" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
</inkscape:perspective>

<inkscape:perspective id="perspective2979" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
</inkscape:perspective>

<inkscape:perspective id="perspective2842" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
</inkscape:perspective>

<inkscape:perspective id="perspective2978" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
</inkscape:perspective>

<inkscape:perspective id="perspective3238" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
</inkscape:perspective>

<inkscape:perspective id="perspective4058" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
</inkscape:perspective>

<inkscape:perspective id="perspective8198" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
</inkscape:perspective>
</defs>
<sodipodi:namedview id="base" inkscape:window-y="25" inkscape:snap-bbox="true" inkscape:cy="12" inkscape:window-width="1280" inkscape:current-layer="layer4" inkscape:zoom="29.833333" inkscape:guide-bbox="true" inkscape:document-units="px" borderopacity="1.0" inkscape:window-x="0" inkscape:snap-global="true" bordercolor="#666666" borderlayer="false" inkscape:cx="12" inkscape:window-maximized="1" showguides="true" inkscape:pageshadow="2" inkscape:pageopacity="0.0" showgrid="true" inkscape:grid-bbox="true" pagecolor="#ffffff" inkscape:window-height="950">

<inkscape:grid type="xygrid" id="grid5700" visible="true" originx="0.5px" dotted="true" originy="0.5px" snapvisiblegridlinesonly="true" spacingx="1px" enabled="true" spacingy="1px" empspacing="5">
</inkscape:grid>
</sodipodi:namedview>
<g id="layer4" transform="translate(0,-8)" inkscape:groupmode="layer" inkscape:label="1">
<g id="g3653">

<linearGradient id="path4080_1_" gradientUnits="userSpaceOnUse" x1="814.1465" y1="-658.5552" x2="803.4866" y2="-642.5653" gradientTransform="matrix(1 0 0 -1 -768 -604)">
<stop offset="0" style="stop-color:#EDD400"/>
<stop offset="1" style="stop-color:#FFF17A"/>
</linearGradient>

<path id="path4080" sodipodi:nodetypes="cccccc" fill="url(#path4080_1_)" stroke="#C4A000" stroke-width="2.6653" stroke-linecap="round" stroke-linejoin="round" d="
M5.35,40l10.661-13.326h42.637v26.652H16.011L5.35,40z"/>
<g enable-background="new ">
<path fill="#2E3436" d="M27.819,46.065v0.357h-3.207c-0.225-0.338-0.338-0.718-0.338-1.141c-1.04,1.083-2.194,1.625-3.459,1.625
c-1.084,0-1.97-0.357-2.658-1.075c-0.535-0.575-0.802-1.356-0.802-2.341c0-2.012,1.118-3.208,3.354-3.587l1.181-0.211
c0.956-0.154,1.54-0.28,1.751-0.38c0.014-0.015,0.049-0.034,0.105-0.062c0.338-0.184,0.506-0.478,0.506-0.886
c0-0.76-0.57-1.139-1.709-1.139c-0.956,0-1.568,0.225-1.835,0.675l-0.19,0.507l-0.063,0.381h-2.848
c0.182-2.631,1.807-3.946,4.873-3.946c3.108,0,4.662,1.168,4.662,3.502v6.328c0,0.479,0.183,0.9,0.549,1.266
C27.734,45.98,27.777,46.023,27.819,46.065z M24.253,41.847v-0.803c-0.267,0.128-0.682,0.247-1.244,0.358l-1.013,0.19
c-0.929,0.196-1.47,0.548-1.624,1.055l-0.064,0.507c0,0.688,0.344,1.124,1.034,1.308c0.169,0.042,0.359,0.062,0.569,0.062
c1.223,0,1.969-0.584,2.237-1.751C24.218,42.493,24.253,42.184,24.253,41.847z"/>
<path fill="#2E3436" d="M31.279,31.045h2.954v5.464c0.702-1.111,1.751-1.667,3.143-1.667c1.195,0,2.223,0.422,3.081,1.265
c0.183,0.183,0.346,0.374,0.486,0.57c0.816,1.182,1.224,2.582,1.224,4.199c0,1.926-0.557,3.479-1.668,4.663
c-0.886,0.913-1.926,1.371-3.121,1.371c-1.393,0-2.44-0.549-3.145-1.646v1.16H31.28L31.279,31.045L31.279,31.045z M36.722,37.311
c-0.931,0-1.624,0.499-2.09,1.498l-0.253,0.737c-0.1,0.407-0.148,0.837-0.148,1.287c0,1.533,0.422,2.603,1.266,3.206
c0.352,0.269,0.759,0.4,1.224,0.4c0.899,0,1.589-0.484,2.067-1.455c0.281-0.604,0.423-1.301,0.423-2.088
c0-1.435-0.395-2.475-1.182-3.123C37.637,37.465,37.198,37.311,36.722,37.311z"/>
<path fill="#2E3436" d="M53.935,39.293h-2.826c-0.238-1.083-0.669-1.729-1.286-1.942l-0.592-0.126c-0.069,0-0.147,0-0.232,0
c-0.871,0-1.482,0.324-1.835,0.971c-0.38,0.716-0.568,1.638-0.568,2.764c0,1.716,0.463,2.819,1.392,3.312
c0.311,0.168,0.646,0.253,1.012,0.253c0.844,0,1.447-0.387,1.815-1.161c0.111-0.252,0.209-0.547,0.294-0.884h2.827
c-0.184,1.741-0.95,3.002-2.299,3.776c-0.773,0.436-1.659,0.653-2.658,0.653c-2.224,0-3.77-0.871-4.642-2.616
c-0.463-0.929-0.696-2.039-0.696-3.334c0-2.629,0.837-4.437,2.511-5.422c0.801-0.464,1.757-0.696,2.869-0.696
c1.941,0,3.34,0.688,4.198,2.068c0.267,0.464,0.464,0.977,0.592,1.54C53.864,38.717,53.908,38.997,53.935,39.293z"/>
</g>
</g>
</g>
</svg>
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
<circle fill="#6D9CCF" stroke="#34497D" stroke-miterlimit="10" cx="32" cy="32" r="28.678"/>
<path opacity="0.3" fill="#FFFFFF" d="M8.773,37.198c0.732-8.419,2.376-13.47,7.604-18.698c5.646-5.646,10.875-8.266,20.755-10.514
c4.854-1.104-3.554-4.764-15.189-0.411c-6.25,2.338-12.594,8.44-14.82,17.332C4.426,35.673,8.438,41.053,8.773,37.198z"/>
<path fill="#FFFFFF" stroke="#34497D" stroke-miterlimit="10" d="M38.875,44.071l-0.71-0.708c-0.647-0.646-1.886-0.518-2.398,0.248
c-0.321,0.481-1.805,2.017-2.74,2.739c0.116-0.479,0.338-1.211,0.756-2.399l3.75-10.646c0.881-2.521,1.413-4.043,1.413-5.341
c0-2.054-1.514-3.382-3.855-3.382c-5.913,0-10.541,5.34-12.254,7.634c-0.022,0.029-0.042,0.057-0.06,0.082
c-0.295,0.335-0.412,0.782-0.32,1.24c0.071,0.354,0.265,0.697,0.562,0.994l0.532,0.531c0.318,0.318,0.731,0.493,1.164,0.493
c0.323,0,0.807-0.101,1.283-0.582l0.088-0.103c0.617-0.822,1.77-2.065,2.613-2.83c-0.145,0.492-0.35,1.096-0.591,1.791l-2.607,7.599
c-1.857,5.369-2.552,7.378-2.552,8.497c0,1.463,0.935,3.025,3.559,3.025c8.155,0,12.175-6.058,12.616-6.763
C39.573,45.438,39.487,44.687,38.875,44.071z"/>
<path fill="#FFFFFF" stroke="#34497D" stroke-miterlimit="10" d="M35.563,12.381c-2.622,0-4.921,2.271-4.921,4.861
c0,2.953,1.978,4.861,5.039,4.861c3.005,0,5.335-2.772,5.335-5.157C41.017,14.841,39.589,12.381,35.563,12.381z"/>
</svg>
@@ -13,7 +13,7 @@ REM * (at your option) any later version. *
REM * *
REM ***************************************************************************
@echo off
set GRASS_VERSION=6.4.3RC2
set GRASS_VERSION=6.4.3RC3

set BUILDDIR=%CD%\build
REM set BUILDDIR=%TEMP%\qgis_unstable
@@ -13,7 +13,7 @@ REM * (at your option) any later version. *
REM * *
REM ***************************************************************************
@echo off
set GRASS_VERSION=6.4.3RC2
set GRASS_VERSION=6.4.3RC3

set BUILDDIR=%CD%\build
REM set BUILDDIR=%TEMP%\qgis_unstable

0 comments on commit d835194

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