Diffstat (limited to 'noncore/net/opietooth/manager/scandialog.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/opietooth/manager/scandialog.cpp | 28 |
1 files changed, 16 insertions, 12 deletions
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); |