From 8ca28986f41fb3213aca2f7409630d77f7ea9d7e Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Fri, 15 Jul 2011 19:20:57 +0200 Subject: [PATCH] fix #4081 --- src/app/qgisapp.cpp | 44 ++++++++++++++++++++++++++++++-------------- src/app/qgsabout.cpp | 4 +++- src/ui/qgsabout.ui | 27 ++++++++++++++------------- 3 files changed, 47 insertions(+), 28 deletions(-) diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp index d13cccf8c572..da7c82beb4dd 100644 --- a/src/app/qgisapp.cpp +++ b/src/app/qgisapp.cpp @@ -1926,36 +1926,52 @@ void QgisApp::about() { QApplication::setOverrideCursor( Qt::WaitCursor ); abt = new QgsAbout(); - QString versionString = tr( "You are using QGIS version %1 built against code revision %2." ) - .arg( QGis::QGIS_VERSION ) - .arg( QGis::QGIS_DEV_VERSION ); + QString versionString = "
"; - versionString += tr( "\nGDAL/OGR Version: %1." ).arg( GDAL_RELEASE_NAME ); + versionString += ""; + versionString += ""; + versionString += ""; + versionString += ""; + + versionString += ""; + versionString += ""; + + versionString += ""; + + versionString += ""; + versionString += ""; + + versionString += ""; + + versionString += ""; + versionString += ""; + + versionString += ""; - versionString += tr( "\nQWT Version: %1." ).arg( QWT_VERSION_STR ); + versionString += ""; #ifdef QGISDEBUG - versionString += tr( "\nThis copy of QGIS writes debugging output." ); + versionString += ""; #endif - versionString += tr( "\nThis binary was compiled against Qt %1," - "and is currently running against Qt %2" ) - .arg( QT_VERSION_STR ) - .arg( qVersion() ); + versionString += "
" + tr( "QGIS version" ) + "" + QGis::QGIS_VERSION + "" + tr( "QGIS code revision" ) + "" + QGis::QGIS_DEV_VERSION + "
" + tr( "Compiled against Qt" ) + "" + QT_VERSION_STR + "" + tr( "Running against Qt" ) + "" + qVersion() + "
" + tr( "GDAL/OGR Version" ) + "" + GDAL_RELEASE_NAME + "" + tr( "GEOS Version" ) + "" + GEOS_VERSION + "
" + tr( "PostgreSQL Client Version" ) + ""; #ifdef HAVE_POSTGRESQL - versionString += tr( "\nPostgreSQL Client Version: %1." ).arg( PG_VERSION ); + versionString += PG_VERSION; #else - versionString += tr( "\nNo PostgreSQL support." ); + versionString += tr( "No support." ); #endif + versionString += "" + tr( "SpatiaLite Version" ) + ""; #ifdef HAVE_SPATIALITE - versionString += tr( "\nSpatiaLite Version: %1." ).arg( spatialite_version() ); + versionString += spatialite_version(); #else - versionString += tr( "\nNo SpatiaLite support." ); + versionString += tr( "No support." ); #endif + versionString += "
" + tr( "QWT Version" ) + "" + QWT_VERSION_STR + "" + tr( "This copy of QGIS writes debugging output." ) + "
"; abt->setVersion( versionString ); + QString whatsNew = "" ; whatsNew += "

" + tr( "Version" ) + " " + QString( QGis::QGIS_VERSION ) + "

"; whatsNew += "

" + trUtf8( "What's new in Version 1.7.0 'Wrocław'?" ) + "

"; diff --git a/src/app/qgsabout.cpp b/src/app/qgsabout.cpp index 4ceb1108038e..d5d365471fcb 100644 --- a/src/app/qgsabout.cpp +++ b/src/app/qgsabout.cpp @@ -220,7 +220,9 @@ void QgsAbout::init() void QgsAbout::setVersion( QString v ) { - lblVersion->setText( v ); + txtVersion->setBackgroundRole( QPalette::NoRole ); + txtVersion->setAutoFillBackground( true ); + txtVersion->setHtml( v ); } void QgsAbout::setWhatsNew( QString txt ) diff --git a/src/ui/qgsabout.ui b/src/ui/qgsabout.ui index 2039a7c19027..c219d02cbb7b 100644 --- a/src/ui/qgsabout.ui +++ b/src/ui/qgsabout.ui @@ -67,19 +67,6 @@ p, li { white-space: pre-wrap; } - - - - Version - - - Qt::AlignCenter - - - true - - - @@ -153,6 +140,19 @@ p, li { white-space: pre-wrap; } + + + + QFrame::NoFrame + + + QFrame::Plain + + + true + + + @@ -264,6 +264,7 @@ p, li { white-space: pre-wrap; } +