Skip to content
Permalink
Browse files

- Quantum GIS => QGIS update

- integrate PythonConsole help into main translation
- allow referencing QGIS images in context help(viewer)
  • Loading branch information
jef-n committed May 20, 2013
1 parent 5331d6f commit 65d3535fc5da1a26110e568d802c3cfd7f4ddcf0
Showing with 25,952 additions and 12,855 deletions.
  1. +5 −5 CMakeLists.txt
  2. +9 −9 CODING
  3. +1 −1 Doxyfile
  4. +13 −13 INSTALL
  5. +4 −4 NEWS
  6. +10 −10 cmake/FindQGIS.cmake
  7. +1 −1 cmake/FindQsci.py
  8. +9 −9 doc/CODING.t2t
  9. +10 −10 doc/INSTALL.html
  10. +6 −6 doc/INSTALL.t2t
  11. +11 −11 doc/TRANSLATORS
  12. +4 −4 doc/index.dox
  13. +1 −1 doc/index.html
  14. +2 −2 doc/msys.t2t
  15. +2 −2 doc/news.html
  16. +1 −1 doc/news.t2t
  17. +645 −363 i18n/qgis_de.ts
  18. +850 −99 i18n/qgis_es.ts
  19. +1,975 −1,149 i18n/qgis_fr.ts
  20. +2,074 −1,152 i18n/qgis_it.ts
  21. +1,935 −1,128 i18n/qgis_ja.ts
  22. +9,667 −3,728 i18n/qgis_pl_PL.ts
  23. +1,908 −1,158 i18n/qgis_pt_BR.ts
  24. +2,112 −1,171 i18n/qgis_ru.ts
  25. +1,846 −1,213 i18n/qgis_sk.ts
  26. +1,862 −1,181 i18n/qgis_sv.ts
  27. +0 −3 python/console/CMakeLists.txt
  28. +2 −5 python/console/console.py
  29. +0 −54 python/console/console_help.py
  30. +0 −82 python/console/console_help.ui
  31. +0 −201 python/console/help/help.htm
  32. +1 −3 python/console/help/i18n/de_DE.properties
  33. +5 −5 python/console/help/i18n/en_US.properties
  34. +1 −1 python/console/help/i18n/it_IT.properties
  35. +2 −2 python/console/help/i18n/ru_RU.properties
  36. +2 −2 python/core/qgis.sip
  37. +1 −1 python/plugins/GdalTools/GdalTools.py
  38. +1 −1 python/plugins/fTools/fTools.py
  39. +10 −10 python/plugins/plugin_installer/installer_gui.py
  40. +1 −1 python/plugins/plugin_installer/qgsplugininstallerbase.ui
  41. +3 −3 qgis.1
  42. +159 −0 resources/context_help/PythonConsole
  43. +165 −0 resources/context_help/PythonConsole-de_DE
  44. +171 −0 resources/context_help/PythonConsole-en_US
  45. +172 −0 resources/context_help/PythonConsole-it_IT
  46. +171 −0 resources/context_help/PythonConsole-ru_RU
  47. +1 −1 resources/context_help/RgShortestPathWidget-en_US
  48. +2 −2 resources/customization.xml
  49. +17 −6 scripts/integrate_function_help.pl
  50. +62 −0 scripts/replace-console-i18n.pl
  51. +2 −2 src/app/main.cpp
  52. +3 −3 src/app/qgisapp.cpp
  53. +1 −1 src/app/qgspluginregistry.cpp
  54. +9 −10 src/app/qgstipfactory.cpp
  55. +2 −2 src/core/qgshttptransaction.cpp
  56. +1 −1 src/gui/qgscomposerview.cpp
  57. +3 −3 src/helpviewer/CMakeLists.txt
  58. +1 −1 src/helpviewer/qgshelpviewer.cpp
  59. +1 −1 src/plugins/coordinate_capture/README
  60. +1 −1 src/plugins/qgisplugin.h
  61. +1 −1 src/plugins/spatialquery/README
  62. +1 −1 src/plugins/spit/qgsspit.cpp
  63. +1 −1 src/providers/gpx/gpsdata.cpp
  64. +1 −1 src/providers/oracle/qgsoracleprovider.cpp
  65. +1 −1 src/providers/postgres/qgspostgresconn.cpp
  66. +1 −1 src/providers/postgres/qgspostgresprovider.cpp
  67. +5 −5 src/providers/sqlanywhere/qgssqlanywhereprovider.cpp
  68. +1 −1 src/providers/wcs/qgswcscapabilities.cpp
  69. +3 −3 src/ui/qgsabout.ui
  70. +1 −1 src/ui/qgssponsorsbase.ui
@@ -13,7 +13,7 @@ ENDIF (APPLE)

