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

CMakeLists.txt

@@ -253,7 +253,6 @@ IF (WIN32)
   SET (DEFAULT_LIBEXEC_SUBDIR .)
   SET (DEFAULT_DATA_SUBDIR    .)
   SET (DEFAULT_PLUGIN_SUBDIR  plugins)
-  SET (DEFAULT_PROVIDER_SUBDIR  providers)
   SET (DEFAULT_INCLUDE_SUBDIR include)
 
   IF (MSVC)
@@ -323,8 +322,6 @@ ELSE (WIN32)
     SET (QGIS_LIBEXEC_SUBDIR_REV ../..)
     SET (DEFAULT_PLUGIN_SUBDIR   ../PlugIns/qgis)
     SET (QGIS_PLUGIN_SUBDIR_REV  ../../MacOS)
-    SET (DEFAULT_PROVIDER_SUBDIR   ../Providers/qgis)
-    SET (QGIS_PROVIDER_SUBDIR_REV  ../../MacOS)
     SET (DEFAULT_INCLUDE_SUBDIR  include/qgis)
     # path for framework references
     SET (CMAKE_INSTALL_NAME_DIR @executable_path/${QGIS_FW_SUBDIR})
@@ -337,7 +334,6 @@ ELSE (WIN32)
     SET (DEFAULT_DATA_SUBDIR    share/qgis)
     SET (DEFAULT_LIBEXEC_SUBDIR lib${LIB_SUFFIX}/qgis)
     SET (DEFAULT_PLUGIN_SUBDIR  lib${LIB_SUFFIX}/qgis/plugins)
-    SET (DEFAULT_PROVIDER_SUBDIR  lib${LIB_SUFFIX}/qgis/providers)
     SET (DEFAULT_INCLUDE_SUBDIR include/qgis)
   ENDIF (APPLE)
 
