4 files changed, 39 insertions, 18 deletions

diff --git a/noncore/net/wellenreiter/gui/resource.cpp b/noncore/net/wellenreiter/gui/resource.cpp
index 7683329..a39bbcc 100644
--- a/noncore/net/wellenreiter/gui/resource.cpp
+++ b/noncore/net/wellenreiter/gui/resource.cpp
@@ -8,28 +8,43 @@
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #include "resource.h"
 
 #define PIXMAPPATH "/usr/local/share"
 
+#include <qpixmap.h>
+#include <qiconset.h>
+
 namespace Resource
 {
 
 QPixmap loadPixmap( const QString& pix )
 {
     QString filename;
     filename.sprintf( "%s/%s.png", (const char*) PIXMAPPATH, (const char*) pix );
     QPixmap pixmap( filename );
     if ( pixmap.isNull() )
     {
         qDebug( "Wellenreiter::Resource: can't find pixmap " + filename );
     }
     return pixmap;
 };
 
+QIconSet loadIconSet( const QString& pix )
+{
+    QString filename;
+    filename.sprintf( "%s/%s.png", (const char*) PIXMAPPATH, (const char*) pix );
+    QPixmap pixmap( filename );
+    if ( pixmap.isNull() )
+    {
+        qDebug( "Wellenreiter::Resource: can't find pixmap " + filename );
+    }
+    return QIconSet( pixmap );
+};
+
 };
diff --git a/noncore/net/wellenreiter/gui/resource.h b/noncore/net/wellenreiter/gui/resource.h
index 6a3cc99..8788c6e 100644
--- a/noncore/net/wellenreiter/gui/resource.h
+++ b/noncore/net/wellenreiter/gui/resource.h
@@ -7,20 +7,24 @@
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #ifndef RESOURCE_H
 #define RESOURCE_H
 
-#include <qpixmap.h>
+#include <qstring.h>
+
+class QPixmap;
+class QIconSet;
 
 namespace Resource
 {
     QPixmap loadPixmap( const QString& );
+    QIconSet loadIconSet( const QString& );
 }
 
 #endif // RESOURCE_H
diff --git a/noncore/net/wellenreiter/lib/lib.pro b/noncore/net/wellenreiter/lib/lib.pro
index 0dcc25a..75eba76 100644
--- a/noncore/net/wellenreiter/lib/lib.pro
+++ b/noncore/net/wellenreiter/lib/lib.pro
@@ -1,22 +1,28 @@
 DESTDIR         = $(OPIEDIR)/output/lib
 TEMPLATE        = lib
 CONFIG          = qt warn_on debug
 
-HEADERS         = ../libopie2/opieui/olistview.h \
+HEADERS         = ../libopie2/opiecore/odebug.h \
+                  ../libopie2/opieui/olistview.h \
                   ../libopie2/opienet/onetutils.h \
                   ../libopie2/opienet/omanufacturerdb.h \
+                  ../libopie2/opienet/odebugmapper.h \
                   ../libopie2/opienet/onetwork.h \
-                  ../libopie2/opienet/opcap.h
+                  ../libopie2/opienet/opcap.h \
+                  ../libopie2/opienet/ostation.h
 
-SOURCES         = ../libopie2/opieui/olistview.cpp \
+SOURCES         = ../libopie2/opiecore/odebug.cpp \
+                  ../libopie2/opieui/olistview.cpp \
                   ../libopie2/opienet/onetutils.cpp \
                   ../libopie2/opienet/omanufacturerdb.cpp \
+                  ../libopie2/opienet/odebugmapper.cpp \
                   ../libopie2/opienet/onetwork.cpp \
-                  ../libopie2/opienet/opcap.cpp
+                  ../libopie2/opienet/opcap.cpp \
+                  ../libopie2/opienet/ostation.h
 
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib -lpcap
 INTERFACES      =
 TARGET          = wellenreiter
-VERSION         = 1.0.0
+VERSION         = 1.0.2
diff --git a/noncore/net/wellenreiter/makedist.sh b/noncore/net/wellenreiter/makedist.sh
index ccb9c85..6a0bb26 100755
--- a/noncore/net/wellenreiter/makedist.sh
+++ b/noncore/net/wellenreiter/makedist.sh
@@ -1,55 +1,51 @@
-VERSION=2-1.0.1-cvs
+VERSION=2-1.0.2
 
 TGZDIR=$PWD
 
 # script to make a .tgz distributable for the Wellenreiter X11 Standalone Version
 
 find . -name "*.o"|xargs rm -f
 find . -name "Makefile"|xargs rm -f
 find . -name "*moc*"|xargs rm -f
 #TMPFILE=`mktemp -d -q /tmp/build.XXXXXX`
 TMPFILE=/tmp/build
 #if [ $? -ne 0 ]; then
 #        echo "$0: Can't create temp file, exiting..."
 #        exit 1
 #fi
 
 TMPDIR=$TMPFILE/wellenreiter$VERSION
 OUTPUT=$TMPDIR/output
 
+mkdir -p $TMPDIR/libopie2/opiecore
 mkdir -p $TMPDIR/libopie2/opieui
 mkdir -p $TMPDIR/libopie2/opienet
 mkdir -p $TMPDIR/include/opie2
 mkdir -p $OUTPUT/share/wellenreiter/pics
 mkdir -p $OUTPUT/share/wellenreiter
 cp -dfR gui $TMPDIR
 cp -dfR lib $TMPDIR
 cp -dfR build README wellenreiter.pro $TMPDIR
 cp -dfR $OPIEDIR/pics/wellenreiter/* $OUTPUT/share/wellenreiter/
 cp -dfR $OPIEDIR/etc/manufacturers $OUTPUT/share/wellenreiter/
 
-# take care about sourcefiles
+# take care about sourcefiles from libopie2
 
-FILES="libopie2/opienet/onetwork.h libopie2/opienet/onetwork.cpp \
-      libopie2/opienet/opcap.h libopie2/opienet/opcap.cpp \
-      libopie2/opienet/802_11_user.h libopie2/opienet/dhcp.h libopie2/opienet/udp_ports.h \
-      libopie2/opienet/onetutils.h libopie2/opienet/onetutils.cpp \
-      libopie2/opienet/omanufacturerdb.h libopie2/opienet/omanufacturerdb.cpp \
-      libopie2/opieui/olistview.cpp libopie2/opieui/olistview.h"
-
-for i in $FILES
-    do cp -dfR $OPIEDIR/$i $TMPDIR/$i
-done
+cp -dfR $OPIEDIR/libopie2/opienet/*.* $TMPDIR/libopie2/opienet
+cp -dfR $OPIEDIR/libopie2/opiecore/*.* $TMPDIR/libopie2/opiecore
+cp -dfR $OPIEDIR/libopie2/opieui/olistview.* $TMPDIR/libopie2/opieui
 
 # make includes
+
 pushd $TMPDIR/include/opie2
 ln -sf ../../libopie2/opieui/*.h .
 ln -sf ../../libopie2/opienet/*.h .
+ln -sf ../../libopie2/opiecore/*.h .
 popd
 
 find $TMPDIR -name "CVS"|xargs rm -rf
 
 pushd $TMPFILE
 tar czf $TGZDIR/wellenreiter$VERSION.tgz wellenreiter$VERSION
 popd