Skip to content
Permalink
Browse files

merge from trunk r11500:11550

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11890 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder
wonder committed Nov 2, 2009
1 parent dee6b0a commit d282d2a9ebcb7620c34a9f7fdab5467d09b11d89
Showing with 4,025 additions and 1,624 deletions.
  1. +2 −1 debian/changelog
  2. +1 −0 debian/qgis.install
  3. +130 −130 i18n/qgis_fr.ts
  4. BIN images/splash/web_banner.jpg
  5. BIN images/splash/web_banner.xcf.bz2
  6. +257 −10 mac/xcode/Qgis.xcodeproj/project.pbxproj
  7. +10 −12 mac/xcode/ReadMe.rtf
  8. +35 −13 mac/xcode/qgis_settings.xcconfig
  9. +8 −7 mac/xcode/qgis_user-template.xcconfig
  10. +19 −2 ms-windows/QGIS-Installer.nsi
  11. +4 −2 python/configure.py.in
  12. +1 −1 python/core/qgsrect.sip
  13. +1 −1 python/gui/qgisinterface.sip
  14. +4 −2 python/gui/qgsmapcanvas.sip
  15. +2 −2 python/gui/qgsmaptoolemitpoint.sip
  16. +21 −0 resources/context_help/151694916_pl_PL
  17. +26 −0 resources/context_help/94000531_pl_PL
  18. +40 −33 src/app/qgisapp.cpp
  19. +2 −2 src/app/qgisapp.h
  20. +1 −1 src/app/qgisappinterface.cpp
  21. +1 −1 src/app/qgisappinterface.h
  22. +10 −4 src/app/qgsdbsourceselect.cpp
  23. +65 −61 src/app/qgsmaptoolidentify.cpp
  24. +2 −3 src/app/qgsmaptoolidentify.h
  25. +10 −3 src/app/qgsmaptoolselect.cpp
  26. +0 −3 src/app/qgsnewconnection.cpp
  27. +23 −1 src/app/qgsprojectproperties.cpp
  28. +11 −0 src/app/qgsprojectproperties.h
  29. +8 −6 src/app/qgsserversourceselect.cpp
  30. +1 −2 src/app/qgsserversourceselect.h
  31. +4 −0 src/core/CMakeLists.txt
  32. +51 −38 src/core/qgscoordinatereferencesystem.cpp
  33. +136 −118 src/core/qgsgeometry.cpp
  34. +3 −0 src/core/qgsmessageoutput.cpp
  35. +1 −1 src/core/qgsrectangle.cpp
  36. +1 −1 src/core/qgsrectangle.h
  37. +10 −16 src/core/qgsvectorlayer.cpp
  38. +0 −6 src/core/raster/qgsrasterlayer.cpp
  39. +0 −10 src/core/renderer/qgsuniquevaluerenderer.cpp
  40. +1 −1 src/core/renderer/qgsuniquevaluerenderer.h
  41. +4 −0 src/gui/CMakeLists.txt
  42. +1 −1 src/gui/qgisinterface.h
  43. +25 −0 src/gui/qgsencodingfiledialog.cpp
  44. +14 −0 src/gui/qgsencodingfiledialog.h
  45. +4 −2 src/gui/qgsmapcanvas.h
  46. +2 −1 src/gui/qgsmaptoolemitpoint.h
  47. +50 −4 src/gui/qgsprojectionselector.cpp
  48. +1 −0 src/plugins/CMakeLists.txt
  49. +670 −889 src/plugins/evis/ui/evisgenericeventbrowserguibase.ui
  50. +3 −3 src/plugins/georeferencer/mapcoordsdialog.cpp
  51. +1 −1 src/plugins/georeferencer/mapcoordsdialog.h
  52. +3 −3 src/plugins/interpolation/qgsgridfilewriter.cpp
  53. +1 −1 src/plugins/interpolation/qgsgridfilewriter.h
  54. +5 −0 src/plugins/interpolation/qgsidwinterpolator.cpp
  55. +227 −13 src/plugins/interpolation/qgsinterpolationdialog.cpp
  56. +27 −0 src/plugins/interpolation/qgsinterpolationdialog.h
  57. +110 −6 src/plugins/interpolation/qgsinterpolationdialogbase.ui
  58. +1 −1 src/plugins/interpolation/qgsinterpolator.cpp
  59. +62 −0 src/plugins/raster_terrain_analysis/CMakeLists.txt
  60. +50 −0 src/plugins/raster_terrain_analysis/qgsaspectfilter.cpp
  61. +38 −0 src/plugins/raster_terrain_analysis/qgsaspectfilter.h
  62. +168 −0 src/plugins/raster_terrain_analysis/qgsderivativefilter.cpp
  63. +40 −0 src/plugins/raster_terrain_analysis/qgsderivativefilter.h
  64. +275 −0 src/plugins/raster_terrain_analysis/qgsninecellfilter.cpp
  65. +72 −0 src/plugins/raster_terrain_analysis/qgsninecellfilter.h
  66. +163 −0 src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog.cpp
  67. +47 −0 src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog.h
  68. 0 src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialogbase.h
  69. +144 −0 src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialogbase.ui
  70. +155 −0 src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.cpp
  71. +49 −0 src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.h
  72. +94 −0 src/plugins/raster_terrain_analysis/qgsruggednessfilter.cpp
  73. +40 −0 src/plugins/raster_terrain_analysis/qgsruggednessfilter.h
  74. +19 −0 src/plugins/raster_terrain_analysis/qgsruggednessindex.cpp
  75. +44 −0 src/plugins/raster_terrain_analysis/qgsslopefilter.cpp
  76. +37 −0 src/plugins/raster_terrain_analysis/qgsslopefilter.h
  77. +48 −0 src/plugins/raster_terrain_analysis/qgstotalcurvaturefilter.cpp
  78. +37 −0 src/plugins/raster_terrain_analysis/qgstotalcurvaturefilter.h
  79. BIN src/plugins/raster_terrain_analysis/raster_terrain_icon.png
  80. +5 −0 src/plugins/raster_terrain_analysis/resources.qrc
  81. +162 −0 src/plugins/raster_terrain_analysis/ui_qgsrasterterrainanalysisdialogbase.h
  82. +1 −1 src/plugins/spit/qgsspit.cpp
  83. +0 −1 src/plugins/spit/qgsspitplugin.cpp
  84. +4 −2 src/plugins/wfs/qgswfssourceselect.cpp
  85. +4 −0 src/providers/grass/CMakeLists.txt
  86. +7 −1 src/providers/ogr/qgsogrprovider.cpp
  87. +1 −1 src/providers/osm/osmprovider.h
  88. +7 −7 src/providers/wms/qgswmsprovider.cpp
  89. +4 −0 src/python/CMakeLists.txt
  90. +3 −1 src/ui/qgscustomprojectiondialogbase.ui
  91. +1 −1 src/ui/qgslabeldialogbase.ui
  92. +3 −1 src/ui/qgsmeasurebase.ui
  93. +2 −2 src/ui/qgsoptionsbase.ui
  94. +3 −1 src/ui/qgspgquerybuilderbase.ui
  95. +3 −1 src/ui/qgsprojectionselectorbase.ui
  96. +139 −133 src/ui/qgsprojectpropertiesbase.ui
  97. +37 −49 src/ui/qgsserversourceselectbase.ui
  98. +0 −1 src/ui/qgssinglesymboldialogbase.ui
  99. +3 −1 src/ui/qgsspatialitesourceselectbase.ui
  100. +3 −1 src/ui/qgsvectorlayerpropertiesbase.ui
