| -rw-r--r-- | noncore/net/opietooth/manager/.cvsignore | 8 | ||||
| -rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 62 | ||||
| -rw-r--r-- | noncore/net/opietooth/manager/bluebase.h | 18 | ||||
| -rw-r--r-- | noncore/net/opietooth/manager/main.cpp | 18 | ||||
| -rw-r--r-- | noncore/net/opietooth/manager/manager.pro | 22 |
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 @@ +Makefile +bluetoothbase.cpp +bluetoothbase.h +devicedialog.cpp +devicedialog.h +moc_* +scandialog.cpp +scandialog.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 @@ -35,64 +35,20 @@ #include <qpe/resource.h> BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) { + : BluetoothBase( parent, name, fl ) { - QWidget *d = QApplication::desktop(); - int w=d->width(); - int h=d->height(); - resize( w , h ); - - QVBoxLayout * TopLayout = new QVBoxLayout(this); - TabWidget = new QTabWidget( this, "TabWidget" ); - TopLayout->addWidget(TabWidget); - TabWidget->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, TabWidget->sizePolicy().hasHeightForWidth() ) ); - TabWidget->setAutoMask( FALSE ); - TabWidget->setTabShape( QTabWidget::Rounded ); - - Tab = new QWidget( TabWidget, "tab" ); - - QVBoxLayout * Layout = new QVBoxLayout(Tab); - - Test = new QLabel( Tab, "test"); - ScanButton = new QPushButton(Tab, "scanbutton"); - - Layout->addWidget(Test); - Layout->addWidget(ScanButton); - - - TabWidget->insertTab( Tab, tr( "Geräte" ) ); - - - TabConn = new QWidget( TabWidget, "tab3" ); - - TabWidget->insertTab( TabConn, tr("Connections") ); - - TabConf = new QWidget( TabWidget, "tab2" ); - - AuthCheckBox = new QCheckBox (TabConf, "auth" ); - QLabel *AuthLabel = new QLabel( TabConf, "authlabel" ); - AuthLabel->setText( tr("enable authentification")); - - CryptCheckBox = new QCheckBox (TabConf, "crypt"); - QLabel *CryptLabel = new QLabel ( TabConf, "cryptlabel"); - CryptLabel->setText(tr("enable encryption")); - - - TabWidget->insertTab( TabConf, tr("Configuration")); - - - - QPalette pal = this->palette(); - QColor col = pal.color(QPalette::Active, QColorGroup::Background); - pal.setColor(QPalette::Active, QColorGroup::Button, col); - pal.setColor(QPalette::Inactive, QColorGroup::Button, col); - pal.setColor(QPalette::Normal, QColorGroup::Button, col); - pal.setColor(QPalette::Disabled, QColorGroup::Button, col); - this->setPalette(pal); + QPalette pal = this->palette(); + QColor col = pal.color(QPalette::Active, QColorGroup::Background); + pal.setColor(QPalette::Active, QColorGroup::Button, col); + pal.setColor(QPalette::Inactive, QColorGroup::Button, col); + pal.setColor(QPalette::Normal, QColorGroup::Button, col); + pal.setColor(QPalette::Disabled, QColorGroup::Button, col); + this->setPalette(pal); } BlueBase::~BlueBase(){ } + 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 @@ -7,6 +7,8 @@ #include <qscrollview.h> #include <qsplitter.h> +#include "bluetoothbase.h" + class QVBox; class QHBoxLayout; class QGridLayout; @@ -16,25 +18,17 @@ class QPushButton; class QTabWidget; class QCheckBox; -class BlueBase : public QWidget -{ +class BlueBase : public BluetoothBase { Q_OBJECT public: BlueBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~BlueBase(); - - protected: - QTabWidget *TabWidget; - QWidget *Tab; - QWidget *TabConf; - QWidget *TabConn; - QCheckBox *AuthCheckBox; - QCheckBox *CryptCheckBox; - QLabel *Test; - QPushButton *ScanButton; + }; + + #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 @@ -17,20 +17,20 @@ * * ***************************************************************************/ -#include "bluemanager.h" +#include "bluebase.h" #include <qpe/qpeapplication.h> QPEApplication *BluetoothApp; -int main( int argc, char ** argv ) -{ - QPEApplication a(argc, argv); - BluetoothApp=&a; +int main( int argc, char ** argv ) { + QPEApplication a(argc, argv); + BluetoothApp=&a; - BlueManager t; + BlueBase t; - t.setCaption( BlueManager::tr("Bluetooth Manager") ); - a.showMainWidget(&t); + t.setCaption( BlueBase::tr("Bluetooth Manager") ); + a.showMainWidget(&t); - return a.exec(); + return a.exec(); } + 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 @@ -TEMPLATE = app -#CONFIG = qt warn_on debug -CONFIG = qt warn_on release -HEADERS = bluemanager.h -SOURCES = main.cpp bluemanager.cpp +TEMPLATE = app +#CONFIG = qt warn_on debug +CONFIG = qt warn_on release +HEADERS = bluebase.h +SOURCES = main.cpp bluebase.cpp +INCLUDEPATH += $(OPIEDIR)/include +INCLUDEPATH += $(OPIEDIR)/noncore/opietooth/lib +DEPENDPATH += $(OPIEDIR)/include +LIBS += -lqpe -lopietooth +INTERFACES = bluetoothbase.ui devicedialog.ui scandialog.ui +TARGET = $(OPIEDIR)/bin/bluetooth-manager -INCLUDEPATH += $(OPIEDIR)/include -DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -INTERFACES = bluetoothbase.ui devicedialog.ui scandialog.ui -TARGET = bluetooth-manager -DESTDIR = $(OPIEDIR)/bin |