# Note the version no is Mmmpp for Major/minor/patch, 0-padded, thus '10100' for 1.1.0
MATH(EXPR QGIS_VERSION_INT "${CPACK_PACKAGE_VERSION_MAJOR}*10000+${CPACK_PACKAGE_VERSION_MINOR}*100+${CPACK_PACKAGE_VERSION_PATCH}")
MESSAGE(STATUS "Quantum GIS version: ${COMPLETE_VERSION} ${RELEASE_NAME} (${QGIS_VERSION_INT})")
MESSAGE(STATUS "QGIS version: ${COMPLETE_VERSION} ${RELEASE_NAME} (${QGIS_VERSION_INT})")

#############################################################
# CMake settings
@@ -700,25 +700,25 @@ ADD_CUSTOM_TARGET(uninstall

INCLUDE(InstallRequiredSystemLibraries)

SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Quantum GIS")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "QGIS")
SET(CPACK_PACKAGE_VENDOR "Open Source Geospatial Foundation")
SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "Quantum GIS ${COMPLETE_VERSION}")
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "QGIS ${COMPLETE_VERSION}")
IF(WIN32 AND NOT UNIX)
# There is a bug in NSI that does not handle full unix paths properly. Make
# sure there is at least one set of four (4) backslashes.
SET(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/win_build\\\\sidebar.bmp")
SET(CPACK_NSIS_INSTALLED_ICON_NAME "\\\\qgis.exe")
SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} Quantum GIS")
SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} QGIS")
SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\qgis.org")
SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\qgis.org")
SET(CPACK_NSIS_CONTACT "tim@linfiniti.com")
SET(CPACK_NSIS_MODIFY_PATH ON)

# SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS " !include \\\"${CMAKE_SOURCE_DIR}\\\\win_build\\\\extra.nsh\\\"")
ELSE(WIN32 AND NOT UNIX)
#SET(CPACK_STRIP_FILES "Quantum GIS")
#SET(CPACK_STRIP_FILES "QGIS")
#SET(CPACK_SOURCE_STRIP_FILES "")
ENDIF(WIN32 AND NOT UNIX)
SET(CPACK_PACKAGE_EXECUTABLES "qgis" "QGIS")
18 CODING
@@ -1,4 +1,4 @@
Quantum GIS (QGIS)
QGIS
Developers guide for QGIS


@@ -484,15 +484,15 @@ To clone QGIS master:

To check out a branch, for example the release 1.7.0 branch do:

cd Quantum-GIS
cd QGIS
git fetch
git branch --track origin release-1_7_0
git checkout release-1_7_0


To check out the master branch:

cd Quantum-GIS
cd QGIS
git checkout master

/!\ Note: In QGIS we keep our most stable code in the current release branch.
@@ -618,7 +618,7 @@ from the top level dir makes this much easier. Below is an example of how you
can include multiple changed files into your patch from the top level
directory:

cd Quantum-GIS
cd QGIS
git checkout master
git pull origin master
git checkout newfeature
@@ -1236,13 +1236,13 @@ After installing you should find it in your gnome menu.
4.2. Setting up your project
============================

I'm assuming you have already got a local Quantum-GIS clone containing the
I'm assuming you have already got a local QGIS clone containing the
source code, and have installed all needed build dependencies etc. There are
detailed in instructions on doing that here:

http://github.com/qgis/Quantum-GIS/blob/master/CODING

On my system I have checked out the code into $HOME/dev/cpp/Quantum-GIS and the
On my system I have checked out the code into $HOME/dev/cpp/QGIS and the
rest of the article is written assuming that, you should update these paths as
appropriate for your local system.

@@ -1252,14 +1252,14 @@ On launching QtCreator do:

Then use the resulting file selection dialog to browse to and open this file:

$HOME/dev/cpp/Quantum-GIS/CMakeLists.txt
$HOME/dev/cpp/QGIS/CMakeLists.txt

[images/image01.jpeg]

Next you will be prompted for a build location. I create a specific build dir
for QtCreator to work in under:

$HOME/dev/cpp/Quantum-GIS/build-master-qtcreator
$HOME/dev/cpp/QGIS/build-master-qtcreator

Its probably a good idea to create separate build directories for different
branches if you can afford the disk space.
@@ -1301,7 +1301,7 @@ Now we set the following details:

Enable custom process step [yes]
Command: make
Working directory: $HOME/dev/cpp/Quantum-GIS/build-master-qtcreator
Working directory: $HOME/dev/cpp/QGIS/build-master-qtcreator
Command arguments: install

[images/image07.jpeg]
@@ -26,7 +26,7 @@ DOXYFILE_ENCODING = UTF-8
# identify the project. Note that if you do not use Doxywizard you need
# to put quotes around the project name if it contains spaces.

