author | mickeyl <mickeyl> | 2003-02-23 16:45:09 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-02-23 16:45:09 (UTC) |
commit | 2f897267b4d3ec5b1c7dafdc0700a8e91cbb3321 (patch) (unidiff) | |
tree | 9f32fb9e22a26188c6f1c1092c74b1bf47aa418c | |
parent | 3a3c703d9bdf57f50b3f47aa14c858ef1026e3d3 (diff) | |
download | opie-2f897267b4d3ec5b1c7dafdc0700a8e91cbb3321.zip opie-2f897267b4d3ec5b1c7dafdc0700a8e91cbb3321.tar.gz opie-2f897267b4d3ec5b1c7dafdc0700a8e91cbb3321.tar.bz2 |
simplification and fixes for the standalone X11 build
-rw-r--r-- | noncore/net/wellenreiter/README | 11 | ||||
-rw-r--r-- | noncore/net/wellenreiter/daemon/daemon.pro | 4 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.cpp | 9 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/gui-x11.pro | 15 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/gui.pro | 13 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.cpp | 27 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.h | 1 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/resource.cpp | 2 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 2 | ||||
-rw-r--r-- | noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro | 7 | ||||
-rw-r--r-- | noncore/net/wellenreiter/wellenreiter.pro | 10 |
11 files changed, 67 insertions, 34 deletions
diff --git a/noncore/net/wellenreiter/README b/noncore/net/wellenreiter/README index ada9321..7de6a33 100644 --- a/noncore/net/wellenreiter/README +++ b/noncore/net/wellenreiter/README | |||
@@ -47,9 +47,8 @@ make SUBDIRS=packages/opie package | |||
47 | (III) To compile a standalone Wellenreiter for X11, you need Qt3 and the development | 47 | (III) To compile a standalone Wellenreiter for X11, you need Qt3 and the development |
48 | packages for Qt3, e.g. libqt3-devel. Assuming, $OPIEDIR and $QTDIR is set to Opie resp. | 48 | packages for Qt3, e.g. libqt3-devel. Assuming, $QTDIR is set to your Qt-Director |
49 | Qt (e.g. /usr/lib/qt3), do the following: | 49 | (e.g. /usr/lib/qt3), set $OPIEDIR to your installation prefix, e.g. /usr/local, then |
50 | export QMAKESPEC=$OPIEDIR/mkspecs/linux-g++ | 50 | export QMAKESPEC=$QTDIR/mkspecs/linux-g++ |
51 | cd $OPIEDIR/noncore/net/wellenreiter | 51 | qmake "platform=x11" wellenreiter.pro |
52 | qmake -makefile wellenreiter.pro | ||
53 | make qmake | ||
54 | make | 52 | make |
53 | make install | ||
55 | 54 | ||
diff --git a/noncore/net/wellenreiter/daemon/daemon.pro b/noncore/net/wellenreiter/daemon/daemon.pro index 8943db7..33a6bb9 100644 --- a/noncore/net/wellenreiter/daemon/daemon.pro +++ b/noncore/net/wellenreiter/daemon/daemon.pro | |||
@@ -13,4 +13,4 @@ DEFINES += DEBUG | |||
13 | 13 | ||
14 | 14 | !contains( platform, x11 ) { | |
15 | |||
16 | include ( $(OPIEDIR)/include.pro ) | 15 | include ( $(OPIEDIR)/include.pro ) |
16 | } | ||
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp index 6ea6f02..f86b109 100644 --- a/noncore/net/wellenreiter/gui/configwindow.cpp +++ b/noncore/net/wellenreiter/gui/configwindow.cpp | |||
@@ -18,3 +18,5 @@ | |||
18 | #include <qcombobox.h> | 18 | #include <qcombobox.h> |
19 | #include <qpushbutton.h> | ||
19 | #include <qspinbox.h> | 20 | #include <qspinbox.h> |
21 | #include <qlayout.h> | ||
20 | 22 | ||
@@ -28,2 +30,9 @@ WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char | |||
28 | _devicetype[ "<manual>" ] = 5; | 30 | _devicetype[ "<manual>" ] = 5; |
31 | |||
32 | #ifdef Q_WS_X11 // We're on X11: adding an Ok-Button for the Dialog here | ||
33 | QPushButton* okButton = new QPushButton( "ok", this ); | ||
34 | okButton->show(); | ||
35 | Layout5_2->addWidget( okButton ); //FIXME: rename this in configbase.ui | ||
36 | connect( okButton, SIGNAL( clicked() ), this, SLOT( accept() ) ); | ||
37 | #endif | ||
29 | }; | 38 | }; |
diff --git a/noncore/net/wellenreiter/gui/gui-x11.pro b/noncore/net/wellenreiter/gui/gui-x11.pro deleted file mode 100644 index 25185fb..0000000 --- a/noncore/net/wellenreiter/gui/gui-x11.pro +++ b/dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | DESTDIR = . | ||
2 | TEMPLATE = app | ||
3 | CONFIG = qt warn_on debug | ||
4 | #CONFIG = qt warn_on release | ||
5 | HEADERS = mainwindow.h wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h logwindow.h hexwindow.h configwindow.h resource.h wlan.h cardconfig.h manufacturers.h | ||
6 | SOURCES = main.cpp mainwindow.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cpp scanlist.cpp logwindow.cpp hexwindow.cpp configwindow.cpp resource.cpp wlan.cpp cardconfig.cpp manufacturers.cpp | ||
7 | INCLUDEPATH += ../ | ||
8 | DEPENDPATH += ../ | ||
9 | LIBS += -L. -lwellenreiter | ||
10 | INTERFACES = configbase.ui | ||
11 | TARGET = wellenreiter | ||
12 | |||
13 | |||
14 | |||
15 | include ( $(OPIEDIR)/include.pro ) | ||
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro index 95e9f22..822b0db 100644 --- a/noncore/net/wellenreiter/gui/gui.pro +++ b/noncore/net/wellenreiter/gui/gui.pro | |||
@@ -33,3 +33,3 @@ INCLUDEPATH += $(OPIEDIR)/include ../ | |||
33 | DEPENDPATH += $(OPIEDIR)/include ../ | 33 | DEPENDPATH += $(OPIEDIR)/include ../ |
34 | LIBS += -lqpe -lopie -L. -lwellenreiter | 34 | LIBS += -L. -lwellenreiter |
35 | INTERFACES = configbase.ui | 35 | INTERFACES = configbase.ui |
@@ -37,4 +37,13 @@ TARGET = wellenreiter | |||
37 | 37 | ||
38 | !contains( platform, x11 ) { | ||
39 | message( qws ) | ||
40 | include ( $(OPIEDIR)/include.pro ) | ||
41 | LIBS += -lqpe -lopie | ||
42 | } | ||
38 | 43 | ||
44 | contains( platform, x11 ) { | ||
45 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | ||
46 | SOURCES += resource.cpp | ||
47 | HEADERS += resource.h | ||
48 | } | ||
39 | 49 | ||
40 | include ( $(OPIEDIR)/include.pro ) | ||
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp index b67376c..b2d3a71 100644 --- a/noncore/net/wellenreiter/gui/mainwindow.cpp +++ b/noncore/net/wellenreiter/gui/mainwindow.cpp | |||
@@ -42,6 +42,12 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
42 | 42 | ||
43 | searchIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/SearchIcon" ) ); | ||
44 | infoIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/InfoIcon" ) ); | 43 | infoIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/InfoIcon" ) ); |
45 | settingsIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/SettingsIcon" ) ); | 44 | settingsIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/SettingsIcon" ) ); |
45 | #ifdef QWS | ||
46 | searchIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/SearchIcon" ) ); | ||
46 | cancelIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/CancelIcon" ) ); | 47 | cancelIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/CancelIcon" ) ); |
48 | #else | ||
49 | startStopIconSet = new QIconSet(); | ||
50 | startStopIconSet->setPixmap( Resource::loadPixmap( "wellenreiter/SearchIcon" ), QIconSet::Automatic, QIconSet::Normal, QIconSet::Off ); | ||
51 | startStopIconSet->setPixmap( Resource::loadPixmap( "wellenreiter/CancelIcon" ), QIconSet::Automatic, QIconSet::Normal, QIconSet::On ); | ||
52 | #endif | ||
47 | 53 | ||
@@ -51,4 +57,8 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
51 | startStopButton->setAutoRaise( true ); | 57 | startStopButton->setAutoRaise( true ); |
58 | #ifdef QWS | ||
52 | startStopButton->setOnIconSet( *cancelIconSet ); | 59 | startStopButton->setOnIconSet( *cancelIconSet ); |
53 | startStopButton->setOffIconSet( *searchIconSet ); | 60 | startStopButton->setOffIconSet( *searchIconSet ); |
61 | #else | ||
62 | startStopButton->setIconSet( *startStopIconSet ); | ||
63 | #endif | ||
54 | startStopButton->setToggleButton( true ); | 64 | startStopButton->setToggleButton( true ); |
@@ -91,2 +101,3 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
91 | 101 | ||
102 | #ifdef QWS | ||
92 | mb->insertItem( startStopButton ); | 103 | mb->insertItem( startStopButton ); |
@@ -94,2 +105,7 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
94 | mb->insertItem( d ); | 105 | mb->insertItem( d ); |
106 | #else // Qt3 changed the insertion order. It's now totally random :( | ||
107 | mb->insertItem( d ); | ||
108 | mb->insertItem( c ); | ||
109 | mb->insertItem( startStopButton ); | ||
110 | #endif | ||
95 | 111 | ||
@@ -107,3 +123,5 @@ void WellenreiterMainWindow::showConfigure() | |||
107 | cw->setCaption( tr( "Configure" ) ); | 123 | cw->setCaption( tr( "Configure" ) ); |
124 | #ifdef QWS | ||
108 | cw->showMaximized(); | 125 | cw->showMaximized(); |
126 | #endif | ||
109 | int result = cw->exec(); | 127 | int result = cw->exec(); |
@@ -130,7 +148,10 @@ WellenreiterMainWindow::~WellenreiterMainWindow() | |||
130 | 148 | ||
131 | delete searchIconSet; | ||
132 | delete infoIconSet; | 149 | delete infoIconSet; |
133 | delete settingsIconSet; | 150 | delete settingsIconSet; |
151 | #ifdef QWS | ||
152 | delete searchIconSet; | ||
134 | delete cancelIconSet; | 153 | delete cancelIconSet; |
135 | 154 | #else | |
155 | delete startStopIconSet; | ||
156 | #endif | ||
136 | 157 | ||
diff --git a/noncore/net/wellenreiter/gui/mainwindow.h b/noncore/net/wellenreiter/gui/mainwindow.h index 7d772a8..c21841a 100644 --- a/noncore/net/wellenreiter/gui/mainwindow.h +++ b/noncore/net/wellenreiter/gui/mainwindow.h | |||
@@ -37,2 +37,3 @@ class WellenreiterMainWindow: public QMainWindow | |||
37 | 37 | ||
38 | QIconSet* startStopIconSet; | ||
38 | const QIconSet* searchIconSet; | 39 | const QIconSet* searchIconSet; |
diff --git a/noncore/net/wellenreiter/gui/resource.cpp b/noncore/net/wellenreiter/gui/resource.cpp index fb0966a..7683329 100644 --- a/noncore/net/wellenreiter/gui/resource.cpp +++ b/noncore/net/wellenreiter/gui/resource.cpp | |||
@@ -17,3 +17,3 @@ | |||
17 | 17 | ||
18 | #define PIXMAPPATH "/usr/share/wellenreiter/pics/" | 18 | #define PIXMAPPATH "/usr/local/share" |
19 | 19 | ||
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index db7063b..c599bb4 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -76,3 +76,3 @@ Wellenreiter::Wellenreiter( QWidget* parent ) | |||
76 | #else | 76 | #else |
77 | manufile.sprintf( "/home/mickey/work/opie/share/wellenreiter/manufacturers.dat" ); | 77 | manufile.sprintf( "/usr/local/share/wellenreiter/manufacturers.dat" ); |
78 | #endif | 78 | #endif |
diff --git a/noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro b/noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro index 58da0c1..5930c60 100644 --- a/noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro +++ b/noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro | |||
@@ -1 +1,2 @@ | |||
1 | DESTDIR = $(OPIEDIR)/lib | ||
1 | TEMPLATE = lib | 2 | TEMPLATE = lib |
@@ -9,7 +10,7 @@ TMAKE_CFLAGS += -D__UNIX__ | |||
9 | DEFINES += DEBUG | 10 | DEFINES += DEBUG |
10 | DESTDIR = $(OPIEDIR)/lib | ||
11 | TARGET = wellenreiter | 11 | TARGET = wellenreiter |
12 | 12 | ||
13 | 13 | !contains( platform, x11 ) { | |
14 | |||
15 | include ( $(OPIEDIR)/include.pro ) | 14 | include ( $(OPIEDIR)/include.pro ) |
15 | } | ||
16 | |||
diff --git a/noncore/net/wellenreiter/wellenreiter.pro b/noncore/net/wellenreiter/wellenreiter.pro index dd75c8c..17d0e31 100644 --- a/noncore/net/wellenreiter/wellenreiter.pro +++ b/noncore/net/wellenreiter/wellenreiter.pro | |||
@@ -4,3 +4,11 @@ unix:SUBDIRS = libwellenreiter daemon gui | |||
4 | 4 | ||
5 | 5 | !contains( platform, x11 ) { | |
6 | message( Configuring Wellenreiter for build on Opie ) | ||
6 | include ( $(OPIEDIR)/include.pro ) | 7 | include ( $(OPIEDIR)/include.pro ) |
8 | } | ||
9 | |||
10 | contains( platform, x11 ) { | ||
11 | message( Configuring Wellenreiter for build on Qt/X11 ) | ||
12 | system( mkdir -p $OPIEDIR/lib $OPIEDIR/bin $OPIEDIR/share/pics ) | ||
13 | } | ||
14 | |||