@@ -377,12 +373,11 @@ SET (QGIS_LIB_SUBDIR     ${DEFAULT_LIB_SUBDIR}     CACHE STRING "Subdirectory wh
 SET (QGIS_LIBEXEC_SUBDIR ${DEFAULT_LIBEXEC_SUBDIR} CACHE STRING "Subdirectory where private executables will be installed")
 SET (QGIS_DATA_SUBDIR    ${DEFAULT_DATA_SUBDIR}    CACHE STRING "Subdirectory where QGIS data will be installed")
 SET (QGIS_PLUGIN_SUBDIR  ${DEFAULT_PLUGIN_SUBDIR}  CACHE STRING "Subdirectory where plugins will be installed")
-SET (QGIS_PROVIDER_SUBDIR  ${DEFAULT_PROVIDER_SUBDIR}  CACHE STRING "Subdirectory where providers will be installed")
 SET (QGIS_INCLUDE_SUBDIR ${DEFAULT_INCLUDE_SUBDIR} CACHE STRING "Subdirectory where header files will be installed")
 
 # mark *_SUBDIR variables as advanced as this is not something
 # that an average user would use
-MARK_AS_ADVANCED (QGIS_BIN_SUBDIR QGIS_CGIBIN_SUBDIR QGIS_LIB_SUBDIR QGIS_LIBEXEC_SUBDIR QGIS_DATA_SUBDIR QGIS_PROVIDER_SUBDIR QGIS_PLUGIN_SUBDIR QGIS_INCLUDE_SUBDIR)
+MARK_AS_ADVANCED (QGIS_BIN_SUBDIR QGIS_CGIBIN_SUBDIR QGIS_LIB_SUBDIR QGIS_LIBEXEC_SUBDIR QGIS_DATA_SUBDIR QGIS_PLUGIN_SUBDIR QGIS_INCLUDE_SUBDIR)
 
 # full paths for the installation
 SET (QGIS_BIN_DIR     ${QGIS_BIN_SUBDIR})
@@ -391,7 +386,6 @@ SET (QGIS_LIB_DIR     ${QGIS_LIB_SUBDIR})
 SET (QGIS_LIBEXEC_DIR ${QGIS_LIBEXEC_SUBDIR})
 SET (QGIS_DATA_DIR    ${QGIS_DATA_SUBDIR})
 SET (QGIS_PLUGIN_DIR  ${QGIS_PLUGIN_SUBDIR})
-SET (QGIS_PROVIDER_DIR  ${QGIS_PROVIDER_SUBDIR})
 SET (QGIS_INCLUDE_DIR ${QGIS_INCLUDE_SUBDIR})
 
 # set the default locations where the targets (executables, libraries) will land when compiled

cmake_templates/qgsconfig.h.in

@@ -21,7 +21,6 @@
 #define RELEASE_NAME "${RELEASE_NAME}"
 
 #define QGIS_PLUGIN_SUBDIR "${QGIS_PLUGIN_SUBDIR}"
-#define QGIS_PROVIDER_SUBDIR "${QGIS_PROVIDER_SUBDIR}"
 #define QGIS_DATA_SUBDIR "${QGIS_DATA_SUBDIR}"
 #define QGIS_LIBEXEC_SUBDIR "${QGIS_LIBEXEC_SUBDIR}"
 #define QGIS_LIB_SUBDIR "${QGIS_LIB_SUBDIR}"

resources/css/qgisdoc.css → doc/qgisdoc.css

@@ -11,11 +11,11 @@ body{
   font-weight: bold;
   color: #800000;
 } 
-h1,  span.header{
+span.header{
   font-family: trebuchet,arial,helvetica,sans;
   font-size: 18pt;
 }
-h2, span.subheader{
+span.subheader{
   font-family: trebuchet,arial,helvetica,sans;
   font-size: 14pt;
   font-weight: normal;
@@ -27,7 +27,14 @@ dt{
 ul.small{
   font-size: 9pt;
 }
+h2{
+  font-size: 14pt;
+  font-family: trebuchet,arial,helvetica,sans;
+  font-weight: normal;
+}
 a.link.bar{
   font-size: 9pt;
   font-style: italic;
+}
+  }
 }

python/console.py

@@ -86,6 +86,7 @@ def __init__(self, parent=None):
     self.setAllowedAreas(Qt.BottomDockWidgetArea)
     self.widget = QWidget()
     self.l = QVBoxLayout(self.widget)
+    self.l.setMargin(0)
     self.edit = PythonEdit()
     self.l.addWidget(self.edit)
     self.setWidget(self.widget)

python/plugins/GdalTools/resources.qrc

@@ -24,5 +24,6 @@
         <file>icons/fillnodata.png</file>
         <file>icons/edit.png</file>
         <file>icons/reset.png</file>
+        <file>icons/tooltip.png</file>
     </qresource>
 </RCC>

python/plugins/GdalTools/tools/GdalTools_utils.py

@@ -760,3 +760,9 @@ def __cmp__(self, other):
 
   def __str__(self):
     return ".".join(self.vers)
+
+
+# setup the default MacOs path
+#if platform.system() == "Darwin" and getGdalPath().isEmpty():
+#  setGdalPath( u"/Library/Frameworks/GDAL.framework/Versions/%s/Programs" % str(GdalConfig.version())[:3] )
+

python/plugins/GdalTools/tools/dialogBase.py

@@ -24,16 +24,19 @@ def __init__(self, parent, iface, pluginBase, pluginName, pluginCommand):
       self.process = QProcess(self)
       gdalPath = Utils.getGdalPath()
       if not gdalPath.isEmpty():
+          sep = ";" if platform.system() == "Windows" else ":"
           env = self.process.environment()
           if env.isEmpty():
-            #env << "PATH=" + gdalPath
-            os.putenv( "PATH", str( gdalPath ) )
+            # process.enviroment() is probably not supported (MacOS?), 
+            # use os.putenv() instead
+            path = os.getenv("PATH")
+            if path != "": 
+              path += sep
+            path += gdalPath
+            os.putenv( "PATH", path )
           else:
-            if platform.system() == "Windows":
-              env.replaceInStrings( QRegExp( "^PATH=(.*)", Qt.CaseInsensitive ), "PATH=\\1;" + gdalPath )
-            else:
-              env.replaceInStrings( QRegExp( "^PATH=(.*)", Qt.CaseInsensitive ), "PATH=\\1:" + gdalPath )
-          self.process.setEnvironment( env )
+            env.replaceInStrings( QRegExp( "^PATH=(.*)", Qt.CaseInsensitive ), "PATH=\\1%s%s" % (sep, gdalPath) )
+            self.process.setEnvironment( env )
       self.connect(self.process, SIGNAL("error(QProcess::ProcessError)"), self.processError)
       self.connect(self.process, SIGNAL("finished(int, QProcess::ExitStatus)"), self.processFinished)
 

python/plugins/GdalTools/tools/dialogSettings.ui

@@ -7,19 +7,36 @@
     <x>0</x>
     <y>0</y>
     <width>368</width>
-    <height>324</height>
+    <height>337</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Gdal Tools settings</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Path to the GDAL binaries</string>
-     </property>
-    </widget>
+    <layout class="QHBoxLayout" name="horizontalLayout_6">
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Path to the GDAL binaries</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="bin_tooltip_label">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string notr="true">##tooltip icon##</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
@@ -36,11 +53,28 @@
     </layout>
    </item>
    <item>
-    <widget class="QLabel" name="label_5">
-     <property name="text">
-      <string>GDAL help path</string>
-     </property>
-    </widget>
+    <layout class="QHBoxLayout" name="horizontalLayout_7">
+     <item>
+      <widget class="QLabel" name="label_5">
+       <property name="text">
+        <string>GDAL help path</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="help_tooltip_label">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string notr="true">##tooltip icon##</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_5">

python/plugins/GdalTools/tools/doSettings.py

@@ -8,18 +8,34 @@
 from ui_dialogSettings import Ui_GdalToolsSettingsDialog as Ui_Dialog
 import GdalTools_utils as Utils
 
+from .. import resources_rc
+
 class GdalToolsSettingsDialog( QDialog, Ui_Dialog ):
   def __init__( self, iface ):
     QDialog.__init__( self, iface.mainWindow() )
     self.setAttribute(Qt.WA_DeleteOnClose)
     self.iface = iface
     self.setupUi( self )
 
+    # binaries
     self.leGdalBinPath.setText( Utils.getGdalPath() )
-    self.leGdalHelpPath.setText( Utils.getHelpPath() )
-
     QObject.connect( self.btnSetBinPath, SIGNAL( "clicked()" ), self.setBinPath )
+    self.bin_tooltip_label.setPixmap( QPixmap(':/icons/tooltip.png') )
+    self.bin_tooltip_label.setToolTip( self.tr( \
+u"""A list of colon-separated (Linux and MacOS) or 
+semicolon-separated (Windows) paths to executables.
+
+MacOS users usually need to set it to something like
+/Library/Frameworks/GDAL.framework/Versions/1.8/Programs""") )
+
+    # help
+    self.leGdalHelpPath.setText( Utils.getHelpPath() )
     QObject.connect( self.btnSetHelpPath, SIGNAL( "clicked()" ), self.setHelpPath )
+    self.help_tooltip_label.setPixmap( QPixmap(':/icons/tooltip.png') )
+    self.help_tooltip_label.setToolTip( self.tr( \
+u"""Useful to open local GDAL documentation instead of online help 
+when pressing on the tool dialog's Help button.""") )
+
 
   def setBinPath( self ):
     inputDir = Utils.FileDialog.getExistingDirectory( self, self.tr( "Select directory with GDAL executables" ) )

resources/CMakeLists.txt

@@ -2,7 +2,4 @@ INSTALL(FILES srs.db qgis.db qgis_help.db symbology-ng-style.xml spatialite.db c
         DESTINATION ${QGIS_DATA_DIR}/resources)
 
 ADD_SUBDIRECTORY(context_help)
-ADD_SUBDIRECTORY(js)
-ADD_SUBDIRECTORY(html)
-ADD_SUBDIRECTORY(css)
 ADD_SUBDIRECTORY(function_help)