PROJECT_NAME = "Quantum GIS API Documentation"
PROJECT_NAME = "QGIS API Documentation"

# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or
26 INSTALL
@@ -1,10 +1,10 @@
Quantum GIS (QGIS)
QGIS
Building QGIS from source - step by step
Wednesday April 24, 2013
Monday May 20, 2013


Last Change : Saturday December 08, 2012
Last Updated: Wednesday April 24, 2013
Last Updated: Monday May 20, 2013
Last Change : Monday May 20, 2013


1. Introduction
@@ -22,7 +22,7 @@ Last Updated: Wednesday April 24, 2013
4. Building on Windows
4.1. Building with Microsoft Visual Studio
4.2. Building using MinGW
4.3. Creation of MSYS environment for compilation of Quantum GIS
4.3. Creation of MSYS environment for compilation of QGIS
5. Building on MacOS X
5.1. Install Developer Tools
5.2. Install Qt4 from disk image
@@ -48,10 +48,10 @@ Last Updated: Wednesday April 24, 2013
===============

This document is the original installation guide of the described software
Quantum GIS. The software and hardware descriptions named in this
QGIS. The software and hardware descriptions named in this
document are in most cases registered trademarks and are therefore subject
to the legal requirements. Quantum GIS is subject to the GNU General Public
License. Find more information on the Quantum GIS Homepage:
to the legal requirements. QGIS is subject to the GNU General Public
License. Find more information on the QGIS Homepage:
http://www.qgis.org

The details, that are given in this document have been written and verified
@@ -61,13 +61,13 @@ liable to any duties or guarantees. The editors and publishers do not take
any responsibility or liability for failures and their consequences. You are
always welcome for indicating possible mistakes.

You can download this document as part of the Quantum GIS 'User and
You can download this document as part of the QGIS 'User and
Installation Guide' in HTML and PDF format via http://www.qgis.org. A current
version is also available at:
http://www.qgis.org/api/INSTALL.html

Translations of this document can also be downloaded at the documentation area
of the Quantum GIS project at http://www.qgis.org. More information is
of the QGIS project at http://www.qgis.org. More information is
available via http://wiki.qgis.org/qgiswiki/DocumentationWritersCorner.

Please visit http://qgis.org for information on joining our mailing lists
@@ -865,7 +865,7 @@ http://msysgit.googlecode.com/files/Git-1.7.4-preview20110204.exe
4.2.6. CMake
============

CMake is build system used by Quantum GIS. Download it from here:
CMake is build system used by QGIS. Download it from here:

http://www.cmake.org/files/v2.8/cmake-2.8.2-win32-x86.exe

@@ -954,8 +954,8 @@ tree. Read the READMEfile there and follow the instructions. Next right click
on qgis.nsi and choose the option 'Compile NSIS Script'.


4.3. Creation of MSYS environment for compilation of Quantum GIS
================================================================
4.3. Creation of MSYS environment for compilation of QGIS
=========================================================


4.3.1. Initial setup
8 NEWS
@@ -1,6 +1,6 @@
Quantum GIS (QGIS) News
QGIS News
Change history for the QGIS Project
Tuesday June 12, 2012
Monday May 20, 2013


------------------------------------------------------------------------
@@ -58,8 +58,8 @@ Tuesday June 12, 2012
------------------------------------------------------------------------


Last Updated: Tuesday June 12, 2012
Last Change : Tuesday June 12, 2012
Last Updated: Monday May 20, 2013
Last Change : Monday May 20, 2013


1. Whats new in Version 1.8.0 'Lisboa'?
@@ -12,27 +12,27 @@

#MESSAGE("Searching for QGIS")
IF(WIN32)
#MESSAGE("Searching for QGIS in $ENV{PROGRAMFILES}/Quantum GIS")
#MESSAGE("Searching for QGIS in $ENV{PROGRAMFILES}/QGIS")
IF (MINGW)
FIND_PATH(QGIS_PLUGIN_DIR
NAMES libdelimitedtextplugin.dll
PATHS
"$ENV{PROGRAMFILES}/Quantum GIS/plugins"
"$ENV{PROGRAMFILES}/QGIS/plugins"
)
FIND_PATH(QGIS_INCLUDE_DIR
NAMES qgsapplication.h
PATHS
"$ENV{PROGRAMFILES}/Quantum GIS/include"
"$ENV{PROGRAMFILES}/QGIS/include"
)
FIND_LIBRARY(QGIS_CORE_LIBRARY
NAMES qgis_core
PATHS
"$ENV{PROGRAMFILES}/Quantum GIS/"
"$ENV{PROGRAMFILES}/QGIS/"
)
FIND_LIBRARY(QGIS_GUI_LIBRARY
NAMES qgis_gui
PATHS
"$ENV{PROGRAMFILES}/Quantum GIS/"
"$ENV{PROGRAMFILES}/QGIS/"
)
ENDIF (MINGW)

