2826 Commits

Author SHA1 Message Date
gsherman
950cb17e9c Modified the way in which the toolbar is added to the main window so that
the toolbar is properly placed in the dock area.


git-svn-id: http://svn.osgeo.org/qgis/trunk@4410 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-12-30 06:04:50 +00:00
gsherman
4b6a5a9d9d Merge UI conversion branch to HEAD. UI branch is now deprecated.
git-svn-id: http://svn.osgeo.org/qgis/trunk@4409 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-12-30 04:56:31 +00:00
mhugent
1ac2e2e295 improved restoring of checkbox states from project files. Fix for segfault in QgsMapCanvas::removeAllLayers
git-svn-id: http://svn.osgeo.org/qgis/trunk@4373 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-12-24 23:10:56 +00:00
mhugent
92614313b5 restored reading/writing XML for the legend settings, but there are still some bugs
git-svn-id: http://svn.osgeo.org/qgis/trunk@4360 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-12-21 21:41:28 +00:00
mhugent
63be44897b more legend fixes
git-svn-id: http://svn.osgeo.org/qgis/trunk@4355 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-12-19 18:36:29 +00:00
mhugent
78e3a756bd some more legend fixes
git-svn-id: http://svn.osgeo.org/qgis/trunk@4353 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-12-17 14:23:26 +00:00
mhugent
f97e9faf72 a little improvement to avoid flickering when a legendlayerfile is dragged
git-svn-id: http://svn.osgeo.org/qgis/trunk@4345 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-12-15 22:22:26 +00:00
mhugent
04095b9eea improved legend checkbox handling in case of several QgsLegendLayerFiles in one QgsLegendLayer
git-svn-id: http://svn.osgeo.org/qgis/trunk@4344 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-12-15 22:06:30 +00:00
mhugent
1478427e02 First implementation step of having checkboxes in the qt4 legend (legendlayer and legendlayerfile)
git-svn-id: http://svn.osgeo.org/qgis/trunk@4335 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-12-14 22:26:13 +00:00
mhugent
6f09aeb991 fix for names of classification attributes in legend
git-svn-id: http://svn.osgeo.org/qgis/trunk@4309 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-12-10 12:56:08 +00:00
gsherman
172e1148c6 Merged changes to the Qgis->MapServer export tool from the Qt4 Ui branch to HEAD.
This only affects the tools/mapserver_export directory.



