summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-12-20 16:08:41 (UTC)
committer mickeyl <mickeyl>2003-12-20 16:08:41 (UTC)
commit33dfe08454a70d3f9dd6dd154385c40adf6df918 (patch) (side-by-side diff)
treebbd2a62954a3ecb11702f33587206e55c2a962fb
parentadb369c28cac7600b3912d6a3fdb645f1b1d571d (diff)
downloadopie-33dfe08454a70d3f9dd6dd154385c40adf6df918.zip
opie-33dfe08454a70d3f9dd6dd154385c40adf6df918.tar.gz
opie-33dfe08454a70d3f9dd6dd154385c40adf6df918.tar.bz2
more work towards repairing the x11 version - still far away though
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/resource.cpp15
-rw-r--r--noncore/net/wellenreiter/gui/resource.h6
-rw-r--r--noncore/net/wellenreiter/lib/lib.pro16
-rwxr-xr-xnoncore/net/wellenreiter/makedist.sh20
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
@@ -17,6 +17,9 @@
#define PIXMAPPATH "/usr/local/share"
+#include <qpixmap.h>
+#include <qiconset.h>
+
namespace Resource
{
@@ -32,4 +35,16 @@ QPixmap loadPixmap( const QString& pix )
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
@@ -16,11 +16,15 @@
#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
@@ -2,21 +2,27 @@ 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,4 +1,4 @@
-VERSION=2-1.0.1-cvs
+VERSION=2-1.0.2
TGZDIR=$PWD
@@ -17,6 +17,7 @@ TMPFILE=/tmp/build
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
@@ -28,23 +29,18 @@ 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