summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-02-23 16:45:09 (UTC)
committer mickeyl <mickeyl>2003-02-23 16:45:09 (UTC)
commit2f897267b4d3ec5b1c7dafdc0700a8e91cbb3321 (patch) (unidiff)
tree9f32fb9e22a26188c6f1c1092c74b1bf47aa418c
parent3a3c703d9bdf57f50b3f47aa14c858ef1026e3d3 (diff)
downloadopie-2f897267b4d3ec5b1c7dafdc0700a8e91cbb3321.zip
opie-2f897267b4d3ec5b1c7dafdc0700a8e91cbb3321.tar.gz
opie-2f897267b4d3ec5b1c7dafdc0700a8e91cbb3321.tar.bz2
simplification and fixes for the standalone X11 build
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/README11
-rw-r--r--noncore/net/wellenreiter/daemon/daemon.pro6
-rw-r--r--noncore/net/wellenreiter/gui/configwindow.cpp9
-rw-r--r--noncore/net/wellenreiter/gui/gui-x11.pro15
-rw-r--r--noncore/net/wellenreiter/gui/gui.pro13
-rw-r--r--noncore/net/wellenreiter/gui/mainwindow.cpp27
-rw-r--r--noncore/net/wellenreiter/gui/mainwindow.h1
-rw-r--r--noncore/net/wellenreiter/gui/resource.cpp2
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp2
-rw-r--r--noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro7
-rw-r--r--noncore/net/wellenreiter/wellenreiter.pro10
11 files changed, 68 insertions, 35 deletions
diff --git a/noncore/net/wellenreiter/README b/noncore/net/wellenreiter/README
index ada9321..7de6a33 100644
--- a/noncore/net/wellenreiter/README
+++ b/noncore/net/wellenreiter/README
@@ -42,19 +42,18 @@ CONFIG_WELLENREITER noncore/net/wellenreiter/contrib/orinoco_hopper orinoco_hopp
42 42
43make -f Makefile.test clean-configs 43make -f Makefile.test clean-configs
44cd <BUILDROOT> 44cd <BUILDROOT>
45make SUBDIRS=packages/opie package 45make SUBDIRS=packages/opie package
46 46
47(III) To compile a standalone Wellenreiter for X11, you need Qt3 and the development 47(III) To compile a standalone Wellenreiter for X11, you need Qt3 and the development
48packages for Qt3, e.g. libqt3-devel. Assuming, $OPIEDIR and $QTDIR is set to Opie resp. 48packages for Qt3, e.g. libqt3-devel. Assuming, $QTDIR is set to your Qt-Director
49Qt (e.g. /usr/lib/qt3), do the following: 49(e.g. /usr/lib/qt3), set $OPIEDIR to your installation prefix, e.g. /usr/local, then
50export QMAKESPEC=$OPIEDIR/mkspecs/linux-g++ 50export QMAKESPEC=$QTDIR/mkspecs/linux-g++
51cd $OPIEDIR/noncore/net/wellenreiter 51qmake "platform=x11" wellenreiter.pro
52qmake -makefile wellenreiter.pro
53make qmake
54make 52make
53make install
55 54
56===================== 55=====================
57= Install = 56= Install =
58===================== 57=====================
59 58
60Alternatively, you can use our precompiled ipk. Get it from 59Alternatively, you can use our precompiled ipk. Get it from
diff --git a/noncore/net/wellenreiter/daemon/daemon.pro b/noncore/net/wellenreiter/daemon/daemon.pro
index 8943db7..33a6bb9 100644
--- a/noncore/net/wellenreiter/daemon/daemon.pro
+++ b/noncore/net/wellenreiter/daemon/daemon.pro
@@ -8,9 +8,9 @@ INCLUDEPATH += ../
8DEPENDPATH += $(OPIEDIR)/include 8DEPENDPATH += $(OPIEDIR)/include
9LIBS += -lpcap -lpthread -L$(OPIEDIR)/lib -lwellenreiter 9LIBS += -lpcap -lpthread -L$(OPIEDIR)/lib -lwellenreiter
10INTERFACES = 10INTERFACES =
11TARGET = wellenreiterd 11TARGET = wellenreiterd
12DEFINES += DEBUG 12DEFINES += DEBUG
13 13
14 14!contains( platform, x11 ) {
15 15 include ( $(OPIEDIR)/include.pro )
16include ( $(OPIEDIR)/include.pro ) 16}
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp
index 6ea6f02..f86b109 100644
--- a/noncore/net/wellenreiter/gui/configwindow.cpp
+++ b/noncore/net/wellenreiter/gui/configwindow.cpp
@@ -13,22 +13,31 @@
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16#include "configwindow.h" 16#include "configwindow.h"
17#include <qmap.h> 17#include <qmap.h>
18#include <qcombobox.h> 18#include <qcombobox.h>
19#include <qpushbutton.h>
19#include <qspinbox.h> 20#include <qspinbox.h>
21#include <qlayout.h>
20 22
21WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char * name, WFlags f ) 23WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char * name, WFlags f )
22 :WellenreiterConfigBase( parent, name, true, f ) 24 :WellenreiterConfigBase( parent, name, true, f )
23{ 25{
24 _devicetype[ "cisco" ] = 1; 26 _devicetype[ "cisco" ] = 1;
25 _devicetype[ "wlan-ng" ] = 2; 27 _devicetype[ "wlan-ng" ] = 2;
26 _devicetype[ "hostap" ] = 3; 28 _devicetype[ "hostap" ] = 3;
27 _devicetype[ "orinoco" ] = 4; 29 _devicetype[ "orinoco" ] = 4;
28 _devicetype[ "<manual>" ] = 5; 30 _devicetype[ "<manual>" ] = 5;
31
32 #ifdef Q_WS_X11 // We're on X11: adding an Ok-Button for the Dialog here
33 QPushButton* okButton = new QPushButton( "ok", this );
34 okButton->show();
35 Layout5_2->addWidget( okButton ); //FIXME: rename this in configbase.ui
36 connect( okButton, SIGNAL( clicked() ), this, SLOT( accept() ) );
37 #endif
29}; 38};
30 39
31int WellenreiterConfigWindow::daemonDeviceType() 40int WellenreiterConfigWindow::daemonDeviceType()
32{ 41{
33 QString name = deviceType->currentText(); 42 QString name = deviceType->currentText();
34 if ( _devicetype.contains( name ) ) 43 if ( _devicetype.contains( name ) )
diff --git a/noncore/net/wellenreiter/gui/gui-x11.pro b/noncore/net/wellenreiter/gui/gui-x11.pro
deleted file mode 100644
index 25185fb..0000000
--- a/noncore/net/wellenreiter/gui/gui-x11.pro
+++ b/dev/null
@@ -1,15 +0,0 @@
1DESTDIR = .
2TEMPLATE = app
3CONFIG = qt warn_on debug
4#CONFIG = qt warn_on release
5HEADERS = mainwindow.h wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h logwindow.h hexwindow.h configwindow.h resource.h wlan.h cardconfig.h manufacturers.h
6SOURCES = main.cpp mainwindow.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cpp scanlist.cpp logwindow.cpp hexwindow.cpp configwindow.cpp resource.cpp wlan.cpp cardconfig.cpp manufacturers.cpp
7INCLUDEPATH += ../
8DEPENDPATH += ../
9LIBS += -L. -lwellenreiter
10INTERFACES = configbase.ui
11TARGET = wellenreiter
12
13
14
15include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro
index 95e9f22..822b0db 100644
--- a/noncore/net/wellenreiter/gui/gui.pro
+++ b/noncore/net/wellenreiter/gui/gui.pro
@@ -28,13 +28,22 @@ SOURCES = main.cpp \
28 wlan.cpp \ 28 wlan.cpp \
29 cardconfig.cpp \ 29 cardconfig.cpp \
30 manufacturers.cpp 30 manufacturers.cpp
31 31
32INCLUDEPATH += $(OPIEDIR)/include ../ 32INCLUDEPATH += $(OPIEDIR)/include ../
33DEPENDPATH += $(OPIEDIR)/include ../ 33DEPENDPATH += $(OPIEDIR)/include ../
34LIBS += -lqpe -lopie -L. -lwellenreiter 34LIBS += -L. -lwellenreiter
35INTERFACES = configbase.ui 35INTERFACES = configbase.ui
36TARGET = wellenreiter 36TARGET = wellenreiter
37 37
38!contains( platform, x11 ) {
39 message( qws )
40 include ( $(OPIEDIR)/include.pro )
41 LIBS += -lqpe -lopie
42}
38 43
44contains( platform, x11 ) {
45 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
46 SOURCES += resource.cpp
47 HEADERS += resource.h
48}
39 49
40include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
index b67376c..b2d3a71 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.cpp
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -37,23 +37,33 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
37 mw = new Wellenreiter( this ); 37 mw = new Wellenreiter( this );
38 mw->setConfigWindow( cw ); 38 mw->setConfigWindow( cw );
39 setCentralWidget( mw ); 39 setCentralWidget( mw );
40 40
41 // setup icon sets 41 // setup icon sets
42 42
43 searchIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/SearchIcon" ) );
44 infoIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/InfoIcon" ) ); 43 infoIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/InfoIcon" ) );
45 settingsIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/SettingsIcon" ) ); 44 settingsIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/SettingsIcon" ) );
45 #ifdef QWS
46 searchIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/SearchIcon" ) );
46 cancelIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/CancelIcon" ) ); 47 cancelIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/CancelIcon" ) );
48 #else
49 startStopIconSet = new QIconSet();
50 startStopIconSet->setPixmap( Resource::loadPixmap( "wellenreiter/SearchIcon" ), QIconSet::Automatic, QIconSet::Normal, QIconSet::Off );
51 startStopIconSet->setPixmap( Resource::loadPixmap( "wellenreiter/CancelIcon" ), QIconSet::Automatic, QIconSet::Normal, QIconSet::On );
52 #endif
47 53
48 // setup tool buttons 54 // setup tool buttons
49 55
50 startStopButton = new QToolButton( 0 ); 56 startStopButton = new QToolButton( 0 );
51 startStopButton->setAutoRaise( true ); 57 startStopButton->setAutoRaise( true );
58 #ifdef QWS
52 startStopButton->setOnIconSet( *cancelIconSet ); 59 startStopButton->setOnIconSet( *cancelIconSet );
53 startStopButton->setOffIconSet( *searchIconSet ); 60 startStopButton->setOffIconSet( *searchIconSet );
61 #else
62 startStopButton->setIconSet( *startStopIconSet );
63 #endif
54 startStopButton->setToggleButton( true ); 64 startStopButton->setToggleButton( true );
55 connect( startStopButton, SIGNAL( clicked() ), mw, SLOT( startStopClicked() ) ); 65 connect( startStopButton, SIGNAL( clicked() ), mw, SLOT( startStopClicked() ) );
56 startStopButton->setEnabled( false ); 66 startStopButton->setEnabled( false );
57 67
58 QToolButton* c = new QToolButton( 0 ); 68 QToolButton* c = new QToolButton( 0 );
59 c->setAutoRaise( true ); 69 c->setAutoRaise( true );
@@ -86,15 +96,21 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
86 mb->setItemEnabled( id, false ); 96 mb->setItemEnabled( id, false );
87 id = mb->insertItem( "&View", view ); 97 id = mb->insertItem( "&View", view );
88 mb->setItemEnabled( id, false ); 98 mb->setItemEnabled( id, false );
89 id = mb->insertItem( "&Sniffer", sniffer ); 99 id = mb->insertItem( "&Sniffer", sniffer );
90 mb->setItemEnabled( id, false ); 100 mb->setItemEnabled( id, false );
91 101
102 #ifdef QWS
92 mb->insertItem( startStopButton ); 103 mb->insertItem( startStopButton );
93 mb->insertItem( c ); 104 mb->insertItem( c );
94 mb->insertItem( d ); 105 mb->insertItem( d );
106 #else // Qt3 changed the insertion order. It's now totally random :(
107 mb->insertItem( d );
108 mb->insertItem( c );
109 mb->insertItem( startStopButton );
110 #endif
95 111
96 // setup status bar (for now only on X11) 112 // setup status bar (for now only on X11)
97 113
98 #ifndef QWS 114 #ifndef QWS
99 statusBar()->message( "Ready." ); 115 statusBar()->message( "Ready." );
100 #endif 116 #endif
@@ -102,13 +118,15 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
102}; 118};
103 119
104void WellenreiterMainWindow::showConfigure() 120void WellenreiterMainWindow::showConfigure()
105{ 121{
106 qDebug( "show configure..." ); 122 qDebug( "show configure..." );
107 cw->setCaption( tr( "Configure" ) ); 123 cw->setCaption( tr( "Configure" ) );
124 #ifdef QWS
108 cw->showMaximized(); 125 cw->showMaximized();
126 #endif
109 int result = cw->exec(); 127 int result = cw->exec();
110 128
111 if ( result ) 129 if ( result )
112 { 130 {
113 // check configuration from config window 131 // check configuration from config window
114 132
@@ -125,16 +143,19 @@ void WellenreiterMainWindow::showConfigure()
125 } 143 }
126} 144}
127 145
128WellenreiterMainWindow::~WellenreiterMainWindow() 146WellenreiterMainWindow::~WellenreiterMainWindow()
129{ 147{
130 148
131 delete searchIconSet;
132 delete infoIconSet; 149 delete infoIconSet;
133 delete settingsIconSet; 150 delete settingsIconSet;
151 #ifdef QWS
152 delete searchIconSet;
134 delete cancelIconSet; 153 delete cancelIconSet;
135 154 #else
155 delete startStopIconSet;
156 #endif
136 157
137}; 158};
138 159
139 160
140 161
diff --git a/noncore/net/wellenreiter/gui/mainwindow.h b/noncore/net/wellenreiter/gui/mainwindow.h
index 7d772a8..c21841a 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.h
+++ b/noncore/net/wellenreiter/gui/mainwindow.h
@@ -32,12 +32,13 @@ class WellenreiterMainWindow: public QMainWindow
32 ~WellenreiterMainWindow(); 32 ~WellenreiterMainWindow();
33 33
34 protected: 34 protected:
35 Wellenreiter* mw; 35 Wellenreiter* mw;
36 WellenreiterConfigWindow* cw; 36 WellenreiterConfigWindow* cw;
37 37
38 QIconSet* startStopIconSet;
38 const QIconSet* searchIconSet; 39 const QIconSet* searchIconSet;
39 const QIconSet* infoIconSet; 40 const QIconSet* infoIconSet;
40 const QIconSet* settingsIconSet; 41 const QIconSet* settingsIconSet;
41 const QIconSet* cancelIconSet; 42 const QIconSet* cancelIconSet;
42 43
43 QToolButton* startStopButton; 44 QToolButton* startStopButton;
diff --git a/noncore/net/wellenreiter/gui/resource.cpp b/noncore/net/wellenreiter/gui/resource.cpp
index fb0966a..7683329 100644
--- a/noncore/net/wellenreiter/gui/resource.cpp
+++ b/noncore/net/wellenreiter/gui/resource.cpp
@@ -12,13 +12,13 @@
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16#include "resource.h" 16#include "resource.h"
17 17
18#define PIXMAPPATH "/usr/share/wellenreiter/pics/" 18#define PIXMAPPATH "/usr/local/share"
19 19
20namespace Resource 20namespace Resource
21{ 21{
22 22
23QPixmap loadPixmap( const QString& pix ) 23QPixmap loadPixmap( const QString& pix )
24{ 24{
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index db7063b..c599bb4 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -71,13 +71,13 @@ Wellenreiter::Wellenreiter( QWidget* parent )
71 // 71 //
72 72
73 QString manufile; 73 QString manufile;
74 #ifdef QWS 74 #ifdef QWS
75 manufile.sprintf( "%s/share/wellenreiter/manufacturers.dat", (const char*) QPEApplication::qpeDir() ); 75 manufile.sprintf( "%s/share/wellenreiter/manufacturers.dat", (const char*) QPEApplication::qpeDir() );
76 #else 76 #else
77 manufile.sprintf( "/home/mickey/work/opie/share/wellenreiter/manufacturers.dat" ); 77 manufile.sprintf( "/usr/local/share/wellenreiter/manufacturers.dat" );
78 #endif 78 #endif
79 manufacturerdb = new ManufacturerDB( manufile ); 79 manufacturerdb = new ManufacturerDB( manufile );
80 80
81 logwindow->log( "(i) Wellenreiter has been started." ); 81 logwindow->log( "(i) Wellenreiter has been started." );
82 82
83 // 83 //
diff --git a/noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro b/noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro
index 58da0c1..5930c60 100644
--- a/noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro
+++ b/noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro
@@ -1,15 +1,16 @@
1DESTDIR = $(OPIEDIR)/lib
1TEMPLATE = lib 2TEMPLATE = lib
2CONFIG = warn_on debug 3CONFIG = warn_on debug
3VERSION = 0.2 4VERSION = 0.2
4HEADERS = source/cardmode.hh source/wl_log.hh source/wl_proto.hh source/sniff.hh source/wl_sock.hh source/wl_types.hh 5HEADERS = source/cardmode.hh source/wl_log.hh source/wl_proto.hh source/sniff.hh source/wl_sock.hh source/wl_types.hh
5SOURCES = source/cardmode.cc source/wl_log.cc source/wl_proto.cc source/sniff.cc source/wl_sock.cc 6SOURCES = source/cardmode.cc source/wl_log.cc source/wl_proto.cc source/sniff.cc source/wl_sock.cc
6 7
7LIBS = -lpcap 8LIBS = -lpcap
8TMAKE_CFLAGS += -D__UNIX__ 9TMAKE_CFLAGS += -D__UNIX__
9DEFINES += DEBUG 10DEFINES += DEBUG
10DESTDIR = $(OPIEDIR)/lib
11TARGET = wellenreiter 11TARGET = wellenreiter
12 12
13!contains( platform, x11 ) {
14 include ( $(OPIEDIR)/include.pro )
15}
13 16
14
15include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/wellenreiter/wellenreiter.pro b/noncore/net/wellenreiter/wellenreiter.pro
index dd75c8c..17d0e31 100644
--- a/noncore/net/wellenreiter/wellenreiter.pro
+++ b/noncore/net/wellenreiter/wellenreiter.pro
@@ -1,6 +1,14 @@
1TEMPLATE = subdirs 1TEMPLATE = subdirs
2unix:SUBDIRS = libwellenreiter daemon gui 2unix:SUBDIRS = libwellenreiter daemon gui
3 3
4 4
5!contains( platform, x11 ) {
6 message( Configuring Wellenreiter for build on Opie )
7 include ( $(OPIEDIR)/include.pro )
8}
9
10contains( platform, x11 ) {
11 message( Configuring Wellenreiter for build on Qt/X11 )
12 system( mkdir -p $OPIEDIR/lib $OPIEDIR/bin $OPIEDIR/share/pics )
13}
5 14
6include ( $(OPIEDIR)/include.pro )