[QGIS Commit] [qgis/Quantum-GIS] fbb7b3: [FEATURE] editable global scales list

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: fbb7b3c4e08f8f39b4c54e6e7faf7cae55197252
      https://github.com/qgis/Quantum-GIS/commit/fbb7b3c4e08f8f39b4c54e6e7faf7cae55197252
  Author: Alexander Bruy <alexander.bruy at gmail.com>
  Date:   2012-07-18 (Wed, 18 Jul 2012)

  Changed paths:
    M python/gui/qgsscalecombobox.sip
    M src/app/qgisapp.cpp
    M src/app/qgsoptions.cpp
    M src/app/qgsoptions.h
    M src/core/qgis.h
    M src/gui/qgsscalecombobox.cpp
    M src/gui/qgsscalecombobox.h
    M src/ui/qgsoptionsbase.ui

  Log Message:
  -----------
  [FEATURE] editable global scales list


  Commit: c4299f4beec766d937ffe75a52b33cf5a7c43cdb
      https://github.com/qgis/Quantum-GIS/commit/c4299f4beec766d937ffe75a52b33cf5a7c43cdb
  Author: Alexander Bruy <alexander.bruy at gmail.com>
  Date:   2012-07-18 (Wed, 18 Jul 2012)

  Changed paths:
    M src/app/qgisapp.cpp

  Log Message:
  -----------
  reload scales list only when necessary


  Commit: fc3e49b8a3c230ea75e2a73cce7c753735f9777f
      https://github.com/qgis/Quantum-GIS/commit/fc3e49b8a3c230ea75e2a73cce7c753735f9777f
  Author: Alexander Bruy <alexander.bruy at gmail.com>
  Date:   2012-07-18 (Wed, 18 Jul 2012)

  Changed paths:
    M src/app/qgisapp.cpp
    M src/app/qgsoptions.cpp
    M src/app/qgsoptions.h
    M src/app/qgsprojectproperties.cpp
    M src/app/qgsprojectproperties.h
    M src/gui/qgsscalecombobox.cpp
    M src/ui/qgsoptionsbase.ui
    M src/ui/qgsprojectpropertiesbase.ui

  Log Message:
  -----------
  [FEATURE] project scale list (if used - overrides global predefined scales)


  Commit: f5dce33431762bbe9f67e8bcdf3b6d3bd42c98e0
      https://github.com/qgis/Quantum-GIS/commit/f5dce33431762bbe9f67e8bcdf3b6d3bd42c98e0
  Author: Alexander Bruy <alexander.bruy at gmail.com>
  Date:   2012-07-18 (Wed, 18 Jul 2012)

  Changed paths:
    M src/app/qgsoptions.cpp
    M src/app/qgsoptions.h
    M src/app/qgsprojectproperties.cpp
    M src/app/qgsprojectproperties.h
    M src/core/CMakeLists.txt
    A src/core/qgsscaleutils.cpp
    A src/core/qgsscaleutils.h

  Log Message:
  -----------
  scales import/export


  Commit: fe2252de5e2f83a1d445675233ae35ee7668a99b
      https://github.com/qgis/Quantum-GIS/commit/fe2252de5e2f83a1d445675233ae35ee7668a99b
  Author: Alexander Bruy <alexander.bruy at gmail.com>
  Date:   2012-07-18 (Wed, 18 Jul 2012)

  Changed paths:
    M python/gui/qgsscalecombobox.sip
    M src/app/qgisapp.cpp
    M src/app/qgsoptions.cpp
    M src/app/qgsoptions.h
    M src/app/qgsprojectproperties.cpp
    M src/app/qgsprojectproperties.h
    M src/core/CMakeLists.txt
    M src/core/qgis.h
    A src/core/qgsscaleutils.cpp
    A src/core/qgsscaleutils.h
    M src/gui/qgsscalecombobox.cpp
    M src/gui/qgsscalecombobox.h
    M src/ui/qgsoptionsbase.ui
    M src/ui/qgsprojectpropertiesbase.ui

  Log Message:
  -----------
  Merge branch 'project_scale'


Compare: https://github.com/qgis/Quantum-GIS/compare/aea41eebbc7b...fe2252de5e2f