Skip to content
Permalink
Browse files
Merge branch 'master' of github.com:qgis/Quantum-GIS into qgis-master
  • Loading branch information
timlinux committed Nov 30, 2011
2 parents 2414a3a + 763caa7 commit 78ce3cdc84b79dbec5d227db9ee14af6edf9af66
Showing with 18,044 additions and 315 deletions.
  1. +7 −1 CMakeLists.txt
  2. +1 −0 cmake_templates/qgsconfig.h.in
  3. +3 −0 resources/CMakeLists.txt
  4. +4 −0 resources/css/CMakeLists.txt
  5. +36 −0 resources/css/ie.css
  6. +29 −0 resources/css/print.css
  7. +2 −9 {doc → resources/css}/qgisdoc.css
  8. +265 −0 resources/css/screen.css
  9. +4 −0 resources/html/CMakeLists.txt
  10. +41 −0 resources/html/chart.html
  11. +54 −0 resources/html/qgsrasterlayer.html
  12. +1,201 −0 resources/js/API.txt
  13. +4 −0 resources/js/CMakeLists.txt
  14. +76 −0 resources/js/FAQ.txt
  15. +22 −0 resources/js/LICENSE.txt
  16. +508 −0 resources/js/NEWS.txt
  17. +137 −0 resources/js/PLUGINS.txt
  18. +90 −0 resources/js/README.txt
  19. +1,427 −0 resources/js/excanvas.js
  20. +1 −0 resources/js/excanvas.min.js
  21. +179 −0 resources/js/jquery.colorhelpers.js
  22. +1 −0 resources/js/jquery.colorhelpers.min.js
  23. +167 −0 resources/js/jquery.flot.crosshair.js
  24. +1 −0 resources/js/jquery.flot.crosshair.min.js
  25. +183 −0 resources/js/jquery.flot.fillbetween.js
  26. +1 −0 resources/js/jquery.flot.fillbetween.min.js
  27. +140 −0 resources/js/jquery.flot.grow.js
  28. +238 −0 resources/js/jquery.flot.image.js
  29. +1 −0 resources/js/jquery.flot.image.min.js
  30. +2,599 −0 resources/js/jquery.flot.js
  31. +6 −0 resources/js/jquery.flot.min.js
  32. +336 −0 resources/js/jquery.flot.navigate.js
  33. +1 −0 resources/js/jquery.flot.navigate.min.js
  34. +750 −0 resources/js/jquery.flot.pie.js
  35. +1 −0 resources/js/jquery.flot.pie.min.js
  36. +60 −0 resources/js/jquery.flot.resize.js
  37. +1 −0 resources/js/jquery.flot.resize.min.js
  38. +344 −0 resources/js/jquery.flot.selection.js
  39. +1 −0 resources/js/jquery.flot.selection.min.js
  40. +184 −0 resources/js/jquery.flot.stack.js
  41. +1 −0 resources/js/jquery.flot.stack.min.js
  42. +70 −0 resources/js/jquery.flot.symbol.js
  43. +1 −0 resources/js/jquery.flot.symbol.min.js
  44. +103 −0 resources/js/jquery.flot.threshold.js
  45. +1 −0 resources/js/jquery.flot.threshold.min.js
  46. +8,316 −0 resources/js/jquery.js
  47. +23 −0 resources/js/jquery.min.js
  48. +96 −0 resources/js/json.js
  49. +1 −0 src/app/CMakeLists.txt
  50. +7 −0 src/app/main.cpp
  51. +60 −116 src/app/qgsrasterlayerproperties.cpp
  52. +6 −0 src/app/qgsrasterlayerproperties.h
  53. +24 −10 src/core/qgsapplication.cpp
  54. +11 −0 src/core/qgsapplication.h
  55. +1 −0 src/core/qgsmaplayer.h
  56. +4 −4 src/core/qgsproviderregistry.cpp
  57. +2 −2 src/core/qgsproviderregistry.h
  58. +3 −3 src/core/qgsrasterdataprovider.cpp
  59. +80 −79 src/core/raster/qgsrasterlayer.cpp
  60. +3 −3 src/mapserver/qgis_map_serv.cpp
  61. +2 −2 src/providers/CMakeLists.txt
  62. +2 −2 src/providers/delimitedtext/CMakeLists.txt
  63. +2 −2 src/providers/gdal/CMakeLists.txt
  64. +42 −21 src/providers/gdal/qgsgdalprovider.cpp
  65. +2 −2 src/providers/gpx/CMakeLists.txt
  66. +4 −4 src/providers/grass/CMakeLists.txt
  67. +2 −2 src/providers/memory/CMakeLists.txt
  68. +2 −2 src/providers/ogr/CMakeLists.txt
  69. +2 −2 src/providers/osm/CMakeLists.txt
  70. +2 −2 src/providers/postgres/CMakeLists.txt
  71. +2 −2 src/providers/spatialite/CMakeLists.txt
  72. +2 −2 src/providers/sqlanywhere/CMakeLists.txt
  73. +3 −3 src/providers/sqlanywhere/sqlanyconnection/CMakeLists.txt
  74. +2 −2 src/providers/wfs/CMakeLists.txt
  75. +2 −2 src/providers/wms/CMakeLists.txt
  76. +51 −35 src/ui/qgsrasterlayerpropertiesbase.ui
  77. +1 −1 tests/bench/main.cpp
