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 { | |||
55 | QWidget* privateLayoutWidget = new QWidget( Frame7, "Layout11" ); | 55 | QWidget* privateLayoutWidget = new QWidget( Frame7, "Layout11" ); |
56 | privateLayoutWidget->setGeometry( QRect( 10, 9, 221, 310 ) ); | 56 | privateLayoutWidget->setGeometry( QRect( 10, 9, 221, 280 ) ); |
57 | Layout11 = new QGridLayout( privateLayoutWidget ); | 57 | Layout11 = new QVBoxLayout( privateLayoutWidget ); |
58 | Layout11->setSpacing( 6 ); | 58 | Layout11->setSpacing( 6 ); |
@@ -64,14 +64,15 @@ namespace OpieTooth { | |||
64 | 64 | ||
65 | //Layout11->addMultiCellWidget( progress, 1, 1, 0, 1 ); | ||
66 | Layout11->addWidget(progress, 2, 2); | ||
67 | 65 | ||
68 | StartButton = new QPushButton( privateLayoutWidget, "StartButton" ); | 66 | QFrame *buttonFrame = new QFrame(Frame7, ""); |
67 | |||
68 | StartButton = new QPushButton( buttonFrame, "StartButton" ); | ||
69 | StartButton->setText( tr( "Start" ) ); | 69 | StartButton->setText( tr( "Start" ) ); |
70 | 70 | ||
71 | Layout11->addWidget( StartButton, 2, 0 ); | 71 | StopButton = new QPushButton( buttonFrame, "StopButton" ); |
72 | |||
73 | StopButton = new QPushButton( privateLayoutWidget, "StopButton" ); | ||
74 | StopButton->setText( tr( "Cancel" ) ); | 72 | StopButton->setText( tr( "Cancel" ) ); |
75 | 73 | ||
76 | Layout11->addWidget( StopButton, 2, 1 ); | 74 | |
75 | QHBoxLayout *buttonLayout = new QHBoxLayout(buttonFrame); | ||
76 | buttonLayout->addWidget(StartButton); | ||
77 | buttonLayout->addWidget(StopButton); | ||
77 | 78 | ||
@@ -83,3 +84,7 @@ namespace OpieTooth { | |||
83 | 84 | ||
84 | Layout11->addMultiCellWidget( ListView1, 0, 0, 0, 1 ); | 85 | Layout11->addWidget( ListView1); |
86 | Layout11->addWidget(progress); | ||
87 | Layout11->addWidget( buttonFrame); | ||
88 | |||
89 | localDevice = new Manager( "hci0" ); | ||
85 | 90 | ||
@@ -105,4 +110,3 @@ namespace OpieTooth { | |||
105 | progressStat = 0; | 110 | progressStat = 0; |
106 | // read it from config later | 111 | |
107 | localDevice = new Manager( "hci0" ); | ||
108 | progressTimer(20); | 112 | progressTimer(20); |