@@ -41,39 +41,39 @@ IF(WIN32)
NAMES delimitedtextplugin.dll
PATHS
"$ENV{OSGEO4W_ROOT}/apps/qgis/plugins"
"$ENV{PROGRAMFILES}/Quantum GIS/plugins"
"$ENV{PROGRAMFILES}/QGIS/plugins"
)
FIND_PATH(QGIS_INCLUDE_DIR
NAMES qgsapplication.h
PATHS
"$ENV{INCLUDE}"
"$ENV{LIB_DIR}/include/qgis"
"$ENV{OSGEO4W_ROOT}/include"
"$ENV{PROGRAMFILES}/Quantum GIS/include"
"$ENV{PROGRAMFILES}/QGIS/include"
)
FIND_LIBRARY(QGIS_CORE_LIBRARY
NAMES qgis_core
PATHS
"$ENV{LIB_DIR}/lib/"
"$ENV{LIB}"
"$ENV{OSGEO4W_ROOT}/lib"
"$ENV{PROGRAMFILES}/Quantum GIS/lib"
"$ENV{PROGRAMFILES}/QGIS/lib"
)
FIND_LIBRARY(QGIS_GUI_LIBRARY
NAMES qgis_gui
PATHS
"$ENV{LIB_DIR}"
"$ENV{LIB}"
"$ENV{OSGEO4W_ROOT}/lib"
"$ENV{PROGRAMFILES}/Quantum GIS/lib"
"$ENV{PROGRAMFILES}/QGIS/lib"
)
FIND_LIBRARY(QGIS_ANALYSIS_LIBRARY
NAMES qgis_analysis
PATHS
"$ENV{LIB_DIR}"
"$ENV{LIB}"
"$ENV{OSGEO4W_ROOT}/lib"
"$ENV{PROGRAMFILES}/Quantum GIS/lib"
"$ENV{PROGRAMFILES}/QGIS/lib"
)
ENDIF (MSVC)
ELSE(WIN32)
@@ -32,7 +32,7 @@
"""
__author__ = 'Larry Shaffer (larry@dakotacarto.com)'
__date__ = '22/10/2012'
__copyright__ = 'Copyright 2012, The Quantum GIS Project'
__copyright__ = 'Copyright 2012, The QGIS Project'


try:
@@ -1,4 +1,4 @@
Quantum GIS (QGIS)
QGIS

Developers guide for QGIS

@@ -463,7 +463,7 @@ git://github.com/qgis/Quantum-GIS.git

To check out a branch, for example the release 1.7.0 branch do:
```
cd Quantum-GIS
cd QGIS
git fetch
git branch --track origin release-1_7_0
git checkout release-1_7_0
@@ -473,7 +473,7 @@ To check out a branch, for example the release 1.7.0 branch do:
To check out the master branch:

```
cd Quantum-GIS
cd QGIS
git checkout master
```

@@ -590,7 +590,7 @@ can include multiple changed files into your patch from the top level
directory:

```
cd Quantum-GIS
cd QGIS
git checkout master
git pull origin master
git checkout newfeature
@@ -1242,14 +1242,14 @@ After installing you should find it in your gnome menu.

== Setting up your project ==

I'm assuming you have already got a local Quantum-GIS clone containing the
I'm assuming you have already got a local QGIS clone containing the
source code, and have installed all needed build dependencies etc. There are
detailed in instructions on doing that here:

http://github.com/qgis/Quantum-GIS/blob/master/CODING


On my system I have checked out the code into $HOME/dev/cpp/Quantum-GIS and the
On my system I have checked out the code into $HOME/dev/cpp/QGIS and the
rest of the article is written assuming that, you should update these paths as
appropriate for your local system.

@@ -1262,7 +1262,7 @@ File->Open File or Project
Then use the resulting file selection dialog to browse to and open this file:

```
$HOME/dev/cpp/Quantum-GIS/CMakeLists.txt
$HOME/dev/cpp/QGIS/CMakeLists.txt
```

[images/image01.jpeg]
@@ -1271,7 +1271,7 @@ Next you will be prompted for a build location. I create a specific build dir
for QtCreator to work in under:

```
$HOME/dev/cpp/Quantum-GIS/build-master-qtcreator
$HOME/dev/cpp/QGIS/build-master-qtcreator
```

Its probably a good idea to create separate build directories for different
@@ -1318,7 +1318,7 @@ Now we set the following details:
```
Enable custom process step [yes]
Command: make
Working directory: $HOME/dev/cpp/Quantum-GIS/build-master-qtcreator
Working directory: $HOME/dev/cpp/QGIS/build-master-qtcreator
Command arguments: install
```

0 comments on commit 65d3535

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