author | harlekin <harlekin> | 2002-06-19 22:36:08 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-06-19 22:36:08 (UTC) |
commit | ce6d4880d3d78fb569322c14e425654785de980d (patch) (unidiff) | |
tree | e1515034b27b6a07b879031fbebac8126c184000 | |
parent | 3cff4da41a61679e0222be190af8a98682f07393 (diff) | |
download | opie-ce6d4880d3d78fb569322c14e425654785de980d.zip opie-ce6d4880d3d78fb569322c14e425654785de980d.tar.gz opie-ce6d4880d3d78fb569322c14e425654785de980d.tar.bz2 |
update
-rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 20 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/scandialog.cpp | 2 |
2 files changed, 11 insertions, 11 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 | |||
@@ -51,21 +51,21 @@ namespace OpieTooth { | |||
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); |
@@ -84,14 +84,14 @@ namespace OpieTooth { | |||
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 | } |
@@ -256,9 +256,9 @@ namespace OpieTooth { | |||
256 | 256 | ||
257 | /* | 257 | /* |
258 | * Action that is toggled on entrys on click | 258 | * Action that is toggled on entrys on click |
259 | */ | 259 | */ |
260 | void BlueBase::startServiceActionClicked( QListViewItem * item ) { | 260 | void BlueBase::startServiceActionClicked( QListViewItem *item ) { |
261 | 261 | ||
262 | 262 | ||
263 | } | 263 | } |
264 | 264 | ||
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 | |||
@@ -100,9 +100,9 @@ namespace OpieTooth { | |||
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 | } |