← Back to branch summary

~blue-shell/kdebase-workspace/tasks-qml

« back to all changes in this revision

Viewing changes to plasma/desktop/applets/tasks/tasks.cpp

  • Committer: Eike Hein
  • Date: 2013-04-05 06:21:40 UTC
  • Revision ID: git-v1:61a0c7961751bf4a6e09353d462c1ebcc7548e96
Launcher basics (layout pending).

Show diffs side-by-side

added added

removed removed

Lines of Context:
plasma/desktop/applets/tasks/tasks.cpp
181
181
 
182
182
void Tasks::activateItem(int id, bool toggle)
183
183
{
184
 
    TaskManager::TaskItem* taskItem = dynamic_cast<TaskManager::TaskItem*>(m_groupManager->rootGroup()->getMemberById(id));
185
 
 
186
 
    if (taskItem && taskItem->task()) {
 
184
    TaskManager::AbstractGroupableItem* item = m_groupManager->rootGroup()->getMemberById(id);
 
185
 
 
186
    if (!item) {
 
187
        return;
 
188
    }
 
189
 
 
190
    if (item->itemType() == TaskManager::TaskItemType && !item->isStartupItem()) {
 
191
        TaskManager::TaskItem* taskItem = static_cast<TaskManager::TaskItem*>(item);
 
192
 
187
193
        if (toggle) {
188
194
            taskItem->task()->activateRaiseOrIconify();
189
195
        } else {
190
196
            taskItem->task()->activate();
191
197
        }
 
198
    } else if (item->itemType() == TaskManager::LauncherItemType) {
 
199
        static_cast<TaskManager::LauncherItem*>(item)->launch();
192
200
    }
193
201
}
194
202
 
244
252
        actionList.prepend(a);
245
253
*/
246
254
        menu = new TaskManager::BasicMenu(0, taskGroup, m_groupManager, actionList);
 
255
    } else if (item->itemType() == TaskManager::LauncherItemType) {
 
256
        menu = new TaskManager::BasicMenu(0, static_cast<TaskManager::LauncherItem*>(item),
 
257
            m_groupManager, actionList);
247
258
    }
248
259
 
249
260
    if (!menu) {