Skip to content

Commit f9f4860

Browse files
timlinuxtimlinux
committed
Merge branch 'master' of github.com:qgis/Quantum-GIS
2 parents ad8ae1b + 335dbf1 commit f9f4860

File tree

107 files changed

+1461
-18783
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+1461
-18783
lines changed

‎CMakeLists.txt

+1-7
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,6 @@ IF (WIN32)
253253
SET (DEFAULT_LIBEXEC_SUBDIR .)
254254
SET (DEFAULT_DATA_SUBDIR .)
255255
SET (DEFAULT_PLUGIN_SUBDIR plugins)
256-
SET (DEFAULT_PROVIDER_SUBDIR providers)
257256
SET (DEFAULT_INCLUDE_SUBDIR include)
258257

259258
IF (MSVC)
@@ -323,8 +322,6 @@ ELSE (WIN32)
323322
SET (QGIS_LIBEXEC_SUBDIR_REV ../..)
324323
SET (DEFAULT_PLUGIN_SUBDIR ../PlugIns/qgis)
325324
SET (QGIS_PLUGIN_SUBDIR_REV ../../MacOS)
326-
SET (DEFAULT_PROVIDER_SUBDIR ../Providers/qgis)
327-
SET (QGIS_PROVIDER_SUBDIR_REV ../../MacOS)
328325
SET (DEFAULT_INCLUDE_SUBDIR include/qgis)
329326
# path for framework references
330327
SET (CMAKE_INSTALL_NAME_DIR @executable_path/${QGIS_FW_SUBDIR})
@@ -337,7 +334,6 @@ ELSE (WIN32)
337334
SET (DEFAULT_DATA_SUBDIR share/qgis)
338335
SET (DEFAULT_LIBEXEC_SUBDIR lib${LIB_SUFFIX}/qgis)
339336
SET (DEFAULT_PLUGIN_SUBDIR lib${LIB_SUFFIX}/qgis/plugins)
340-
SET (DEFAULT_PROVIDER_SUBDIR lib${LIB_SUFFIX}/qgis/providers)
341337
SET (DEFAULT_INCLUDE_SUBDIR include/qgis)
342338
ENDIF (APPLE)
343339

@@ -377,12 +373,11 @@ SET (QGIS_LIB_SUBDIR ${DEFAULT_LIB_SUBDIR} CACHE STRING "Subdirectory wh
377373
SET (QGIS_LIBEXEC_SUBDIR ${DEFAULT_LIBEXEC_SUBDIR} CACHE STRING "Subdirectory where private executables will be installed")
378374
SET (QGIS_DATA_SUBDIR ${DEFAULT_DATA_SUBDIR} CACHE STRING "Subdirectory where QGIS data will be installed")
379375
SET (QGIS_PLUGIN_SUBDIR ${DEFAULT_PLUGIN_SUBDIR} CACHE STRING "Subdirectory where plugins will be installed")
380-
SET (QGIS_PROVIDER_SUBDIR ${DEFAULT_PROVIDER_SUBDIR} CACHE STRING "Subdirectory where providers will be installed")
381376
SET (QGIS_INCLUDE_SUBDIR ${DEFAULT_INCLUDE_SUBDIR} CACHE STRING "Subdirectory where header files will be installed")
382377

383378
# mark *_SUBDIR variables as advanced as this is not something
384379
# that an average user would use
385-
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)
380+
MARK_AS_ADVANCED (QGIS_BIN_SUBDIR QGIS_CGIBIN_SUBDIR QGIS_LIB_SUBDIR QGIS_LIBEXEC_SUBDIR QGIS_DATA_SUBDIR QGIS_PLUGIN_SUBDIR QGIS_INCLUDE_SUBDIR)
386381

387382
# full paths for the installation
388383
SET (QGIS_BIN_DIR ${QGIS_BIN_SUBDIR})
@@ -391,7 +386,6 @@ SET (QGIS_LIB_DIR ${QGIS_LIB_SUBDIR})
391386
SET (QGIS_LIBEXEC_DIR ${QGIS_LIBEXEC_SUBDIR})
392387
SET (QGIS_DATA_DIR ${QGIS_DATA_SUBDIR})
393388
SET (QGIS_PLUGIN_DIR ${QGIS_PLUGIN_SUBDIR})
394-
SET (QGIS_PROVIDER_DIR ${QGIS_PROVIDER_SUBDIR})
395389
SET (QGIS_INCLUDE_DIR ${QGIS_INCLUDE_SUBDIR})
396390

397391
# set the default locations where the targets (executables, libraries) will land when compiled

‎cmake_templates/qgsconfig.h.in

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#define RELEASE_NAME "${RELEASE_NAME}"
2222

