summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-06-15 21:19:03 (UTC)
committer harlekin <harlekin>2002-06-15 21:19:03 (UTC)
commite31f557a84055ce00f814fd44427f9b3584243f9 (patch) (unidiff)
tree013a928eb50be77200e361b20df46d846bdf6250
parentbe10ba352f2a89bc5ec816eefc307a4ae2f7ff6b (diff)
downloadopie-e31f557a84055ce00f814fd44427f9b3584243f9.zip
opie-e31f557a84055ce00f814fd44427f9b3584243f9.tar.gz
opie-e31f557a84055ce00f814fd44427f9b3584243f9.tar.bz2
update
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp4
-rw-r--r--noncore/net/opietooth/manager/scandialog.cpp28
-rw-r--r--noncore/net/opietooth/manager/scandialog.h2
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
@@ -57,6 +57,8 @@ namespace OpieTooth {
57 pal.setColor(QPalette::Disabled, QColorGroup::Button, col); 57 pal.setColor(QPalette::Disabled, QColorGroup::Button, col);
58 this->setPalette(pal); 58 this->setPalette(pal);
59 59
60 setCaption( tr( "Bluetooth Manager" ) );
61
60 readConfig(); 62 readConfig();
61 initGui(); 63 initGui();
62 } 64 }
@@ -152,7 +154,7 @@ namespace OpieTooth {
152 */ 154 */
153 void BlueBase::startScan() { 155 void BlueBase::startScan() {
154 ScanDialog *scan = new ScanDialog( this, "", true); 156 ScanDialog *scan = new ScanDialog( this, "", true);
155 scan->exec(); 157 scan->showMaximized();
156 } 158 }
157 159
158/** 160/**
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
@@ -53,8 +53,8 @@ namespace OpieTooth {
53 53
54 54
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 );
59 Layout11->setMargin( 0 ); 59 Layout11->setMargin( 0 );
60 60
@@ -62,18 +62,19 @@ namespace OpieTooth {
62 progress = new QProgressBar(privateLayoutWidget, "progbar"); 62 progress = new QProgressBar(privateLayoutWidget, "progbar");
63 progress->setTotalSteps(20); 63 progress->setTotalSteps(20);
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
78 ListView1 = new QListView( privateLayoutWidget, "ListView1" ); 79 ListView1 = new QListView( privateLayoutWidget, "ListView1" );
79 80
@@ -81,7 +82,11 @@ namespace OpieTooth {
81 ListView1->addColumn( tr( "Device Name" ) ); 82 ListView1->addColumn( tr( "Device Name" ) );
82 //ListView1->addColumn( tr( "Type" ) ); 83 //ListView1->addColumn( tr( "Type" ) );
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
86 connect( (QObject*)StartButton, SIGNAL( clicked() ), this, SLOT( startSearch() ) ); 91 connect( (QObject*)StartButton, SIGNAL( clicked() ), this, SLOT( startSearch() ) );
87 connect( (QObject*)StopButton, SIGNAL( clicked() ), this, SLOT( stopSearch() ) ); 92 connect( (QObject*)StopButton, SIGNAL( clicked() ), this, SLOT( stopSearch() ) );
@@ -103,8 +108,7 @@ namespace OpieTooth {
103 void ScanDialog::startSearch() { 108 void ScanDialog::startSearch() {
104 progress->setProgress(0); 109 progress->setProgress(0);
105 progressStat = 0; 110 progressStat = 0;
106 // read it from config later 111
107 localDevice = new Manager( "hci0" );
108 progressTimer(20); 112 progressTimer(20);
109 // when finished, it emmite foundDevices() 113 // when finished, it emmite foundDevices()
110 // checken ob initialisiert , qcop ans applet. 114 // checken ob initialisiert , qcop ans applet.
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
@@ -55,7 +55,7 @@ class Device;
55 55
56 56
57 protected: 57 protected:
58 QGridLayout* Layout11; 58 QVBoxLayout* Layout11;
59 59
60 private slots: 60 private slots:
61 void stopSearch(); 61 void stopSearch();