| author | mickeyl <mickeyl> | 2005-04-18 21:51:57 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2005-04-18 21:51:57 (UTC) |
| commit | 0421a65ca6c21715b7268ef52679bdc14ab25c89 (patch) (side-by-side diff) | |
| tree | 243a5a4d9c390a349ebe5bd8ad69ac987c9a75a8 | |
| parent | 9e685cedc4425dd5ae60170e3f59a899c9e2bf36 (diff) | |
| download | opie-0421a65ca6c21715b7268ef52679bdc14ab25c89.zip opie-0421a65ca6c21715b7268ef52679bdc14ab25c89.tar.gz opie-0421a65ca6c21715b7268ef52679bdc14ab25c89.tar.bz2 | |
relax WE matching test
set VERSION in .pro
define WELLENREITER_VERSION through .pro
| -rw-r--r-- | noncore/net/wellenreiter/gui/gui.pro | 3 | ||||
| -rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 3 | ||||
| -rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiterbase.cpp | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro index 4ebac84..faedd1b 100644 --- a/noncore/net/wellenreiter/gui/gui.pro +++ b/noncore/net/wellenreiter/gui/gui.pro @@ -33,6 +33,9 @@ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include INTERFACES = configbase.ui TARGET = wellenreiter +VERSION = 1.0.5 + +DEFINES += WELLENREITER_VERSION='"$$VERSION (GPL) Opie"' !contains( platform, x11 ) { message( qws ) diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index 9fe463a..8cabf0d 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp @@ -569,7 +569,8 @@ void Wellenreiter::startClicked() } // check if wireless extension version matches - if ( ONetwork::wirelessExtensionCompileVersion() != iface->wirelessExtensionDriverVersion() ) + if ( ONetwork::wirelessExtensionCompileVersion() != iface->wirelessExtensionDriverVersion() + && ( ONetwork::wirelessExtensionCompileVersion() <= 15 || iface->wirelessExtensionDriverVersion() <= 15 ) ) { QMessageBox::critical( this, "Wellenreiter II", tr( "<p>The Wireless Extension Versions<br>do not match!<p>" " Wellenreiter II : WE V%1<br>Interface driver: WE V%2" ) diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp index 0ca0bd7..1d5bd1b 100644 --- a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp @@ -33,8 +33,6 @@ using namespace Opie; #include <qtabwidget.h> #endif -#define WELLENREITER_VERSION "V1.0.3 (unofficial)" - /* * Constructs a WellenreiterBase which is a child of 'parent', with the * name 'name' and widget flags set to 'f' @@ -111,7 +109,7 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f QPainter draw( &logo ); draw.setPen( Qt::black ); draw.setFont( QFont( "Fixed", 8 ) ); - draw.drawText( 30, 10, WELLENREITER_VERSION ); + draw.drawText( 5, 10, WELLENREITER_VERSION ); PixmapLabel1_3_2->setPixmap( logo ); PixmapLabel1_3_2->setScaledContents( TRUE ); |