Tim Sutton
4d5455f5b1
Merge branch 'master' of github.com:qgis/Quantum-GIS
2011-05-23 21:50:15 +02:00
Juergen E. Fischer
b6106203d3
fix typos
2011-05-23 18:37:03 +02:00
Juergen E. Fischer
23a182209e
debian and osgeo4w packaging update: include qbrowser
2011-05-23 18:35:54 +02:00
Tim Sutton
3f50ee200b
Merge branch 'master' of github.com:timlinux/Quantum-GIS
2011-05-23 14:45:40 +02:00
Juergen E. Fischer
4549d0e199
cleanups:
...
- use QMetaObject instead of RTTI
- no get in getters:
- QgsDataProvider:
- getProvider => provider
- getSelectWidget => selectWidget
- getFunction => function
- getLibary => providerLibrary
- QgsProviderRegistry:
- getLibrary => providerLibrary
- /* ... */ => #if 0 / #endif
- reindentation
2011-05-23 08:10:35 +02:00
Juergen E. Fischer
ee6c516111
osgeo4w update: fix crssync run
2011-05-23 06:54:06 +02:00
Juergen E. Fischer
a155c2cf0c
fix build with Qt 4.6 and some warnings
2011-05-23 06:50:47 +02:00
Juergen E. Fischer
f723398743
german translation update
2011-05-23 06:35:03 +02:00
Tim Sutton
7c0e9000ec
Merge branch 'master' of github.com:qgis/Quantum-GIS
2011-05-23 00:04:33 +02:00
Tim Sutton
bb1a4e6af8
Merge pull request #22 from alexbruy/master
...
Make "-dstalpha" parameter in GDALTools Clipper optional
2011-05-22 14:56:42 -07:00
Tim Sutton
5fea5a8c61
Merge branch 'master' of github.com:qgis/Quantum-GIS
2011-05-22 21:41:40 +02:00
Alexander Bruy
cd8ecd6a6e
add checkbox for "-dstalpha" option in GDALTools Clipper tool
2011-05-22 21:12:04 +03:00
Radim Blazek
9784cd78e5
grass support for qbrowser
2011-05-22 16:29:25 +02:00
Marco Hugentobler
b02d06ba73
Show only annotation items in composermap, no rubberbands etc. Fixes ticket #3774
2011-05-21 23:20:40 +02:00
Juergen E. Fischer
694c356158
fix windows build
2011-05-21 04:27:30 +02:00
Marco Hugentobler
d85320b7a2
Fix rotation of simple marker if cache is not used (ticket #3778 )
2011-05-20 22:59:59 +02:00
Martin Dobias
b656ebdea4
Merge branch 'browser-and-customization'
2011-05-20 18:06:53 +02:00
Martin Dobias
62db3d7dac
Re-enable recursive WMS layers
2011-05-20 17:59:06 +02:00
Martin Dobias
34361ae279
Move setCrs() back to QgsDataItem from QgsLayerItem.
...
The rationale is that some data sources (providers) share CRS for a whole
set of layers (e.g. GRASS)
2011-05-20 17:45:36 +02:00
Radim Blazek
215d50b4db
browser double click removed
2011-05-18 16:09:12 +02:00
Radim Blazek
0797640595
QgsLayerItem uri/providerKey/mapLayerType better vithout virtual methods
2011-05-18 16:01:26 +02:00
Marco Hugentobler
0390131247
Fix for multipoint bug in wfs provider. Fixes ticket #3829
2011-05-18 13:39:32 +02:00
Radim Blazek
b4fde40163
QgsLayerItem::layerInfo replaced by mapLayerType, providerKey and uri methods
2011-05-18 09:36:40 +02:00
Tim Sutton
ffed1d7702
Merge branch 'master' of github.com:qgis/Quantum-GIS
2011-05-17 16:45:45 +02:00
Radim Blazek
022be6e7a4
customize mMenuToolbar according to toolbars customization
2011-05-17 11:33:43 +02:00
Marco Hugentobler
c724ce5180
Composermapwidget update
2011-05-17 09:13:08 +02:00
Martin Dobias
c2457ae4fd
Hide QgsDataItem members: use getters for access
2011-05-16 23:42:22 +02:00
Martin Dobias
f06b01b98e
Set data item's parent always in constructor
2011-05-16 23:16:15 +02:00
Martin Dobias
e0eb6d829a
QgsDataItem refactoring
...
- hasChildren, rowCount, icon methods made non-virtual
- shared default icons
- data item's mType should be used for differentiating classes
- layer-specific virtual methods moved down to QgsLayerItem
2011-05-16 20:14:23 +02:00
mhugent
72b6cd101e
Merge pull request #21 from telwertowski/master
...
Integrate Mac window event code with 'Show composer maps on demand'
2011-05-16 10:09:09 -07:00
Tom Elwertowski
6062bb587a
Integrate Mac window event code with 'Show composer maps on demand'
2011-05-16 12:25:31 -04:00
Radim Blazek
247fa7b3e8
Deblin removed
2011-05-16 15:35:20 +02:00
Marco Hugentobler
6de875ab16
Cleanup
2011-05-16 14:39:42 +02:00
Marco Hugentobler
ad95cce706
Show composer maps on demand after project loading
2011-05-16 14:25:54 +02:00
Martin Dobias
d991f1d481
Fix the compilation
2011-05-15 15:10:50 +02:00
Tim Sutton
03a2fe7bcd
Added fancy pdf generation from t2t docs
2011-05-15 10:22:38 +02:00
Tim Sutton
cda5461099
Merge branch 'master' of github.com:timlinux/Quantum-GIS
2011-05-14 11:37:34 +02:00
Tim Sutton
27e3a8f621
Fix inconsistent naming of general options
2011-05-14 11:32:32 +02:00
Tim Sutton
a9422394f3
Fix inconsistent naming of general options
2011-05-14 11:24:59 +02:00
Martin Dobias
ce4c12665b
Fixed #3818
2011-05-14 00:13:32 +02:00
Martin Dobias
b20619623f
Merge branch 'master' into dbl
...
Conflicts:
images/splash/splash.png
src/CMakeLists.txt
src/app/main.cpp
src/app/qgsvectorlayerproperties.cpp
src/core/qgsvectorlayer.cpp
src/providers/wms/qgswmssourceselect.cpp
2011-05-13 22:20:43 +02:00
Martin Dobias
153ad164fe
All customization and QGIS browser work in one commit.
2011-05-13 22:00:46 +02:00
Marco Hugentobler
3ec8059141
Merge branch 'wms_filewatch'
2011-05-13 14:54:36 +02:00
Marco Hugentobler
55795600db
Use a file watcher also for capabilities cache
2011-05-13 14:51:01 +02:00
Marco Hugentobler
d4109ce2dc
[FEATURE]: use file watcher in wms server to check for updates in project files
2011-05-13 14:12:29 +02:00
Alexander Bruy
6327b2e224
allow merging shapefiles with different attribute tables ( fix #3010 )
2011-05-12 19:42:24 +03:00
Marco Hugentobler
07da493572
[FEATURE]: Possibility to set a WFS filter
2011-05-12 09:29:30 +02:00
Tom Elwertowski
76751f614d
Mac Info.plist svn=>git
2011-05-11 21:11:10 +02:00
Radim Blazek
3ffc255cc3
sync QgsRubberBand and QgsMpaCanvasMap antialiasing, this also fixes 1px QgsRubberBand shift with x11 rendering engine if rendered without antialiasing
2011-05-11 20:46:13 +02:00
Juergen E. Fischer
3d41384ce8
fix #3821
2011-05-11 20:42:10 +02:00