git-svn-id: http://svn.osgeo.org/qgis/trunk@4306 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-12-09 03:42:04 +00:00
mhugent
4ca202ddf1 qgisapp now uses QgsLegend::currentLayer() instead of parsing list items
git-svn-id: http://svn.osgeo.org/qgis/trunk@4293 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-12-06 21:11:54 +00:00
mcoletti
8f1ce4f233 Merged render() fix and reformatted to addVectorLayer to follow project formatting guidelines.
git-svn-id: http://svn.osgeo.org/qgis/trunk@4292 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-12-05 22:41:56 +00:00
telwertowski
a10ec90f30 Convert to Qt4 iterator. (This should fix Identify Tool crashes.
git-svn-id: http://svn.osgeo.org/qgis/trunk@4291 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-12-05 04:59:28 +00:00
telwertowski
2468c09298 Revise legend classes to use Qt4 static QCoreApplication methods instead of deprecated Qt3 qApp-> methods. Move include of qgisapp.h from legend.h to cpp file to minimize header dependencies.
git-svn-id: http://svn.osgeo.org/qgis/trunk@4290 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-12-05 03:49:29 +00:00
mhugent
43caa017f5 Replaced the legend classes Q3ListView and Q3ListViewItem with the qt4 classes QTreeWidget and QTreeWidgetItem. More bugfixes and refactoring (e.g. no direct access to items for mapcanvas, overview canvas and ev. renderers) will follow soon
git-svn-id: http://svn.osgeo.org/qgis/trunk@4289 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-12-04 22:18:41 +00:00
morb_au
a29869637f Raster drawing improvements / Qt4 porting.
* Zooming into a raster (where a source pixel covers more than one screen pixel) should now draw fully into the bottom right corner of the window.
* Since Qt4 wants all QPainter activity to be done inside a paint event, QgsMapCanvas::render() is no longer called directly.  Instead, it is called via QgsMapCanvas::update() or more rarely ::repaint(), therefore calling through ::paintEvent() to ::render() if appropriate.  ::render() does not call ::repaint() any more as that would cause a paint event loop.
* Some debugging to cerr/cout has been updated to diagnose the above.



git-svn-id: http://svn.osgeo.org/qgis/trunk@4288 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-12-04 05:58:47 +00:00
mcoletti
c685cffc9b Includes now Qt4 happy. Once again the support vector file formats lives.
git-svn-id: http://svn.osgeo.org/qgis/trunk@4287 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-12-02 21:13:48 +00:00
mcoletti
2c880dcd24 Yet more more superfluous checks for OGR plug-in removed since that's now handled elsewhere.
git-svn-id: http://svn.osgeo.org/qgis/trunk@4286 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-12-01 23:26:33 +00:00
mcoletti
6b862952bd Removed more superfluous checks for OGR plug-in since that's now handled elsewhere.
git-svn-id: http://svn.osgeo.org/qgis/trunk@4285 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-12-01 23:08:30 +00:00
mcoletti
deae1bd7d3 in addLayer() Removed superfluous check for OGR plug-in since that's now handled elsewhere.
git-svn-id: http://svn.osgeo.org/qgis/trunk@4284 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-12-01 22:40:07 +00:00
morb_au
76dddcb9b7 The map should now move again when you go to drag it with the little hand/pan symbol, not just when you complete the drag.
The original problem was due to the bitBlt idiom going away in Qt4.

Others should check that this new method works/doesn't cause flickering under their system, as I developed this modification against a KDE session via VNC.

Also there seems to be a little bit of realignment (probabaly a fraction of a screen pixel) that occurs when the pan completes.  I presume this is not a significant issue to anyone.


git-svn-id: http://svn.osgeo.org/qgis/trunk@4283 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-30 13:08:54 +00:00
mcoletti
49f0c39c5c - one cannot do QStringList = 0 as a default parameter; QStringList =
QStringList() substituted

- thou shalt pass non atomic function arguments as references or
  pointers (thus saving some memory and copy ctor overhead)



git-svn-id: http://svn.osgeo.org/qgis/trunk@4282 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-29 00:31:58 +00:00
mcoletti
ae9d4be811 Now properly clean MOC and UIC files with make clean.
git-svn-id: http://svn.osgeo.org/qgis/trunk@4281 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-29 00:20:42 +00:00
mcoletti
2c01500b3e Now make clean removes MOC files.
git-svn-id: http://svn.osgeo.org/qgis/trunk@4280 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-28 22:15:51 +00:00
g_j_m
9f81954392 Don't use the postgres information_schema view because earlier versions of
postgres don't have it...


git-svn-id: http://svn.osgeo.org/qgis/trunk@4279 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-28 09:10:59 +00:00
morb_au
fae6b55f96 Several improvements related to WMS:
* Adds WMS styles support (think "themes").
* WMS layer selection window only lets you select one style at a time.
* WMS layer selection window can be sorted various ways, including the list order in which it was sent from the server (this helps in keeping lists of months ordered properly).
* Early work for changing the image encoding sent from the WMS server.


git-svn-id: http://svn.osgeo.org/qgis/trunk@4278 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-27 20:51:17 +00:00
telwertowski
2a92fc4b56 Update ToolButton popup menus for Qt4.C
git-svn-id: http://svn.osgeo.org/qgis/trunk@4277 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-27 08:13:51 +00:00
telwertowski
679c52ca37 QApplication needs to be instantiated before applicationDirPath() is called.
git-svn-id: http://svn.osgeo.org/qgis/trunk@4276 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-27 04:25:58 +00:00
timlinux
e7e6629a01 Fix some layout issues
git-svn-id: http://svn.osgeo.org/qgis/trunk@4275 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-27 00:27:31 +00:00
timlinux
e57e06ab9e UI improvements to keep the A-types (ie me) happy..
git-svn-id: http://svn.osgeo.org/qgis/trunk@4274 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-27 00:10:31 +00:00
gsherman
26d058741c Python wrapper code -- testing only
git-svn-id: http://svn.osgeo.org/qgis/trunk@4273 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-26 22:23:23 +00:00
gsherman
dbb0d24e78 Implementation of Qt4 dialog for mapserver export tool
git-svn-id: http://svn.osgeo.org/qgis/trunk@4272 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-26 03:46:24 +00:00
telwertowski
6897c8dcfb Make X11 selection rect display to the upper left as well as lower right.
git-svn-id: http://svn.osgeo.org/qgis/trunk@4271 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-26 02:27:06 +00:00
gsherman
df55283a30 Refactoring of QSettings naming conventions. This has been tested but there
may be errors since the base key name for all plugins was changed. The convention
for settings keys used by a pluting is to name the key "/Plugin-MyPluginName/foo".
Thus the delimited text plugin key is /Plugin-DelimitedText and all settings
related to it are stored under it. (I know, commit messages shouldn't be used
to write documentation)


git-svn-id: http://svn.osgeo.org/qgis/trunk@4270 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-26 01:10:29 +00:00
gsherman
1370e5683b Reorganization of the sections in the QGIS configuration file (QSettings).
There may be issues with the implementation -- check to make sure that
the appropriate keys are being used when restoring settings.

Plugins are not affected -- yet.


git-svn-id: http://svn.osgeo.org/qgis/trunk@4269 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-25 23:31:01 +00:00
telwertowski
63076ddcc0 Update selection and zoom rectangles for Qt4.
(Object editing rubberbands are still not updated.)


git-svn-id: http://svn.osgeo.org/qgis/trunk@4268 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-25 19:43:45 +00:00
gsherman
d5fb0e2e98 Quick change to fail configure if Qt 4 is not found. Additional cleanup
to the Qt detection code is required to complete the migration from
version 3.x to 4.x.


git-svn-id: http://svn.osgeo.org/qgis/trunk@4267 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-25 17:53:29 +00:00
morb_au
cbd6248652 qgis/helpviewer should now be compilable under Qt4; Makefile.am more closely follows (e.g.) qgis/plugins/grass, which makes "make clean" work properly.
After this commit you should re-configure qgis, make clean in qgis/helpviewer then build as normal.


git-svn-id: http://svn.osgeo.org/qgis/trunk@4266 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-24 21:45:44 +00:00
gsherman
065a777aaa Converted QSettings to use global organization and application name so
they don't have to be specified in the QSettings constructor. This doesn't
apply to plugins.


git-svn-id: http://svn.osgeo.org/qgis/trunk@4265 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-24 17:18:36 +00:00
gsherman
a4ac1363b1 Fixes for QSettings implementation
git-svn-id: http://svn.osgeo.org/qgis/trunk@4264 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-24 00:13:55 +00:00
telwertowski
69ed0628ff Set dialog constructor modal flag to true. This causes the dialog to have the right window type on a Mac.
git-svn-id: http://svn.osgeo.org/qgis/trunk@4263 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-23 07:58:09 +00:00
telwertowski
bd0244bdcb Remove font property settings using the default (unspecified) font size from UI files. uic3 (Qt 4.0.1) is generating code which sets the size to 0 instead of the default size. This causes no text to be drawn for X11 and a crash for Macs.
Removing empty attribute blocks has no effect. For non-empty blocks using the default size, the settings have been moved to the implementation class. When the bug is fixed, the settings can be put back in the ui file and removed from the implementation file.


git-svn-id: http://svn.osgeo.org/qgis/trunk@4262 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-23 07:08:50 +00:00
timlinux
7e874ee08e Transparency for grayscale images works again
git-svn-id: http://svn.osgeo.org/qgis/trunk@4261 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-22 17:57:01 +00:00
timlinux
9ca68a0c90 Reinstate nodata in metadata which has mysteriously disappeared from raster metadata...
git-svn-id: http://svn.osgeo.org/qgis/trunk@4260 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-22 16:38:38 +00:00
timlinux
49748b396f Apply patch from Martin for gentoo friendliness
git-svn-id: http://svn.osgeo.org/qgis/trunk@4259 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-22 16:05:05 +00:00
gsherman
29227032e8 Removed Qt4 #ifdef block (issue resolved)
git-svn-id: http://svn.osgeo.org/qgis/trunk@4258 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-22 07:18:39 +00:00
gsherman
8e808ca602 Fix for plugins not loading. This was related to grabbing the existing Plugin menu
in order to insert the new menu items.


git-svn-id: http://svn.osgeo.org/qgis/trunk@4257 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-22 07:10:50 +00:00
telwertowski
86f9d6db04 Qt4/Mac requires a type to avoid an "ambiguous argument type" error.
git-svn-id: http://svn.osgeo.org/qgis/trunk@4256 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-22 00:10:34 +00:00
telwertowski
a84eaad45d Add build support for Qt4/Mac.
(The environment variable QTDIR should be defined similar to /usr/local/Trolltech/Qt-4.0.1 for Qt4 and /Developer/qt for Qt3.)


git-svn-id: http://svn.osgeo.org/qgis/trunk@4255 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-21 23:54:16 +00:00