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

Author: slarosa

CMakeLists.txt

@@ -388,12 +388,9 @@ ELSE (WIN32)
     SET (DEFAULT_PLUGIN_SUBDIR   ../PlugIns/qgis)
     SET (QGIS_PLUGIN_SUBDIR_REV  ../../MacOS)
     SET (DEFAULT_INCLUDE_SUBDIR  include/qgis)
-    # path for framework references
-    IF (ENABLE_TESTS)
-      SET (CMAKE_INSTALL_NAME_DIR ${CMAKE_BINARY_DIR}/output/lib)
-    ELSE (ENABLE_TESTS)
-      SET (CMAKE_INSTALL_NAME_DIR @executable_path/${QGIS_FW_SUBDIR})
-    ENDIF (ENABLE_TESTS)
+    # path for framework references when running from build directory
+    # changed later to reference in-app resources upon install
+    SET (CMAKE_INSTALL_NAME_DIR ${CMAKE_BINARY_DIR}/output/lib)
     IF (WITH_GLOBE)
         SET (OSG_PLUGINS_PATH "" CACHE PATH "Path to OSG plugins for bundling")
     ENDIF (WITH_GLOBE)
@@ -480,16 +477,6 @@ SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/${QGIS_LIB_SUBDIR})
 # if run from the build directory QGIS will detect it and alter the paths
 FILE(WRITE ${QGIS_OUTPUT_DIRECTORY}/${QGIS_BIN_SUBDIR}/path.txt "${CMAKE_SOURCE_DIR}\n${QGIS_OUTPUT_DIRECTORY}")
 
-# symlink extra provider plugin frameworks for Mac unit tests
-IF (APPLE AND ENABLE_TESTS)
-  EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
-    "${CMAKE_BINARY_DIR}/Plugins/qgis/qgisgrass.framework"
-    "${CMAKE_BINARY_DIR}/output/lib/qgisgrass.framework")
-  EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
-    "${CMAKE_BINARY_DIR}/Plugins/qgis/qgissqlanyconnection.framework"
-    "${CMAKE_BINARY_DIR}/output/lib/qgissqlanyconnection.framework")
-ENDIF (APPLE AND ENABLE_TESTS)
-
 # manual page - makes sense only on unix systems
 IF (UNIX AND NOT APPLE)
   SET (DEFAULT_MANUAL_SUBDIR  man)
@@ -625,11 +612,12 @@ IF (APPLE)
   # must be last for install, so install_name_tool can do its work
   ADD_SUBDIRECTORY(mac)
 
