-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 | |||
@@ -24,24 +24,27 @@ SOURCES = main.cpp \ | |||
24 | hexwindow.cpp \ | 24 | hexwindow.cpp \ |
25 | statwindow.cpp \ | 25 | statwindow.cpp \ |
26 | configwindow.cpp \ | 26 | configwindow.cpp \ |
27 | graphwindow.cpp \ | 27 | graphwindow.cpp \ |
28 | packetview.cpp \ | 28 | packetview.cpp \ |
29 | protolistview.cpp \ | 29 | protolistview.cpp \ |
30 | gps.cpp | 30 | gps.cpp |
31 | 31 | ||
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 ) |
40 | LIBS += -lqpe -lopiecore2 -lopieui2 -lopienet2 | 43 | LIBS += -lqpe -lopiecore2 -lopieui2 -lopienet2 |
41 | } | 44 | } |
42 | 45 | ||
43 | contains( platform, x11 ) { | 46 | contains( platform, x11 ) { |
44 | LIBS += -L$(OPIEDIR)/output/lib -Wl,-rpath,$(OPIEDIR)/output/lib -Wl,-rpath,/usr/local/lib -lwellenreiter | 47 | LIBS += -L$(OPIEDIR)/output/lib -Wl,-rpath,$(OPIEDIR)/output/lib -Wl,-rpath,/usr/local/lib -lwellenreiter |
45 | SOURCES += resource.cpp | 48 | SOURCES += resource.cpp |
46 | HEADERS += resource.h | 49 | HEADERS += resource.h |
47 | DESTDIR = $(OPIEDIR)/output/bin | 50 | DESTDIR = $(OPIEDIR)/output/bin |
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 | |||
@@ -560,25 +560,26 @@ void Wellenreiter::startClicked() | |||
560 | assert( iface ); | 560 | assert( iface ); |
561 | 561 | ||
562 | // bring device UP | 562 | // bring device UP |
563 | iface->setUp( true ); | 563 | iface->setUp( true ); |
564 | if ( !iface->isUp() ) | 564 | if ( !iface->isUp() ) |
565 | { | 565 | { |
566 | QMessageBox::warning( this, "Wellenreiter II", | 566 | QMessageBox::warning( this, "Wellenreiter II", |
567 | tr( "Can't bring interface '%1' up:\n" ).arg( iface->name() ) + strerror( errno ) ); | 567 | tr( "Can't bring interface '%1' up:\n" ).arg( iface->name() ) + strerror( errno ) ); |
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() ) ) |
577 | .arg( QString::number( iface->wirelessExtensionDriverVersion() ) ) ); | 578 | .arg( QString::number( iface->wirelessExtensionDriverVersion() ) ) ); |
578 | return; | 579 | return; |
579 | } | 580 | } |
580 | } | 581 | } |
581 | // set monitor mode | 582 | // set monitor mode |
582 | bool usePrism = configwindow->usePrismHeader(); | 583 | bool usePrism = configwindow->usePrismHeader(); |
583 | 584 | ||
584 | switch ( cardtype ) | 585 | switch ( cardtype ) |
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 | |||
@@ -24,26 +24,24 @@ | |||
24 | #include "statwindow.h" | 24 | #include "statwindow.h" |
25 | #include "graphwindow.h" | 25 | #include "graphwindow.h" |
26 | 26 | ||
27 | #ifdef QWS | 27 | #ifdef QWS |
28 | #include <qpe/resource.h> | 28 | #include <qpe/resource.h> |
29 | #include <opie2/otabwidget.h> | 29 | #include <opie2/otabwidget.h> |
30 | using namespace Opie; | 30 | using namespace Opie; |
31 | #else | 31 | #else |
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 | */ |
42 | using namespace Opie::Ui; | 40 | using namespace Opie::Ui; |
43 | using namespace Opie::Ui; | 41 | using namespace Opie::Ui; |
44 | using namespace Opie::Ui; | 42 | using namespace Opie::Ui; |
45 | WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags fl ) | 43 | WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags fl ) |
46 | : QWidget( parent, name, fl ) | 44 | : QWidget( parent, name, fl ) |
47 | { | 45 | { |
48 | //ani1 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot0" ) ); | 46 | //ani1 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot0" ) ); |
49 | //ani2 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot90" ) ); | 47 | //ani2 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot90" ) ); |
@@ -102,25 +100,25 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f | |||
102 | PixmapLabel1_3_2 = new QLabel( about, "PixmapLabel1_3_2" ); | 100 | PixmapLabel1_3_2 = new QLabel( about, "PixmapLabel1_3_2" ); |
103 | PixmapLabel1_3_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, PixmapLabel1_3_2->sizePolicy().hasHeightForWidth() ) ); | 101 | PixmapLabel1_3_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, PixmapLabel1_3_2->sizePolicy().hasHeightForWidth() ) ); |
104 | PixmapLabel1_3_2->setFrameShape( QLabel::Panel ); | 102 | PixmapLabel1_3_2->setFrameShape( QLabel::Panel ); |
105 | PixmapLabel1_3_2->setFrameShadow( QLabel::Sunken ); | 103 | PixmapLabel1_3_2->setFrameShadow( QLabel::Sunken ); |
106 | PixmapLabel1_3_2->setLineWidth( 2 ); | 104 | PixmapLabel1_3_2->setLineWidth( 2 ); |
107 | PixmapLabel1_3_2->setMargin( 0 ); | 105 | PixmapLabel1_3_2->setMargin( 0 ); |
108 | PixmapLabel1_3_2->setMidLineWidth( 0 ); | 106 | PixmapLabel1_3_2->setMidLineWidth( 0 ); |
109 | 107 | ||
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 ) ); |
119 | 117 | ||
120 | aboutLayout->addWidget( PixmapLabel1_3_2, 0, 0 ); | 118 | aboutLayout->addWidget( PixmapLabel1_3_2, 0, 0 ); |
121 | 119 | ||
122 | TextLabel1_4_2 = new QLabel( about, "TextLabel1_4_2" ); | 120 | TextLabel1_4_2 = new QLabel( about, "TextLabel1_4_2" ); |
123 | QFont TextLabel1_4_2_font( TextLabel1_4_2->font() ); | 121 | QFont TextLabel1_4_2_font( TextLabel1_4_2->font() ); |
124 | TextLabel1_4_2_font.setFamily( "adobe-helvetica" ); | 122 | TextLabel1_4_2_font.setFamily( "adobe-helvetica" ); |
125 | TextLabel1_4_2_font.setPointSize( 10 ); | 123 | TextLabel1_4_2_font.setPointSize( 10 ); |
126 | TextLabel1_4_2->setFont( TextLabel1_4_2_font ); | 124 | TextLabel1_4_2->setFont( TextLabel1_4_2_font ); |