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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/desktop/applets/tasks
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2011-01-25 0:24:41
Message-ID: 20110125002441.B00D8AC8BA () svn ! kde ! org
[Download RAW message or body]

SVN commit 1216812 by aseigo:

adapt to changes in libtaskmanager


 M  +1 -1      taskgroupitem.cpp  
 M  +2 -23     tasks.cpp  


--- trunk/KDE/kdebase/workspace/plasma/desktop/applets/tasks/taskgroupitem.cpp \
#1216811:1216812 @@ -1119,7 +1119,7 @@
                     while (it.hasNext()) {
                         it.next();
                         if (it.key()->itemType() == TaskManager::LauncherItemType &&
-                            static_cast<LauncherItem *>(it.key())->url() == url) {
+                            it.key()->launcherUrl() == url) {
                             layoutTaskItem(it.value(), event->pos());
                             break;
                         }
--- trunk/KDE/kdebase/workspace/plasma/desktop/applets/tasks/tasks.cpp \
#1216811:1216812 @@ -201,29 +201,8 @@
         changed = true;
     }
 
-    disconnect(m_groupManager, SIGNAL(launcherAdded(LauncherItem*)), this, \
                SLOT(launcherAdded(LauncherItem*)));
-    disconnect(m_groupManager, SIGNAL(launcherRemoved(LauncherItem*)), this, \
SLOT(launcherRemoved(LauncherItem*)));  KConfigGroup launcherCg(&cg, "Launchers");
-    foreach (const QString &key, launcherCg.keyList()) {
-        QStringList item = launcherCg.readEntry(key, QStringList());
-        if (item.length() >= 4) {
-            KUrl url(item[0]);
-            KIcon icon;
-            if (!item[1].isEmpty()) {
-                icon = KIcon(item[1]);
-            } else if (item.length() >= 5) {
-                QPixmap pixmap;
-                QByteArray bytes = QByteArray::fromBase64(item[4].toAscii());
-                pixmap.loadFromData(bytes);
-                icon.addPixmap(pixmap);
-            }
-            QString name(item[2]);
-            QString genericName(item[3]);
-            m_groupManager->addLauncher(url, icon, name, genericName);
-        }
-    }
-    connect(m_groupManager, SIGNAL(launcherAdded(LauncherItem*)), this, \
                SLOT(launcherAdded(LauncherItem*)));
-    connect(m_groupManager, SIGNAL(launcherRemoved(LauncherItem*)), this, \
SLOT(launcherRemoved(LauncherItem*))); +    \
m_groupManager->readLauncherConfig(launcherCg);  
     if (changed) {
         emit settingsChanged();
@@ -237,7 +216,7 @@
     KConfigGroup launcherCg(&cg, "Launchers");
 
     QVariantList launcherProperties;
-    launcherProperties.append(launcher->url().url());
+    launcherProperties.append(launcher->launcherUrl().url());
     launcherProperties.append(launcher->icon().name());
     launcherProperties.append(launcher->name());
     launcherProperties.append(launcher->genericName());


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