summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-06-20 15:44:36 (UTC)
committer harlekin <harlekin>2002-06-20 15:44:36 (UTC)
commite0eec50bf3992d95d7060af74fa98e9630abfa4e (patch) (side-by-side diff)
tree5e4dd3d7900a93c71a1519eda8953cb9df871e3e
parent5a5356882fe8dc4b1c1f9986b425d673ac8875ad (diff)
downloadopie-e0eec50bf3992d95d7060af74fa98e9630abfa4e.zip
opie-e0eec50bf3992d95d7060af74fa98e9630abfa4e.tar.gz
opie-e0eec50bf3992d95d7060af74fa98e9630abfa4e.tar.bz2
up
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp83
-rw-r--r--noncore/net/opietooth/manager/bluebase.h3
2 files changed, 45 insertions, 41 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 7a92dc3..6caca70 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -46,314 +46,317 @@ namespace OpieTooth {
BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
: BluetoothBase( parent, name, fl ) {
localDevice = new Manager( "hci0" );
connect( PushButton2, SIGNAL( clicked() ), this, SLOT(startScan() ) );
connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) );
connect( ListView2, SIGNAL( expanded ( QListViewItem* ) ),
this, SLOT( addServicesToDevice( QListViewItem * ) ) );
connect( ListView2, SIGNAL( clicked( QListViewItem* )),
this, SLOT( startServiceActionClicked( QListViewItem* ) ) );
connect( localDevice , SIGNAL( foundServices( const QString& , Services::ValueList ) ),
this, SLOT( addServicesToDevice( const QString& , Services::ValueList ) ) );
//Load all icons needed
offPix = Resource::loadPixmap( "editdelete" );
onPix = Resource::loadPixmap( "installed" );
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);
+ 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();
//TESTING
-
ListView2->setRootIsDecorated(true);
- QListViewItem *topLV = new QListViewItem( ListView2, "Harlekins Dongle" , "yes");
- topLV->setPixmap( 1, offPix );
- // (void) new QListViewItem( topLV, "on" );
- //(void) new QListViewItem( topLV, "off" );
-
QListViewItem *topLV2 = new QListViewItem( ListView2, "Siemens S45" , "no" );
topLV2->setPixmap( 1, onPix );
- (void) new QListViewItem( topLV2, "on" );
- (void) new QListViewItem( topLV2, "off" );
-
+ (void) new QListViewItem( topLV2, "Serial" );
+ (void) new QListViewItem( topLV2, "BlueNiC" );
}
/**
* Reads all options from the config file
*/
void BlueBase::readConfig() {
Config cfg( "bluetoothmanager" );
cfg.setGroup( "bluezsettings" );
deviceName = cfg.readEntry( "name" , "No name" ); // name the device should identify with
defaultPasskey = cfg.readEntryCrypt( "passkey" , "" ); // <- hmm, look up how good the trolls did that, maybe too weak
useEncryption = cfg.readNumEntry( "useEncryption" , 1 );
enableAuthentification = cfg.readNumEntry( "enableAuthentification" , 1 );
enablePagescan = cfg.readNumEntry( "enablePagescan" , 1 );
enableInquiryscan = cfg.readNumEntry( "enableInquiryscan" , 1 );
}
/**
* Writes all options to the config file
*/
void BlueBase::writeConfig() {
Config cfg( "bluetoothmanager" );
cfg.setGroup( "bluezsettings" );
cfg.writeEntry( "name" , deviceName );
cfg.writeEntryCrypt( "passkey" , defaultPasskey );
cfg.writeEntry( "useEncryption" , useEncryption );
cfg.writeEntry( "enableAuthentification" , enableAuthentification );
cfg.writeEntry( "enablePagescan" , enablePagescan );
cfg.writeEntry( "enableInquiryscan" , enableInquiryscan );
}
- /*
+ /**
* Read the list of allready known devices
*
*/
void BlueBase::readSavedDevices() {
QList<RemoteDevice> *loadedDevices = new QList<RemoteDevice>;
Config deviceListSave( QDir::homeDirPath() + "/Settings/bluetooth/devicelist.conf", Config::File );
// RemoteDevice *currentDevice = RemoteDevice( , );
//loadedDevices->append( currentDevice );
addSearchedDevices( *loadedDevices );
}
- /*
+ /**
* Write the list of allready known devices
*
*/
void BlueBase::writeSavedDevices() {
QListViewItemIterator it( ListView2 );
for ( ; it.current(); ++it ) {
// seperate config file for each device, to store more information in future.
Config conf( QDir::homeDirPath() + "/Settings/bluetooth/" + (it.current()->text(3)) + ".conf", Config::File );
conf.setGroup( "Info" );
conf.writeEntry( "name", it.current()->text(0) );
}
}
/**
* Set up the gui
*/
void BlueBase::initGui() {
- StatusLabel->setText(getStatus()); // maybe move it to getStatus()
+ StatusLabel->setText( getStatus() ); // maybe move it to getStatus()
- cryptCheckBox->setChecked(useEncryption);
- authCheckBox->setChecked(enableAuthentification);
- pagescanCheckBox->setChecked(enablePagescan);
- inquiryscanCheckBox->setChecked(enableInquiryscan);
- deviceNameLine->setText(deviceName);
- passkeyLine->setText(defaultPasskey);
+ cryptCheckBox->setChecked( useEncryption );
+ authCheckBox->setChecked( enableAuthentification );
+ pagescanCheckBox->setChecked( enablePagescan );
+ inquiryscanCheckBox->setChecked( enableInquiryscan );
+ deviceNameLine->setText( deviceName );
+ passkeyLine->setText( defaultPasskey );
// set info tab
setInfo();
}
/**
* Get the status informations and returns it
* @return QString the status informations gathered
*/
QString BlueBase::getStatus(){
- QString infoString = tr("<b>Device name : </b> Ipaq" );
- infoString += QString("<br><b>" + tr("MAC adress: ") +"</b> No idea");
- infoString += QString("<br><b>" + tr("Class") + "</b> PDA");
+ QString infoString = tr( "<b>Device name : </b> Ipaq" );
+ infoString += QString( "<br><b>" + tr( "MAC adress: " ) +"</b> No idea" );
+ infoString += QString( "<br><b>" + tr( "Class" ) + "</b> PDA" );
return (infoString);
}
/**
* Read the current values from the gui and invoke writeConfig()
*/
void BlueBase::applyConfigChanges() {
deviceName = deviceNameLine->text();
defaultPasskey = passkeyLine->text();
useEncryption = cryptCheckBox->isChecked();
enableAuthentification = authCheckBox->isChecked();
enablePagescan = pagescanCheckBox->isChecked();
enableInquiryscan = inquiryscanCheckBox->isChecked();
writeConfig();
QMessageBox* box = new QMessageBox( this, "Test" );
box->setText( tr( "Changes applied" ) );
box->show();
// falls nötig hcid killhupen - die funktionalität adden
-}
+ }
- /*
+ /**
* Add fresh found devices from scan dialog to the listing
*
*/
void BlueBase::addSearchedDevices( QList<RemoteDevice> &newDevices ) {
QListViewItem * deviceItem;
QListIterator<RemoteDevice> it( newDevices );
for( ; it.current() ; ++it ) {
RemoteDevice *dev = it.current();
deviceItem = new QListViewItem( ListView2 , dev->name() );
if ( deviceActive( dev ) ) {
deviceItem->setPixmap( 1 , onPix );
} else {
deviceItem->setPixmap( 1, offPix );
}
deviceItem->setText( 3, dev->mac() );
// ggf auch hier?
addServicesToDevice( deviceItem );
}
}
- /*
+ /**
* Action that is toggled on entrys on click
*/
void BlueBase::startServiceActionClicked( QListViewItem *item ) {
}
- /*
+ /**
* Action that are toggled on hold (mostly QPopups i guess)
*/
void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int column ) {
}
- /*
+ /**
* Search and display avail. services for a device (on expand from device listing)
*
*/
void BlueBase::addServicesToDevice( QListViewItem * item ) {
qDebug("addServicesToDevice");
// row of mac adress
- RemoteDevice *device = new RemoteDevice(item->text(3), item->text(0));
+ RemoteDevice *device = new RemoteDevice( item->text(3), item->text(0) );
deviceList.insert( item->text(3) , item );
-// and some time later I get a signal foundServices( const QString& device, Services::ValueList ); back
+ // and some time later I get a signal foundServices( const QString& device, Services::ValueList ); back
localDevice->searchServices( *device );
// delete
}
/**
* Overloaded. This one it the one that is connected to the foundServices signal
* @param device the mac address of the remote device
* @param servicesList the list with the service the device has.
*/
void BlueBase::addServicesToDevice( const QString& device, Services::ValueList servicesList ) {
qDebug("fill services list");
QMap<QString,QListViewItem*>::Iterator it;
QListViewItem* deviceItem;
for( it = deviceList.begin(); it != deviceList.end(); ++it ) {
- if (it.key() == device ) {
+ if ( it.key() == device ) {
deviceItem = it.data();
}
}
QValueList<OpieTooth::Services>::Iterator it2;
QListViewItem * serviceItem;
for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) {
-// it2.serviceName()
serviceItem = new QListViewItem( deviceItem , (*it2).serviceName() );
}
-
}
- /*
+ /**
+ * Add the existing connections (pairs) to the connections tab.
+ *
+ */
+ void BlueBase::addConnectedDevices() {
+
+
+ }
+
+ /**
* Find out if a device can currently be reached
*/
bool BlueBase::deviceActive( RemoteDevice *device ) {
return true;
}
/**
* Open the "scan for devices" dialog
*/
void BlueBase::startScan() {
ScanDialog *scan = new ScanDialog( this, "", true);
- QObject::connect( scan, SIGNAL( selectedDevices(QList<RemoteDevice>&) ),
- this, SLOT( addSearchedDevices(QList<RemoteDevice>& ) ));
+ QObject::connect( scan, SIGNAL( selectedDevices( QList<RemoteDevice>& ) ),
+ this, SLOT( addSearchedDevices( QList<RemoteDevice>& ) ) );
scan->showMaximized();
}
+ /**
+ * Set the informations about the local device in information Tab
+ */
void BlueBase::setInfo() {
StatusLabel->setText( getStatus() );
}
/**
* Decontructor
*/
BlueBase::~BlueBase() {
writeSavedDevices();
}
}
diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index d20d05c..99d2fa6 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -44,37 +44,38 @@ namespace OpieTooth {
private:
void readConfig();
void writeConfig();
void readSavedDevices();
void writeSavedDevices();
QString getStatus();
void initGui();
void setInfo();
Manager *localDevice;
QMap<QString,QListViewItem*> deviceList;
bool deviceActive( RemoteDevice *device );
QString deviceName;
QString defaultPasskey;
int useEncryption;
int enableAuthentification;
int enablePagescan;
int enableInquiryscan;
QPixmap offPix;
QPixmap onPix;
- public slots:
+ private slots:
void addSearchedDevices( QList<RemoteDevice> &newDevices );
void addServicesToDevice( QListViewItem *item );
void addServicesToDevice( const QString& device, Services::ValueList );
+ void addConnectedDevices();
void startServiceActionClicked( QListViewItem *item );
void startServiceActionHold( QListViewItem *item, const QPoint &point, int column);
void applyConfigChanges();
};
}
#endif