Permalink
Showing
with
2,059 additions
and 628 deletions.
- +60 −44 debian/control.in
- +0 −4 debian/qgis-plugin-grass.install.in
- +0 −12 debian/qgis-plugin-grass.postrm
- +0 −13 debian/qgis-plugin-grass.preinst
- +4 −0 debian/qgis-provider-grass.install.in
- +2 −0 debian/qgis-provider-grass.lintian-overrides
- +12 −0 debian/qgis-provider-grass.postrm
- +13 −0 debian/qgis-provider-grass.preinst
- +38 −19 debian/rules
- +1 −1 i18n/qgis_ar.ts
- +1 −1 i18n/qgis_bs.ts
- +1 −1 i18n/qgis_ca.ts
- +1 −1 i18n/qgis_cs.ts
- +1 −1 i18n/qgis_da.ts
- +1 −1 i18n/qgis_de.ts
- +1 −1 i18n/qgis_el.ts
- +2 −2 i18n/qgis_en.ts
- +1 −1 i18n/qgis_es.ts
- +1 −1 i18n/qgis_et.ts
- +1 −1 i18n/qgis_eu.ts
- +1 −1 i18n/qgis_fa.ts
- +1 −1 i18n/qgis_fi.ts
- +1 −1 i18n/qgis_fr.ts
- +1 −1 i18n/qgis_gl.ts
- +1 −1 i18n/qgis_hi.ts
- +1 −1 i18n/qgis_hr.ts
- +1 −1 i18n/qgis_hu.ts
- +1 −1 i18n/qgis_id.ts
- +1 −1 i18n/qgis_is.ts
- +1 −1 i18n/qgis_it.ts
- +1 −1 i18n/qgis_ja.ts
- +1 −1 i18n/qgis_km.ts
- +1 −1 i18n/qgis_ko.ts
- +1 −1 i18n/qgis_lt.ts
- +1 −1 i18n/qgis_lv.ts
- +1 −1 i18n/qgis_nb.ts
- +1 −1 i18n/qgis_nl.ts
- +1 −1 i18n/qgis_pl.ts
- +1 −1 i18n/qgis_pt_BR.ts
- +1 −1 i18n/qgis_pt_PT.ts
- +1 −1 i18n/qgis_ro.ts
- +1 −1 i18n/qgis_ru.ts
- +1 −1 i18n/qgis_sk.ts
- +1 −1 i18n/qgis_sl.ts
- +1 −1 i18n/qgis_sr.ts
- +1 −1 i18n/qgis_sr@latin.ts
- +1 −1 i18n/qgis_sv.ts
- +1 −1 i18n/qgis_th.ts
- +1 −1 i18n/qgis_tr.ts
- +1 −1 i18n/qgis_vi.ts
- +1 −1 i18n/qgis_zh-Hans.ts
- +1 −1 i18n/qgis_zh_CN.ts
- +1 −1 i18n/qgis_zh_TW.ts
- +48 −27 python/core/qgsapplication.sip
- +15 −0 python/core/qgspallabeling.sip
- +2 −0 python/gui/attributetable/qgsfieldconditionalformatwidget.sip
- +1 −0 resources/CMakeLists.txt
- BIN resources/themes/Night Mapping/icons/caret-down_ffffff_14.png
- BIN resources/themes/Night Mapping/icons/caret-right_ffffff_14.png
- BIN resources/themes/Night Mapping/icons/check.png
- +59 −0 resources/themes/Night Mapping/icons/cross.svg
- BIN resources/themes/Night Mapping/icons/down_arrow.png
- +67 −0 resources/themes/Night Mapping/icons/eye-blocked.svg
- +56 −0 resources/themes/Night Mapping/icons/eye.svg
- +515 −0 resources/themes/Night Mapping/style.qss
- +4 −0 src/app/composer/qgscomposer.cpp
- +1 −0 src/app/main.cpp
- +18 −4 src/app/qgisapp.cpp
- +2 −0 src/app/qgisapp.h
- +4 −0 src/app/qgsadvanceddigitizingcanvasitem.cpp
- +1 −0 src/app/qgsadvanceddigitizingcanvasitem.h
- +5 −0 src/app/qgsadvanceddigitizingdockwidget.cpp
- +1 −1 src/app/qgsbookmarks.cpp
- +11 −1 src/app/qgsmaptooladdcircularstring.cpp
- +2 −0 src/app/qgsmaptooladdcircularstring.h
- +8 −0 src/app/qgsmaptoolcapture.cpp
- +2 −1 src/app/qgsmaptoolcapture.h
- +1 −1 src/app/qgsmaptoolcircularstringcurvepoint.cpp
- +13 −0 src/app/qgsoptions.cpp
- +2 −0 src/app/qgsoptions.h
- +4 −1 src/app/qgsversioninfo.cpp
- +8 −3 src/app/qgswelcomepage.cpp
- +5 −0 src/app/qgswelcomepage.h
- +1 −1 src/core/composer/qgsatlascomposition.cpp
- +1 −1 src/core/composer/qgscomposerattributetable.cpp
- +15 −0 src/core/geometry/qgscircularstringv2.cpp
- +5 −0 src/core/geometry/qgscompoundcurvev2.cpp
- +1 −0 src/core/geometry/qgsgeometry.cpp
- +73 −28 src/core/qgsapplication.cpp
- +45 −28 src/core/qgsapplication.h
- +14 −0 src/core/qgsexpression.cpp
- +6 −9 src/core/qgsexpression.h
- +45 −7 src/core/qgspallabeling.cpp
- +18 −0 src/core/qgspallabeling.h
- +3 −1 src/core/qgsvectorlayer.cpp
- +6 −1 src/core/qgsvectorlayereditutils.cpp
- +2 −0 src/core/symbology-ng/qgsrulebasedrendererv2.cpp
- +10 −2 src/gui/attributetable/qgsfieldconditionalformatwidget.cpp
- +2 −0 src/gui/attributetable/qgsfieldconditionalformatwidget.h
- +1 −1 src/gui/editorwidgets/qgsrelationreferencewidget.cpp
- +4 −1 src/gui/qgsvariableeditorwidget.cpp
- +10 −1 src/plugins/grass/CMakeLists.txt
- +1 −1 src/plugins/grass/modules/db.out.ogr.qgm
- +6 −3 src/plugins/grass/modules/r.basins.fill.qgm
- +4 −2 src/plugins/grass/modules/r.carve.qgm
- +4 −2 src/plugins/grass/modules/r.circle.qgm
- +5 −4 src/plugins/grass/modules/r.colors.stddev.qgm
- +10 −7 src/plugins/grass/modules/r.composite.qgm
- +4 −2 src/plugins/grass/modules/r.fill.dir.qgm
- +12 −6 src/plugins/grass/modules/r.his.qgm
- +4 −2 src/plugins/grass/modules/r.lake.seed.qgm
- +6 −3 src/plugins/grass/modules/r.lake.xy.qgm
- +4 −2 src/plugins/grass/modules/r.random.qgm
- +4 −2 src/plugins/grass/modules/r.random.raster.qgm
- +3 −1 src/plugins/grass/modules/r.reclass.area.greater.qgm
- +3 −1 src/plugins/grass/modules/r.reclass.area.lesser.qgm
- +7 −4 src/plugins/grass/modules/r.water.outlet.qgm
- +1 −1 src/plugins/grass/modules/v.in.ogr.qgis.loc.qgm
- +1 −1 src/plugins/grass/modules/v.normal.qgm
- +27 −10 src/plugins/grass/qgsgrassmoduleparam.cpp
- +1 −1 src/plugins/grass/qtermwidget/SearchBar.cpp
- +66 −38 src/providers/wms/qgswmscapabilities.cpp
- +7 −0 src/providers/wms/qgswmscapabilities.h
- +16 −4 src/providers/wms/qgswmsdataitems.cpp
- +4 −0 src/providers/wms/qgswmsdataitems.h
- +2 −5 src/server/qgswmsserver.cpp
- +0 −2 src/ui/qgisapp.ui
- +85 −262 src/ui/qgsoptionsbase.ui
- +3 −0 tests/src/core/testqgscomposermap.cpp
- +1 −0 tests/src/core/testqgscomposermultiframe.cpp
- +2 −2 tests/src/core/testqgscomposertablev2.cpp
- +4 −3 tests/src/core/testqgsrasterlayer.cpp
- +1 −0 tests/src/python/CMakeLists.txt
- +131 −0 tests/src/python/test_qgspallabeling_placement.py
- BIN ...ata/control_images/expected_pal_placement/sp_point_placement_around/sp_point_placement_around.png
- BIN ...ontrol_images/expected_pal_placement/sp_point_placement_around/sp_point_placement_around_mask.png
- BIN .../expected_pal_placement/sp_point_placement_around_obstacle/sp_point_placement_around_obstacle.png
- BIN ...cted_pal_placement/sp_point_placement_around_obstacle/sp_point_placement_around_obstacle_mask.png
- BIN tests/testdata/labeling/pal_features_v3.sqlite
- +339 −0 tests/testdata/labeling/point2.qml
| @@ -1,6 +1,2 @@ | ||
| usr/lib/qgis/grass/modules/qgis.d.rast{GRASSVER} | ||
| usr/lib/qgis/grass/modules/qgis.g.info{GRASSVER} | ||
| usr/lib/qgis/grass/bin/qgis.g.browser{GRASSVER} | ||
| usr/lib/qgis/plugins/libgrassplugin{GRASSVER}.so | ||
| usr/lib/qgis/plugins/libgrassprovider{GRASSVER}.so | ||
| usr/lib/qgis/plugins/libgrassrasterprovider{GRASSVER}.so |
| @@ -0,0 +1,4 @@ | ||
| usr/lib/qgis/grass/modules/qgis.d.rast{GRASSVER} | ||
| usr/lib/qgis/grass/modules/qgis.g.info{GRASSVER} | ||
| usr/lib/qgis/plugins/libgrassprovider{GRASSVER}.so | ||
| usr/lib/qgis/plugins/libgrassrasterprovider{GRASSVER}.so |
| @@ -0,0 +1,2 @@ | ||
| qgis-plugin-grass: package-name-doesnt-match-sonames | ||
| qgis-plugin-grass: no-symbols-control-file |
| @@ -0,0 +1,12 @@ | ||
| #!/bin/sh | ||
|
|
||
| set -e | ||
|
|
||
| if [ "$1" = "remove" ]; then | ||
| dpkg-divert --package qgis-provider-grass --remove --rename --divert /usr/bin/qgis.bin /usr/bin/qgis | ||
| dpkg-divert --package qgis-provider-grass --remove --rename --divert /usr/bin/qbrowser.bin /usr/bin/qbrowser | ||
| fi | ||
|
|
||
| #DEBHELPER# | ||
|
|
||
| exit 0 |
| @@ -0,0 +1,13 @@ | ||
| #!/bin/sh | ||
|
|
||
| set -e | ||
|
|
||
| if [ "$1" = "install" -o "$1" = "upgrade" ]; then | ||
| dpkg-divert --package qgis-provider-grass --add --rename --divert /usr/bin/qgis.bin /usr/bin/qgis | ||
| dpkg-divert --package qgis-provider-grass --add --rename --divert /usr/bin/qbrowser.bin /usr/bin/qbrowser | ||
| fi | ||
|
|
||
| #DEBHELPER# | ||
|
|
||
| exit 0 | ||
|
|
| </message> | ||
| <message> | ||
| <location filename="../src/app/qgstipfactory.cpp" line="58"/> | ||
| <source>If you need help using QGIS we have a 'users' mailing list where users help each other with issues related to using our sofware. We also have a 'developers' mailing list. for those wanting help and to discuss things relating to the QGIS code base. Details on how to subscribe are in the <a href="http://qgis.org/en/site/forusers/support.html#mailing-lists">community section</a> of the QGIS home page.</source> | ||
| <source>If you need help using QGIS we have a 'users' mailing list where users help each other with issues related to using our software. We also have a 'developers' mailing list. for those wanting help and to discuss things relating to the QGIS code base. Details on how to subscribe are in the <a href="http://qgis.org/en/site/forusers/support.html#mailing-lists">community section</a> of the QGIS home page.</source> | ||
| <translation type="unfinished"></translation> | ||
| </message> | ||
| <message> |
| </message> | ||
| <message> | ||
| <location filename="../src/app/qgstipfactory.cpp" line="58"/> | ||
| <source>If you need help using QGIS we have a 'users' mailing list where users help each other with issues related to using our sofware. We also have a 'developers' mailing list. for those wanting help and to discuss things relating to the QGIS code base. Details on how to subscribe are in the <a href="http://qgis.org/en/site/forusers/support.html#mailing-lists">community section</a> of the QGIS home page.</source> | ||
| <source>If you need help using QGIS we have a 'users' mailing list where users help each other with issues related to using our software. We also have a 'developers' mailing list. for those wanting help and to discuss things relating to the QGIS code base. Details on how to subscribe are in the <a href="http://qgis.org/en/site/forusers/support.html#mailing-lists">community section</a> of the QGIS home page.</source> | ||
| <translation type="unfinished"></translation> | ||
| </message> | ||
| <message> |
| </message> | ||
| <message> | ||
| <location filename="../src/app/qgstipfactory.cpp" line="58"/> | ||
| <source>If you need help using QGIS we have a 'users' mailing list where users help each other with issues related to using our sofware. We also have a 'developers' mailing list. for those wanting help and to discuss things relating to the QGIS code base. Details on how to subscribe are in the <a href="http://qgis.org/en/site/forusers/support.html#mailing-lists">community section</a> of the QGIS home page.</source> | ||
| <source>If you need help using QGIS we have a 'users' mailing list where users help each other with issues related to using our software. We also have a 'developers' mailing list. for those wanting help and to discuss things relating to the QGIS code base. Details on how to subscribe are in the <a href="http://qgis.org/en/site/forusers/support.html#mailing-lists">community section</a> of the QGIS home page.</source> | ||
| <translation type="unfinished"></translation> | ||
| </message> | ||
| <message> |
| </message> | ||
| <message> | ||
| <location filename="../src/app/qgstipfactory.cpp" line="58"/> | ||
| <source>If you need help using QGIS we have a 'users' mailing list where users help each other with issues related to using our sofware. We also have a 'developers' mailing list. for those wanting help and to discuss things relating to the QGIS code base. Details on how to subscribe are in the <a href="http://qgis.org/en/site/forusers/support.html#mailing-lists">community section</a> of the QGIS home page.</source> | ||
| <source>If you need help using QGIS we have a 'users' mailing list where users help each other with issues related to using our software. We also have a 'developers' mailing list. for those wanting help and to discuss things relating to the QGIS code base. Details on how to subscribe are in the <a href="http://qgis.org/en/site/forusers/support.html#mailing-lists">community section</a> of the QGIS home page.</source> | ||
| <translation type="unfinished"></translation> | ||
| </message> | ||
| <message> |
Oops, something went wrong.