author | mickeyl <mickeyl> | 2003-04-08 16:43:20 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-04-08 16:43:20 (UTC) |
commit | 89100a32b43b7eda68aaa19bc275a0fb7ce36e30 (patch) (side-by-side diff) | |
tree | 7538662f3b5a0b8b657013bb82ba02f7d57fc80b /noncore/net/wellenreiter/gui | |
parent | 0d48ba39224582c83d68c2938e6cbedc4c77ec7d (diff) | |
download | opie-89100a32b43b7eda68aaa19bc275a0fb7ce36e30.zip opie-89100a32b43b7eda68aaa19bc275a0fb7ce36e30.tar.gz opie-89100a32b43b7eda68aaa19bc275a0fb7ce36e30.tar.bz2 |
preparations 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 | 2 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/gui.pro | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp index 59c2a61..ba1119e 100644 --- a/noncore/net/wellenreiter/gui/configwindow.cpp +++ b/noncore/net/wellenreiter/gui/configwindow.cpp @@ -53,48 +53,48 @@ WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char QFile m( "/proc/modules" ); if ( m.open( IO_ReadOnly ) ) { int devicetype(0); QString line; QTextStream modules( &m ); while( !modules.atEnd() && !devicetype ) { modules >> line; if ( line.contains( "cisco" ) ) devicetype = 1; else if ( line.contains( "hostap" ) ) devicetype = 3; else if ( line.contains( "prism" ) ) devicetype = 2; else if ( line.contains( "orinoco" ) ) devicetype = 4; } if ( devicetype ) { deviceType->setCurrentItem( devicetype ); qDebug( "Wellenreiter: guessed device type to be %d", devicetype ); } } #ifdef Q_WS_X11 // We're on X11: adding an Ok-Button for the Dialog here QPushButton* okButton = new QPushButton( "ok", this ); okButton->show(); - Layout5_2->addWidget( okButton ); //FIXME: rename this in configbase.ui + Layout5_2->addWidget( okButton, 0, 3 ); //FIXME: rename this in configbase.ui connect( okButton, SIGNAL( clicked() ), this, SLOT( accept() ) ); #endif WellenreiterConfigWindow::_instance = this; }; int WellenreiterConfigWindow::daemonDeviceType() { QString name = deviceType->currentText(); if ( _devicetype.contains( name ) ) { return _devicetype[name]; } else { return 0; } }; int WellenreiterConfigWindow::daemonHopInterval() { return hopInterval->cleanText().toInt(); } diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro index 5a8972c..5970b01 100644 --- a/noncore/net/wellenreiter/gui/gui.pro +++ b/noncore/net/wellenreiter/gui/gui.pro @@ -14,29 +14,30 @@ HEADERS = wellenreiterbase.h \ manufacturers.h SOURCES = main.cpp \ mainwindow.cpp \ wellenreiterbase.cpp \ wellenreiter.cpp \ scanlist.cpp \ logwindow.cpp \ hexwindow.cpp \ configwindow.cpp \ manufacturers.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include INTERFACES = configbase.ui TARGET = wellenreiter !contains( platform, x11 ) { message( qws ) include ( $(OPIEDIR)/include.pro ) LIBS += -lqpe -lopie -lopiecore2 -lopieui2 -lopienet2 } contains( platform, x11 ) { - LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib -lwellenreiter + LIBS += -L$(OPIEDIR)/output/lib -Wl,-rpath,$(OPIEDIR)/output/lib -Wl,-rpath,/usr/local/lib -lwellenreiter SOURCES += resource.cpp HEADERS += resource.h + DESTDIR = $(OPIEDIR)/output/bin } |