-  # make hard link to embedded app bundle binary (symlink won't work)
-  # allows QGIS to be run directly from build directory
-  ADD_CUSTOM_TARGET(mac_hardlink ALL
-    COMMAND /bin/ln -f QGIS.app/Contents/MacOS/QGIS QGIS
-    WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/output/bin"
+  # allow QGIS to be run directly from build directory and to run unit tests
+  ADD_CUSTOM_TARGET(mac_run_from_build ALL
+    # make symlinks to extra provider-plugin
+    COMMAND /bin/ln -fs ../../Plugins/qgis/qgisgrass.framework lib/
+    COMMAND /bin/ln -fs ../../Plugins/qgis/qgissqlanyconnection.framework lib/
+    WORKING_DIRECTORY "${QGIS_OUTPUT_DIRECTORY}"
     DEPENDS QGIS
   )
 ENDIF (APPLE)

README

@@ -6,7 +6,7 @@ SourceForge in June of the same year. We've worked hard to make GIS
 software (which is traditionally expensive commercial software) a viable
 prospect for anyone with basic access to a Personal Computer.  QGIS
 currently runs on most Unix platforms, Windows, and OS X. QGIS is
-developed using the Qt toolkit (http://qt.nokia.com) and C++.  This
+developed using the Qt toolkit (http://qt.digia.com) and C++.  This
 means that QGIS feels snappy to use and has a pleasing, easy to use
 graphical user interface. 
 

build.xml

@@ -75,6 +75,7 @@ FUNCTION (COPY_FRAMEWORK FWPREFIX FWNAME FWDEST)
             EXECUTE_PROCESS (COMMAND cp -Rfp "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/Resources" "${FWDEST}/${FWNAME}.framework/Versions/${FWVER}")
             EXECUTE_PROCESS (COMMAND ln -sfh Versions/Current/Resources "${FWDEST}/${FWNAME}.framework/Resources")
         ENDIF (IS_DIRECTORY "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/Resources")
+        EXECUTE_PROCESS (COMMAND install_name_tool -id "${ATEXECUTABLE}/${QGIS_FW_SUBDIR}/${FWNAME}" "${FWDEST}/${FWNAME}.framework/${FWNAME}")
         # debug variants
         SET (FWD "${FWNAME}_debug")
         IF ("${FWDEBUG}" STREQUAL "Debug" AND EXISTS "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/${FWD}")

cmake/MacBundleMacros.cmake

@@ -49,3 +49,4 @@ René-Luc D'Hont	<rldhont at gmail.com>
 Etienne Tourigny	<etourigny.dev at gmail.com>
 Larry Shaffer	<larrys at dakotacarto.com>
 Victor Olaya	<volayaf at gmail.com>
+Dave DeHaan	<dave.dehaan@sap.com>

doc/AUTHORS

@@ -20,5 +20,9 @@ IF (@OSX_HAVE_LOADERPATH@)
         GET_INSTALL_NAME ("${QFWDIR}/${QL}.framework/${QL}" ${QL}.framework QQ)
         SET (QFW_CHG "${QQ}")
         UPDATEQGISPATHS ("${QFW_CHG}" ${QL})
+        # change id of the framework
+        IF (NOT @QGIS_MACAPP_INSTALL_DEV@)
+            EXECUTE_PROCESS(COMMAND install_name_tool -id "${ATEXECUTABLE}/${QGIS_FW_SUBDIR}/${QL}.framework/${QL}" "${QFWDIR}/${QL}.framework/${QL}")
+        ENDIF ()
     ENDFOREACH (QL)
 ENDIF (@OSX_HAVE_LOADERPATH@)

images/developers/essen-2012.jpg

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

images/images.qrc

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

images/splash/splash.png

@@ -35,21 +35,22 @@ def __init__(self, parent):
         QDialog.__init__(self, parent)
         self.setModal(True)
         self.setupUi(self)
-        
+
         self.setWindowTitle(QCoreApplication.translate("PythonConsole","Help Python Console"))
         self.setMaximumSize(500, 300)
 
         qgisDataDir = QgsApplication.pkgDataPath()
         listFile = os.listdir(qgisDataDir + "/python/console_help/i18n")
         localeFullName = QSettings().value( "locale/userLocale", QVariant( "" ) ).toString()
+        locale = "en_US"
         for i in listFile:
             lang = i[0:5]
             if localeFullName in (lang[0:2], lang):
                 locale = lang
-                
+
         filename = qgisDataDir + "/python/console_help/help.htm? \
                                                 lang=" + locale \
                                                 + "&pkgDir=" + qgisDataDir
-                                                
-        url = QUrl(filename)
+
+        url = QtCore.QUrl(filename)
         self.webView.load(url)

images/splash/splash.xcf.bz2

@@ -1,6 +1,5 @@
 SET (SEXTANTE_PLUGIN_DIR ${QGIS_DATA_DIR}/python/plugins/sextante)
 
-ADD_SUBDIRECTORY(about)
 ADD_SUBDIRECTORY(algs)
 ADD_SUBDIRECTORY(core)
 ADD_SUBDIRECTORY(ftools)
@@ -27,6 +26,4 @@ FILE(GLOB PY_FILES *.py)
 
 PYQT4_ADD_RESOURCES(PYRC_FILES resources.qrc)
 
-
-
 PLUGIN_INSTALL(sextante . ${PY_FILES} ${OTHER_FILES} ${PYRC_FILES})

mac/cmake/0qgis.cmake.in

@@ -42,8 +42,6 @@
 
 from sextante.modeler.ModelerDialog import ModelerDialog
 
-from sextante.about.AboutDialog import AboutDialog
-
 import resources_rc
 
 cmd_folder = os.path.split(inspect.getfile( inspect.currentframe() ))[0]
@@ -102,12 +100,6 @@ def initGui(self):
         QObject.connect(self.helpAction, SIGNAL("triggered()"), self.openHelp)
         self.menu.addAction(self.helpAction)
 
-        self.aboutAction = QAction(QIcon(":/sextante/images/info.png"),
-            QCoreApplication.translate("SEXTANTE", "&About SEXTANTE"),
-            self.iface.mainWindow())
-        QObject.connect(self.aboutAction, SIGNAL("triggered()"), self.openAbout)
-        self.menu.addAction(self.aboutAction)
-
         menuBar = self.iface.mainWindow().menuBar()
         menuBar.insertMenu(menuBar.actions()[-1], self.menu)
 
@@ -145,9 +137,5 @@ def openConfig(self):
         dlg = ConfigDialog(self.toolbox)
         dlg.exec_()
 
-    def openAbout(self):
-        dlg = AboutDialog()
-        dlg.exec_()
-
     def openHelp(self):
         QDesktopServices.openUrl(QUrl(os.path.dirname(__file__) + "/help/index.html"))

ms-windows/osgeo4w/package-nightly.cmd

@@ -35,7 +35,7 @@
 
 class MultipleInputPanel(QtGui.QWidget):
 
-    def __init__(self, options, datatype, parent = None):
+    def __init__(self, options, datatype = None, parent = None):
         super(MultipleInputPanel, self).__init__(parent)
         self.options = options
         self.datatype = datatype
@@ -54,17 +54,18 @@ def __init__(self, options, datatype, parent = None):
         self.setLayout(self.horizontalLayout)
 
     def showSelectionDialog(self):
-        if self.datatype == ParameterMultipleInput.TYPE_RASTER:
-            options = QGisLayers.getRasterLayers()
-        elif self.datatype == ParameterMultipleInput.TYPE_VECTOR_ANY:
-            options = QGisLayers.getVectorLayers()
-        else:
-            options = QGisLayers.getVectorLayers(self.datatype)
-        opts = []
-        for opt in options:
-            opts.append(opt.name())
-        self.options = opts
-        
+        #If there is a datatype, we use it to create the list of options
+        if self.datatype is not None:
+            if self.datatype == ParameterMultipleInput.TYPE_RASTER:
+                options = QGisLayers.getRasterLayers()
+            elif self.datatype == ParameterMultipleInput.TYPE_VECTOR_ANY:
+                options = QGisLayers.getVectorLayers()
+            else:
+                options = QGisLayers.getVectorLayers(self.datatype)
+            opts = []
+            for opt in options:
+                opts.append(opt.name())
+            self.options = opts        
         dlg = MultipleInputDialog(self.options, self.selectedoptions)
         dlg.exec_()
         if dlg.selectedoptions != None: