29296 Commits

Author SHA1 Message Date
Nathan Woodrow
c7eef14d62 Remove default QGIS rocks text 2015-10-23 08:52:42 +10:00
Juergen E. Fischer
76ba841853 update debian changelog 2015-10-22 23:16:09 +02:00
Bas Couwenberg
fd6bec43fe Also install MIME type icon in hicolor theme.
Additionally the Shared MIME-info configuration is updated to reference the icon by name (without extension) like the desktop files.
2015-10-22 23:16:09 +02:00
Bas Couwenberg
b730fa0c78 Fix desktop-file-valide issues.
The desktop-file-valide utility reported the following issues:
```
debian/qbrowser.desktop: hint: value "Qt;Education;Science;Geography;" for key "Categories" in group "Desktop Entry" contains more than one main category; application might appear more than once in the application menu
debian/qbrowser.desktop: error: value "map;globe;postgis;wms;wfs;ogc;osgeo" for locale string list key "Keywords" in group "Desktop Entry" does not have a semicolon (';') as trailing character

debian/qgis.desktop: hint: value "Qt;Education;Science;Geography;" for key "Categories" in group "Desktop Entry" contains more than one main category; application might appear more than once in the application menu
debian/qgis.desktop: error: value "map;globe;postgis;wms;wfs;ogc;osgeo" for locale string list key "Keywords" in group "Desktop Entry" does not have a semicolon (';') as trailing character
```

