author | harlekin <harlekin> | 2002-06-15 21:19:03 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-06-15 21:19:03 (UTC) |
commit | e31f557a84055ce00f814fd44427f9b3584243f9 (patch) (unidiff) | |
tree | 013a928eb50be77200e361b20df46d846bdf6250 | |
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 { | |||
59 | 59 | ||
60 | setCaption( tr( "Bluetooth Manager" ) ); | ||
61 | |||
60 | readConfig(); | 62 | readConfig(); |
@@ -154,3 +156,3 @@ namespace OpieTooth { | |||
154 | ScanDialog *scan = new ScanDialog( this, "", true); | 156 | ScanDialog *scan = new ScanDialog( this, "", true); |
155 | scan->exec(); | 157 | scan->showMaximized(); |
156 | } | 158 | } |
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, ""); |
69 | StartButton->setText( tr( "Start" ) ); | ||
70 | 67 | ||
71 | Layout11->addWidget( StartButton, 2, 0 ); | 68 | StartButton = new QPushButton( buttonFrame, "StartButton" ); |
69 | StartButton->setText( tr( "Start" ) ); | ||
72 | 70 | ||
73 | StopButton = new QPushButton( privateLayoutWidget, "StopButton" ); | 71 | StopButton = new QPushButton( buttonFrame, "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); |
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; | |||
57 | protected: | 57 | protected: |
58 | QGridLayout* Layout11; | 58 | QVBoxLayout* Layout11; |
59 | 59 | ||