[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-3/kdebluetooth/kbluetoothd/kbluetoothd
From:       Fred Schättgen <kde.sch () ttgen ! net>
Date:       2004-10-22 18:10:09
Message-ID: 20041022181009.5430516C50 () office ! kde ! org
[Download RAW message or body]

CVS commit by schaettgen: 

- Fixed typo
- Don't update tooltip of tray icon unnecessarily.
This helps especially when trying to figure out where
Bluez is connecting to while the connection is being 
established (tray icons blinks).


  M +1 -1      rfcommportlistener.cpp   1.18
  M +7 -3      trayicon.cpp   1.30


--- kdeextragear-3/kdebluetooth/kbluetoothd/kbluetoothd/rfcommportlistener.cpp  #1.17:1.18
@@ -175,5 +175,5 @@ Make sure that BlueZ is installed correc
             i18n("Could not assign a channel to service %1.").arg(this->name()),
             i18n("<p>KBluetoothD was unable to find an unused Rfcomm channel \
-for the service %1, so other devices will not be able to access that service.<p/>\
+for the service %1, so other devices will not be able to access that service.</p>\
 <p>\
 Possible reasons:<br/> \

--- kdeextragear-3/kdebluetooth/kbluetoothd/kbluetoothd/trayicon.cpp  #1.29:1.30
@@ -190,4 +190,6 @@ a connection. To enable the permanent tr
 void TrayIcon::updateIcon()
 {
+    QString oldText = QToolTip::textFor(this);
+    QString newText = "";
     if (connections.size() == 0) {
         if (alwaysVisible) {
@@ -203,6 +205,5 @@ void TrayIcon::updateIcon()
         }
         //showMonitorAction->setEnabled(false);
-        QToolTip::remove(this);
-        QToolTip::add(this, "Not connected");
+        newText = i18n("Not connected");
     }
     else {
@@ -248,6 +249,9 @@ void TrayIcon::updateIcon()
         }
         toolTipText += "</p>";
+        newText = toolTipText;
+    }
+    if (oldText != newText) {
         QToolTip::remove(this);
-        QToolTip::add(this, toolTipText);
+        QToolTip::add(this, newText);
     }
 }


[prev in list] [next in list] [prev in thread] [next in thread]