@@ -253,6 +253,7 @@ 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)
@@ -322,6 +323,8 @@ 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})
@@ -334,6 +337,7 @@ 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)

@@ -373,11 +377,12 @@ 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_PLUGIN_SUBDIR QGIS_INCLUDE_SUBDIR)
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)

# full paths for the installation
SET (QGIS_BIN_DIR ${QGIS_BIN_SUBDIR})
@@ -386,6 +391,7 @@ 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,6 +21,7 @@
#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}"
@@ -2,4 +2,7 @@ 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)
@@ -0,0 +1,4 @@
FILE(GLOB CSS_FILES *.*)

INSTALL(FILES ${CSS_FILES} DESTINATION ${QGIS_DATA_DIR}/resources/css)

@@ -0,0 +1,36 @@
/* -----------------------------------------------------------------------
Blueprint CSS Framework 1.0
http://blueprintcss.org
* Copyright (c) 2007-Present. See LICENSE for more info.
* See README for instructions on how to use Blueprint.
* For credits and origins, see AUTHORS.
* This is a compressed file. See the sources in the 'src' directory.
----------------------------------------------------------------------- */

/* ie.css */
body {text-align:center;}
.container {text-align:left;}
* html .column, * html .span-1, * html .span-2, * html .span-3, * html .span-4, * html .span-5, * html .span-6, * html .span-7, * html .span-8, * html .span-9, * html .span-10, * html .span-11, * html .span-12, * html .span-13, * html .span-14, * html .span-15, * html .span-16, * html .span-17, * html .span-18, * html .span-19, * html .span-20, * html .span-21, * html .span-22, * html .span-23, * html .span-24 {display:inline;overflow-x:hidden;}
* html legend {margin:0px -8px 16px 0;padding:0;}
sup {vertical-align:text-top;}
sub {vertical-align:text-bottom;}
html>body p code {*white-space:normal;}
hr {margin:-8px auto 11px;}
img {-ms-interpolation-mode:bicubic;}
.clearfix, .container {display:inline-block;}
* html .clearfix, * html .container {height:1%;}
fieldset {padding-top:0;}
legend {margin-top:-0.2em;margin-bottom:1em;margin-left:-0.5em;}
textarea {overflow:auto;}
label {vertical-align:middle;position:relative;top:-0.25em;}
input.text, input.title, textarea {background-color:#fff;border:1px solid #bbb;}
input.text:focus, input.title:focus {border-color:#666;}
input.text, input.title, textarea, select {margin:0.5em 0;}
input.checkbox, input.radio {position:relative;top:.25em;}
form.inline div, form.inline p {vertical-align:middle;}
form.inline input.checkbox, form.inline input.radio, form.inline input.button, form.inline button {margin:0.5em 0;}
button, input.button {position:relative;top:0.25em;}
@@ -0,0 +1,29 @@
/* -----------------------------------------------------------------------
Blueprint CSS Framework 1.0
http://blueprintcss.org
* Copyright (c) 2007-Present. See LICENSE for more info.
* See README for instructions on how to use Blueprint.
* For credits and origins, see AUTHORS.
* This is a compressed file. See the sources in the 'src' directory.
----------------------------------------------------------------------- */

/* print.css */
body {line-height:1.5;font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;color:#000;background:none;font-size:10pt;}
.container {background:none;}
hr {background:#ccc;color:#ccc;width:100%;height:2px;margin:2em 0;padding:0;border:none;}
hr.space {background:#fff;color:#fff;visibility:hidden;}
h1, h2, h3, h4, h5, h6 {font-family:"Helvetica Neue", Arial, "Lucida Grande", sans-serif;}
code {font:.9em "Courier New", Monaco, Courier, monospace;}
a img {border:none;}
p img.top {margin-top:0;}
blockquote {margin:1.5em;padding:1em;font-style:italic;font-size:.9em;}
.small {font-size:.9em;}
.large {font-size:1.1em;}
.quiet {color:#999;}
.hide {display:none;}
a:link, a:visited {background:transparent;font-weight:700;text-decoration:underline;}
a:link:after, a:visited:after {content:" (" attr(href) ")";font-size:90%;}
@@ -11,11 +11,11 @@ body{
font-weight: bold;
color: #800000;
}
span.header{
h1, span.header{
font-family: trebuchet,arial,helvetica,sans;
font-size: 18pt;
}
span.subheader{
h2, span.subheader{
font-family: trebuchet,arial,helvetica,sans;
font-size: 14pt;
font-weight: normal;
@@ -27,14 +27,7 @@ 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;
}
}
}

0 comments on commit 78ce3cd

Please sign in to comment.