author | harlekin <harlekin> | 2002-06-15 21:19:03 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-06-15 21:19:03 (UTC) |
commit | e31f557a84055ce00f814fd44427f9b3584243f9 (patch) (side-by-side diff) | |
tree | 013a928eb50be77200e361b20df46d846bdf6250 /noncore/net | |
parent | be10ba352f2a89bc5ec816eefc307a4ae2f7ff6b (diff) | |
download | opie-e31f557a84055ce00f814fd44427f9b3584243f9.zip opie-e31f557a84055ce00f814fd44427f9b3584243f9.tar.gz opie-e31f557a84055ce00f814fd44427f9b3584243f9.tar.bz2 |
update
-rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 4 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/scandialog.cpp | 28 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/scandialog.h | 2 |
3 files changed, 20 insertions, 14 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index c905ea3..e3b9e53 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp @@ -59,2 +59,4 @@ namespace OpieTooth { + setCaption( tr( "Bluetooth Manager" ) ); + readConfig(); @@ -154,3 +156,3 @@ namespace OpieTooth { ScanDialog *scan = new ScanDialog( this, "", true); - scan->exec(); + scan->showMaximized(); } diff --git a/noncore/net/opietooth/manager/scandialog.cpp b/noncore/net/opietooth/manager/scandialog.cpp index 842466a..e81b2ee 100644 --- a/noncore/net/opietooth/manager/scandialog.cpp +++ b/noncore/net/opietooth/manager/scandialog.cpp @@ -55,4 +55,4 @@ namespace OpieTooth { QWidget* privateLayoutWidget = new QWidget( Frame7, "Layout11" ); - privateLayoutWidget->setGeometry( QRect( 10, 9, 221, 310 ) ); - Layout11 = new QGridLayout( privateLayoutWidget ); + privateLayoutWidget->setGeometry( QRect( 10, 9, 221, 280 ) ); + Layout11 = new QVBoxLayout( privateLayoutWidget ); Layout11->setSpacing( 6 ); @@ -64,14 +64,15 @@ namespace OpieTooth { - //Layout11->addMultiCellWidget( progress, 1, 1, 0, 1 ); - Layout11->addWidget(progress, 2, 2); - StartButton = new QPushButton( privateLayoutWidget, "StartButton" ); + QFrame *buttonFrame = new QFrame(Frame7, ""); + + StartButton = new QPushButton( buttonFrame, "StartButton" ); StartButton->setText( tr( "Start" ) ); - Layout11->addWidget( StartButton, 2, 0 ); - - StopButton = new QPushButton( privateLayoutWidget, "StopButton" ); + StopButton = new QPushButton( buttonFrame, "StopButton" ); StopButton->setText( tr( "Cancel" ) ); - Layout11->addWidget( StopButton, 2, 1 ); + + QHBoxLayout *buttonLayout = new QHBoxLayout(buttonFrame); + buttonLayout->addWidget(StartButton); + buttonLayout->addWidget(StopButton); @@ -83,3 +84,7 @@ namespace OpieTooth { - Layout11->addMultiCellWidget( ListView1, 0, 0, 0, 1 ); + Layout11->addWidget( ListView1); + Layout11->addWidget(progress); + Layout11->addWidget( buttonFrame); + + localDevice = new Manager( "hci0" ); @@ -105,4 +110,3 @@ namespace OpieTooth { progressStat = 0; - // read it from config later - localDevice = new Manager( "hci0" ); + progressTimer(20); diff --git a/noncore/net/opietooth/manager/scandialog.h b/noncore/net/opietooth/manager/scandialog.h index 6d9b877..22ee01d 100644 --- a/noncore/net/opietooth/manager/scandialog.h +++ b/noncore/net/opietooth/manager/scandialog.h @@ -57,3 +57,3 @@ class Device; protected: - QGridLayout* Layout11; + QVBoxLayout* Layout11; |