2323
#define QGIS_PLUGIN_SUBDIR "${QGIS_PLUGIN_SUBDIR}"
24-
#define QGIS_PROVIDER_SUBDIR "${QGIS_PROVIDER_SUBDIR}"
2524
#define QGIS_DATA_SUBDIR "${QGIS_DATA_SUBDIR}"
2625
#define QGIS_LIBEXEC_SUBDIR "${QGIS_LIBEXEC_SUBDIR}"
2726
#define QGIS_LIB_SUBDIR "${QGIS_LIB_SUBDIR}"

‎resources/css/qgisdoc.css ‎doc/qgisdoc.css

+9-2
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ body{
1111
font-weight: bold;
1212
color: #800000;
1313
}
14-
h1, span.header{
14+
span.header{
1515
font-family: trebuchet,arial,helvetica,sans;
1616
font-size: 18pt;
1717
}
18-
h2, span.subheader{
18+
span.subheader{
1919
font-family: trebuchet,arial,helvetica,sans;
2020
font-size: 14pt;
2121
font-weight: normal;
@@ -27,7 +27,14 @@ dt{
2727
ul.small{
2828
font-size: 9pt;
2929
}
30+
h2{
31+
font-size: 14pt;
32+
font-family: trebuchet,arial,helvetica,sans;
33+
font-weight: normal;
34+
}
3035
a.link.bar{
3136
font-size: 9pt;
3237
font-style: italic;
38+
}
39+
}
3340
}

‎i18n/qgis_de.ts

+386-350
Large diffs are not rendered by default.

‎python/console.py

+1
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ def __init__(self, parent=None):
8686
self.setAllowedAreas(Qt.BottomDockWidgetArea)
8787
self.widget = QWidget()
8888
self.l = QVBoxLayout(self.widget)
89+
self.l.setMargin(0)
8990
self.edit = PythonEdit()
9091
self.l.addWidget(self.edit)
9192
self.setWidget(self.widget)

‎python/plugins/GdalTools/icons/tooltip.png

969 Bytes
Loading

‎python/plugins/GdalTools/resources.qrc

+1
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@
2424
<file>icons/fillnodata.png</file>
2525
<file>icons/edit.png</file>
2626
<file>icons/reset.png</file>
27+
<file>icons/tooltip.png</file>
2728
</qresource>
2829
</RCC>

‎python/plugins/GdalTools/tools/GdalTools_utils.py

+6
Original file line numberDiff line numberDiff line change
@@ -760,3 +760,9 @@ def __cmp__(self, other):
760760

761761
def __str__(self):
762762
return ".".join(self.vers)
763+
764+
765+
# setup the default MacOs path
766+
#if platform.system() == "Darwin" and getGdalPath().isEmpty():
767+
# setGdalPath( u"/Library/Frameworks/GDAL.framework/Versions/%s/Programs" % str(GdalConfig.version())[:3] )
768+

‎python/plugins/GdalTools/tools/dialogBase.py

+10-7
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,19 @@ def __init__(self, parent, iface, pluginBase, pluginName, pluginCommand):
2424
self.process = QProcess(self)
2525
gdalPath = Utils.getGdalPath()
2626
if not gdalPath.isEmpty():
27+
sep = ";" if platform.system() == "Windows" else ":"
2728
env = self.process.environment()
2829
if env.isEmpty():
29-
#env << "PATH=" + gdalPath
30-
os.putenv( "PATH", str( gdalPath ) )
30+
# process.enviroment() is probably not supported (MacOS?),
31+
# use os.putenv() instead
32+
path = os.getenv("PATH")
33+
if path != "":
34+
path += sep
35+
path += gdalPath
36+
os.putenv( "PATH", path )
3137
else:
32-
if platform.system() == "Windows":
33-
env.replaceInStrings( QRegExp( "^PATH=(.*)", Qt.CaseInsensitive ), "PATH=\\1;" + gdalPath )
34-
else:
35-
env.replaceInStrings( QRegExp( "^PATH=(.*)", Qt.CaseInsensitive ), "PATH=\\1:" + gdalPath )
36-
self.process.setEnvironment( env )
38+
env.replaceInStrings( QRegExp( "^PATH=(.*)", Qt.CaseInsensitive ), "PATH=\\1%s%s" % (sep, gdalPath) )
39+
self.process.setEnvironment( env )
3740
self.connect(self.process, SIGNAL("error(QProcess::ProcessError)"), self.processError)
3841
self.connect(self.process, SIGNAL("finished(int, QProcess::ExitStatus)"), self.processFinished)
3942

‎python/plugins/GdalTools/tools/dialogSettings.ui

+45-11
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,36 @@
77
<x>0</x>
88
<y>0</y>
99
<width>368</width>
10-
<height>324</height>
10+
<height>337</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Gdal Tools settings</string>
1515
</property>
1616
<layout class="QVBoxLayout" name="verticalLayout">
1717
<item>
18-
<widget class="QLabel" name="label">
19-
<property name="text">
20-
<string>Path to the GDAL binaries</string>
21-
</property>
22-
</widget>
18+
<layout class="QHBoxLayout" name="horizontalLayout_6">
19+
<item>
20+
<widget class="QLabel" name="label">
21+
<property name="text">
22+
<string>Path to the GDAL binaries</string>
23+
</property>
24+
</widget>
25+
</item>
26+
<item>
27+
<widget class="QLabel" name="bin_tooltip_label">
28+
<property name="sizePolicy">
29+
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
30+
<horstretch>0</horstretch>
31+
<verstretch>0</verstretch>
32+
</sizepolicy>
33+
</property>
34+
<property name="text">
35+
<string notr="true">##tooltip icon##</string>
36+
</property>
37+
</widget>
38+
</item>
39+
</layout>
2340
</item>
2441
<item>
2542
<layout class="QHBoxLayout" name="horizontalLayout">
@@ -36,11 +53,28 @@
3653
</layout>
3754
</item>
3855
<item>
39-
<widget class="QLabel" name="label_5">
40-
<property name="text">
41-
<string>GDAL help path</string>
42-
</property>
43-
</widget>
56+
<layout class="QHBoxLayout" name="horizontalLayout_7">
57+
<item>
58+
<widget class="QLabel" name="label_5">
59+
<property name="text">
60+
<string>GDAL help path</string>
61+
</property>
62+
</widget>
63+
</item>
64+
<item>
65+
<widget class="QLabel" name="help_tooltip_label">
66+
<property name="sizePolicy">
67+
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
68+
<horstretch>0</horstretch>
69+
<verstretch>0</verstretch>
70+
</sizepolicy>
71+
</property>
72+
<property name="text">
73+
<string notr="true">##tooltip icon##</string>
74+
</property>
75+
</widget>
76+
</item>
77+
</layout>
4478
</item>
4579
<item>
4680
<layout class="QHBoxLayout" name="horizontalLayout_5">

‎python/plugins/GdalTools/tools/doSettings.py

+18-2
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,34 @@
88
from ui_dialogSettings import Ui_GdalToolsSettingsDialog as Ui_Dialog
99
import GdalTools_utils as Utils
1010

11+
from .. import resources_rc
12+
1113
class GdalToolsSettingsDialog( QDialog, Ui_Dialog ):
1214
def __init__( self, iface ):
1315
QDialog.__init__( self, iface.mainWindow() )
1416
self.setAttribute(Qt.WA_DeleteOnClose)
1517
self.iface = iface
1618
self.setupUi( self )
1719

20+
# binaries
1821
self.leGdalBinPath.setText( Utils.getGdalPath() )
19-
self.leGdalHelpPath.setText( Utils.getHelpPath() )
20-
2122
QObject.connect( self.btnSetBinPath, SIGNAL( "clicked()" ), self.setBinPath )
23+
self.bin_tooltip_label.setPixmap( QPixmap(':/icons/tooltip.png') )
24+
self.bin_tooltip_label.setToolTip( self.tr( \
25+
u"""A list of colon-separated (Linux and MacOS) or
26+
semicolon-separated (Windows) paths to executables.
27+
28+
MacOS users usually need to set it to something like
29+
/Library/Frameworks/GDAL.framework/Versions/1.8/Programs""") )
30+
31+
# help
32+
self.leGdalHelpPath.setText( Utils.getHelpPath() )
2233
QObject.connect( self.btnSetHelpPath, SIGNAL( "clicked()" ), self.setHelpPath )
34+
self.help_tooltip_label.setPixmap( QPixmap(':/icons/tooltip.png') )
35+
self.help_tooltip_label.setToolTip( self.tr( \
36+
u"""Useful to open local GDAL documentation instead of online help
37+
when pressing on the tool dialog's Help button.""") )
38+
2339

2440
def setBinPath( self ):
2541
inputDir = Utils.FileDialog.getExistingDirectory( self, self.tr( "Select directory with GDAL executables" ) )

‎resources/CMakeLists.txt

-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,4 @@ INSTALL(FILES srs.db qgis.db qgis_help.db symbology-ng-style.xml spatialite.db c
22
DESTINATION ${QGIS_DATA_DIR}/resources)
33

44
ADD_SUBDIRECTORY(context_help)
5-
ADD_SUBDIRECTORY(js)
6-
ADD_SUBDIRECTORY(html)
7-
ADD_SUBDIRECTORY(css)
85
ADD_SUBDIRECTORY(function_help)

‎resources/css/CMakeLists.txt

-4
This file was deleted.

‎resources/css/ie.css

-36
This file was deleted.

‎resources/css/print.css

-29
This file was deleted.

0 commit comments

Comments
 (0)