summaryrefslogtreecommitdiff
path: root/noncore
Side-by-side diff
Diffstat (limited to 'noncore') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp32
-rw-r--r--noncore/net/opietooth/manager/bluetoothbase.ui6
-rw-r--r--noncore/net/opietooth/manager/devicedialog.ui12
-rw-r--r--noncore/net/opietooth/manager/scandialog.cpp18
-rw-r--r--noncore/net/opietooth/manager/scandialog.h2
5 files changed, 35 insertions, 35 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 90e44cb..7954cc3 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -58,63 +58,63 @@ using namespace OpieTooth;
BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
: BluetoothBase( parent, name, fl )
{
m_localDevice = new Manager( "hci0" );
connect( PushButton2, SIGNAL( clicked() ), this, SLOT(startScan() ) );
connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) );
connect( rfcommBindButton, SIGNAL( clicked() ), this, SLOT( rfcommDialog() ) );
// not good since lib is async
- // connect( ListView2, SIGNAL( expanded(QListViewItem*) ),
+ // connect( devicesView, SIGNAL( expanded(QListViewItem*) ),
// this, SLOT( addServicesToDevice(QListViewItem*) ) );
- connect( ListView2, SIGNAL( clicked(QListViewItem*)),
+ connect( devicesView, SIGNAL( clicked(QListViewItem*)),
this, SLOT( startServiceActionClicked(QListViewItem*) ) );
- connect( ListView2, SIGNAL( rightButtonClicked(QListViewItem*,const QPoint&,int) ),
+ connect( devicesView, SIGNAL( rightButtonClicked(QListViewItem*,const QPoint&,int) ),
this, SLOT(startServiceActionHold(QListViewItem*,const QPoint&,int) ) );
connect( m_localDevice , SIGNAL( foundServices(const QString&,Services::ValueList) ),
this, SLOT( addServicesToDevice(const QString&,Services::ValueList) ) );
connect( m_localDevice, SIGNAL( available(const QString&,bool) ),
this, SLOT( deviceActive(const QString&,bool) ) );
connect( m_localDevice, SIGNAL( connections(ConnectionState::ValueList) ),
this, SLOT( addConnectedDevices(ConnectionState::ValueList) ) );
connect( m_localDevice, SIGNAL( signalStrength(const QString&,const QString&) ),
this, SLOT( addSignalStrength(const QString&,const QString&) ) );
// let hold be rightButtonClicked()
- QPEApplication::setStylusOperation( ListView2->viewport(), QPEApplication::RightOnHold);
- QPEApplication::setStylusOperation( ListView4->viewport(), QPEApplication::RightOnHold);
+ QPEApplication::setStylusOperation( devicesView->viewport(), QPEApplication::RightOnHold);
+ QPEApplication::setStylusOperation( connectionsView->viewport(), QPEApplication::RightOnHold);
//Load all icons needed
m_offPix = Resource::loadPixmap( "opietooth/notconnected" );
m_onPix = Resource::loadPixmap( "opietooth/connected" );
m_findPix = Resource::loadPixmap( "opietooth/find" );
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();
- ListView2->setRootIsDecorated(true);
+ devicesView->setRootIsDecorated(true);
writeToHciConfig();
// search conncetions
addConnectedDevices();
addSignalStrength();
m_iconLoader = new BTIconLoader();
readSavedDevices();
}
/**
* Reads all options from the config file
@@ -180,25 +180,25 @@ void BlueBase::readSavedDevices()
DeviceHandler handler;
loadedDevices = handler.load();
addSearchedDevices( loadedDevices );
}
/**
* Write the list of allready known devices
*/
void BlueBase::writeSavedDevices()
{
- QListViewItemIterator it( ListView2 );
+ QListViewItemIterator it( devicesView );
BTListItem* item;
BTDeviceItem* device;
RemoteDevice::ValueList list;
for ( ; it.current(); ++it )
{
item = (BTListItem*)it.current();
if(item->typeId() != BTListItem::Device )
continue;
device = (BTDeviceItem*)item;
list.append( device->remoteDevice() );
}
@@ -280,25 +280,25 @@ void BlueBase::rfcommDialog()
*/
void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices )
{
BTDeviceItem * deviceItem;
QValueList<RemoteDevice>::ConstIterator it;
for( it = newDevices.begin(); it != newDevices.end() ; ++it )
{
if (find( (*it) )) // is already inserted
continue;
- deviceItem = new BTDeviceItem( ListView2 , (*it) );
+ deviceItem = new BTDeviceItem( devicesView , (*it) );
deviceItem->setPixmap( 1, m_findPix );
deviceItem->setExpandable ( true );
// look if device is avail. atm, async
deviceActive( (*it) );
// ggf auch hier?
addServicesToDevice( deviceItem );
}
}
@@ -478,37 +478,37 @@ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList s
}
// now remove them from the list
m_deviceList.remove( it );
}
void BlueBase::addSignalStrength()
{
- QListViewItemIterator it( ListView4 );
+ QListViewItemIterator it( connectionsView );
for ( ; it.current(); ++it )
{
m_localDevice->signalStrength( ((BTConnectionItem*)it.current() )->connection().mac() );
}
QTimer::singleShot( 5000, this, SLOT( addSignalStrength() ) );
}
void BlueBase::addSignalStrength( const QString& mac, const QString& strength )
{
- QListViewItemIterator it( ListView4 );
+ QListViewItemIterator it( connectionsView );
for ( ; it.current(); ++it )
{
if( ((BTConnectionItem*)it.current())->connection().mac() == mac )
{
((BTConnectionItem*)it.current() )->setSignalStrength( strength );
}
}
}
/**
* Add the existing connections (pairs) to the connections tab.
* This one triggers the search
@@ -525,73 +525,73 @@ void BlueBase::addConnectedDevices()
void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
{
QValueList<OpieTooth::ConnectionState>::Iterator it;
BTConnectionItem * connectionItem;
if ( !connectionList.isEmpty() )
{
for (it = connectionList.begin(); it != connectionList.end(); ++it)
{
- QListViewItemIterator it2( ListView4 );
+ QListViewItemIterator it2( connectionsView );
bool found = false;
for ( ; it2.current(); ++it2 )
{
if( ( (BTConnectionItem*)it2.current())->connection().mac() == (*it).mac() )
{
found = true;
}
}
if ( found == false )
{
- connectionItem = new BTConnectionItem( ListView4, (*it) );
+ connectionItem = new BTConnectionItem( connectionsView, (*it) );
if( m_deviceList.find((*it).mac()).data() )
{
connectionItem->setName( m_deviceList.find( (*it).mac()).data()->name() );
}
}
}
- QListViewItemIterator it2( ListView4 );
+ QListViewItemIterator it2( connectionsView );
for ( ; it2.current(); ++it2 )
{
bool found = false;
for (it = connectionList.begin(); it != connectionList.end(); ++it)
{
if( ( ((BTConnectionItem*)it2.current())->connection().mac() ) == (*it).mac() )
{
found = true;
}
}
if ( !found )
{
delete it2.current();
}
}
}
else
{
- ListView4->clear();
+ connectionsView->clear();
ConnectionState con;
con.setMac( tr("No connections found") );
- connectionItem = new BTConnectionItem( ListView4 , con );
+ connectionItem = new BTConnectionItem( connectionsView , con );
}
// recall connection search after some time
QTimer::singleShot( 15000, this, SLOT( addConnectedDevices() ) );
}
/**
* Find out if a device can currently be reached
* @param device
*/
void BlueBase::deviceActive( const RemoteDevice &device )
@@ -664,25 +664,25 @@ BlueBase::~BlueBase()
delete m_iconLoader;
}
/**
* find searches the ListView for a BTDeviceItem containig
* the same Device if found return true else false
* @param dev RemoteDevice to find
* @return returns true if found
*/
bool BlueBase::find( const RemoteDevice& rem )
{
- QListViewItemIterator it( ListView2 );
+ QListViewItemIterator it( devicesView );
BTListItem* item;
BTDeviceItem* device;
for (; it.current(); ++it )
{
item = (BTListItem*) it.current();
if ( item->typeId() != BTListItem::Device )
continue;
device = (BTDeviceItem*)item;
if ( rem.equals( device->remoteDevice() ) )
return true;
}
diff --git a/noncore/net/opietooth/manager/bluetoothbase.ui b/noncore/net/opietooth/manager/bluetoothbase.ui
index 2d14b8f..cbde3c6 100644
--- a/noncore/net/opietooth/manager/bluetoothbase.ui
+++ b/noncore/net/opietooth/manager/bluetoothbase.ui
@@ -2,25 +2,25 @@
<class>BluetoothBase</class>
<widget>
<class>QWidget</class>
<property stdset="1">
<name>name</name>
<cstring>BluetoothBase</cstring>
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
- <width>297</width>
+ <width>293</width>
<height>382</height>
</rect>
</property>
<property stdset="1">
<name>caption</name>
<string>Form1</string>
</property>
<property>
<name>layoutMargin</name>
</property>
<property>
<name>layoutSpacing</name>
@@ -88,25 +88,25 @@
</property>
<property>
<name>clickable</name>
<bool>true</bool>
</property>
<property>
<name>resizeable</name>
<bool>true</bool>
</property>
</column>
<property stdset="1">
<name>name</name>
- <cstring>ListView2</cstring>
+ <cstring>devicesView</cstring>
</property>
</widget>
<widget>
<class>QPushButton</class>
<property stdset="1">
<name>name</name>
<cstring>PushButton2</cstring>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>0</hsizetype>
@@ -176,25 +176,25 @@
</property>
<property>
<name>clickable</name>
<bool>true</bool>
</property>
<property>
<name>resizeable</name>
<bool>true</bool>
</property>
</column>
<property stdset="1">
<name>name</name>
- <cstring>ListView4</cstring>
+ <cstring>connectionsView</cstring>
</property>
</widget>
</vbox>
</widget>
<widget>
<class>QWidget</class>
<property stdset="1">
<name>name</name>
<cstring>tab</cstring>
</property>
<attribute>
<name>title</name>
diff --git a/noncore/net/opietooth/manager/devicedialog.ui b/noncore/net/opietooth/manager/devicedialog.ui
index 2ecfd4c..f5cd9ab 100644
--- a/noncore/net/opietooth/manager/devicedialog.ui
+++ b/noncore/net/opietooth/manager/devicedialog.ui
@@ -2,25 +2,25 @@
<class>DeviceDialog</class>
<widget>
<class>QDialog</class>
<property stdset="1">
<name>name</name>
<cstring>DeviceDialog</cstring>
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
- <width>275</width>
+ <width>267</width>
<height>323</height>
</rect>
</property>
<property stdset="1">
<name>caption</name>
<string>Form2</string>
</property>
<property>
<name>layoutMargin</name>
</property>
<property>
<name>layoutSpacing</name>
@@ -60,25 +60,25 @@
<property stdset="1">
<name>margin</name>
<number>4</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>3</number>
</property>
<widget row="1" column="0" >
<class>QPushButton</class>
<property stdset="1">
<name>name</name>
- <cstring>PushButton5</cstring>
+ <cstring>applyChanges</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>&amp;Apply Changes</string>
</property>
</widget>
<widget row="0" column="0" >
<class>QListView</class>
<column>
<property>
<name>text</name>
<string>active</string>
@@ -99,25 +99,25 @@
</property>
<property>
<name>clickable</name>
<bool>true</bool>
</property>
<property>
<name>resizeable</name>
<bool>true</bool>
</property>
</column>
<property stdset="1">
<name>name</name>
- <cstring>ListView1</cstring>
+ <cstring>serviceView</cstring>
</property>
</widget>
</grid>
</widget>
<widget>
<class>QWidget</class>
<property stdset="1">
<name>name</name>
<cstring>tab</cstring>
</property>
<attribute>
<name>title</name>
@@ -138,32 +138,32 @@
<name>name</name>
<cstring>TextLabel8</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Default PIN Code</string>
</property>
</widget>
<widget row="1" column="1" >
<class>QLineEdit</class>
<property stdset="1">
<name>name</name>
- <cstring>LineEdit6</cstring>
+ <cstring>defaultPinCode</cstring>
</property>
</widget>
<widget row="0" column="1" >
<class>QLineEdit</class>
<property stdset="1">
<name>name</name>
- <cstring>LineEdit1</cstring>
+ <cstring>deviceName</cstring>
</property>
</widget>
<widget row="0" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextLabel5</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Change device name</string>
</property>
@@ -205,25 +205,25 @@
<property stdset="1">
<name>margin</name>
<number>4</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>2</number>
</property>
<widget row="0" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>DeviceInfoLabel</cstring>
+ <cstring>deviceInfoLabel</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>TextLabel9</string>
</property>
</widget>
</grid>
</widget>
</widget>
</grid>
</widget>
</UI>
diff --git a/noncore/net/opietooth/manager/scandialog.cpp b/noncore/net/opietooth/manager/scandialog.cpp
index bccc6c2..160e8dd 100644
--- a/noncore/net/opietooth/manager/scandialog.cpp
+++ b/noncore/net/opietooth/manager/scandialog.cpp
@@ -47,31 +47,31 @@ namespace OpieTooth {
setCaption( tr( "Scan for devices" ) );
Layout11 = new QVBoxLayout( this );
Layout11->setSpacing( 6 );
Layout11->setMargin( 0 );
progress = new QProgressBar( this, "progbar");
progress->setTotalSteps(20);
StartStopButton = new QPushButton( this, "StartButton" );
StartStopButton->setText( tr( "Start scan" ) );
- ListView1 = new QListView( this, "ListView1" );
+ serviceView = new QListView( this, "serviceView" );
- //ListView1->addColumn( tr( "Add" ) );
- ListView1->addColumn( tr( "Add Device" ) );
- //ListView1->addColumn( tr( "Type" ) );
+ //serviceView->addColumn( tr( "Add" ) );
+ serviceView->addColumn( tr( "Add Device" ) );
+ //serviceView->addColumn( tr( "Type" ) );
- Layout11->addWidget( ListView1 );
+ Layout11->addWidget( serviceView );
Layout11->addWidget( progress );
Layout11->addWidget( StartStopButton );
localDevice = new Manager( "hci0" );
connect( StartStopButton, SIGNAL( clicked() ), this, SLOT( startSearch() ) );
connect( localDevice, SIGNAL( foundDevices(const QString&,RemoteDevice::ValueList) ),
this, SLOT( fillList(const QString&,RemoteDevice::ValueList) ) ) ;
progressStat = 0;
m_search = false;
}
@@ -93,67 +93,67 @@ namespace OpieTooth {
void ScanDialog::startSearch() {
if ( m_search ) {
stopSearch();
return;
}
m_search = true;
progress->setProgress(0);
progressStat = 0;
// empty list before a new scan
- ListView1->clear();
+ serviceView->clear();
progressTimer();
// when finished, it emmite foundDevices()
// checken ob initialisiert , qcop ans applet.
StartStopButton->setText( tr( "Stop scan" ) );
localDevice->searchDevices();
}
void ScanDialog::stopSearch() {
m_search = true;
}
void ScanDialog::fillList(const QString&, RemoteDevice::ValueList deviceList) {
progress->setProgress(0);
progressStat = 0;
QCheckListItem * deviceItem;
RemoteDevice::ValueList::Iterator it;
for( it = deviceList.begin(); it != deviceList.end(); ++it ) {
- deviceItem = new QCheckListItem( ListView1, (*it).name(), QCheckListItem::CheckBox );
+ deviceItem = new QCheckListItem( serviceView, (*it).name(), QCheckListItem::CheckBox );
deviceItem->setText( 1, (*it).mac() );
}
m_search = false;
StartStopButton->setText( tr( "Start scan" ) );
}
/**
* Iterates trough the items, and collects the checked items.
* Then it emits it, so the manager can connect to the signal to fill the listing.
*/
void ScanDialog::emitToManager() {
- if (!ListView1) {
+ if (!serviceView) {
return;
}
QValueList<RemoteDevice> deviceList;
- QListViewItemIterator it( ListView1 );
+ QListViewItemIterator it( serviceView );
for ( ; it.current(); ++it ) {
if ( ( (QCheckListItem*)it.current() )->isOn() ) {
RemoteDevice device( it.current()->text(1), it.current()->text(0) );
deviceList.append( device );
}
}
emit selectedDevices( deviceList );
}
/**
* Cleanup
*/
diff --git a/noncore/net/opietooth/manager/scandialog.h b/noncore/net/opietooth/manager/scandialog.h
index a644e96..2b04964 100644
--- a/noncore/net/opietooth/manager/scandialog.h
+++ b/noncore/net/opietooth/manager/scandialog.h
@@ -37,25 +37,25 @@ class Manager;
class Device;
class ScanDialog : public QDialog {
Q_OBJECT
public:
ScanDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
~ScanDialog();
private:
QProgressBar* progress;
QPushButton* StartStopButton;
- QListView* ListView1;
+ QListView* serviceView;
public slots:
void accept();
protected:
QVBoxLayout* Layout11;
private slots:
void stopSearch();
void startSearch();
void progressTimer();
void fillList( const QString& device, RemoteDevice::ValueList list );