summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-06-02 20:47:02 (UTC)
committer harlekin <harlekin>2002-06-02 20:47:02 (UTC)
commit6898878a1ef6d5551d7dde9363f238e57b5c9671 (patch) (unidiff)
tree1dbad715e49c72e5552c532b71e077a70b6f14fa
parent7202b34a7a9b5e9b3c5ac12b02b1ba654051ea2a (diff)
downloadopie-6898878a1ef6d5551d7dde9363f238e57b5c9671.zip
opie-6898878a1ef6d5551d7dde9363f238e57b5c9671.tar.gz
opie-6898878a1ef6d5551d7dde9363f238e57b5c9671.tar.bz2
update
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/.cvsignore8
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp62
-rw-r--r--noncore/net/opietooth/manager/bluebase.h18
-rw-r--r--noncore/net/opietooth/manager/main.cpp18
-rw-r--r--noncore/net/opietooth/manager/manager.pro22
5 files changed, 43 insertions, 85 deletions
diff --git a/noncore/net/opietooth/manager/.cvsignore b/noncore/net/opietooth/manager/.cvsignore
new file mode 100644
index 0000000..8a37ec3
--- a/dev/null
+++ b/noncore/net/opietooth/manager/.cvsignore
@@ -0,0 +1,8 @@
1Makefile
2bluetoothbase.cpp
3bluetoothbase.h
4devicedialog.cpp
5devicedialog.h
6moc_*
7scandialog.cpp
8scandialog.h
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 8ba5e0e..f4153a0 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -32,67 +32,23 @@
32#include <qapplication.h> 32#include <qapplication.h>
33#include <qcheckbox.h> 33#include <qcheckbox.h>
34 34
35#include <qpe/resource.h> 35#include <qpe/resource.h>
36 36
37BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl ) 37BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
38 : QWidget( parent, name, fl ) { 38 : BluetoothBase( parent, name, fl ) {
39 39
40 QWidget *d = QApplication::desktop();
41 int w=d->width();
42 int h=d->height();
43 resize( w , h );
44 40
45 41 QPalette pal = this->palette();
46 QVBoxLayout * TopLayout = new QVBoxLayout(this); 42 QColor col = pal.color(QPalette::Active, QColorGroup::Background);
47 TabWidget = new QTabWidget( this, "TabWidget" ); 43 pal.setColor(QPalette::Active, QColorGroup::Button, col);
48 TopLayout->addWidget(TabWidget); 44 pal.setColor(QPalette::Inactive, QColorGroup::Button, col);
49 TabWidget->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, TabWidget->sizePolicy().hasHeightForWidth() ) ); 45 pal.setColor(QPalette::Normal, QColorGroup::Button, col);
50 TabWidget->setAutoMask( FALSE ); 46 pal.setColor(QPalette::Disabled, QColorGroup::Button, col);
51 TabWidget->setTabShape( QTabWidget::Rounded ); 47 this->setPalette(pal);
52
53 Tab = new QWidget( TabWidget, "tab" );
54
55 QVBoxLayout * Layout = new QVBoxLayout(Tab);
56
57 Test = new QLabel( Tab, "test");
58 ScanButton = new QPushButton(Tab, "scanbutton");
59
60 Layout->addWidget(Test);
61 Layout->addWidget(ScanButton);
62
63
64 TabWidget->insertTab( Tab, tr( "Geräte" ) );
65
66
67 TabConn = new QWidget( TabWidget, "tab3" );
68
69 TabWidget->insertTab( TabConn, tr("Connections") );
70
71 TabConf = new QWidget( TabWidget, "tab2" );
72
73 AuthCheckBox = new QCheckBox (TabConf, "auth" );
74 QLabel *AuthLabel = new QLabel( TabConf, "authlabel" );
75 AuthLabel->setText( tr("enable authentification"));
76
77 CryptCheckBox = new QCheckBox (TabConf, "crypt");
78 QLabel *CryptLabel = new QLabel ( TabConf, "cryptlabel");
79 CryptLabel->setText(tr("enable encryption"));
80
81
82 TabWidget->insertTab( TabConf, tr("Configuration"));
83
84
85
86 QPalette pal = this->palette();
87 QColor col = pal.color(QPalette::Active, QColorGroup::Background);
88 pal.setColor(QPalette::Active, QColorGroup::Button, col);
89 pal.setColor(QPalette::Inactive, QColorGroup::Button, col);
90 pal.setColor(QPalette::Normal, QColorGroup::Button, col);
91 pal.setColor(QPalette::Disabled, QColorGroup::Button, col);
92 this->setPalette(pal);
93} 48}
94 49
95 50
96BlueBase::~BlueBase(){ 51BlueBase::~BlueBase(){
97} 52}
98 53
54
diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index e2b013e..4d53e99 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -4,37 +4,31 @@
4 4
5#include <qvariant.h> 5#include <qvariant.h>
6#include <qwidget.h> 6#include <qwidget.h>
7#include <qscrollview.h> 7#include <qscrollview.h>
8#include <qsplitter.h> 8#include <qsplitter.h>
9 9
10#include "bluetoothbase.h"
11
10class QVBox; 12class QVBox;
11class QHBoxLayout; 13class QHBoxLayout;
12class QGridLayout; 14class QGridLayout;
13class QFrame; 15class QFrame;
14class QLabel; 16class QLabel;
15class QPushButton; 17class QPushButton;
16class QTabWidget; 18class QTabWidget;
17class QCheckBox; 19class QCheckBox;
18 20
19class BlueBase : public QWidget 21class BlueBase : public BluetoothBase {
20{
21 Q_OBJECT 22 Q_OBJECT
22 23
23public: 24public:
24 BlueBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); 25 BlueBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
25 ~BlueBase(); 26 ~BlueBase();
26 27
27
28
29protected: 28protected:
30 QTabWidget *TabWidget; 29
31 QWidget *Tab;
32 QWidget *TabConf;
33 QWidget *TabConn;
34 QCheckBox *AuthCheckBox;
35 QCheckBox *CryptCheckBox;
36 QLabel *Test;
37 QPushButton *ScanButton;
38}; 30};
39 31
32
33
40#endif 34#endif
diff --git a/noncore/net/opietooth/manager/main.cpp b/noncore/net/opietooth/manager/main.cpp
index c7ccf23..d566419 100644
--- a/noncore/net/opietooth/manager/main.cpp
+++ b/noncore/net/opietooth/manager/main.cpp
@@ -14,23 +14,23 @@
14 * it under the terms of the GNU General Public License as published by * 14 * it under the terms of the GNU General Public License as published by *
15 * the Free Software Foundation; either version 2 of the License, or * 15 * the Free Software Foundation; either version 2 of the License, or *
16 * (at your option) any later version. * 16 * (at your option) any later version. *
17 * * 17 * *
18 ***************************************************************************/ 18 ***************************************************************************/
19 19
20#include "bluemanager.h" 20#include "bluebase.h"
21#include <qpe/qpeapplication.h> 21#include <qpe/qpeapplication.h>
22 22
23QPEApplication *BluetoothApp; 23QPEApplication *BluetoothApp;
24 24
25int main( int argc, char ** argv ) 25int main( int argc, char ** argv ) {
26{ 26 QPEApplication a(argc, argv);
27 QPEApplication a(argc, argv); 27 BluetoothApp=&a;
28 BluetoothApp=&a;
29 28
30 BlueManager t; 29 BlueBase t;
31 30
32 t.setCaption( BlueManager::tr("Bluetooth Manager") ); 31 t.setCaption( BlueBase::tr("Bluetooth Manager") );
33 a.showMainWidget(&t); 32 a.showMainWidget(&t);
34 33
35 return a.exec(); 34 return a.exec();
36} 35}
36
diff --git a/noncore/net/opietooth/manager/manager.pro b/noncore/net/opietooth/manager/manager.pro
index 3cb308c..c369eba 100644
--- a/noncore/net/opietooth/manager/manager.pro
+++ b/noncore/net/opietooth/manager/manager.pro
@@ -1,12 +1,12 @@
1 TEMPLATE= app 1TEMPLATE = app
2 #CONFIG = qt warn_on debug 2#CONFIG = qt warn_on debug
3 CONFIG = qt warn_on release 3CONFIG = qt warn_on release
4 HEADERS = bluemanager.h 4HEADERS = bluebase.h
5 SOURCES = main.cpp bluemanager.cpp 5SOURCES = main.cpp bluebase.cpp
6INCLUDEPATH += $(OPIEDIR)/include
7INCLUDEPATH += $(OPIEDIR)/noncore/opietooth/lib
8DEPENDPATH += $(OPIEDIR)/include
9LIBS += -lqpe -lopietooth
10INTERFACES = bluetoothbase.ui devicedialog.ui scandialog.ui
11TARGET = $(OPIEDIR)/bin/bluetooth-manager
6 12
7 INCLUDEPATH+= $(OPIEDIR)/include
8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe
10INTERFACES = bluetoothbase.ui devicedialog.ui scandialog.ui
11 TARGET = bluetooth-manager
12 DESTDIR = $(OPIEDIR)/bin