[QGIS Commit] [qgis/Quantum-GIS] 0f756c: Delimited text GUI tidy up. Renamed useWatcher op...

GitHub noreply at github.com
Fri May 17 00:12:18 PDT 2013 

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: 0f756c9528c1b006c3f91c0e73e83e89636f38da
      https://github.com/qgis/Quantum-GIS/commit/0f756c9528c1b006c3f91c0e73e83e89636f38da
  Author: Chris Crook <ccrook at linz.govt.nz>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M resources/context_help/QgsDelimitedTextSourceSelect-en_US
    M src/core/qgsvectorlayer.h
    M src/providers/delimitedtext/qgsdelimitedtextfile.cpp
    M src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp
    M src/providers/delimitedtext/qgsdelimitedtextsourceselect.h
    M src/ui/qgsdelimitedtextsourceselectbase.ui
    M tests/src/python/test_qgsdelimitedtextprovider.py
    M tests/src/python/test_qgsdelimitedtextprovider_wanted.py

  Log Message:
  -----------
  Delimited text GUI tidy up.  Renamed useWatcher option to watchFile


  Commit: 94468c52ddb6520b525a2b96edb978c804ec4455
      https://github.com/qgis/Quantum-GIS/commit/94468c52ddb6520b525a2b96edb978c804ec4455
  Author: Chris Crook <ccrook at linz.govt.nz>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp

  Log Message:
  -----------
  Minor gui fix


  Commit: 83b571b45e7a7057249206f6b19a63a4201b1413
      https://github.com/qgis/Quantum-GIS/commit/83b571b45e7a7057249206f6b19a63a4201b1413
  Author: Chris Crook <ccrook at linz.govt.nz>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    R doc/plugins/delimited_text/dialog.png
    R doc/plugins/delimited_text/ellipsis.png
    R doc/plugins/delimited_text/file_selected.png
    R doc/plugins/delimited_text/file_selected1.png
    R doc/plugins/delimited_text/file_selected2.png
    R doc/plugins/delimited_text/file_selected3.png
    R doc/plugins/delimited_text/index.html
    R doc/plugins/delimited_text/layer_added.png
    R doc/plugins/delimited_text/plugin_manager.png
    R doc/plugins/delimited_text/toolbar_icon.png
    M images/images.qrc
    A images/themes/default/mActionAddDelimitedTextLayer.png
    R images/themes/default/plugins/delimited_text.png
    M src/app/qgisapp.cpp
    M src/app/qgisapp.h
    M src/plugins/CMakeLists.txt
    R src/plugins/delimited_text/CMakeLists.txt
    R src/plugins/delimited_text/delimitedText.svg
    R src/plugins/delimited_text/delimited_text.png
    R src/plugins/delimited_text/delimited_text.qrc
    R src/plugins/delimited_text/qgsdelimitedtextplugin.cpp
    R src/plugins/delimited_text/qgsdelimitedtextplugin.h
    M src/ui/qgisapp.ui

  Log Message:
  -----------
  Delimited text plugin moved to core


  Commit: 8bf3d18c683d3cf459c5496d1945e2dd7c3a310b
      https://github.com/qgis/Quantum-GIS/commit/8bf3d18c683d3cf459c5496d1945e2dd7c3a310b
  Author: Chris Crook <ccrook at linz.govt.nz>
  Date:   2013-05-16 (Thu, 16 May 2013)

  Changed paths:
    M debian/changelog
    M debian/qgis-common.install
    M doc/TRANSLATORS
    M i18n/qgis_de.ts
    M i18n/qgis_es.ts
    M i18n/qgis_fr.ts
    M i18n/qgis_it.ts
    M i18n/qgis_ja.ts
    M i18n/qgis_pl_PL.ts
    M i18n/qgis_pt_BR.ts
    M i18n/qgis_ru.ts
    M i18n/qgis_sk.ts
    M i18n/qgis_sv.ts
    M python/console/console.py
    M python/console/console_editor.py
    M python/console/console_sci.py
    M python/console/console_settings.py
    M python/console/console_settings.ui
    M python/core/composer/qgscomposermap.sip
    M python/core/qgsbrowsermodel.sip
    M python/core/qgsdataitem.sip
    M python/core/qgsproject.sip
    M python/core/qgsvectorlayer.sip
    M python/core/raster/qgsrasterlayer.sip
    M python/gui/qgisinterface.sip
    M python/plugins/sextante/grass/GrassUtils.py
    M python/plugins/sextante/modeler/ModelerArrowItem.py
    M python/plugins/sextante/modeler/ModelerGraphicItem.py
    M resources/CMakeLists.txt
    M resources/context_help/CMakeLists.txt
    M resources/context_help/MapServerExport-de_DE
    M resources/context_help/QgsAttributeTableDialog-de_DE
    M resources/context_help/QgsAttributeTableDialog-en_US
    M resources/context_help/QgsBookmarks-de_DE
    M resources/context_help/QgsBookmarks-fr_FR
    M resources/context_help/QgsComposer-de_DE
    M resources/context_help/QgsComposer-es_ES
    M resources/context_help/QgsComposer-pl_PL
    M resources/context_help/QgsCustomProjectionDialog-de_DE
    M resources/context_help/QgsDecorationCopyrightDialog-de_DE
    M resources/context_help/QgsDecorationCopyrightDialog-pl_PL
    M resources/context_help/QgsDecorationNorthArrowDialog-de_DE
    M resources/context_help/QgsDecorationScaleBarDialog-de_DE
    M resources/context_help/QgsDecorationScaleBarDialog-en_US
    M resources/context_help/QgsDecorationScaleBarDialog-es_ES
    M resources/context_help/QgsDecorationScaleBarDialog-ja_JP
    M resources/context_help/QgsDecorationScaleBarDialog-pt_BR
    M resources/context_help/QgsDelimitedTextSourceSelect-de_DE
    M resources/context_help/QgsFieldCalculator-de_DE
    M resources/context_help/QgsFieldCalculator-fr_FR
    M resources/context_help/QgsIdentifyResults-de_DE
    M resources/context_help/QgsMeasureDialog-de_DE
    M resources/context_help/QgsNewOgrConnection-fr_FR
    M resources/context_help/QgsNewSpatialiteLayerDialog-de_DE
    M resources/context_help/QgsNewVectorLayerDialog-de_DE
    M resources/context_help/QgsOpenVectorLayerDialog-de_DE
    M resources/context_help/QgsOptions-de_DE
    M resources/context_help/QgsOracleNewConnection-de_DE
    M resources/context_help/QgsOracleNewConnection-en_US
    M resources/context_help/QgsPgNewConnection-de_DE
    M resources/context_help/QgsPgNewConnection-fr_FR
    M resources/context_help/QgsPgSourceSelect-de_DE
    M resources/context_help/QgsPluginInstallerDialog-de_DE
    M resources/context_help/QgsPluginInstallerDialog-en_US
    M resources/context_help/QgsProjectProperties-de_DE
    M resources/context_help/QgsSpatiaLiteSourceSelect-de_DE
    M resources/context_help/QgsVectorLayerProperties-de_DE
    M resources/context_help/QgsVectorLayerProperties-en_US
    M resources/context_help/QgsVectorLayerProperties-fr_FR
    M resources/context_help/QgsVectorLayerSaveAsDialog-de_DE
    M resources/context_help/QgsWMSSourceSelect-de_DE
    M resources/context_help/QgsWMSSourceSelect-fr_FR
    M resources/context_help/RgSettingsDlg-de_DE
    M resources/context_help/RgSettingsDlg-fr_FR
    M resources/context_help/RgShortestPathWidget-de_DE
    M resources/context_help/SaNewConnection-de_DE
    M resources/context_help/SaSourceSelect-de_DE
    M resources/context_help/SaSourceSelect-fr_FR
    M resources/function_help/$area-de_DE
    A resources/function_help/$feature-de_DE
    M resources/function_help/$id-de_DE
    M resources/function_help/$length-de_DE
    A resources/function_help/$numfeatures-de_DE
    A resources/function_help/$numpages-de_DE
    A resources/function_help/$page-de_DE
    M resources/function_help/$perimeter-de_DE
    M resources/function_help/$pi-de_DE
    M resources/function_help/$scale-de_DE
    M resources/function_help/$x-de_DE
    M resources/function_help/$y-de_DE
    M resources/function_help/Bedingungen-de_DE
    M resources/function_help/CASE ELSE-de_DE
    M resources/function_help/CASE-de_DE
    M resources/function_help/CMakeLists.txt
    A resources/function_help/Conditions-de_DE
    M resources/function_help/Datensatz-de_DE
    M resources/function_help/Datum und Zeit-de_DE
    A resources/function_help/Farbe-de_DE
    M resources/function_help/Felder und Werte-de_DE
    M resources/function_help/Field-de_DE
    M resources/function_help/Geometrie-de_DE
    M resources/function_help/Mathematik-de_DE
    M resources/function_help/Operatoren-de_DE
    M resources/function_help/Umwandlungen-de_DE
    M resources/function_help/Zeichenketten-de_DE
    A resources/function_help/abs-de_DE
    A resources/function_help/abs-en_US
    M resources/function_help/acos-de_DE
    M resources/function_help/acos-en_US
    M resources/function_help/age-de_DE
    M resources/function_help/asin-de_DE
    M resources/function_help/asin-en_US
    M resources/function_help/atan-de_DE
    M resources/function_help/atan-en_US
    M resources/function_help/atan2-de_DE
    M resources/function_help/atan2-en_US
    A resources/function_help/ceil-de_DE
    A resources/function_help/ceil-en_US
    A resources/function_help/clamp-en_US
    M resources/function_help/coalesce-de_DE
    A resources/function_help/color_cmyk-de_DE
    A resources/function_help/color_cmyka-de_DE
    A resources/function_help/color_hsl-de_DE
    M resources/function_help/color_hsl-en_US
    A resources/function_help/color_hsla-de_DE
    M resources/function_help/color_hsla-en_US
    A resources/function_help/color_hsv-de_DE
    M resources/function_help/color_hsv-en_US
    A resources/function_help/color_hsva-de_DE
    M resources/function_help/color_hsva-en_US
    A resources/function_help/color_rgb-de_DE
    A resources/function_help/color_rgba-de_DE
    M resources/function_help/concat-de_DE
    M resources/function_help/cos-de_DE
    M resources/function_help/cos-en_US
    M resources/function_help/exp-de_DE
    M resources/function_help/exp-en_US
    A resources/function_help/floor-de_DE
    A resources/function_help/floor-en_US
    A resources/function_help/format-de_DE
    A resources/function_help/format_date-de_DE
    M resources/function_help/format_date-en_US
    M resources/function_help/format_number-de_DE
    M resources/function_help/left-de_DE
    M resources/function_help/length-de_DE
    M resources/function_help/ln-de_DE
    M resources/function_help/log-de_DE
    M resources/function_help/log-en_US
    M resources/function_help/log10-de_DE
    M resources/function_help/lpad-de_DE
    A resources/function_help/max-de_DE
    A resources/function_help/max-en_US
    A resources/function_help/min-de_DE
    A resources/function_help/min-en_US
    M resources/function_help/month-de_DE
    A resources/function_help/ramp_color-de_DE
    A resources/function_help/rand-de_DE
    A resources/function_help/rand-en_US
    A resources/function_help/randf-de_DE
    A resources/function_help/randf-en_US
    A resources/function_help/regexp_match-de_DE
    M resources/function_help/regexp_replace-de_DE
    A resources/function_help/regexp_substr-de_DE
    A resources/function_help/regexp_substr-en_US
    M resources/function_help/replace-de_DE
    M resources/function_help/right-de_DE
    M resources/function_help/right-en_US
    M resources/function_help/round-de_DE
    M resources/function_help/rpad-de_DE
    A resources/function_help/scale_exp-en_US
    A resources/function_help/scale_linear-de_DE
    A resources/function_help/scale_linear-en_US
    M resources/function_help/second-de_DE
    M resources/function_help/sin-de_DE
    M resources/function_help/sin-en_US
    M resources/function_help/sqrt-de_DE
    M resources/function_help/sqrt-en_US
    M resources/function_help/strpos-de_DE
    M resources/function_help/substr-de_DE
    M resources/function_help/tan-de_DE
    M resources/function_help/tan-en_US
    M resources/function_help/title-de_DE
    A resources/function_help/todate-de_DE
    A resources/function_help/todatetime-de_DE
    M resources/function_help/toint-de_DE
    M resources/function_help/toint-en_US
    A resources/function_help/tointerval-de_DE
    A resources/function_help/toreal-de_DE
    M resources/function_help/toreal-en_US
    M resources/function_help/tostring-de_DE
    M resources/function_help/tostring-en_US
    A resources/function_help/totime-de_DE
    A resources/function_help/trim-de_DE
    A resources/function_help/trim-en_US
    M resources/function_help/upper-de_DE
    M resources/function_help/week-de_DE
    M resources/function_help/year-de_DE
    R resources/qgis_help.db
    A scripts/integrate_function_help.pl
    M src/app/composer/qgscomposer.cpp
    M src/app/composer/qgscomposer.h
    M src/app/composer/qgscomposermapwidget.cpp
    M src/app/composer/qgscomposermapwidget.h
    M src/app/main.cpp
    M src/app/qgisapp.cpp
    M src/app/qgisapp.h
    M src/app/qgisappinterface.cpp
    M src/app/qgisappinterface.h
    M src/app/qgsattributetabledialog.cpp
    M src/app/qgsbrowserdockwidget.cpp
    M src/app/qgsbrowserdockwidget.h
    M src/app/qgsfieldsproperties.cpp
    M src/app/qgsfieldsproperties.h
    M src/app/qgsrasterlayerproperties.cpp
    M src/app/qgsrasterlayerproperties.h
    M src/core/CMakeLists.txt
    M src/core/composer/qgscomposermap.cpp
    M src/core/composer/qgscomposermap.h
    M src/core/qgsapplication.cpp
    M src/core/qgsbrowsermodel.cpp
    M src/core/qgsbrowsermodel.h
    M src/core/qgscontexthelp.cpp
    M src/core/qgscontexthelp.h
    M src/core/qgscoordinatereferencesystem.h
    M src/core/qgscoordinatetransform.cpp
    M src/core/qgsdataitem.cpp
    M src/core/qgsdataitem.h
    M src/core/qgsexpression.cpp
    M src/core/qgsexpression.h
    M src/core/qgsmaprenderer.cpp
    M src/core/qgsowsconnection.cpp
    M src/core/qgsowsconnection.h
    M src/core/qgsproject.h
    M src/core/qgsvectorlayer.cpp
    M src/core/qgsvectorlayer.h
    M src/core/qgsvectorlayercache.cpp
    M src/core/qgsvectorlayercache.h
    M src/core/raster/qgsbrightnesscontrastfilter.cpp
    M src/core/raster/qgshuesaturationfilter.cpp
    M src/core/raster/qgspalettedrasterrenderer.cpp
    M src/core/raster/qgsrasterblock.h
    M src/core/raster/qgsrasterlayer.cpp
    M src/core/raster/qgsrasterlayer.h
    M src/core/raster/qgsrasternuller.cpp
    M src/core/raster/qgsrasterprojector.cpp
    M src/core/raster/qgsrasterresamplefilter.cpp
    M src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
    M src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
    M src/gui/attributetable/qgsattributetablemodel.cpp
    M src/gui/attributetable/qgsattributetableview.cpp
    M src/gui/qgisinterface.h
    M src/gui/qgscredentialdialog.cpp
    M src/gui/qgscredentialdialog.h
    M src/gui/qgsexpressionbuilderwidget.cpp
    M src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp
    M src/helpviewer/CMakeLists.txt
    M src/helpviewer/main.cpp
    R src/helpviewer/qgshelpserver.cpp
    R src/helpviewer/qgshelpserver.h
    M src/helpviewer/qgshelpviewer.cpp
    M src/helpviewer/qgshelpviewer.h
    M src/mapserver/qgsconfigparser.cpp
    M src/mapserver/qgshttprequesthandler.cpp
    M src/mapserver/qgsmslayerbuilder.cpp
    M src/mapserver/qgsprojectparser.cpp
    M src/mapserver/qgsprojectparser.h
    M src/mapserver/qgssldparser.cpp
    M src/mapserver/qgswmsserver.cpp
    M src/providers/gdal/qgsgdalprovider.cpp
    M src/providers/oracle/qgsoraclecolumntypethread.cpp
    M src/providers/oracle/qgsoraclecolumntypethread.h
    M src/providers/oracle/qgsoracleconn.cpp
    M src/providers/oracle/qgsoracleconn.h
    M src/providers/oracle/qgsoracledataitems.cpp
    M src/providers/oracle/qgsoracledataitems.h
    M src/providers/oracle/qgsoraclenewconnection.cpp
    M src/providers/oracle/qgsoracleprovider.cpp
    M src/providers/oracle/qgsoraclesourceselect.cpp
    M src/providers/oracle/qgsoracletablemodel.cpp
    M src/providers/postgres/qgscolumntypethread.cpp
    M src/providers/postgres/qgscolumntypethread.h
    M src/providers/postgres/qgspgsourceselect.cpp
    M src/providers/postgres/qgspgtablemodel.cpp
    M src/providers/postgres/qgspgtablemodel.h
    M src/providers/postgres/qgspostgresconn.cpp
    M src/providers/postgres/qgspostgresconn.h
    M src/providers/postgres/qgspostgresdataitems.cpp
    M src/providers/postgres/qgspostgresdataitems.h
    M src/providers/postgres/qgspostgresprovider.cpp
    M src/ui/qgisapp.ui
    M src/ui/qgscomposermapwidgetbase.ui
    M src/ui/qgsdiagrampropertiesbase.ui
    M src/ui/qgsfieldspropertiesbase.ui
    R src/ui/qgshelpviewerbase.ui
    M src/ui/qgsoraclenewconnectionbase.ui
    M src/ui/qgsrendererv2propsdialogbase.ui
    M tests/src/core/testqgsblendmodes.cpp
    M tests/src/core/testqgscomposermap.cpp
    M tests/src/core/testqgsexpression.cpp
    M tests/src/python/test_qgsblendmodes.py
    M tests/src/python/test_qgscomposermap.py
    M tests/testdata/control_images/expected_composermap/composermap_landsat_grid.png
    A tests/testdata/control_images/expected_vector_featureblendmodes/expected_vector_featureblendmodes.png
    A tests/testdata/control_images/expected_vector_layertransparency/expected_vector_layertransparency.png

  Log Message:
  -----------
  Fix merge conflict


  Commit: 198cc39f85b749e9cc6d1ff2451ce5a56ea5dfa3
      https://github.com/qgis/Quantum-GIS/commit/198cc39f85b749e9cc6d1ff2451ce5a56ea5dfa3
  Author: Chris Crook <ccrook at linz.govt.nz>
  Date:   2013-05-16 (Thu, 16 May 2013)

  Changed paths:
    M resources/context_help/QgsDelimitedTextSourceSelect-en_US

  Log Message:
  -----------
  Fixing line spacing in <pre> section of delimited text context help


  Commit: 91f3ceab26013d6c97a0047c344f5e2570df34c3
      https://github.com/qgis/Quantum-GIS/commit/91f3ceab26013d6c97a0047c344f5e2570df34c3
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2013-05-17 (Fri, 17 May 2013)

  Changed paths:
    R doc/plugins/delimited_text/dialog.png
    R doc/plugins/delimited_text/ellipsis.png
    R doc/plugins/delimited_text/file_selected.png
    R doc/plugins/delimited_text/file_selected1.png
    R doc/plugins/delimited_text/file_selected2.png
    R doc/plugins/delimited_text/file_selected3.png
    R doc/plugins/delimited_text/index.html
    R doc/plugins/delimited_text/layer_added.png
    R doc/plugins/delimited_text/plugin_manager.png
    R doc/plugins/delimited_text/toolbar_icon.png
    M images/images.qrc
    A images/themes/default/mActionAddDelimitedTextLayer.png
    R images/themes/default/plugins/delimited_text.png
    M resources/context_help/QgsDelimitedTextSourceSelect-en_US
    M src/app/qgisapp.cpp
    M src/app/qgisapp.h
    M src/core/qgsvectorlayer.h
    M src/plugins/CMakeLists.txt
    R src/plugins/delimited_text/CMakeLists.txt
    R src/plugins/delimited_text/delimitedText.svg
    R src/plugins/delimited_text/delimited_text.png
    R src/plugins/delimited_text/delimited_text.qrc
    R src/plugins/delimited_text/qgsdelimitedtextplugin.cpp
    R src/plugins/delimited_text/qgsdelimitedtextplugin.h
    M src/providers/delimitedtext/qgsdelimitedtextfile.cpp
    M src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp
    M src/providers/delimitedtext/qgsdelimitedtextsourceselect.h
    M src/ui/qgisapp.ui
    M src/ui/qgsdelimitedtextsourceselectbase.ui
    M tests/src/python/test_qgsdelimitedtextprovider.py
    M tests/src/python/test_qgsdelimitedtextprovider_wanted.py

  Log Message:
  -----------
  Merge pull request #591 from ccrook/delimited_text_to_core

Delimited text to core


Compare: https://github.com/qgis/Quantum-GIS/compare/957c4f14331e...91f3ceab2601

More information about the QGIS-commit mailing list