Only the Keywords syntax error is addressed, the Categories hint is left as-is.
2015-10-22 23:16:09 +02:00
Bas Couwenberg
7102c522d4 Drop menu files in favor of desktop files.
The menu files are no longer required for the Debian packages since
[CTTE #741573 Debian Menu System](https://lists.debian.org/debian-devel-announce/2015/09/msg00000.html)
which advised:

>  2. In addition to those changes, the Technical Committee resolves that
>     packages providing a .desktop file shall not also provide a menu
>     file for the same application.
2015-10-22 23:16:09 +02:00
Nyall Dawson
dc6c12b6c3 [composer] Fix scalebar widgets not updated when changing units (fix #13572) 2015-10-23 08:04:44 +11:00
Nyall Dawson
71d88a753f [composer] Fix wording of scalebar widget controls (fix #12063)
Also add some tooltips to clarify meaning of various controls
2015-10-23 08:04:44 +11:00
Nyall Dawson
0886e98023 Standardise naming of border/outline in symbol GUI
Now for markers it's always "outline", and for fills it's
always "border"
2015-10-23 08:04:44 +11:00
Juergen E. Fischer
bf64f8d0a0 spelling fixes and indentation update 2015-10-22 21:56:54 +02:00
Giuseppe Sucameli
339fd75655 DBManager: merge PR2342 by medspx (fix #13650) 2015-10-22 21:28:02 +02:00
Giuseppe Sucameli
9419a44537 DBManager: revert commit 87675f8ab
Maybe I was drunk...
2015-10-22 21:17:56 +02:00
Giuseppe Sucameli
87657f8ab4 DBManager: fix #13650 2015-10-22 19:27:33 +02:00
Giuseppe Sucameli
2a57b17068 DBManager: avoid loading a query as layer with missing fields (fix #11037),
restore combo style and label when multiple unique fields for view are not supported (follow 8e45da9d7e)
2015-10-22 19:23:42 +02:00
Giuseppe Sucameli
ef8f3d3843 Merge pull request #2382 from SebDieBln/MultiColumnPK_DbManagerQuery
[DB_Manager] allows to specify multiple columns as the primary for a query to PostGIS (follow a4124da)
2015-10-22 19:21:39 +02:00
Radim Blazek
54e2a5112a [GRASS] hide db driver window on Windows 2015-10-22 16:52:52 +02:00
volaya
f5b0dbe902 [processing] allow translating algorithm dialog title
fixes #13652
2015-10-22 16:50:05 +02:00
Radim Blazek
e8cb8c1a99 [GRASS] disable multiple vector editing on Linux/Mac 2015-10-22 14:25:41 +02:00
Radim Blazek
ca70491363 [GRASS] try to get off_t from Make/platform.h 2015-10-22 11:01:07 +02:00
DelazJ
f7f8d7e497 Restore "Add result to canvas" option as default
fixes #13647
2015-10-22 10:32:38 +02:00
Matthias Kuhn
457c76d964 [sip] QgsMapCanvasSnappingUtils 2015-10-22 10:32:05 +02:00
Matthias Kuhn
ef2528bf02 Allow usage of QgsMapToolAdvancedDigitizing from python code 2015-10-22 10:32:05 +02:00
Nyall Dawson
7b9bcffb87 [composer] prevent application freeze upon opening composer due to qt/cups bug
Credit to nirvn
2015-10-22 17:02:53 +11:00
Nyall Dawson
87e11cb2d7 Fix a crash in filtered legends 2015-10-22 16:20:34 +11:00
Nyall Dawson
b4b7017068 Add tooltips to advanced digitizing dock 2015-10-22 16:20:27 +11:00
Nyall Dawson
307b1b92a3 [pal] Fix regression in placement for free/horizontal polygon labels 2015-10-22 11:37:20 +11:00
Juergen E. Fischer
0559939725 partly revert 3e0badc (fixes #13645 and #13646) 2015-10-22 01:14:42 +02:00
Juergen E. Fischer
ea0ce4ec1e rule based renderer: keep skip else rule if an inactive rule matches, but still return if the feature was actually rendered so that only rendered features are labeled (fixes #13631) 2015-10-21 21:45:39 +02:00
Radim Blazek
29b061c0b3 [GRASS] prevent changing attributes of different layer 2015-10-21 20:36:12 +02:00
Radim Blazek
86505e0fb8 [GRASS] more edit tests 2015-10-21 20:02:22 +02:00
Nyall Dawson
1a4e8c95d5 Fix doxygen warning 2015-10-21 22:45:33 +11:00
Nyall Dawson
8286b1fe39 Really fix adding parts to null geometry (fix #12885) 2015-10-21 21:38:08 +11:00
Nyall Dawson
2d069c6645 Fix leak in labeling 2015-10-21 21:10:10 +11:00
Nyall Dawson
f5a72c6ba5 Fix a LOT of leaks relating to geometry and GEOS operations 2015-10-21 21:10:09 +11:00
Hugo Mercier
a460e47e90 Merge pull request #2322 from mhugo/fix_tin
Postgres provider: allow to load layers with polyhedral surfaces or TINs
2015-10-21 10:55:11 +02:00
Hugo Mercier
c7aeb774ce PostGIS: Allow to load TIN, PS and Triangle layers
The postgres provider is modified so that layers with
TIN, PolyhedralSurface and Triangle geometries can be loaded.
Geometries are converted to MultiPolygons (and Polygons for Triangles).

The postgres test is completed to cover the loading of different types
of layers
2015-10-21 09:41:49 +02:00
Juergen E. Fischer
55babc3ee3 postgres provider: support NULL in composite keys (fixes #13641) 2015-10-20 23:08:43 +02:00
Juergen E. Fischer
a8765a3a23 avoid duplicate qgisstyle run 2015-10-20 23:07:06 +02:00
volaya
603c2767aa Merge pull request #2372 from om-henners/ogrsql_fix
Fix ogrsql path quoting
2015-10-20 19:28:55 +02:00
Radim Blazek
898a738451 [GRASS] cmake add check if version.h exists 2015-10-20 18:54:29 +02:00
Radim Blazek
d2564bbeb2 [GRASS] editing fix 2015-10-20 18:27:55 +02:00
Radim Blazek
f5a93ef95f [GRASS] fixed multilayer editing 2015-10-20 18:22:58 +02:00
Matthias Kuhn
b99ef2c0bb Merge pull request #2386 from arnaud-morvan/processing-fix-importfromproj4
Fix string type errors in processing algorithms
2015-10-20 17:34:56 +02:00
arnaud.morvan@camptocamp.com
3bc11b1947 Revert crs.ImportFromProj4(unicode(...)) to crs.ImportFromProj4(str(...)) 2015-10-20 17:19:27 +02:00
Matthias Kuhn
c45fc090d9 Do not index geometryless layers for snapping
With a lot of geometryless layers in a project reindexing on every mousemove
makes the UI unresponsive and brings up a "indexing layers" dialog with
progress bar repeatedly.
2015-10-20 16:42:32 +02:00
Matthias Kuhn
148e808202 Fix snapping may never be indexed 2015-10-20 16:42:32 +02:00
Juergen E. Fischer
441f6f8cf1 postgres provider: allow detection of empty views (fixes #13638) 2015-10-20 14:42:45 +02:00
Anita Graser
b20d316692 changed to descriptive name
as suggested in https://hub.qgis.org/issues/9868
2015-10-20 14:27:01 +02:00
Matthias Kuhn
f7051547a7 Merge pull request #2384 from bstroebl/undoChangesInDissolve
[PROCESSING] Undo recent changes to Dissolve
2015-10-20 12:07:59 +02:00
Nyall Dawson
1969e09b6f Also avoid detaching QgsFields and QgsAttributes where possible 2015-10-20 20:36:08 +11:00
Nyall Dawson
9a94132fb4 Clazy issues:
- use at() instead of [] for temporary containers (at() returns
const reference, so it avoids the detach which occurs with [])
- use at( 0 ) rather than first() for containers, because first()
detaches (Qt5 introduced constFirst()/constLast() to overcome this)
2015-10-20 20:36:08 +11:00