more work towards repairing the x11 version - still far away though

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
@@ -18,4 +18,7 @@
 #define PIXMAPPATH "/usr/local/share"
 
+#include <qpixmap.h>
+#include <qiconset.h>
+
 namespace Resource
 {
@@ -33,3 +36,15 @@ QPixmap loadPixmap( const QString& pix )
 };
 
+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
@@ -17,9 +17,13 @@
 #define RESOURCE_H
 
-#include <qpixmap.h>
+#include <qstring.h>
+
+class QPixmap;
+class QIconSet;
 
 namespace Resource
 {
     QPixmap loadPixmap( const QString& );
+    QIconSet loadIconSet( const QString& );
 }
 
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
@@ -3,15 +3,21 @@ 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
@@ -20,3 +26,3 @@ 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,3 +1,3 @@
-VERSION=2-1.0.1-cvs
+VERSION=2-1.0.2
 
 TGZDIR=$PWD
@@ -18,4 +18,5 @@ TMPDIR=$TMPFILE/wellenreiter$VERSION
 OUTPUT=$TMPDIR/output
 
+mkdir -p $TMPDIR/libopie2/opiecore
 mkdir -p $TMPDIR/libopie2/opieui
 mkdir -p $TMPDIR/libopie2/opienet
@@ -29,21 +30,16 @@ 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