summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-02-20 00:00:22 (UTC)
committer mickeyl <mickeyl>2003-02-20 00:00:22 (UTC)
commitd25a16d1fd34374e4d2815dec4d11b25b2049432 (patch) (unidiff)
tree51f8fe7f32a891e3a1f5c579b15734bd784f8142
parentc815825a0368257defb64d5f8ce5e2a2f2da93c6 (diff)
downloadopie-d25a16d1fd34374e4d2815dec4d11b25b2049432.zip
opie-d25a16d1fd34374e4d2815dec4d11b25b2049432.tar.gz
opie-d25a16d1fd34374e4d2815dec4d11b25b2049432.tar.bz2
- add mainwindow as central window
- add menubar and some toolbuttons
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/gui-x11.pro4
-rw-r--r--noncore/net/wellenreiter/gui/gui.pro25
-rw-r--r--noncore/net/wellenreiter/gui/main.cpp12
-rw-r--r--noncore/net/wellenreiter/gui/mainwindow.cpp92
-rw-r--r--noncore/net/wellenreiter/gui/mainwindow.h43
-rwxr-xr-xpics/wellenreiter/CancelIcon.pngbin0 -> 821 bytes
-rw-r--r--pics/wellenreiter/InfoIcon.pngbin0 -> 914 bytes
-rw-r--r--pics/wellenreiter/SearchIcon.pngbin0 -> 1059 bytes
-rw-r--r--pics/wellenreiter/SettingsIcon.pngbin0 -> 918 bytes
9 files changed, 166 insertions, 10 deletions
diff --git a/noncore/net/wellenreiter/gui/gui-x11.pro b/noncore/net/wellenreiter/gui/gui-x11.pro
index 856e0b2..25185fb 100644
--- a/noncore/net/wellenreiter/gui/gui-x11.pro
+++ b/noncore/net/wellenreiter/gui/gui-x11.pro
@@ -1,15 +1,15 @@
1DESTDIR = . 1DESTDIR = .
2TEMPLATE = app 2TEMPLATE = app
3CONFIG = qt warn_on debug 3CONFIG = qt warn_on debug
4#CONFIG = qt warn_on release 4#CONFIG = qt warn_on release
5HEADERS = wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h logwindow.h hexwindow.h configwindow.h resource.h wlan.h cardconfig.h manufacturers.h 5HEADERS = mainwindow.h wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h logwindow.h hexwindow.h configwindow.h resource.h wlan.h cardconfig.h manufacturers.h
6SOURCES = main.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cpp scanlist.cpp logwindow.cpp hexwindow.cpp configwindow.cpp resource.cpp wlan.cpp cardconfig.cpp manufacturers.cpp 6SOURCES = 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
7INCLUDEPATH += ../ 7INCLUDEPATH += ../
8DEPENDPATH += ../ 8DEPENDPATH += ../
9LIBS += -L. -lwellenreiter 9LIBS += -L. -lwellenreiter
10INTERFACES = configbase.ui 10INTERFACES = configbase.ui
11TARGET = wellenreiter 11TARGET = wellenreiter
12 12
13 13
14 14
15include ( $(OPIEDIR)/include.pro ) 15include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro
index 39eda52..4ee360d 100644
--- a/noncore/net/wellenreiter/gui/gui.pro
+++ b/noncore/net/wellenreiter/gui/gui.pro
@@ -1,15 +1,36 @@
1DESTDIR = $(OPIEDIR)/bin 1DESTDIR = $(OPIEDIR)/bin
2TEMPLATE = app 2TEMPLATE = app
3CONFIG = qt warn_on debug 3CONFIG = qt warn_on debug
4#CONFIG = qt warn_on release 4#CONFIG = qt warn_on release
5HEADERS = wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h logwindow.h hexwindow.h configwindow.h wlan.h cardconfig.h manufacturers.h 5HEADERS = mainwindow.h \
6SOURCES = main.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cpp scanlist.cpp logwindow.cpp hexwindow.cpp configwindow.cpp wlan.cpp cardconfig.cpp manufacturers.h 6 wellenreiterbase.h \
7 wellenreiter.h \
8 scanlistitem.h \
9 scanlist.h \
10 logwindow.h \
11 hexwindow.h \
12 configwindow.h \
13 wlan.h \
14 cardconfig.h \
15 manufacturers.h
16SOURCES = main.cpp \
17 mainwindow.cpp \
18 wellenreiterbase.cpp \
19 wellenreiter.cpp \
20 scanlistitem.cpp \
21 scanlist.cpp \
22 logwindow.cpp \
23 hexwindow.cpp \
24 configwindow.cpp \
25 wlan.cpp \
26 cardconfig.cpp \
27 manufacturers.h
7INCLUDEPATH += $(OPIEDIR)/include ../ 28INCLUDEPATH += $(OPIEDIR)/include ../
8DEPENDPATH += $(OPIEDIR)/include ../ 29DEPENDPATH += $(OPIEDIR)/include ../
9LIBS += -lqpe -lopie -L. -lwellenreiter 30LIBS += -lqpe -lopie -L. -lwellenreiter
10INTERFACES = configbase.ui 31INTERFACES = configbase.ui
11TARGET = wellenreiter 32TARGET = wellenreiter
12 33
13 34
14 35
15include ( $(OPIEDIR)/include.pro ) 36include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/wellenreiter/gui/main.cpp b/noncore/net/wellenreiter/gui/main.cpp
index 3307d49..270ce06 100644
--- a/noncore/net/wellenreiter/gui/main.cpp
+++ b/noncore/net/wellenreiter/gui/main.cpp
@@ -4,40 +4,40 @@
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 "wellenreiter.h" 16#include "mainwindow.h"
17 17
18#ifdef QWS 18#ifdef QWS
19#include <qpe/qpeapplication.h> 19#include <qpe/qpeapplication.h>
20#else 20#else
21#include <qapplication.h> 21#include <qapplication.h>
22#endif 22#endif
23 23
24int main( int argc, char **argv ) 24int main( int argc, char **argv )
25{ 25{
26#ifdef QWS 26#ifdef QWS
27 QPEApplication a( argc, argv ); 27 QPEApplication a( argc, argv );
28#else 28#else
29 QApplication a( argc, argv ); 29 QApplication a( argc, argv );
30#endif 30#endif
31 31
32 Wellenreiter e; 32 WellenreiterMainWindow w;
33 33
34 e.setCaption( Wellenreiter::tr("Wellenreiter") ); 34 w.setCaption( "Wellenreiter/Opie" );
35#ifdef QWS 35#ifdef QWS
36 a.showMainWidget(&e); 36 a.showMainWidget(&w);
37#else 37#else
38 a.setMainWidget(&e); 38 a.setMainWidget(&w);
39 e.show(); 39 w.show();
40#endif 40#endif
41 41
42 return a.exec(); 42 return a.exec();
43} 43}
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
new file mode 100644
index 0000000..d7326c0
--- a/dev/null
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -0,0 +1,92 @@
1/**********************************************************************
2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved.
3**
4** This file is part of Opie Environment.
5**
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
8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file.
10**
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.
13**
14**********************************************************************/
15
16#include "mainwindow.h"
17#include "wellenreiter.h"
18
19#include <qiconset.h>
20#include <qmenubar.h>
21#include <qpopupmenu.h>
22#include <qstatusbar.h>
23#include <qtoolbutton.h>
24
25#ifdef QWS
26#include <qpe/resource.h>
27#else
28#include "resource.h"
29#endif
30
31WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f )
32 :QMainWindow( parent, name, f )
33{
34 mw = new Wellenreiter( this );
35 setCentralWidget( mw );
36
37 // setup icon sets
38
39 searchIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/SearchIcon" ) );
40 infoIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/InfoIcon" ) );
41 settingsIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/SettingsIcon" ) );
42 cancelIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/CancelIcon" ) );
43
44 // setup tool buttons
45
46 QToolButton* b = new QToolButton( 0 );
47 b->setAutoRaise( true );
48 b->setOnIconSet( *cancelIconSet );
49 b->setOffIconSet( *searchIconSet );
50 b->setToggleButton( true );
51
52 QToolButton* c = new QToolButton( 0 );
53 c->setAutoRaise( true );
54 c->setIconSet( *infoIconSet );
55 c->setEnabled( false );
56
57 QToolButton* d = new QToolButton( 0 );
58 d->setAutoRaise( true );
59 d->setIconSet( *settingsIconSet );
60
61 // setup menu bar
62
63 QMenuBar* mb = menuBar();
64
65 QPopupMenu* p = new QPopupMenu( mb );
66 p->insertItem( "&Load" );
67 p->insertItem( "&Save" );
68
69 mb->insertItem( "&File", p );
70 mb->setItemEnabled( mb->insertItem( b ), false );
71 mb->setItemEnabled( mb->insertItem( c ), false );
72 mb->insertItem( d );
73
74 // setup status bar
75
76 // statusBar()->message( "Ready." );
77
78};
79
80WellenreiterMainWindow::~WellenreiterMainWindow()
81{
82
83 delete searchIconSet;
84 delete infoIconSet;
85 delete settingsIconSet;
86 delete cancelIconSet;
87
88
89};
90
91
92
diff --git a/noncore/net/wellenreiter/gui/mainwindow.h b/noncore/net/wellenreiter/gui/mainwindow.h
new file mode 100644
index 0000000..dcc79e6
--- a/dev/null
+++ b/noncore/net/wellenreiter/gui/mainwindow.h
@@ -0,0 +1,43 @@
1/**********************************************************************
2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved.
3**
4** This file is part of Opie Environment.
5**
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
8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file.
10**
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.
13**
14**********************************************************************/
15
16#ifndef MAINWINDOW_H
17#define MAINWINDOW_H
18
19#include <qmainwindow.h>
20
21class Wellenreiter;
22class QIconSet;
23
24class WellenreiterMainWindow: public QMainWindow
25{
26
27 public:
28 WellenreiterMainWindow( QWidget * parent = 0, const char * name = "mainwindow", WFlags f = 0 );
29 ~WellenreiterMainWindow();
30
31 protected:
32 Wellenreiter* mw;
33
34 const QIconSet* searchIconSet;
35 const QIconSet* infoIconSet;
36 const QIconSet* settingsIconSet;
37 const QIconSet* cancelIconSet;
38
39
40};
41
42#endif
43
diff --git a/pics/wellenreiter/CancelIcon.png b/pics/wellenreiter/CancelIcon.png
new file mode 100755
index 0000000..1cabc6e
--- a/dev/null
+++ b/pics/wellenreiter/CancelIcon.png
Binary files differ
diff --git a/pics/wellenreiter/InfoIcon.png b/pics/wellenreiter/InfoIcon.png
new file mode 100644
index 0000000..8d60776
--- a/dev/null
+++ b/pics/wellenreiter/InfoIcon.png
Binary files differ
diff --git a/pics/wellenreiter/SearchIcon.png b/pics/wellenreiter/SearchIcon.png
new file mode 100644
index 0000000..2206448
--- a/dev/null
+++ b/pics/wellenreiter/SearchIcon.png
Binary files differ
diff --git a/pics/wellenreiter/SettingsIcon.png b/pics/wellenreiter/SettingsIcon.png
new file mode 100644
index 0000000..9aab59b
--- a/dev/null
+++ b/pics/wellenreiter/SettingsIcon.png
Binary files differ