@@ -1,8 +1,9 @@
qgis (1.3.0) UNRELEASED; urgency=low

* new development version after 1.2 branch
* add raster terrain analysis plugin

-- Jürgen E. Fischer <jef@norbit.de> Sat, 22 Aug 2009 17:28:29 +0200
-- Jürgen E. Fischer <jef@norbit.de> Wed, 26 Aug 2009 21:10:10 +0200

qgis (1.2.0) UNRELEASED; urgency=low

@@ -24,6 +24,7 @@ usr/lib/qgis/liboracleplugin.so
usr/lib/qgis/libdiagramoverlay.so
usr/lib/qgis/libevis.so
usr/lib/qgis/libosmprovider.so
usr/lib/qgis/librasterterrainplugin.so
usr/share/pixmaps/qgis-icon.xpm
usr/share/pixmaps/qgis-mime-icon.png
usr/share/pixmaps/qgis-mime-icon.png usr/share/icons/crystalsvg/128x128/mimetypes

Large diffs are not rendered by default.

BIN +2.62 KB (120%) images/splash/web_banner.jpg
Binary file not shown.
BIN +3.36 KB (100%) images/splash/web_banner.xcf.bz2
Binary file not shown.

Large diffs are not rendered by default.

@@ -1,4 +1,4 @@
{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf430
{\rtf1\ansi\ansicpg1252\cocoartf1038
{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 Monaco;}
{\colortbl;\red255\green255\blue255;}
\vieww10500\viewh12500\viewkind0
@@ -35,7 +35,7 @@ Dependent libraries are optionally copied into the application bundle and embedd
See the Qgis {\field{\*\fldinst{HYPERLINK "http://wiki.qgis.org/qgiswiki/BuildingFromSource"}}{\fldrslt installation document}} for details on obtaining the requirements. All optional items below are required for the default \ul Full QGIS\ulnone build target.\
\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
\cf0 \ul \ulc0 Xcode 2.5\ulnone - This also makes Mac OS 10.4 a requirement.\
\cf0 \ul \ulc0 Xcode 2.5\ulnone (minimum) - This also makes Mac OS 10.4 a minimum requirement.\
\
\ul QGIS source\ulnone \
\
@@ -59,13 +59,13 @@ See the Qgis {\field{\*\fldinst{HYPERLINK "http://wiki.qgis.org/qgiswiki/Buildin
\
\ul Spatialite library\ulnone - Spatialite is included in the SQLite framework starting with 3.6.11. Or compile from source (includes its own SQLite).\
\
\ul Expat library\ulnone - Leopard includes expat. The one in X11 should work on Tiger, but I prefer to avoid X11 dependencies.\
\ul Expat library\ulnone - Leopard and above includes expat. The one in X11 should work on Tiger, but I prefer to avoid X11 dependencies.\
\
\ul gpsbabel\ulnone (optional) - for the GPS Import plugin. A universal gpsbabel is available from gpsbabel.org.\
\
\ul Python 2.5\ulnone - the system Python on Leopard will work. Or install Python 2.5 from {\field{\*\fldinst{HYPERLINK "http://www.python.org/"}}{\fldrslt python.org}} (required for Tiger).\
\ul Python 2.5 or 2.6\ulnone - the system Python on Leopard and Snow Leopard will work. Or install Python 2.5 from {\field{\*\fldinst{HYPERLINK "http://www.python.org/"}}{\fldrslt python.org}} (required for Tiger).\
\
\ul SIP\ulnone and \ul PyQt\ulnone - make sure that they fully support the installed Qt version. Development versions may cause trouble for QGIS.\
\ul SIP\ulnone and \ul PyQt\ulnone - make sure that they fully support the installed Qt version. Development versions may cause trouble for QGIS. See the QGIS install instructions for info about how to compile and install these.\
\
\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
@@ -90,15 +90,13 @@ The xcconfig file is a simple text file with environment variables and values, a
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
\cf0 \ul Defaults\
\ulnone \
The default configuration is for the native architecture, without using a system SDK. GDAL, PROJ, GEOS and SQLite frameworks are used. Spatialite is expected in the SQLite framework. Expat, Postgres and GSL are expected in default /usr/local builds. GRASS support is from a GRASS-6.4.app application. The python.org Python framework is used, even on Leopard.\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
\cf0 \
The default configuration is for the native architecture, without using a system SDK. GDAL, PROJ, GEOS and SQLite frameworks are used. Spatialite is expected in the SQLite framework. Postgres and GSL are expected in default /usr/local builds. Expat is from the system on Leopard and above, and is expected in /usr/local on Tiger. GRASS support is from a GRASS-6.4.app application. The python.org Python framework is used on Tiger, and the system Python is used on Leopard and above.\
\
By default, Qt, GSL, the Postgres client library are bundled in the Qgis application.\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
\cf0 \
\
\ul Minimal Config\ulnone \
\
The only changes you may need to make for Leopard are: to use the system Python (PYTHON_FORM), and to use the system expat (EXPAT_FORM). See the xcconfig file for details.\
You must set at least SDKSYS to match the system you are building for.\
\
For Tiger, you need to set BISON (see below).\
\
@@ -107,7 +105,7 @@ For Tiger, you need to set BISON (see below).\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural

\f1\fs20 \cf0 SDKSYS
\f0\fs24 tells the project to use the 10.4 (tig) or 10.5 (leo) SDK, or none ([empty]). Using an SDK will also build Qgis in a subfolder of the build folder - this is handy if you want to build once for Tiger (python.org Python) and once for Leopard (system Python) without overwriting either.\
\f0\fs24 tells the project to use the 10.4 (tig), 10.5 (leo) or 10.6 (snow) SDK. Qgis will build in a subfolder of the build folder - this is handy if you want to build once for each system without overwriting any of them.\
\
Note that there may be linking problems with the SDK for non-system libraries and frameworks. This is because the linker prefixes everything with the SDKROOT and indirectly linked libraries in non-standard locations (ie /usr/local) may not be found. If you encounter linking errors, you should add symlinks to the SDKROOT to those locations.\
\
@@ -1,14 +1,16 @@
// QGIS Xcode project common build settings

CURRENT_PROJECT_VERSION = 2.1.9
CURRENT_PROJECT_VERSION = 2.2.0

// SDK not required for native universal build, but recommended,
// and allows building multiple SDK builds side-by-side
SDKSYS = // tig (Tiger), leo (Leopard), [empty] (native)
// SDKSYS must be set to valid value
SDKSYS = leo // tig (Tiger), leo (Leopard), snow (Snow Leopard)

ARCHS = $(NATIVE_ARCH)
ARCHS = $(NATIVE_ARCH) // ppc i386 ppc64 x86_64
//ARCHS = ppc i386 // for universal

// python archs may be different
ARCHS_P = $(ARCH_P_$(SDKSYS)) // in the form arch1;arch2;...

//////////////////////////////////////////////////////////////////////
// QGIS version info & config
//////////////////////////////////////////////////////////////////////
@@ -70,16 +72,15 @@ GSL_FORM = shared // static or shared
PGSQL_FORM = shared // static or shared

// system expat only on Leopard+
EXPAT_FORM = shared // static, shared or system
EXPAT_FORM = $(EXPAT_FORM_$(SDKSYS)) // static, shared or system

GRASS_FORM = app // app or unix
// version as in app name or unix folder name, can't auto-detect here
GRASS_VERSION = 6.4

// system Python only on Leopard+
PYTHON_FORM = fw // fw, system or disabled
// ***TODO*** "Current" will autodetect version
PYTHON_VERSION = 2.5 // can't auto-detect here
PYTHON_FORM = $(PYTHON_FORM_$(SDKSYS)) // fw, system or disabled
PYTHON_VERSION = $(PYTHON_VERSION_$(SDKSYS))

//////////////////////////////////////////////////////////////////////
// whether to bundle some external libs in the app package
@@ -135,11 +136,9 @@ PGSQL_LIBADD = -lintl -framework CoreFoundation -liconv -lxml2 -lssl -lcrypto -l

SDKROOT_tig = /Developer/SDKs/MacOSX10.4u.sdk
SDKROOT_leo = /Developer/SDKs/MacOSX10.5.sdk
SDKROOT_snow = /Developer/SDKs/MacOSX10.6.sdk
SDKROOT = $(SDKROOT_$(SDKSYS))
SYMROOT_tig = build/tig
SYMROOT_leo = build/leo
SYMROOT_ = build/native
SYMROOT = $(SYMROOT_$(SDKSYS))
SYMROOT = build/$(SDKSYS)
INSTALL_PREFIX = /Applications
QGIS_APP_NAME = Qgis.app
PROJECT_TARGET_DIR = $(SYMROOT)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
@@ -162,6 +161,7 @@ DYLIB_CURRENT_VERSION = $(QGIS_VERSION_MAJOR).$(QGIS_VERSION_MINOR)
DYLIB_COMPATIBILITY_VERSION = $(QGIS_VERSION_MAJOR).0
MACOSX_DEPLOYMENT_TARGET_tig = 10.4
MACOSX_DEPLOYMENT_TARGET_leo = 10.5
MACOSX_DEPLOYMENT_TARGET_snow = 10.6
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(SDKSYS))
GCC_INLINES_ARE_PRIVATE_EXTERN = NO
GCC_ENABLE_CPP_EXCEPTIONS = YES
@@ -181,6 +181,10 @@ PERL = /usr/bin/perl
INFOPLIST_EXPAND_BUILD_SETTINGS = YES
DEBUG_INFORMATION_FORMAT = dwarf-with-dsym
OTHER_LDFLAGS = -headerpad_max_install_names
GCC_VERSION_tig = 4.0
GCC_VERSION_leo = 4.0
GCC_VERSION_snow = 4.2
GCC_VERSION = $(GCC_VERSION_$(SDKSYS))

GCC_PREPROCESSOR_DEFINITIONS = CORE_EXPORT= GUI_EXPORT= PYTHON_EXPORT= $(DEFS_$(CONFIGURATION))
DEFS_Debug = QGISDEBUG=1
@@ -240,6 +244,11 @@ GRASS_LIB = -L$(GRASS_PREFIX)/lib -lgrass_vect -lgrass_dig2 -lgrass_dbmiclient -
GRASS_BASE = $(GRASS_PREFIX)
HAVE_OPENPTY = 1

// defaults by SDKSYS
EXPAT_FORM_tig = shared
EXPAT_FORM_leo = system
EXPAT_FORM_snow = system

EXPAT_INC_system =
EXPAT_INC_shared = $(EXPAT_PREFIX)/include
EXPAT_INC_static = $(EXPAT_PREFIX)/include
@@ -295,6 +304,17 @@ SPATIALITE_INC = $(SPATIALITE_INC_$(SQLITE_FORM))
SPATIALITE_LIBADD_internal = -liconv -ldl
SPATIALITE_LIBADD = $(SPATIALITE_GEOS_$(SPATIALITE_GEOS)_$(SQLITE_FORM)) $(SPATIALITE_PROJ_$(SPATIALITE_PROJ)_$(SQLITE_FORM)) $(SPATIALITE_LIBADD_$(SQLITE_FORM))

// defaults by system
PYTHON_VERSION_tig = 2.5
PYTHON_VERSION_leo = 2.5
PYTHON_VERSION_snow = 2.6
PYTHON_FORM_tig = fw
PYTHON_FORM_leo = system
PYTHON_FORM_snow = system
ARCHS_P_tig = ppc;i386
ARCHS_P_leo = ppc;i386
ARCHS_P_snow = i386;x86_64

PYTHON_PREFIX_fw = /Library/Frameworks/Python.framework
PYTHON_PREFIX_system = /System/Library/Frameworks/Python.framework
PYTHON_PREFIX = $(PYTHON_PREFIX_$(PYTHON_FORM))/Versions/$(PYTHON_VERSION)
@@ -308,9 +328,11 @@ PYTHON_INC = $(PYTHON_PREFIX)/Headers
PYTHON_LIB = -framework Python // must always be framework, full path will work
PYTHON_HAVE_fw_tig = HAVE_PYTHON=1
PYTHON_HAVE_fw_leo = HAVE_PYTHON=1
PYTHON_HAVE_fw_snow = HAVE_PYTHON=1
PYTHON_HAVE_fw_ = HAVE_PYTHON=1
PYTHON_HAVE_system_tig =
PYTHON_HAVE_system_leo = HAVE_PYTHON=1
PYTHON_HAVE_system_snow = HAVE_PYTHON=1
PYTHON_HAVE_system_ =
PYTHON_HAVE = $(PYTHON_HAVE_$(PYTHON_FORM)_$(SDKSYS))
PYSITE_system = /Library/Python/$(PYTHON_VERSION)/site-packages
@@ -6,10 +6,13 @@
// commented values values shown here are defaults
// there is no need to set *everything* here.

//SDKSYS = // tig (Tiger), leo (Leopard), [empty] (native)
//ARCHS = $(NATIVE_ARCH) // default
//SDKSYS = leo // tig (Tiger), leo (Leopard), snow (Snow Leopard)
//ARCHS = $(NATIVE_ARCH) // ppc i386 ppc64 x86_64
//ARCHS = ppc i386 // for universal

// python archs may be different
//ARCHS_P = $(ARCH_P_$(SDKSYS)) // in the form arch1;arch2;...

//////////////////////////////////////////////////////////////////////
// Qt and other support
//////////////////////////////////////////////////////////////////////
@@ -51,17 +54,15 @@
//PGSQL_FORM = shared // static or shared

// system expat only on Leopard+
//EXPAT_FORM = shared // static, shared or system
//EXPAT_FORM = $(EXPAT_FORM_$(SDKSYS)) // static, shared or system

//GRASS_FORM = app // app or unix
// version as in app name or unix folder name, can't auto-detect here
//GRASS_VERSION = 6.4

// system Python only on Leopard+
//PYTHON_FORM = fw // fw, system or disabled
//PYTHON_VERSION = 2.5 // can't auto-detect here
// only uncomment this for a native build on Leopard
//PYTHON_HAVE_system_ = HAVE_PYTHON=1
//PYTHON_FORM = $(PYTHON_FORM_$(SDKSYS)) // fw, system or disabled
//PYTHON_VERSION = $(PYTHON_VERSION_$(SDKSYS))

//////////////////////////////////////////////////////////////////////
// whether to bundle some external libs in the app package
@@ -9,7 +9,7 @@
;Select if you are building a "Development Version" or a "Release Version" of the Quantum GIS Installer
;Change the INSTALLER_TYPE variable to Release or Development

!define INSTALLER_TYPE "Release"
!define INSTALLER_TYPE "Release-NoGrass"

;----------------------------------------------------------------------------------------------------------------------------

@@ -39,7 +39,7 @@
;----------------------------------------------------------------------------------------------------------------------------

;define the QGIS Base Name
!define RELEASE_QGIS_BASE "Quantum GIS"
!define RELEASE_QGIS_BASE "Quantum GIS Daphnis"
!define DEV_QGIS_BASE "Quantum GIS Unstable Dev"

;Set the installer variables, depending on the selected version to build
@@ -56,6 +56,18 @@
!define CHECK_INSTALL_NAME "${RELEASE_QGIS_BASE}"
!define INSTALLER_DISPLAYED_NAME "${COMPLETE_NAME}"
!define PACKAGE_FOLDER ".\QGIS-Release-Package"
!else if ${INSTALLER_TYPE} == "Release-NoGrass"
!define VERSION_NUMBER "${RELEASE_VERSION_NUMBER}"
!define VERSION_NAME "${RELEASE_VERSION_NAME}"
!define COMPLETE_NAME "${RELEASE_QGIS_BASE} ${RELEASE_VERSION_NUMBER} ${RELEASE_VERSION_NAME}"
!define SVN_REVISION "${RELEASE_SVN_REVISION}"
!define BINARY_REVISION "${RELEASE_BINARY_REVISION}"
!define QGIS_BASE "${RELEASE_QGIS_BASE}"
!define INSTALLER_NAME "QGIS-${VERSION_NUMBER}-${BINARY_REVISION}-No-GrassSetup.exe"
!define DISPLAYED_NAME "${RELEASE_QGIS_BASE} ${VERSION_NUMBER}-${BINARY_REVISION}"
!define CHECK_INSTALL_NAME "${RELEASE_QGIS_BASE}"
!define INSTALLER_DISPLAYED_NAME "${COMPLETE_NAME}"
!define PACKAGE_FOLDER ".\QGIS-Release-Package-No-Grass"
!else if ${INSTALLER_TYPE} == "Development"
!define VERSION_NUMBER "${DEV_VERSION_NUMBER}"
!define VERSION_NAME "${DEV_VERSION_NAME}"
@@ -525,6 +537,9 @@ Section "Uninstall"

Delete "$INSTDIR\icons\QGIS.ico"
Delete "$INSTDIR\icons\QGIS_Web.ico"

Delete "$INSTDIR\MRSID_README.txt"
Delete "$INSTDIR\run.bat"

;remove folders
RMDir /r "$INSTDIR\bin"
@@ -541,6 +556,8 @@ Section "Uninstall"
RMDir /r "$INSTDIR\resources"
RMDir /r "$INSTDIR\svg"
RMDir /r "$INSTDIR\themes"
RMDir /r "$INSTDIR\proj"
RMDir /r "$INSTDIR\epsg_csv"

;if empty, remove the install folder
RMDir "$INSTDIR"
@@ -13,9 +13,11 @@ geos_inc_dir = '@GEOS_INCLUDE_DIR@'
qt_libs = ["QtCore","QtGui","QtNetwork","QtSvg","QtXml"]
if sys.platform == 'darwin':
qt_libs.append("QtSql")
# possibility of universal build of bindings
# possibility of universal build of bindings, if more than 1 arch
osx_archs = '@CMAKE_OSX_ARCHITECTURES@'
if osx_archs == 'ppc;i386' or osx_archs == 'i386;ppc':
if osx_archs [-1] == ';' :
osx_archs = osx_archs [:-1]
if osx_archs.count(';') > 0:
osx_universal = '@CMAKE_OSX_SYSROOT@'
else:
osx_universal = ''
@@ -58,7 +58,7 @@ class QgsRectangle
//! Expand the rectangle to support zoom out scaling
void expand(double, const QgsPoint *c = 0);
//! return the intersection with the given rectangle
QgsRectangle intersect(QgsRectangle *rect);
QgsRectangle intersect(const QgsRectangle *rect);
//! returns true when rectangle intersects with other rectangle
bool intersects(const QgsRectangle& rect) const;
//! return true when rectangle contains other rectangle
@@ -157,7 +157,7 @@ class QgisInterface : QObject
virtual QAction *actionEditSeparator1() = 0;
virtual QAction *actionCapturePoint() = 0;
virtual QAction *actionCaptureLine() = 0;
virtual QAction *actionCapturePologon() = 0;
virtual QAction *actionCapturePolygon() = 0;
virtual QAction *actionDeleteSelected() = 0;
virtual QAction *actionMoveFeature() = 0;
virtual QAction *actionSplitFeatures() = 0;
@@ -224,8 +224,10 @@ class QgsMapCanvas : QGraphicsView
signals:
/** Let the owner know how far we are with render operations */
void setProgress(int,int);
/** emits current mouse position */
void xyCoordinates(QgsPoint & p);

/** emits current mouse position
\note changed in 1.3 */
void xyCoordinates(const QgsPoint &p);

//! Emitted when the scale of the map changes
void scaleChanged(QString);
@@ -19,7 +19,7 @@ class QgsMapToolEmitPoint : QgsMapTool
virtual void canvasReleaseEvent(QMouseEvent * e);

signals:

//! signal emitted on canvas click
void canvasClicked(QgsPoint& point, Qt::MouseButton button);
// \note changed in 1.3
void canvasClicked( const QgsPoint &point, Qt::MouseButton button);
};
@@ -0,0 +1,21 @@
<h3>Zakładki przestrzenne</h3>
Zakładki przestrzenne pozwalają zapamiętać lokalizację geograficzną w oknie mapy i później do niej wrócić.

<h4>Tworzenie zakładek</h4>
Aby utworzyć zakładkę:
<ol>
<li>Przybliż lub przesuń się do interesującego Cię obszaru mapy
<li>Kliknij <i>Nowa zakładka</i> lub wciśnij Ctrl+B
<li>Wprowadź opisową nazwę zakładki (do 255 znaków)
<li>Kliknij <i>OK</i> aby dodać zakładkę, lub <i>Anuluj</i> aby wyjść bez dodania zakładki.
</ol>
Zauważ, że możesz mieć wiele zakładek o tej samej nazwie.
<h4>Praca z zakładkami</h4>
W celu skorzystania z istniejących zakładek lub zarządzania nimi, kliknij przycisk <i>Pokaż zakładki</i> lub wybierz <i>Pokaż zakładki</i> z menu <i>Widok</i>. Okno dialogowe pozwala na przywołanie zapamiętanego obszaru w oknie mapy lub usunięcie zakładki. Nie ma możliwości edytowania nazwy ani współrzędnych zakładki.
<h5>Przybliżanie się do zakładki</h5>
Z okna dialogowego Zakładki wybierz pożądaną zakładkę klikając na niej, następnie kliknij przycisk <i>Powiększ do</i>.
<p>
Możesz także przybliżyć się do zakładki dwukrotnie klikając na jej nazwie.

<h5>Usuwanie zakładki</h5>
Aby usunąć zakładkę z okna Zakładki, kliknij na jej nazwie, a następnie wybierz przycisk <i>Usuń</i>. Potwierdź swój wybór, klikając <i>OK</i> lub cofnij go, klikając <i>Anuluj</i>.
@@ -0,0 +1,26 @@
<h3>Właściwości warstwy wektorowej</h3>
Okno dialogowe pozwala na pracę z ustawieniami i właściwościami warstwy wektorowej. Dostępnych jest pięć zakładek:
<ol>
<li><a href="#symbology">Symbolika</a></li>
<li><a href="#general">Ogólne</a></li>
<li><a href="#metadata">Metadane</a></li>
<li><a href="#labels">Etykiety</a></li>
<li><a href="#actions">Akcje</a></li>
</ol>
<a name="symbology">
<h4>Symbolika</h4>
</a>

<a name="general">
<h4>Ogólne</h4>
</a>

<a name="metadata">
<h4>Metadane</h4>
</a>
<a name="labels">
<h4>Etykiety</h4>
</a>
<a name="actions">
<h4>Akcje</h4>
</a>

0 comments on commit d282d2a

Please sign in to comment.
You can’t perform that action at this time.