Skip to content
Permalink
Browse files
Merge branch 'master' of github.com:qgis/Quantum-GIS
  • Loading branch information
timlinux committed Dec 2, 2011
2 parents ad8ae1b + 335dbf1 commit f9f486072fcefcecfbbf5376c3014337117b2d54
Showing with 1,461 additions and 18,783 deletions.
  1. +1 −7 CMakeLists.txt
  2. +0 −1 cmake_templates/qgsconfig.h.in
  3. +9 −2 {resources/css → doc}/qgisdoc.css
  4. +386 −350 i18n/qgis_de.ts
  5. +1 −0 python/console.py
  6. BIN python/plugins/GdalTools/icons/tooltip.png
  7. +1 −0 python/plugins/GdalTools/resources.qrc
  8. +6 −0 python/plugins/GdalTools/tools/GdalTools_utils.py
  9. +10 −7 python/plugins/GdalTools/tools/dialogBase.py
  10. +45 −11 python/plugins/GdalTools/tools/dialogSettings.ui
  11. +18 −2 python/plugins/GdalTools/tools/doSettings.py
  12. +0 −3 resources/CMakeLists.txt
  13. +0 −4 resources/css/CMakeLists.txt
  14. +0 −36 resources/css/ie.css
  15. +0 −29 resources/css/print.css
  16. +0 −265 resources/css/screen.css
  17. +0 −4 resources/html/CMakeLists.txt
  18. +0 −41 resources/html/chart.html
  19. +0 −54 resources/html/qgsrasterlayer.html
  20. +0 −1,201 resources/js/API.txt
  21. +0 −4 resources/js/CMakeLists.txt
  22. +0 −76 resources/js/FAQ.txt
  23. +0 −22 resources/js/LICENSE.txt
  24. +0 −508 resources/js/NEWS.txt
  25. +0 −137 resources/js/PLUGINS.txt
  26. +0 −90 resources/js/README.txt
  27. +0 −1,427 resources/js/excanvas.js
  28. +0 −1 resources/js/excanvas.min.js
  29. +0 −179 resources/js/jquery.colorhelpers.js
  30. +0 −1 resources/js/jquery.colorhelpers.min.js
  31. +0 −167 resources/js/jquery.flot.crosshair.js
  32. +0 −1 resources/js/jquery.flot.crosshair.min.js
  33. +0 −183 resources/js/jquery.flot.fillbetween.js
  34. +0 −1 resources/js/jquery.flot.fillbetween.min.js
  35. +0 −140 resources/js/jquery.flot.grow.js
  36. +0 −238 resources/js/jquery.flot.image.js
  37. +0 −1 resources/js/jquery.flot.image.min.js
  38. +0 −2,599 resources/js/jquery.flot.js
  39. +0 −6 resources/js/jquery.flot.min.js
  40. +0 −336 resources/js/jquery.flot.navigate.js
  41. +0 −1 resources/js/jquery.flot.navigate.min.js
  42. +0 −750 resources/js/jquery.flot.pie.js
  43. +0 −1 resources/js/jquery.flot.pie.min.js
  44. +0 −60 resources/js/jquery.flot.resize.js
  45. +0 −1 resources/js/jquery.flot.resize.min.js
  46. +0 −344 resources/js/jquery.flot.selection.js
  47. +0 −1 resources/js/jquery.flot.selection.min.js
  48. +0 −184 resources/js/jquery.flot.stack.js
  49. +0 −1 resources/js/jquery.flot.stack.min.js
  50. +0 −70 resources/js/jquery.flot.symbol.js
  51. +0 −1 resources/js/jquery.flot.symbol.min.js
  52. +0 −103 resources/js/jquery.flot.threshold.js
  53. +0 −1 resources/js/jquery.flot.threshold.min.js
  54. +0 −8,316 resources/js/jquery.js
  55. +0 −23 resources/js/jquery.min.js
  56. +0 −96 resources/js/json.js
  57. +0 −1 src/app/CMakeLists.txt
  58. +13 −9 src/app/legend/qgslayerorder.cpp
  59. +1 −1 src/app/legend/qgslayerorder.h
  60. +4 −2 src/app/legend/qgslegend.cpp
  61. +8 −2 src/app/legend/qgslegend.h
  62. +0 −7 src/app/main.cpp
  63. +31 −3 src/app/qgisapp.cpp
  64. +116 −60 src/app/qgsrasterlayerproperties.cpp
  65. +0 −6 src/app/qgsrasterlayerproperties.h
  66. +10 −24 src/core/qgsapplication.cpp
  67. +0 −11 src/core/qgsapplication.h
  68. +29 −2 src/core/qgsdatasourceuri.cpp
  69. +5 −0 src/core/qgsdatasourceuri.h
  70. +12 −0 src/core/qgsdbtablemodel.cpp
  71. +7 −1 src/core/qgsdbtablemodel.h
  72. +0 −1 src/core/qgsmaplayer.h
  73. +4 −4 src/core/qgsproviderregistry.cpp
  74. +2 −2 src/core/qgsproviderregistry.h
  75. +3 −3 src/core/qgsrasterdataprovider.cpp
  76. +79 −80 src/core/raster/qgsrasterlayer.cpp
  77. +43 −14 src/gui/attributetable/qgsattributetablememorymodel.cpp
  78. +8 −2 src/gui/attributetable/qgsattributetablememorymodel.h
  79. +2 −2 src/gui/attributetable/qgsattributetablemodel.cpp
  80. +9 −11 src/gui/attributetable/qgsattributetablemodel.h
  81. +9 −1 src/gui/attributetable/qgsattributetableview.cpp
  82. +173 −27 src/gui/qgscomposerview.cpp
  83. +8 −0 src/gui/qgscomposerview.h
  84. +3 −3 src/mapserver/qgis_map_serv.cpp
  85. +2 −2 src/providers/CMakeLists.txt
  86. +2 −2 src/providers/delimitedtext/CMakeLists.txt
  87. +2 −2 src/providers/gdal/CMakeLists.txt
  88. +21 −42 src/providers/gdal/qgsgdalprovider.cpp
  89. +2 −2 src/providers/gpx/CMakeLists.txt
  90. +4 −4 src/providers/grass/CMakeLists.txt
  91. +2 −2 src/providers/memory/CMakeLists.txt
  92. +2 −2 src/providers/ogr/CMakeLists.txt
  93. +2 −2 src/providers/osm/CMakeLists.txt
  94. +2 −2 src/providers/postgres/CMakeLists.txt
  95. +2 −0 src/providers/postgres/qgspgsourceselect.cpp
  96. +1 −2 src/providers/postgres/qgspgsourceselect.h
  97. +19 −13 src/providers/postgres/qgspostgresprovider.cpp
  98. +3 −0 src/providers/postgres/qgspostgresprovider.h
  99. +2 −2 src/providers/spatialite/CMakeLists.txt
  100. +2 −2 src/providers/sqlanywhere/CMakeLists.txt
  101. +3 −3 src/providers/sqlanywhere/sqlanyconnection/CMakeLists.txt
  102. +2 −2 src/providers/wfs/CMakeLists.txt
  103. +2 −2 src/providers/wms/CMakeLists.txt
  104. +266 −250 src/ui/qgsprojectpropertiesbase.ui
  105. +35 −51 src/ui/qgsrasterlayerpropertiesbase.ui
  106. +26 −27 src/ui/qgsvectorlayerpropertiesbase.ui
  107. +1 −1 tests/bench/main.cpp
@@ -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
@@ -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}"
@@ -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;
}
}
}

Large diffs are not rendered by default.

@@ -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)
Binary file not shown.
@@ -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>
@@ -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] )

@@ -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)

@@ -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">
@@ -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" ) )
@@ -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)

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit f9f4860

Please sign in to comment.