move feature pick dialog into the task view

2016-04-12 18:12:05 +02:00
parent c92e0f5870
commit 83ab03a491
11 changed files with 782 additions and 297 deletions
@@ -570,12 +570,13 @@ void TaskView::removeDialog(void)
        ActiveCtrl = 0;
    }

+    TaskDialog* remove = NULL;
    if (ActiveDialog) {
        const std::vector<QWidget*> &cont = ActiveDialog->getDialogContent();
        for(std::vector<QWidget*>::const_iterator it=cont.begin();it!=cont.end();++it){
            taskPanel->removeWidget(*it);
        }
-        delete ActiveDialog;
+        remove = ActiveDialog;
        ActiveDialog = 0;
    }

@@ -583,6 +584,11 @@ void TaskView::removeDialog(void)

    // put the watcher back in control
    addTaskWatcher();
+    
+    if(remove) {
+        remove->emitDestructionSignal();
+        delete remove;
+    }
 }

 void TaskView::updateWatcher(void)