-rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.cpp | 3 | ||||
-rwxr-xr-x | noncore/net/wellenreiter/makedist.sh | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp index 3ec190b..f82c088 100644 --- a/noncore/net/wellenreiter/gui/configwindow.cpp +++ b/noncore/net/wellenreiter/gui/configwindow.cpp | |||
@@ -23,26 +23,29 @@ | |||
23 | #include <qcombobox.h> | 23 | #include <qcombobox.h> |
24 | #include <qfile.h> | 24 | #include <qfile.h> |
25 | #include <qlineedit.h> | 25 | #include <qlineedit.h> |
26 | #include <qlayout.h> | 26 | #include <qlayout.h> |
27 | #include <qmap.h> | 27 | #include <qmap.h> |
28 | #include <qpushbutton.h> | 28 | #include <qpushbutton.h> |
29 | #include <qtoolbutton.h> | 29 | #include <qtoolbutton.h> |
30 | #include <qspinbox.h> | 30 | #include <qspinbox.h> |
31 | #include <qtextstream.h> | 31 | #include <qtextstream.h> |
32 | 32 | ||
33 | /* OPIE */ | 33 | /* OPIE */ |
34 | #include <opie2/onetwork.h> | 34 | #include <opie2/onetwork.h> |
35 | |||
36 | #ifdef QWS | ||
35 | #include <opie2/oapplication.h> | 37 | #include <opie2/oapplication.h> |
36 | #include <opie2/oconfig.h> | 38 | #include <opie2/oconfig.h> |
39 | #endif | ||
37 | 40 | ||
38 | WellenreiterConfigWindow* WellenreiterConfigWindow::_instance = 0; | 41 | WellenreiterConfigWindow* WellenreiterConfigWindow::_instance = 0; |
39 | 42 | ||
40 | WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char * name, WFlags f ) | 43 | WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char * name, WFlags f ) |
41 | :WellenreiterConfigBase( parent, name, true, f ) | 44 | :WellenreiterConfigBase( parent, name, true, f ) |
42 | { | 45 | { |
43 | _devicetype[ "cisco" ] = DEVTYPE_CISCO; | 46 | _devicetype[ "cisco" ] = DEVTYPE_CISCO; |
44 | _devicetype[ "wlan-ng" ] = DEVTYPE_WLAN_NG; | 47 | _devicetype[ "wlan-ng" ] = DEVTYPE_WLAN_NG; |
45 | _devicetype[ "hostap" ] = DEVTYPE_HOSTAP; | 48 | _devicetype[ "hostap" ] = DEVTYPE_HOSTAP; |
46 | _devicetype[ "orinoco" ] = DEVTYPE_ORINOCO; | 49 | _devicetype[ "orinoco" ] = DEVTYPE_ORINOCO; |
47 | _devicetype[ "<manual>" ] = DEVTYPE_MANUAL; | 50 | _devicetype[ "<manual>" ] = DEVTYPE_MANUAL; |
48 | _devicetype[ "<file>" ] = DEVTYPE_FILE; | 51 | _devicetype[ "<file>" ] = DEVTYPE_FILE; |
diff --git a/noncore/net/wellenreiter/makedist.sh b/noncore/net/wellenreiter/makedist.sh index 64098d0..ccb9c85 100755 --- a/noncore/net/wellenreiter/makedist.sh +++ b/noncore/net/wellenreiter/makedist.sh | |||
@@ -1,13 +1,13 @@ | |||
1 | VERSION=2-1.0rc2 | 1 | VERSION=2-1.0.1-cvs |
2 | 2 | ||
3 | TGZDIR=$PWD | 3 | TGZDIR=$PWD |
4 | 4 | ||
5 | # script to make a .tgz distributable for the Wellenreiter X11 Standalone Version | 5 | # script to make a .tgz distributable for the Wellenreiter X11 Standalone Version |
6 | 6 | ||
7 | find . -name "*.o"|xargs rm -f | 7 | find . -name "*.o"|xargs rm -f |
8 | find . -name "Makefile"|xargs rm -f | 8 | find . -name "Makefile"|xargs rm -f |
9 | find . -name "*moc*"|xargs rm -f | 9 | find . -name "*moc*"|xargs rm -f |
10 | #TMPFILE=`mktemp -d -q /tmp/build.XXXXXX` | 10 | #TMPFILE=`mktemp -d -q /tmp/build.XXXXXX` |
11 | TMPFILE=/tmp/build | 11 | TMPFILE=/tmp/build |
12 | #if [ $? -ne 0 ]; then | 12 | #if [ $? -ne 0 ]; then |
13 | # echo "$0: Can't create temp file, exiting..." | 13 | # echo "$0: Can't create temp file, exiting..." |
@@ -22,25 +22,26 @@ mkdir -p $TMPDIR/libopie2/opienet | |||
22 | mkdir -p $TMPDIR/include/opie2 | 22 | mkdir -p $TMPDIR/include/opie2 |
23 | mkdir -p $OUTPUT/share/wellenreiter/pics | 23 | mkdir -p $OUTPUT/share/wellenreiter/pics |
24 | mkdir -p $OUTPUT/share/wellenreiter | 24 | mkdir -p $OUTPUT/share/wellenreiter |
25 | cp -dfR gui $TMPDIR | 25 | cp -dfR gui $TMPDIR |
26 | cp -dfR lib $TMPDIR | 26 | cp -dfR lib $TMPDIR |
27 | cp -dfR build README wellenreiter.pro $TMPDIR | 27 | cp -dfR build README wellenreiter.pro $TMPDIR |
28 | cp -dfR $OPIEDIR/pics/wellenreiter/* $OUTPUT/share/wellenreiter/ | 28 | cp -dfR $OPIEDIR/pics/wellenreiter/* $OUTPUT/share/wellenreiter/ |
29 | cp -dfR $OPIEDIR/etc/manufacturers $OUTPUT/share/wellenreiter/ | 29 | cp -dfR $OPIEDIR/etc/manufacturers $OUTPUT/share/wellenreiter/ |
30 | 30 | ||
31 | # take care about sourcefiles | 31 | # take care about sourcefiles |
32 | 32 | ||
33 | FILES="libopie2/opienet/onetwork.h libopie2/opienet/onetwork.cpp \ | 33 | FILES="libopie2/opienet/onetwork.h libopie2/opienet/onetwork.cpp \ |
34 | libopie2/opienet/opcap.h libopie2/opienet/opcap.cpp libopie2/opienet/802_11_user.h \ | 34 | libopie2/opienet/opcap.h libopie2/opienet/opcap.cpp \ |
35 | libopie2/opienet/802_11_user.h libopie2/opienet/dhcp.h libopie2/opienet/udp_ports.h \ | ||
35 | libopie2/opienet/onetutils.h libopie2/opienet/onetutils.cpp \ | 36 | libopie2/opienet/onetutils.h libopie2/opienet/onetutils.cpp \ |
36 | libopie2/opienet/omanufacturerdb.h libopie2/opienet/omanufacturerdb.cpp \ | 37 | libopie2/opienet/omanufacturerdb.h libopie2/opienet/omanufacturerdb.cpp \ |
37 | libopie2/opieui/olistview.cpp libopie2/opieui/olistview.h" | 38 | libopie2/opieui/olistview.cpp libopie2/opieui/olistview.h" |
38 | 39 | ||
39 | for i in $FILES | 40 | for i in $FILES |
40 | do cp -dfR $OPIEDIR/$i $TMPDIR/$i | 41 | do cp -dfR $OPIEDIR/$i $TMPDIR/$i |
41 | done | 42 | done |
42 | 43 | ||
43 | # make includes | 44 | # make includes |
44 | pushd $TMPDIR/include/opie2 | 45 | pushd $TMPDIR/include/opie2 |
45 | ln -sf ../../libopie2/opieui/*.h . | 46 | ln -sf ../../libopie2/opieui/*.h . |
46 | ln -sf ../../libopie2/opienet/*.h . | 47 | ln -sf ../../libopie2/opienet/*.h . |