Skip to content

Commit

Permalink
Fixes for evis (and general win qt image support). Search path for Qt…
Browse files Browse the repository at this point in the history
… 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.

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11588 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Sep 8, 2009
1 parent b0fff3b commit 1c57be4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/app/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ int main( int argc, char *argv[] )
// 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...");
Expand Down
2 changes: 2 additions & 0 deletions src/app/qgsabout.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,8 @@ void QgsAbout::setPluginInfo()
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();
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/evis/eventbrowser/evisimagedisplaywidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
#include <QHBoxLayout>
#include <QScrollBar>
#include <QUrl>

/**
* Constructor
* @param parent - Pointer the to parent QWidget for modality
Expand Down Expand Up @@ -131,6 +130,7 @@ void eVisImageDisplayWidget::resizeEvent( QResizeEvent *event )
void eVisImageDisplayWidget::displayImage( QString path )
{
mImageLoaded = mImage->load( path, 0, Qt::AutoColor );
this->setToolTip(path);

mCurrentZoomStep = 0;
pbtnZoomOut->setEnabled( false );
Expand Down

0 comments on commit 1c57be4

Please sign in to comment.