author | mickeyl <mickeyl> | 2005-04-18 21:51:57 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-04-18 21:51:57 (UTC) |
commit | 0421a65ca6c21715b7268ef52679bdc14ab25c89 (patch) (unidiff) | |
tree | 243a5a4d9c390a349ebe5bd8ad69ac987c9a75a8 /noncore/net/wellenreiter | |
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 | |||
@@ -32,8 +32,11 @@ SOURCES = main.cpp \ | |||
32 | INCLUDEPATH += $(OPIEDIR)/include | 32 | INCLUDEPATH += $(OPIEDIR)/include |
33 | DEPENDPATH += $(OPIEDIR)/include | 33 | DEPENDPATH += $(OPIEDIR)/include |
34 | INTERFACES = configbase.ui | 34 | INTERFACES = configbase.ui |
35 | TARGET = wellenreiter | 35 | TARGET = wellenreiter |
36 | VERSION = 1.0.5 | ||
37 | |||
38 | DEFINES += WELLENREITER_VERSION='"$$VERSION (GPL) Opie"' | ||
36 | 39 | ||
37 | !contains( platform, x11 ) { | 40 | !contains( platform, x11 ) { |
38 | message( qws ) | 41 | message( qws ) |
39 | include( $(OPIEDIR)/include.pro ) | 42 | include( $(OPIEDIR)/include.pro ) |
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 | |||
@@ -568,9 +568,10 @@ void Wellenreiter::startClicked() | |||
568 | return; | 568 | return; |
569 | } | 569 | } |
570 | 570 | ||
571 | // check if wireless extension version matches | 571 | // check if wireless extension version matches |
572 | if ( ONetwork::wirelessExtensionCompileVersion() != iface->wirelessExtensionDriverVersion() ) | 572 | if ( ONetwork::wirelessExtensionCompileVersion() != iface->wirelessExtensionDriverVersion() |
573 | && ( ONetwork::wirelessExtensionCompileVersion() <= 15 || iface->wirelessExtensionDriverVersion() <= 15 ) ) | ||
573 | { | 574 | { |
574 | QMessageBox::critical( this, "Wellenreiter II", tr( "<p>The Wireless Extension Versions<br>do not match!<p>" | 575 | QMessageBox::critical( this, "Wellenreiter II", tr( "<p>The Wireless Extension Versions<br>do not match!<p>" |
575 | " Wellenreiter II : WE V%1<br>Interface driver: WE V%2" ) | 576 | " Wellenreiter II : WE V%1<br>Interface driver: WE V%2" ) |
576 | .arg( QString::number( ONetwork::wirelessExtensionCompileVersion() ) ) | 577 | .arg( QString::number( ONetwork::wirelessExtensionCompileVersion() ) ) |
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 | |||
@@ -32,10 +32,8 @@ using namespace Opie; | |||
32 | #include "resource.h" | 32 | #include "resource.h" |
33 | #include <qtabwidget.h> | 33 | #include <qtabwidget.h> |
34 | #endif | 34 | #endif |
35 | 35 | ||
36 | #define WELLENREITER_VERSION "V1.0.3 (unofficial)" | ||
37 | |||
38 | /* | 36 | /* |
39 | * Constructs a WellenreiterBase which is a child of 'parent', with the | 37 | * Constructs a WellenreiterBase which is a child of 'parent', with the |
40 | * name 'name' and widget flags set to 'f' | 38 | * name 'name' and widget flags set to 'f' |
41 | */ | 39 | */ |
@@ -110,9 +108,9 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f | |||
110 | QPixmap logo = Resource::loadPixmap( "wellenreiter/logo" ); | 108 | QPixmap logo = Resource::loadPixmap( "wellenreiter/logo" ); |
111 | QPainter draw( &logo ); | 109 | QPainter draw( &logo ); |
112 | draw.setPen( Qt::black ); | 110 | draw.setPen( Qt::black ); |
113 | draw.setFont( QFont( "Fixed", 8 ) ); | 111 | draw.setFont( QFont( "Fixed", 8 ) ); |
114 | draw.drawText( 30, 10, WELLENREITER_VERSION ); | 112 | draw.drawText( 5, 10, WELLENREITER_VERSION ); |
115 | 113 | ||
116 | PixmapLabel1_3_2->setPixmap( logo ); | 114 | PixmapLabel1_3_2->setPixmap( logo ); |
117 | PixmapLabel1_3_2->setScaledContents( TRUE ); | 115 | PixmapLabel1_3_2->setScaledContents( TRUE ); |
118 | PixmapLabel1_3_2->setAlignment( int( QLabel::AlignCenter ) ); | 116 | PixmapLabel1_3_2->setAlignment( int( QLabel::AlignCenter ) ); |