summaryrefslogtreecommitdiff
path: root/noncore/net/opietooth
Unidiff
Diffstat (limited to 'noncore/net/opietooth') (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp18
-rw-r--r--noncore/net/opietooth/manager/scandialog.cpp2
2 files changed, 10 insertions, 10 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 6328b59..7a92dc3 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -49,25 +49,25 @@ namespace OpieTooth {
49 : BluetoothBase( parent, name, fl ) { 49 : BluetoothBase( parent, name, fl ) {
50 50
51 localDevice = new Manager( "hci0" ); 51 localDevice = new Manager( "hci0" );
52 52
53 connect( PushButton2, SIGNAL( clicked() ), this, SLOT(startScan() ) ); 53 connect( PushButton2, SIGNAL( clicked() ), this, SLOT(startScan() ) );
54 connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) ); 54 connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) );
55 connect( ListView2, SIGNAL( expanded ( QListViewItem *item ) ), 55 connect( ListView2, SIGNAL( expanded ( QListViewItem* ) ),
56 this, SLOT( addServicesToDevice( QListViewItem *item ) ) ); 56 this, SLOT( addServicesToDevice( QListViewItem * ) ) );
57 connect( ListView2, SIGNAL( clicked( QListViewItem* )), 57 connect( ListView2, SIGNAL( clicked( QListViewItem* )),
58 this, SLOT( startServiceActionClicked( QListViewItem *item ) ) ); 58 this, SLOT( startServiceActionClicked( QListViewItem* ) ) );
59 connect( localDevice, SIGNAL( foundServices( const QString& device, Services::ValueList ) ), 59 connect( localDevice , SIGNAL( foundServices( const QString& , Services::ValueList ) ),
60 this, SLOT( addServicesToDevice( const QString& device, Services::ValueList ) ) ); 60 this, SLOT( addServicesToDevice( const QString& , Services::ValueList ) ) );
61 61
62 62
63 //Load all icons needed 63 //Load all icons needed
64 64
65 65
66 QPixmap offPix = Resource::loadPixmap( "editdelete" ); 66 offPix = Resource::loadPixmap( "editdelete" );
67 QPixmap onPix = Resource::loadPixmap( "installed" ); 67 onPix = Resource::loadPixmap( "installed" );
68 68
69 QPalette pal = this->palette(); 69 QPalette pal = this->palette();
70 QColor col = pal.color(QPalette::Active, QColorGroup::Background); 70 QColor col = pal.color(QPalette::Active, QColorGroup::Background);
71 pal.setColor(QPalette::Active, QColorGroup::Button, col); 71 pal.setColor(QPalette::Active, QColorGroup::Button, col);
72 pal.setColor(QPalette::Inactive, QColorGroup::Button, col); 72 pal.setColor(QPalette::Inactive, QColorGroup::Button, col);
73 pal.setColor(QPalette::Normal, QColorGroup::Button, col); 73 pal.setColor(QPalette::Normal, QColorGroup::Button, col);
@@ -82,18 +82,18 @@ namespace OpieTooth {
82 82
83 //TESTING 83 //TESTING
84 84
85 ListView2->setRootIsDecorated(true); 85 ListView2->setRootIsDecorated(true);
86 86
87 QListViewItem *topLV = new QListViewItem( ListView2, "Harlekins Dongle" , "yes"); 87 QListViewItem *topLV = new QListViewItem( ListView2, "Harlekins Dongle" , "yes");
88 topLV->setPixmap( 0, offPix ); 88 topLV->setPixmap( 1, offPix );
89 // (void) new QListViewItem( topLV, "on" ); 89 // (void) new QListViewItem( topLV, "on" );
90 //(void) new QListViewItem( topLV, "off" ); 90 //(void) new QListViewItem( topLV, "off" );
91 91
92 QListViewItem *topLV2 = new QListViewItem( ListView2, "Siemens S45" , "no" ); 92 QListViewItem *topLV2 = new QListViewItem( ListView2, "Siemens S45" , "no" );
93 topLV2->setPixmap( 0, onPix ); 93 topLV2->setPixmap( 1, onPix );
94 (void) new QListViewItem( topLV2, "on" ); 94 (void) new QListViewItem( topLV2, "on" );
95 (void) new QListViewItem( topLV2, "off" ); 95 (void) new QListViewItem( topLV2, "off" );
96 96
97 } 97 }
98 98
99 99
diff --git a/noncore/net/opietooth/manager/scandialog.cpp b/noncore/net/opietooth/manager/scandialog.cpp
index ec8df82..9520e73 100644
--- a/noncore/net/opietooth/manager/scandialog.cpp
+++ b/noncore/net/opietooth/manager/scandialog.cpp
@@ -98,13 +98,13 @@ namespace OpieTooth {
98 98
99// hack, make cleaner later 99// hack, make cleaner later
100 void ScanDialog::progressTimer() { 100 void ScanDialog::progressTimer() {
101 101
102 progressStat++; 102 progressStat++;
103 if (progressStat++ < 20) { 103 if (progressStat++ < 20) {
104 QTimer::singleShot( 1000, this, SLOT(progressTimer() ) ); 104 QTimer::singleShot( 2000, this, SLOT(progressTimer() ) );
105 } 105 }
106 progress->setProgress(progressStat++); 106 progress->setProgress(progressStat++);
107 107
108 } 108 }
109 109
110 void ScanDialog::accept() { 110 void ScanDialog::accept() {