| -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 @@ -58,4 +58,6 @@ namespace OpieTooth { this->setPalette(pal); + setCaption( tr( "Bluetooth Manager" ) ); + readConfig(); initGui(); @@ -153,5 +155,5 @@ namespace OpieTooth { void BlueBase::startScan() { 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 @@ -54,6 +54,6 @@ 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 ); Layout11->setMargin( 0 ); @@ -63,16 +63,17 @@ namespace OpieTooth { progress->setTotalSteps(20); - //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); ListView1 = new QListView( privateLayoutWidget, "ListView1" ); @@ -82,5 +83,9 @@ namespace OpieTooth { //ListView1->addColumn( tr( "Type" ) ); - Layout11->addMultiCellWidget( ListView1, 0, 0, 0, 1 ); + Layout11->addWidget( ListView1); + Layout11->addWidget(progress); + Layout11->addWidget( buttonFrame); + + localDevice = new Manager( "hci0" ); connect( (QObject*)StartButton, SIGNAL( clicked() ), this, SLOT( startSearch() ) ); @@ -104,6 +109,5 @@ namespace OpieTooth { progress->setProgress(0); progressStat = 0; - // read it from config later - localDevice = new Manager( "hci0" ); + progressTimer(20); // when finished, it emmite foundDevices() 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 @@ -56,5 +56,5 @@ class Device; protected: - QGridLayout* Layout11; + QVBoxLayout* Layout11; private slots: |