18477 Commits

Author SHA1 Message Date
Emilio Loi
f344e5129c Merge branch 'master' of https://github.com/qgis/Quantum-GIS into styles_to_db 2013-04-30 10:25:24 +02:00
Emilio Loi
0704366abe Merge branch 'master' of https://github.com/qgis/Quantum-GIS into styles_to_db
Conflicts:
	python/console/console_editor.py
	src/core/qgsvectordataprovider.h
	src/core/qgsvectorfilewriter.cpp
2013-04-30 10:25:16 +02:00
Emilio Loi
8a6cba64ec Merge branch 'master' of https://github.com/qgis/Quantum-GIS into styles_to_db
Conflicts:
	python/console/console_editor.py
	src/core/qgsvectordataprovider.h
	src/core/qgsvectorfilewriter.cpp
2013-04-30 10:24:07 +02:00
Matthias Kuhn
009ba1b995 Merge pull request #563 from vinayan/rotateMoveFix
[Fix #7625] - rubberbands not visible while rotating/moving point geometries
2013-04-30 00:13:31 -07:00
Werner Macho
7dc0e5180c translation update: swedish by Victor 2013-04-30 09:12:48 +02:00
vinayan
6718d62b50 add Vinayan to authors 2013-04-30 12:13:17 +05:30
nyalldawson
e19079d60a Add tests for composer item transparency and blending 2013-04-30 14:51:05 +10:00
Chris Crook
1fb60b4c9a Adding subset test and help information 2013-04-30 14:11:40 +12:00
Chris Crook
ea8617df25 Substring working - tests not in place yet 2013-04-30 13:47:57 +12:00
Chris Crook
1fb1c9c45f Refactoring code from iterator to provider 2013-04-30 13:46:02 +12:00
Chris Crook
2a23652812 Added check of dataSourceUri to tests 2013-04-30 13:31:31 +12:00
nyalldawson
6e90ba3029 Tweak saturation curve (fix #7655) 2013-04-30 07:33:11 +10:00
olivierdalang
211a090c61 SVG : some more backgrounds again 2013-04-29 20:36:07 +00:00
olivierdalang
f9386d9786 SVG : forgot some 2013-04-29 20:31:42 +00:00
olivierdalang
31a77cd403 SVG : added some backgrounds 2013-04-29 19:53:08 +00:00
olivierdalang
4dcc0823eb SVG : separate arrows and wind roses 2013-04-29 19:53:07 +00:00
olivierdalang
514fe886c2 SVG : manual correction of GPS icon 2013-04-29 19:53:07 +00:00
olivierdalang
33926aa1ad SVG : clean arrows
Conflicts:
	images/svg/north_arrows/NorthArrow1.svg
	images/svg/north_arrows/NorthArrow10.svg
	images/svg/north_arrows/NorthArrow11.svg
	images/svg/north_arrows/NorthArrow12.svg
	images/svg/north_arrows/NorthArrow13.svg
	images/svg/north_arrows/NorthArrow14.svg
	images/svg/north_arrows/NorthArrow15.svg
	images/svg/north_arrows/NorthArrow16.svg
	images/svg/north_arrows/NorthArrow2.svg
	images/svg/north_arrows/NorthArrow4.svg
	images/svg/north_arrows/NorthArrow5.svg
	images/svg/north_arrows/NorthArrow6.svg
	images/svg/north_arrows/NorthArrow_blackgreenblack.svg
	images/svg/north_arrows/NorthArrow_blackwhiteblack.svg
	images/svg/north_arrows/NorthArrow_blackyellowblack.svg
	images/svg/north_arrows/NorthArrow_bluegreenblue.svg
	images/svg/north_arrows/NorthArrow_source.svg
	images/svg/north_arrows/default.svg
	images/svg/north_arrows/north-arrow_0_qgis_decoration.svg
	images/svg/north_arrows/north-arrow_10_with_map_layers.svg
	images/svg/north_arrows/north-arrow_11_simple_corner.svg
	images/svg/north_arrows/north-arrow_12_triangular_arrows_with_worldmap.svg
	images/svg/north_arrows/north-arrow_13_checkerboard_earth.svg
	images/svg/north_arrows/north-arrow_14_steering_wheel.svg
	images/svg/north_arrows/north-arrow_15_checkerboard_corner_arrows.svg
	images/svg/north_arrows/north-arrow_16_corner_arrows_unfilled_with_circle.svg
	images/svg/north_arrows/north-arrow_17_corner_n_e.svg
	images/svg/north_arrows/north-arrow_1_simple_half_arrow.svg
	images/svg/north_arrows/north-arrow_2_simple_half_arrow.svg
	images/svg/north_arrows/north-arrow_3_simple_symmetric_triangular.svg
	images/svg/north_arrows/north-arrow_4_double_arrow.svg
	images/svg/north_arrows/north-arrow_5_arrow_in_circle_small_n.svg
	images/svg/north_arrows/north-arrow_6_unfilled_big_arrow_symmetric.svg
	images/svg/north_arrows/north-arrow_7_big_circle_with_small_arrow_unfilled_n.svg
	images/svg/north_arrows/north-arrow_8_checkered.svg
	images/svg/north_arrows/north-arrow_9_half_arrow_unfilled.svg
2013-04-29 19:53:06 +00:00
olivierdalang
c15768bf0a SVG : add parameters 2013-04-29 19:53:05 +00:00
olivierdalang
1ca02c8e13 SVG : add a directory for crosses 2013-04-29 19:53:04 +00:00
olivierdalang
d3a988ba91 SVG : remove backgrounds, harmonize coulours, harmonize sizes, and add some symbols 2013-04-29 19:53:03 +00:00
olivierdalang
b6958fdfb0 SVG : remove some old-looking svg 2013-04-29 19:53:02 +00:00
Chris Crook
ff92f4d3e8 Using common code for list of encodings 2013-04-30 06:05:59 +12:00
Matthias Kuhn
27c5b93fd7 Fix for a2b2e16 2013-04-29 18:35:35 +02:00
Matthias Kuhn
a2b2e16937 [Fix #7574] [rubberband] Artifacts when using a rubberband with a single point 2013-04-29 18:26:18 +02:00
Radim Blazek
a9a58fa116 Revert "vector data provider start/stop editing methods"
This reverts commit 60b4da443e0998377e0cccbd9113b64555695a41.
2013-04-29 17:39:21 +02:00
Radim Blazek
229419ee13 raster cleanup 2013-04-29 17:29:29 +02:00
Borys Jurgiel
1515c45f65 More informative text and tooltip for the "ignore shapefile encoding declaration" combobox 2013-04-29 16:03:00 +02:00
Borys Jurgiel
62c5e6315b Merge pull request #566 from minorua/fix_cpg
Encoding: produce more compatible .cpg files.
2013-04-29 05:57:24 -07:00
Matthias Kuhn
c5177fc669 Merge pull request #568 from 3nids/layer2map
added layerToMapCoordinates for rectangles, and more detailed comments
2013-04-29 05:55:14 -07:00
Denis Rouzaud
42fc689e60 added layerToMapCoordinates for rectangles, and more detailed comments 2013-04-29 14:53:06 +02:00
nyalldawson
171973a54f Add blending mode for overview frame, option to invert overview frame 2013-04-29 21:48:49 +10:00
Radim Blazek
33d13ccca7 raster cleanup 2013-04-29 13:28:05 +02:00
Salvatore Larosa
e755815ff0 [pyqgis-console] allows comments and quotes folding in editor lexer 2013-04-29 12:41:45 +02:00
Emilio Loi
c499df74a3 Merge branch 'master' of https://github.com/qgis/Quantum-GIS into styles_to_db
Conflicts:
	python/console/console_editor.py
2013-04-29 11:19:44 +02:00
Chris Crook
18786ad7d5 Merge branch 'master' into delimited_text_bug_fixes_2 2013-04-29 20:48:56 +12:00
Minoru Akagi
1113c6099a fix .cpg file contents 2013-04-29 12:22:37 +09:00
Salvatore Larosa
195918293c [pyqgis-console] small fix for show/hide editor action 2013-04-29 01:22:45 +02:00
Nathan Woodrow
8565ef95d9 Merge pull request #565 from nyalldawson/new_functions
New color functions (from hsl, hsv and cmyk), new regexp_match function
2013-04-28 16:16:23 -07:00
nyalldawson
533030f80e Add regexp_match function, improve help for regexp_replace function 2013-04-29 09:10:57 +10:00
nyalldawson
6e5221cd6d Add color_cmyk and color_cmyka functions 2013-04-29 09:10:48 +10:00
nyalldawson
c038374e41 Add color_hsv and color_hsva functions 2013-04-29 09:10:39 +10:00
nyalldawson
d52e007de8 Add color_hsl and color_hsla functions 2013-04-29 09:10:33 +10:00
Salvatore Larosa
71c9d96f44 [pyqgis-console ] adds more options to settings dialog:
- reorganized settings dialog
- added option autosave script before running
- added options for autocompletion code (from Document, from APIs, from Doc and API)
- minor fixes
2013-04-28 23:56:52 +02:00
Werner Macho
a8af82e4e3 translation update: fr by JRM 2013-04-28 23:26:22 +02:00
Matthias Kuhn
1a19947ea1 Merge pull request #564 from vinayan/fixRubberband
[Fix #7728] - QgsRubberband addGeometry does not add multipart geometries to existing points
2013-04-28 12:47:21 -07:00
Werner Macho
6b9bc64e32 translation update: Danish by Jacob 2013-04-28 21:20:08 +02:00
Matthias Kuhn
d90f167be9 Allow adding QToolButton's to the toolbars
* iface.addToolBarWidget()
 * iface.addRasterToolBarWidget()
 * iface.addVectorToolBarWidget()
 * iface.addDatabaseToolBarWidget()
 * iface.addWebToolBarWidget()
2013-04-28 21:17:21 +02:00
Etienne Tourigny
ddbfb2e8ea restore zip raster layer style test - still needs a test for vector layers 2013-04-28 11:55:45 -03:00
Etienne Tourigny
785f614a4e remove invalid layers from zip test files 2013-04-28 11:19:14 -03:00