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

List:       kde-commits
Subject:    branches/work/plasma-desktoplayout-4.2/kdeplasma-addons-applets
From:       Ambroz Bizjak <ambrop7 () gmail ! com>
Date:       2009-01-30 22:16:39
Message-ID: 1233353799.851122.8101.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 918880 by abizjak:

SVN_SILENT Merge upstream changes


 M  +1 -1      comic/comic.cpp  
 M  +1 -0      incomingmsg/plasma-applet-incomingmsg.desktop  
 M  +1 -0      news/plasma-applet-news.desktop  
 M  +3 -0      notes/notes.cpp  
 M  +26 -5     nowplaying/nowplaying.cpp  
 M  +5 -1      nowplaying/nowplaying.h  
 M  +1 -1      previewer/preview.desktop  


--- branches/work/plasma-desktoplayout-4.2/kdeplasma-addons-applets/comic/comic.cpp \
#918879:918880 @@ -220,9 +220,9 @@
     updateContextMenu();
 
     Plasma::ToolTipContent toolTipData;
-    toolTipData.setAutohide( false );
     if ( !mAdditionalText.isEmpty() ) {
         toolTipData = Plasma::ToolTipContent( mAdditionalText, QString() );
+        toolTipData.setAutohide( false );
     }
     Plasma::ToolTipManager::self()->setContent( this, toolTipData );
 
--- branches/work/plasma-desktoplayout-4.2/kdeplasma-addons-applets/incomingmsg/plasma-applet-incomingmsg.desktop \
#918879:918880 @@ -10,6 +10,7 @@
 Name[et]=Sisenev sõnum
 Name[fi]=Tuleva viesti
 Name[fr]=Message entrant
+Name[ga]=Teachtaireacht Isteach
 Name[gl]=Mensaxe entrante
 Name[he]=הודעות × ×›× ×¡×•×ª
 Name[it]=Messaggio in arrivo
--- branches/work/plasma-desktoplayout-4.2/kdeplasma-addons-applets/news/plasma-applet-news.desktop \
#918879:918880 @@ -9,6 +9,7 @@
 Name[et]=Uudised
 Name[fi]=Uutiset
 Name[fr]=Brèves
+Name[ga]=Nuacht
 Name[gl]=Novas
 Name[he]=חדשות
 Name[it]=Notizie
--- branches/work/plasma-desktoplayout-4.2/kdeplasma-addons-applets/notes/notes.cpp \
#918879:918880 @@ -253,6 +253,9 @@
     QAction *action = dynamic_cast<QAction*> (sender());
     if (!action || action->property("color").type() != QVariant::String) return;
     m_color = action->property("color").toString();
+    KConfigGroup cg = config();
+    cg.writeEntry("color", m_color);
+    emit configNeedsSaving();
     update();
 }
 
--- branches/work/plasma-desktoplayout-4.2/kdeplasma-addons-applets/nowplaying/nowplaying.cpp \
#918879:918880 @@ -1,5 +1,6 @@
 /*
  *   Copyright 2007,2008 by Alex Merry <alex.merry@kdemail.net>
+ *   Copyright 2008 by Tony Murray <murraytony@gmail.com>
  *
  *   Some code (text size calculation) taken from clock applet:
  *   Copyright 2007 by Sebastian Kuegler <sebas@kde.org>
@@ -126,6 +127,8 @@
         setAspectRatioMode(Plasma::IgnoreAspectRatio);
         setMinimumSize(300, 200);
 
+        Plasma::ToolTipManager::self()->unregisterWidget(this);
+
         QGraphicsGridLayout* layout = new QGraphicsGridLayout();
         m_textPanel->show();
         layout->addItem(m_textPanel, 0, 0);
@@ -160,6 +163,8 @@
         kDebug() << "Button Panel Minimum Size:" << m_buttonPanel->minimumSize();
         layout->addItem(m_buttonPanel);
 
+        Plasma::ToolTipManager::self()->registerWidget(this);
+
         kDebug() << "Minimum size before changing layout" << minimumSize();
         kDebug() << "Preferred size before changing layout" << preferredSize();
         setLayout(layout);
@@ -271,19 +276,35 @@
     }
 
     // used for seeing when the track has changed
-    QString track = metadata["Artist"] + " - " + metadata["Title"];
+    if ((metadata["Title"] != m_title) || (metadata["Artist"] != m_artist))
+    {
+        m_title = metadata["Title"];
+        m_artist = metadata["Artist"];
 
-    // assume the artwork didn't change unless the track did
-    if (track != m_track) {
-        m_track = track;
-
         m_artwork = data["Artwork"].value<QPixmap>();
         emit coverChanged(m_artwork);
+        if(Plasma::ToolTipManager::self()->isVisible(this)) {
+            toolTipAboutToShow();
+        }
     }
 
     update();
 }
 
+void NowPlaying::toolTipAboutToShow()
+{
+    Plasma::ToolTipContent toolTip;
+    if (m_state == Playing || m_state == Paused) {
+        toolTip.setMainText(m_title);
+        toolTip.setSubText(i18nc("song performer, displayed below the song title", \
"by %1", m_artist)); +        \
toolTip.setImage(m_artwork.scaled(QSize(50,50),Qt::KeepAspectRatio)); +    } else {
+        toolTip.setMainText(i18n("No current track."));
+    }
+
+    Plasma::ToolTipManager::self()->setContent(this, toolTip);
+}
+
 void NowPlaying::playerAdded(const QString &name)
 {
     kDebug() << "Player" << name << "added";
--- branches/work/plasma-desktoplayout-4.2/kdeplasma-addons-applets/nowplaying/nowplaying.h \
#918879:918880 @@ -1,5 +1,6 @@
 /*
  *   Copyright 2007,2008 by Alex Merry <alex.merry@kdemail.net>
+ *   Copyright 2008 by Tony Murray <murraytony@gmail.com>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -23,6 +24,7 @@
 #include <plasma/applet.h>
 #include <plasma/dataengine.h>
 #include <plasma/service.h>
+#include <Plasma/ToolTipManager>
 
 #include <QPixmap>
 
@@ -77,6 +79,7 @@
                      const Plasma::DataEngine::Data &data);
     void playerAdded(const QString &name);
     void playerRemoved(const QString &name);
+    void toolTipAboutToShow();
 
 private slots:
     void play();
@@ -105,7 +108,8 @@
 
     qreal m_volume;
     int m_length;
-    QString m_track;
+    QString m_artist;
+    QString m_title;
     QPixmap m_artwork;
 
     InfoPanel* m_textPanel;
--- branches/work/plasma-desktoplayout-4.2/kdeplasma-addons-applets/previewer/preview.desktop \
#918879:918880 @@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 ServiceTypes=KonqPopupMenu/Plugin
-MimeType=application/octet-stream
+MimeType=application/octet-stream;
 Actions=Preview;
 
 [Desktop Action Preview]


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