summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -54,12 +54,14 @@ namespace OpieTooth {
pal.setColor(QPalette::Active, QColorGroup::Button, col);
pal.setColor(QPalette::Inactive, QColorGroup::Button, col);
pal.setColor(QPalette::Normal, QColorGroup::Button, col);
pal.setColor(QPalette::Disabled, QColorGroup::Button, col);
this->setPalette(pal);
+ setCaption( tr( "Bluetooth Manager" ) );
+
readConfig();
initGui();
}
/**
* Reads all options from the config file
@@ -149,13 +151,13 @@ namespace OpieTooth {
/**
* Open the "scan for devices" dialog
*/
void BlueBase::startScan() {
ScanDialog *scan = new ScanDialog( this, "", true);
- scan->exec();
+ scan->showMaximized();
}
/**
* Decontructor
*/
BlueBase::~BlueBase(){
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
@@ -50,41 +50,46 @@ namespace OpieTooth {
Frame7->setGeometry( QRect( 0, 0, 240, 331 ) );
Frame7->setFrameShape( QFrame::StyledPanel );
Frame7->setFrameShadow( QFrame::Raised );
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 );
progress = new QProgressBar(privateLayoutWidget, "progbar");
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" );
ListView1->addColumn( tr( "Add" ) );
ListView1->addColumn( tr( "Device Name" ) );
//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() ) );
connect( (QObject*)StopButton, SIGNAL( clicked() ), this, SLOT( stopSearch() ) );
connect( (QObject*)localDevice, SIGNAL( foundDevices( const QString& , RemoteDevices::ValueList ) ),
this, SLOT(fillList(const QString& , RemoteDevices::ValueList ) ) ) ;
progressStat = 0;
@@ -100,14 +105,13 @@ namespace OpieTooth {
}
void ScanDialog::startSearch() {
progress->setProgress(0);
progressStat = 0;
- // read it from config later
- localDevice = new Manager( "hci0" );
+
progressTimer(20);
// when finished, it emmite foundDevices()
// checken ob initialisiert , qcop ans applet.
localDevice->searchDevices();
progress->setProgress(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
@@ -52,13 +52,13 @@ class Device;
QPushButton* StartButton;
QPushButton* StopButton;
QListView* ListView1;
protected:
- QGridLayout* Layout11;
+ QVBoxLayout* Layout11;
private slots:
void stopSearch();
void startSearch();
void fillList(const QString& device, RemoteDevices::ValueList list);