summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-12-20 16:08:41 (UTC)
committer mickeyl <mickeyl>2003-12-20 16:08:41 (UTC)
commit33dfe08454a70d3f9dd6dd154385c40adf6df918 (patch) (unidiff)
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) (ignore 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
@@ -1,35 +1,50 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. 2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved.
3** 3**
4** This file is part of Opie Environment. 4** This file is part of Opie Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16#include "resource.h" 16#include "resource.h"
17 17
18#define PIXMAPPATH "/usr/local/share" 18#define PIXMAPPATH "/usr/local/share"
19 19
20#include <qpixmap.h>
21#include <qiconset.h>
22
20namespace Resource 23namespace Resource
21{ 24{
22 25
23QPixmap loadPixmap( const QString& pix ) 26QPixmap loadPixmap( const QString& pix )
24{ 27{
25 QString filename; 28 QString filename;
26 filename.sprintf( "%s/%s.png", (const char*) PIXMAPPATH, (const char*) pix ); 29 filename.sprintf( "%s/%s.png", (const char*) PIXMAPPATH, (const char*) pix );
27 QPixmap pixmap( filename ); 30 QPixmap pixmap( filename );
28 if ( pixmap.isNull() ) 31 if ( pixmap.isNull() )
29 { 32 {
30 qDebug( "Wellenreiter::Resource: can't find pixmap " + filename ); 33 qDebug( "Wellenreiter::Resource: can't find pixmap " + filename );
31 } 34 }
32 return pixmap; 35 return pixmap;
33}; 36};
34 37
38QIconSet loadIconSet( const QString& pix )
39{
40 QString filename;
41 filename.sprintf( "%s/%s.png", (const char*) PIXMAPPATH, (const char*) pix );
42 QPixmap pixmap( filename );
43 if ( pixmap.isNull() )
44 {
45 qDebug( "Wellenreiter::Resource: can't find pixmap " + filename );
46 }
47 return QIconSet( pixmap );
48};
49
35}; 50};
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
@@ -1,26 +1,30 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. 2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved.
3** 3**
4** This file is part of Opie Environment. 4** This file is part of Opie Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16#ifndef RESOURCE_H 16#ifndef RESOURCE_H
17#define RESOURCE_H 17#define RESOURCE_H
18 18
19#include <qpixmap.h> 19#include <qstring.h>
20
21class QPixmap;
22class QIconSet;
20 23
21namespace Resource 24namespace Resource
22{ 25{
23 QPixmap loadPixmap( const QString& ); 26 QPixmap loadPixmap( const QString& );
27 QIconSet loadIconSet( const QString& );
24} 28}
25 29
26#endif // RESOURCE_H 30#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 @@
1DESTDIR = $(OPIEDIR)/output/lib 1DESTDIR = $(OPIEDIR)/output/lib
2TEMPLATE = lib 2TEMPLATE = lib
3CONFIG = qt warn_on debug 3CONFIG = qt warn_on debug
4 4
5HEADERS = ../libopie2/opieui/olistview.h \ 5HEADERS = ../libopie2/opiecore/odebug.h \
6 ../libopie2/opieui/olistview.h \
6 ../libopie2/opienet/onetutils.h \ 7 ../libopie2/opienet/onetutils.h \
7 ../libopie2/opienet/omanufacturerdb.h \ 8 ../libopie2/opienet/omanufacturerdb.h \
9 ../libopie2/opienet/odebugmapper.h \
8 ../libopie2/opienet/onetwork.h \ 10 ../libopie2/opienet/onetwork.h \
9 ../libopie2/opienet/opcap.h 11 ../libopie2/opienet/opcap.h \
12 ../libopie2/opienet/ostation.h
10 13
11SOURCES = ../libopie2/opieui/olistview.cpp \ 14SOURCES = ../libopie2/opiecore/odebug.cpp \
15 ../libopie2/opieui/olistview.cpp \
12 ../libopie2/opienet/onetutils.cpp \ 16 ../libopie2/opienet/onetutils.cpp \
13 ../libopie2/opienet/omanufacturerdb.cpp \ 17 ../libopie2/opienet/omanufacturerdb.cpp \
18 ../libopie2/opienet/odebugmapper.cpp \
14 ../libopie2/opienet/onetwork.cpp \ 19 ../libopie2/opienet/onetwork.cpp \
15 ../libopie2/opienet/opcap.cpp 20 ../libopie2/opienet/opcap.cpp \
21 ../libopie2/opienet/ostation.h
16 22
17INCLUDEPATH += $(OPIEDIR)/include 23INCLUDEPATH += $(OPIEDIR)/include
18DEPENDPATH += $(OPIEDIR)/include 24DEPENDPATH += $(OPIEDIR)/include
19LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib -lpcap 25LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib -lpcap
20INTERFACES = 26INTERFACES =
21TARGET = wellenreiter 27TARGET = wellenreiter
22VERSION = 1.0.0 28VERSION = 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 @@
1VERSION=2-1.0.1-cvs 1VERSION=2-1.0.2
2 2
3TGZDIR=$PWD 3TGZDIR=$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
7find . -name "*.o"|xargs rm -f 7find . -name "*.o"|xargs rm -f
8find . -name "Makefile"|xargs rm -f 8find . -name "Makefile"|xargs rm -f
9find . -name "*moc*"|xargs rm -f 9find . -name "*moc*"|xargs rm -f
10#TMPFILE=`mktemp -d -q /tmp/build.XXXXXX` 10#TMPFILE=`mktemp -d -q /tmp/build.XXXXXX`
11TMPFILE=/tmp/build 11TMPFILE=/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..."
14# exit 1 14# exit 1
15#fi 15#fi
16 16
17TMPDIR=$TMPFILE/wellenreiter$VERSION 17TMPDIR=$TMPFILE/wellenreiter$VERSION
18OUTPUT=$TMPDIR/output 18OUTPUT=$TMPDIR/output
19 19
20mkdir -p $TMPDIR/libopie2/opiecore
20mkdir -p $TMPDIR/libopie2/opieui 21mkdir -p $TMPDIR/libopie2/opieui
21mkdir -p $TMPDIR/libopie2/opienet 22mkdir -p $TMPDIR/libopie2/opienet
22mkdir -p $TMPDIR/include/opie2 23mkdir -p $TMPDIR/include/opie2
23mkdir -p $OUTPUT/share/wellenreiter/pics 24mkdir -p $OUTPUT/share/wellenreiter/pics
24mkdir -p $OUTPUT/share/wellenreiter 25mkdir -p $OUTPUT/share/wellenreiter
25cp -dfR gui $TMPDIR 26cp -dfR gui $TMPDIR
26cp -dfR lib $TMPDIR 27cp -dfR lib $TMPDIR
27cp -dfR build README wellenreiter.pro $TMPDIR 28cp -dfR build README wellenreiter.pro $TMPDIR
28cp -dfR $OPIEDIR/pics/wellenreiter/* $OUTPUT/share/wellenreiter/ 29cp -dfR $OPIEDIR/pics/wellenreiter/* $OUTPUT/share/wellenreiter/
29cp -dfR $OPIEDIR/etc/manufacturers $OUTPUT/share/wellenreiter/ 30cp -dfR $OPIEDIR/etc/manufacturers $OUTPUT/share/wellenreiter/
30 31
31# take care about sourcefiles 32# take care about sourcefiles from libopie2
32 33
33FILES="libopie2/opienet/onetwork.h libopie2/opienet/onetwork.cpp \ 34cp -dfR $OPIEDIR/libopie2/opienet/*.* $TMPDIR/libopie2/opienet
34 libopie2/opienet/opcap.h libopie2/opienet/opcap.cpp \ 35cp -dfR $OPIEDIR/libopie2/opiecore/*.* $TMPDIR/libopie2/opiecore
35 libopie2/opienet/802_11_user.h libopie2/opienet/dhcp.h libopie2/opienet/udp_ports.h \ 36cp -dfR $OPIEDIR/libopie2/opieui/olistview.* $TMPDIR/libopie2/opieui
36 libopie2/opienet/onetutils.h libopie2/opienet/onetutils.cpp \
37 libopie2/opienet/omanufacturerdb.h libopie2/opienet/omanufacturerdb.cpp \
38 libopie2/opieui/olistview.cpp libopie2/opieui/olistview.h"
39
40for i in $FILES
41 do cp -dfR $OPIEDIR/$i $TMPDIR/$i
42done
43 37
44# make includes 38# make includes
39
45pushd $TMPDIR/include/opie2 40pushd $TMPDIR/include/opie2
46ln -sf ../../libopie2/opieui/*.h . 41ln -sf ../../libopie2/opieui/*.h .
47ln -sf ../../libopie2/opienet/*.h . 42ln -sf ../../libopie2/opienet/*.h .
43ln -sf ../../libopie2/opiecore/*.h .
48popd 44popd
49 45
50find $TMPDIR -name "CVS"|xargs rm -rf 46find $TMPDIR -name "CVS"|xargs rm -rf
51 47
52pushd $TMPFILE 48pushd $TMPFILE
53tar czf $TGZDIR/wellenreiter$VERSION.tgz wellenreiter$VERSION 49tar czf $TGZDIR/wellenreiter$VERSION.tgz wellenreiter$VERSION
54popd 50popd
55 51