author | mickeyl <mickeyl> | 2003-02-23 16:45:09 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-02-23 16:45:09 (UTC) |
commit | 2f897267b4d3ec5b1c7dafdc0700a8e91cbb3321 (patch) (unidiff) | |
tree | 9f32fb9e22a26188c6f1c1092c74b1bf47aa418c /noncore/net/wellenreiter/gui | |
parent | 3a3c703d9bdf57f50b3f47aa14c858ef1026e3d3 (diff) | |
download | opie-2f897267b4d3ec5b1c7dafdc0700a8e91cbb3321.zip opie-2f897267b4d3ec5b1c7dafdc0700a8e91cbb3321.tar.gz opie-2f897267b4d3ec5b1c7dafdc0700a8e91cbb3321.tar.bz2 |
simplification and fixes for the standalone X11 build
Diffstat (limited to 'noncore/net/wellenreiter/gui') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.cpp | 9 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/gui-x11.pro | 15 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/gui.pro | 13 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.cpp | 27 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.h | 1 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/resource.cpp | 2 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 2 |
7 files changed, 47 insertions, 22 deletions
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 | |||
@@ -16,7 +16,9 @@ | |||
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 | ||
21 | WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char * name, WFlags f ) | 23 | WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char * name, WFlags f ) |
22 | :WellenreiterConfigBase( parent, name, true, f ) | 24 | :WellenreiterConfigBase( parent, name, true, f ) |
@@ -26,6 +28,13 @@ WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char | |||
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 | ||
31 | int WellenreiterConfigWindow::daemonDeviceType() | 40 | int WellenreiterConfigWindow::daemonDeviceType() |
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 @@ | |||
1 | DESTDIR = . | ||
2 | TEMPLATE = app | ||
3 | CONFIG = qt warn_on debug | ||
4 | #CONFIG = qt warn_on release | ||
5 | HEADERS = mainwindow.h wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h logwindow.h hexwindow.h configwindow.h resource.h wlan.h cardconfig.h manufacturers.h | ||
6 | SOURCES = 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 | ||
7 | INCLUDEPATH += ../ | ||
8 | DEPENDPATH += ../ | ||
9 | LIBS += -L. -lwellenreiter | ||
10 | INTERFACES = configbase.ui | ||
11 | TARGET = wellenreiter | ||
12 | |||
13 | |||
14 | |||
15 | include ( $(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 | |||
@@ -31,10 +31,19 @@ SOURCES = main.cpp \ | |||
31 | 31 | ||
32 | INCLUDEPATH += $(OPIEDIR)/include ../ | 32 | INCLUDEPATH += $(OPIEDIR)/include ../ |
33 | DEPENDPATH += $(OPIEDIR)/include ../ | 33 | DEPENDPATH += $(OPIEDIR)/include ../ |
34 | LIBS += -lqpe -lopie -L. -lwellenreiter | 34 | LIBS += -L. -lwellenreiter |
35 | INTERFACES = configbase.ui | 35 | INTERFACES = configbase.ui |
36 | TARGET = wellenreiter | 36 | TARGET = wellenreiter |
37 | 37 | ||
38 | !contains( platform, x11 ) { | ||
39 | message( qws ) | ||
40 | include ( $(OPIEDIR)/include.pro ) | ||
41 | LIBS += -lqpe -lopie | ||
42 | } | ||
38 | 43 | ||
44 | contains( platform, x11 ) { | ||
45 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | ||
46 | SOURCES += resource.cpp | ||
47 | HEADERS += resource.h | ||
48 | } | ||
39 | 49 | ||
40 | include ( $(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 | |||
@@ -40,17 +40,27 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
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 ); |
@@ -89,9 +99,15 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
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 | ||
@@ -105,7 +121,9 @@ void 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 ) |
@@ -128,11 +146,14 @@ void WellenreiterMainWindow::showConfigure() | |||
128 | WellenreiterMainWindow::~WellenreiterMainWindow() | 146 | WellenreiterMainWindow::~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 | ||
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 | |||
@@ -35,6 +35,7 @@ class WellenreiterMainWindow: public QMainWindow | |||
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; |
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 | |||
@@ -15,7 +15,7 @@ | |||
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 | ||
20 | namespace Resource | 20 | namespace Resource |
21 | { | 21 | { |
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 | |||
@@ -74,7 +74,7 @@ Wellenreiter::Wellenreiter( QWidget* parent ) | |||
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 | ||