[QGIS Commit] [qgis/Quantum-GIS] 53fb95: Reuse closed globe window

GitHub noreply at github.com
Sun Oct 7 12:56:25 PDT 2012


  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: 53fb95cb793e04ee1d975063e5318132a2eb48dc
      https://github.com/qgis/Quantum-GIS/commit/53fb95cb793e04ee1d975063e5318132a2eb48dc
  Author: Pirmin Kalberer <pka at sourcepole.ch>
  Date:   2012-10-07 (Sun, 07 Oct 2012)

  Changed paths:
    M src/plugins/globe/globe_plugin.cpp
    M src/plugins/globe/globe_plugin.h

  Log Message:
  -----------
  Reuse closed globe window


  Commit: 277a4b446f72bbc0b6e780875ca9cdfbfdd7c7ea
      https://github.com/qgis/Quantum-GIS/commit/277a4b446f72bbc0b6e780875ca9cdfbfdd7c7ea
  Author: Pirmin Kalberer <pka at sourcepole.ch>
  Date:   2012-10-07 (Sun, 07 Oct 2012)

  Changed paths:
    M Doxyfile
    M cmake/FindLibPython.py
    M cmake/FindPyQt.py
    M cmake/FindSIP.py
    M cmake/PythonCompile.py
    M doc/TRANSLATORS
    M i18n/qgis_de.ts
    M i18n/qgis_it.ts
    M i18n/qgis_nl.ts
    A images/console/iconQtCoreConsole.png
    A images/console/iconQtGuiConsole.png
    M images/images.qrc
    M ms-windows/QGIS-Packager.bat
    M ms-windows/osgeo4w/package-nightly.cmd
    M ms-windows/osgeo4w/package.cmd
    M python/console.py
    M python/console_sci.py
    A python/core/composer/qgsatlascomposition.sip
    M python/core/composer/qgscomposerlabel.sip
    M python/core/composer/qgscomposition.sip
    M python/core/core.sip
    M python/core/qgsexpression.sip
    M python/core/raster/qgsrasterrenderer.sip
    M python/core/raster/qgssinglebandpseudocolorrenderer.sip
    M python/gui/raster/qgsrasterminmaxwidget.sip
    M python/gui/raster/qgssinglebandpseudocolorrendererwidget.sip
    M python/helpConsole/help.htm
    M python/helpConsole/i18n/en_US.properties
    M python/helpConsole/i18n/it.properties
    M python/helpConsole/js/encoding.js
    M python/plugins/GdalTools/tools/GdalTools_utils.py
    M python/plugins/GdalTools/tools/dialogBase.py
    M python/plugins/GdalTools/tools/dialogSRS.py
    M python/plugins/GdalTools/tools/doBuildVRT.py
    M python/plugins/GdalTools/tools/doClipper.py
    M python/plugins/GdalTools/tools/doContour.py
    M python/plugins/GdalTools/tools/doDEM.py
    M python/plugins/GdalTools/tools/doExtractProj.py
    M python/plugins/GdalTools/tools/doFillNodata.py
    M python/plugins/GdalTools/tools/doGrid.py
    M python/plugins/GdalTools/tools/doInfo.py
    M python/plugins/GdalTools/tools/doMerge.py
    M python/plugins/GdalTools/tools/doNearBlack.py
    M python/plugins/GdalTools/tools/doOverview.py
    M python/plugins/GdalTools/tools/doPctRgb.py
    M python/plugins/GdalTools/tools/doPolygonize.py
    M python/plugins/GdalTools/tools/doProjection.py
    M python/plugins/GdalTools/tools/doProximity.py
    M python/plugins/GdalTools/tools/doRasterize.py
    M python/plugins/GdalTools/tools/doRgbPct.py
    M python/plugins/GdalTools/tools/doSettings.py
    M python/plugins/GdalTools/tools/doSieve.py
    M python/plugins/GdalTools/tools/doTileIndex.py
    M python/plugins/GdalTools/tools/doTranslate.py
    M python/plugins/GdalTools/tools/doWarp.py
    M python/plugins/GdalTools/tools/extentSelector.py
    M python/plugins/GdalTools/tools/inOutSelector.py
    M python/plugins/GdalTools/tools/optionsTable.py
    M python/plugins/GdalTools/tools/widgetBatchBase.py
    M python/plugins/GdalTools/tools/widgetPluginBase.py
    M python/plugins/db_manager/db_plugins/postgis/sql_dictionary.py
    M python/plugins/db_manager/db_plugins/spatialite/sql_dictionary.py
    M python/plugins/db_manager/dlg_field_properties.py
    M python/plugins/db_manager/sql_dictionary.py
    M python/plugins/fTools/tools/voronoi.py
    M python/plugins/osm/OsmPlugin.py
    M python/plugins/osm/__init__.py
    M python/plugins/plugin_installer/installer_data.py
    M python/plugins/plugin_installer/installer_gui.py
    A python/plugins/plugin_installer/pluginExperimental.png
    M python/plugins/plugin_installer/qgsplugininstallerbase.ui
    M python/plugins/plugin_installer/resources.qrc
    M python/plugins/sextante/about/AboutDialog.py
    M python/plugins/sextante/mmqgisx/MMQGISXAlgorithmProvider.py
    M python/plugins/sextante/mmqgisx/mmqgisx_library.py
    M python/pyspatialite/lib/dump.py
    M python/widgets_tree.py
    A resources/function_help/$feature-en_US
    A resources/function_help/$numfeatures-en_US
    A resources/function_help/$numpages-en_US
    A resources/function_help/$page-en_US
    M scripts/addcopyright.sh
    M scripts/astyle-all.sh
    M scripts/astyle-rollback.sh
    M scripts/astyle.sh
    A scripts/chkcopyrights.sh
    M scripts/create_new_ts.sh
    M scripts/fixdiff.pl
    M scripts/make_gource_video.sh
    M scripts/qgm2cpp.pl
    M scripts/qgsloggermig.pl
    M scripts/remove_non_svn_files.sh
    M scripts/scandeps.pl
    M scripts/ts2cpp.pl
    M scripts/tsstat.pl
    M scripts/update-indent.sh
    M scripts/update_ts_files.sh
    M src/app/CMakeLists.txt
    A src/app/composer/qgsatlascompositionwidget.cpp
    A src/app/composer/qgsatlascompositionwidget.h
    M src/app/composer/qgscomposer.cpp
    M src/app/composer/qgscomposer.h
    M src/app/composer/qgscomposerhtmlwidget.cpp
    M src/app/composer/qgscomposerhtmlwidget.h
    M src/app/composer/qgscomposerlabelwidget.cpp
    M src/app/composer/qgscomposerlabelwidget.h
    M src/app/composer/qgscomposermapwidget.cpp
    M src/app/composer/qgscomposermapwidget.h
    M src/app/qgsattributetabledialog.cpp
    M src/app/qgsidentifyresults.cpp
    M src/app/qgsidentifyresults.h
    M src/app/qgssnappingdialog.cpp
    M src/core/CMakeLists.txt
    A src/core/composer/qgsatlascomposition.cpp
    A src/core/composer/qgsatlascomposition.h
    M src/core/composer/qgscomposeritem.h
    M src/core/composer/qgscomposerlabel.cpp
    M src/core/composer/qgscomposerlabel.h
    M src/core/composer/qgscomposermap.cpp
    M src/core/composer/qgscomposermap.h
    M src/core/composer/qgscomposition.cpp
    M src/core/composer/qgscomposition.h
    M src/core/qgsexpression.cpp
    M src/core/qgsexpression.h
    M src/core/qgsexpressionparser.yy
    M src/core/raster/qgsrasterdrawer.cpp
    M src/core/raster/qgssinglebandpseudocolorrenderer.h
    M src/gui/qgscomposerview.cpp
    M src/gui/qgsexpressionbuilderwidget.cpp
    M src/gui/qgsrasterlayersaveasdialog.cpp
    M src/gui/qgsrasterlayersaveasdialog.h
    M src/gui/raster/qgssinglebandpseudocolorrendererwidget.h
    M src/gui/symbology-ng/qgsstylev2managerdialog.cpp
    M src/plugins/dxf2shp_converter/getInsertions.cpp
    M src/plugins/dxf2shp_converter/getInsertions.h
    M src/plugins/grass/qtermwidget/ColorTables.h
    M src/plugins/grass/qtermwidget/konsole_wcwidth.h
    M src/plugins/grass/scripts/db.connect-login.pg.py
    M src/plugins/grass/scripts/qgis.v.kernel.rast.py
    M src/plugins/grass/scripts/r.external.all.py
    M src/plugins/grass/scripts/v.out.ogr.pg.py
    M src/providers/ows/qgsowsdataitems.cpp
    M src/providers/ows/qgsowsdataitems.h
    M src/ui/qgisapp.ui
    A src/ui/qgsatlascompositionwidgetbase.ui
    M src/ui/qgscomposeritemwidgetbase.ui
    M src/ui/qgscomposerlabelwidgetbase.ui
    M src/ui/qgscomposerlegendwidgetbase.ui
    M src/ui/qgscomposermapwidgetbase.ui
    M src/ui/qgsprojectpropertiesbase.ui
    M tests/ctest2junix.xsl
    M tests/src/core/CMakeLists.txt
    A tests/src/core/testqgsatlascomposition.cpp
    A tests/src/core/testqgscomposerlabel.cpp
    M tests/src/core/testqgscomposerscalebar.cpp
    M tests/src/core/testqgsexpression.cpp
    M tests/src/gui/testrendererv2gui.cpp
    M tests/src/gui/testrendererv2gui.h
    M tests/src/python/CMakeLists.txt
    M tests/src/python/qgscompositionchecker.py
    A tests/src/python/test_qgsatlascomposition.py
    A tests/src/python/test_qgscomposerlabel.py
    M tests/src/python/test_qgscomposermap.py
    M tests/src/python/test_qgsgeometry.py
    A tests/src/python/test_qgspoint.py
    M tests/src/python/test_qgssymbollayerv2.py
    M tests/testdata/control_images/expected_composerhtml/composerhtml_table.png
    M tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe1.png
    M tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe2.png
    M tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe3.png
    M tests/testdata/control_images/expected_composermap/composermap_landsat_overview.png
    A tests/testdata/control_images/expected_composermapatlas/autoscale_0.png
    A tests/testdata/control_images/expected_composermapatlas/autoscale_1.png
    A tests/testdata/control_images/expected_composermapatlas/fixedscale_0.png
    A tests/testdata/control_images/expected_composermapatlas/fixedscale_1.png
    A tests/testdata/control_images/expected_composermapatlas/hiding_0.png
    A tests/testdata/control_images/expected_composermapatlas/hiding_1.png
    A tests/testdata/france_parts.dbf
    A tests/testdata/france_parts.prj
    A tests/testdata/france_parts.qpj
    A tests/testdata/france_parts.shp
    A tests/testdata/france_parts.shx
    M tools/qgis-qt3to4.pl

  Log Message:
  -----------
  Merge branch 'master' of github.com:qgis/Quantum-GIS


  Commit: b7a89988dad33b38da84e150d5654a989e17b896
      https://github.com/qgis/Quantum-GIS/commit/b7a89988dad33b38da84e150d5654a989e17b896
  Author: Pirmin Kalberer <pka at sourcepole.ch>
  Date:   2012-10-07 (Sun, 07 Oct 2012)

  Changed paths:
    M src/plugins/CMakeLists.txt

  Log Message:
  -----------
  CMake variable for additional plugins to build (Usage: ccmake .. -DCUSTOM_PLUGINS:STRING=myplugin)


Compare: https://github.com/qgis/Quantum-GIS/compare/fccf9ac5d00e...b7a89988dad3


More information about the QGIS-commit mailing list