Merge branch 'master' of github.com:qgis/Quantum-GIS

qgis · Aug 2, 2012 · 0926c35 · 0926c35
2 parents d8e918d + 28b8ab0
commit 0926c35
Show file tree

Hide file tree

Showing 59 changed files with 6,769 additions and 3,040 deletions.
diff --git a/doc/TRANSLATORS b/doc/TRANSLATORS
diff --git a/i18n/qgis_de.ts b/i18n/qgis_de.ts
diff --git a/i18n/qgis_gl_ES.ts b/i18n/qgis_gl_ES.ts
diff --git a/images/icons/mac/browser/CMakeLists.txt b/images/icons/mac/browser/CMakeLists.txt
@@ -2,5 +2,9 @@
 FILE (GLOB ICONS *.icns)
 INSTALL (FILES ${ICONS}
          DESTINATION "${CMAKE_INSTALL_PREFIX}/${QGIS_BIN_DIR}/QGIS Browser.app/Contents/Resources")
-# create alias now, so alias file gets correct icon
+# create alias now, so alias file gets correct icon, delete first if it exists
+SET (BROWSER_ALIAS "$ENV{DESTDIR}${QGIS_INSTALL_PREFIX}/QGIS Browser.app")
+IF (EXISTS ${BROWSER_ALIAS})
+    FILE (REMOVE ${BROWSER_ALIAS})
+ENDIF ()
 INSTALL (CODE "EXECUTE_PROCESS(COMMAND osascript -e \"tell application \\\"Finder\\\" to make alias file to POSIX file \\\"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${QGIS_BIN_DIR}/QGIS Browser.app\\\" at POSIX file \\\"$ENV{DESTDIR}${QGIS_INSTALL_PREFIX}/\\\"\")")
diff --git a/images/images.qrc b/images/images.qrc
@@ -118,6 +118,7 @@
     <file>themes/default/mActionOptions.png</file>
     <file>themes/default/mActionPan.png</file>
     <file>themes/default/mActionPanToSelected.png</file>
+    <file>themes/default/mActionPanToSelected.svg</file>
     <file>themes/default/mActionShowRasterCalculator.png</file>
     <file>themes/default/mAction.png</file>
     <file>themes/default/mActionProjectProperties.png</file>
@@ -131,6 +132,7 @@
     <file>themes/default/mActionRemoveSelectedFeature.png</file>
     <file>themes/default/mActionReshape.png</file>
     <file>themes/default/mActionRotateLabel.png</file>
+    <file>themes/default/mActionRotateLabel.svg</file>
     <file>themes/default/mActionRotatePointSymbols.png</file>
     <file>themes/default/mActionSaveAsPDF.png</file>
     <file>themes/default/mActionSaveAsSVG.png</file>
@@ -142,6 +144,7 @@
     <file>themes/default/mActionSelectPan.png</file>
     <file>themes/default/mActionSelect.png</file>
     <file>themes/default/mActionSelectPolygon.png</file>
+    <file>themes/default/mActionSelectPolygon.svg</file>
     <file>themes/default/mActionSelectRadius.png</file>
     <file>themes/default/mActionSelectRectangle.png</file>
     <file>themes/default/mActionShowAllLayers.png</file>
@@ -150,6 +153,7 @@
     <file>themes/default/mActionShowPluginManager.png</file>
     <file>themes/default/mActionSimplify.png</file>
     <file>themes/default/mActionSplitFeatures.png</file>
+    <file>themes/default/mActionSplitFeatures.svg</file>
     <file>themes/default/mActionTextAnnotation.png</file>
     <file>themes/default/mActionToggleEditing.png</file>
     <file>themes/default/mActionUndo.png</file>
@@ -319,12 +323,14 @@
     <file>themes/gis/mActionOpenTable.png</file>
     <file>themes/gis/mActionPan.png</file>
     <file>themes/gis/mActionPanToSelected.png</file>
+    <file>themes/gis/mActionPanToSelected.svg</file>
     <file>themes/gis/mActionShowRasterCalculator.png</file>
     <file>themes/gis/mActionRaiseItems.png</file>
     <file>themes/gis/mActionRedo.png</file>
     <file>themes/gis/mActionRemoveLayer.png</file>
     <file>themes/gis/mActionReshape.png</file>
     <file>themes/gis/mActionRotateLabel.png</file>
+    <file>themes/gis/mActionRotateLabel.svg</file>
     <file>themes/gis/mActionSaveAsPDF.png</file>
     <file>themes/gis/mActionSaveAsSVG.png</file>
     <file>themes/gis/mActionSaveEdits.png</file>
@@ -335,12 +341,14 @@
     <file>themes/gis/mActionSelectPan.png</file>
     <file>themes/gis/mActionSelect.png</file>
     <file>themes/gis/mActionSelectPolygon.png</file>
+    <file>themes/gis/mActionSelectPolygon.svg</file>
     <file>themes/gis/mActionSelectRadius.png</file>
     <file>themes/gis/mActionSelectRectangle.png</file>
     <file>themes/gis/mActionShowAllLayers.png</file>
     <file>themes/gis/mActionShowBookmarks.png</file>
     <file>themes/gis/mActionSimplify.png</file>
     <file>themes/gis/mActionSplitFeatures.png</file>
+    <file>themes/gis/mActionSplitFeatures.svg</file>
     <file>themes/gis/mActionTextAnnotation.png</file>
     <file>themes/gis/mActionToggleEditing.png</file>
     <file>themes/gis/mActionUndo.png</file>

diff --git a/images/themes/default/mActionPanToSelected.svg b/images/themes/default/mActionPanToSelected.svg
diff --git a/images/themes/default/mActionRotateLabel.svg b/images/themes/default/mActionRotateLabel.svg
diff --git a/images/themes/default/mActionSelectPolygon.svg b/images/themes/default/mActionSelectPolygon.svg