[QGIS Commit] r11588 - in trunk/qgis/src: app plugins/evis/eventbrowser

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2009-09-08 03:23:21 -0400 (Tue, 08 Sep 2009)
New Revision: 11588

Modified:
   trunk/qgis/src/app/main.cpp
   trunk/qgis/src/app/qgsabout.cpp
   trunk/qgis/src/plugins/evis/eventbrowser/evisimagedisplaywidget.cpp
Log:
Fixes for evis (and general win qt image support). Search path for Qt plugins under win is now <app dir>/bin/qtplugins/. Set evis tooltip to show file path when hovered over the image. Set about box to show search path(s) for plugins.

Modified: trunk/qgis/src/app/main.cpp
===================================================================
--- trunk/qgis/src/app/main.cpp	2009-09-08 06:34:38 UTC (rev 11587)
+++ trunk/qgis/src/app/main.cpp	2009-09-08 07:23:21 UTC (rev 11588)
@@ -575,7 +575,7 @@
   // application bundle...
 #ifdef Q_WS_WIN
   QCoreApplication::addLibraryPath( QApplication::applicationDirPath()
-                                    + QDir::separator() + "plugins" );
+                                    + QDir::separator() + "qtplugins" );
 #endif
 #ifdef Q_OS_MACX
   //qDebug("Adding qt image plugins to plugin search path...");

Modified: trunk/qgis/src/app/qgsabout.cpp
===================================================================
--- trunk/qgis/src/app/qgsabout.cpp	2009-09-08 06:34:38 UTC (rev 11587)
+++ trunk/qgis/src/app/qgsabout.cpp	2009-09-08 07:23:21 UTC (rev 11588)
@@ -280,6 +280,8 @@
   myString += "</li>\n</ol>\n";
   //qt image plugins
   myString += "<b>" + tr( "Available Qt Image Plugins" ) + "</b><br>";
+  myString += tr( "Qt Image Plugin Search Paths<br>"" );
+  myString += QApplication::libraryPaths().join("<br>");
   myString += "<ol>\n<li>\n";
   QList<QByteArray> myImageFormats = QImageReader::supportedImageFormats();
   QList<QByteArray>::const_iterator myIterator = myImageFormats.begin();

Modified: trunk/qgis/src/plugins/evis/eventbrowser/evisimagedisplaywidget.cpp
===================================================================
--- trunk/qgis/src/plugins/evis/eventbrowser/evisimagedisplaywidget.cpp	2009-09-08 06:34:38 UTC (rev 11587)
+++ trunk/qgis/src/plugins/evis/eventbrowser/evisimagedisplaywidget.cpp	2009-09-08 07:23:21 UTC (rev 11588)
@@ -33,7 +33,6 @@
 #include <QHBoxLayout>
 #include <QScrollBar>
 #include <QUrl>
-
 /**
 * Constructor
 * @param parent - Pointer the to parent QWidget for modality
@@ -131,6 +130,7 @@
 void eVisImageDisplayWidget::displayImage( QString path )
 {
   mImageLoaded = mImage->load( path, 0, Qt::AutoColor );
+  this->setToolTip(path);
 
   mCurrentZoomStep = 0;
   pbtnZoomOut->setEnabled( false );