author | harlekin <harlekin> | 2002-06-15 21:19:03 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-06-15 21:19:03 (UTC) |
commit | e31f557a84055ce00f814fd44427f9b3584243f9 (patch) (side-by-side diff) | |
tree | 013a928eb50be77200e361b20df46d846bdf6250 /noncore | |
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 @@ -52,16 +52,18 @@ namespace OpieTooth { QPalette pal = this->palette(); QColor col = pal.color(QPalette::Active, QColorGroup::Background); 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 */ void BlueBase::readConfig() { @@ -147,17 +149,17 @@ 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 @@ -48,45 +48,50 @@ namespace OpieTooth { Frame7 = new QFrame( this, "Frame7" ); 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; } @@ -98,18 +103,17 @@ namespace OpieTooth { QTimer::singleShot( 1000, this, SLOT(progressTimer ) ); } } 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); } void ScanDialog::stopSearch() { 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 @@ -50,17 +50,17 @@ class Device; QFrame* Frame7; QProgressBar* progress; 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); private: void progressTimer(int maxSeconds); |