From kde-commits  Tue Sep 02 22:11:59 2008
From: =?utf-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5 () gmail ! com>
Date: Tue, 02 Sep 2008 22:11:59 +0000
To: kde-commits
Subject: KDE/kdebase/workspace/plasma/applets
Message-Id: <1220393519.380692.15218.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=122039353019135

SVN commit 856465 by rmilecki:

Let's make tooltip display time and date of every selected timezone.


 M  +18 -2     digital-clock/clock.cpp  
 M  +5 -0      libplasmaclock/clockapplet.cpp  
 M  +1 -0      libplasmaclock/clockapplet.h  


--- trunk/KDE/kdebase/workspace/plasma/applets/digital-clock/clock.cpp #856464:856465
@@ -135,9 +135,25 @@
 void Clock::updateToolTipContent()
 {
     Plasma::ToolTipManager::ToolTipContent tipData;
-    tipData.mainText = KGlobal::locale()->formatTime(m_time, m_showSeconds);
-    tipData.subText = m_date.toString();
     tipData.image = m_toolTipIcon;
+
+    QString mainText = m_prettyTimezone + " ";
+    mainText += KGlobal::locale()->formatTime(m_time, m_showSeconds) + "<br>";
+    mainText += KGlobal::locale()->formatDate(m_date);
+    tipData.mainText = mainText;
+
+    QString subText;
+    foreach(QString tz, getSelectedTimezones()) {
+        if (tz==currentTimezone()) {
+            continue;
+        }
+        Plasma::DataEngine::Data data = dataEngine("time")->query(tz);
+        subText += "<br><b>" + data["Timezone City"].toString().replace("_", " ")+"</b> ";
+        subText += KGlobal::locale()->formatTime(data["Time"].toTime(), m_showSeconds) + ", ";
+        subText += KGlobal::locale()->formatDate(data["Date"].toDate());
+    }
+    tipData.subText = subText;
+
     Plasma::ToolTipManager::self()->setToolTipContent(this,tipData);
 }
 
--- trunk/KDE/kdebase/workspace/plasma/applets/libplasmaclock/clockapplet.cpp #856464:856465
@@ -295,6 +295,11 @@
     return d->timezone;
 }
 
+QStringList ClockApplet::getSelectedTimezones() const
+{
+    return d->selectedTimezones;
+}
+
 bool ClockApplet::isLocalTimezone() const
 {
     return d->timezone == localTimezone();
--- trunk/KDE/kdebase/workspace/plasma/applets/libplasmaclock/clockapplet.h #856464:856465
@@ -50,6 +50,7 @@
 
         QString currentTimezone() const;
         bool isLocalTimezone() const;
+        QStringList getSelectedTimezones() const;
 
         static QString localTimezone();