merge fct; disconnect jobItem::batchInfo()

GUI/Model/File/DatafilesCleaner.cpp

@@ -23,7 +23,8 @@ void DatafilesCleaner::recollectDataNames(const QVector<DataItem*>& dataItems)
 {
     m_fnames.clear();
     for (DataItem* item : dataItems) {
-        std::cout << "DEBUG DatafilesCleaner::recollectDataNames " << item->fname().toStdString() <<std::endl;
+        std::cout << "DEBUG DatafilesCleaner::recollectDataNames " << item->fname().toStdString()
+                  << std::endl;
         m_fnames << item->fname();
     }
 }

GUI/View/Job/JobEditor.cpp

@@ -62,14 +62,23 @@ JobEditor::~JobEditor()
 
 void JobEditor::setJobItem(JobItem* jobItem)
 {
-    if (m_job_item)
+    if (m_job_item) {
         disconnect(m_job_item, nullptr, this, nullptr);
+        disconnect(m_job_item->batchInfo());
+    }
     m_job_item = jobItem;
     m_properties_model->setJobItem(m_job_item);
     if (m_job_item) {
         const bool ok = isFailed(m_job_item->batchInfo()->status());
         m_comments_editor->setTextColor(ok ? Qt::black : Qt::red);
-        notifyJobPropertyChange();
+        connect(m_job_item->batchInfo(), &BatchInfo::jobCommentsChanged, [this](const QString&) {
+            if (m_job_item
+                && m_job_item->batchInfo()->comments() != m_comments_editor->toPlainText()) {
+                m_comments_editor->blockSignals(true);
+                m_comments_editor->setPlainText(m_job_item->batchInfo()->comments());
+                m_comments_editor->blockSignals(false);
+            }
+        });
     } else
         m_comments_editor->clear();
 }
@@ -82,14 +91,3 @@ void JobEditor::onCommentsEdited()
         m_job_item->blockSignals(false);
     }
 }
-
-void JobEditor::notifyJobPropertyChange()
-{
-    connect(m_job_item->batchInfo(), &BatchInfo::jobCommentsChanged, [this](const QString&) {
-        if (m_job_item && m_job_item->batchInfo()->comments() != m_comments_editor->toPlainText()) {
-            m_comments_editor->blockSignals(true);
-            m_comments_editor->setPlainText(m_job_item->batchInfo()->comments());
-            m_comments_editor->blockSignals(false);
-        }
-    });
-}

GUI/View/Job/JobEditor.h

@@ -35,8 +35,6 @@ private slots:
     void onCommentsEdited();
 
 private:
-    void notifyJobPropertyChange();
-
     QTreeView* m_properties_view;
     JobparQModel* m_properties_model;
     QTextEdit* m_comments_editor;

GUI/View/Main/ProjectManager.cpp

@@ -183,11 +183,11 @@ void ProjectManager::openProject(QString projectPullPath)
     }
 
     createNewProject();
-    std::cout<<"ProjectManager::openProject 6"<<std::endl;
+    std::cout << "ProjectManager::openProject 6" << std::endl;
     loadProject(projectPullPath);
-    std::cout<<"ProjectManager::openProject 7"<<std::endl;
+    std::cout << "ProjectManager::openProject 7" << std::endl;
     emit documentOpenedOrClosed(true);
-    std::cout<<"ProjectManager::openProject 8"<<std::endl;
+    std::cout << "ProjectManager::openProject 8" << std::endl;
 }
 
 //! Calls dialog window to define project path and name.
@@ -209,17 +209,17 @@ void ProjectManager::loadProject(const QString& fullPathAndName)
     if (qApp)
         QApplication::setOverrideCursor(Qt::WaitCursor);
     if (useAutosave && restoreProjectDialog(fullPathAndName, autosaveFullPath)) {
-        std::cout<<"ProjectManager::loadProject with autosave 1"<<std::endl;
+        std::cout << "ProjectManager::loadProject with autosave 1" << std::endl;
         gDoc->loadProjectFileWithData(autosaveFullPath);
-        std::cout<<"ProjectManager::loadProject with autosave 2"<<std::endl;
+        std::cout << "ProjectManager::loadProject with autosave 2" << std::endl;
         gDoc->setProjectFullPath(fullPathAndName);
-        std::cout<<"ProjectManager::loadProject with autosave 3"<<std::endl;
+        std::cout << "ProjectManager::loadProject with autosave 3" << std::endl;
         // restored project should be marked by '*'
         gDoc->setModified();
     } else {
-        std::cout<<"ProjectManager::loadProject without autosave 4"<<std::endl;
+        std::cout << "ProjectManager::loadProject without autosave 4" << std::endl;
         gDoc->loadProjectFileWithData(fullPathAndName);
-        std::cout<<"ProjectManager::loadProject without autosave 5"<<std::endl;
+        std::cout << "ProjectManager::loadProject without autosave 5" << std::endl;
     }
     if (qApp)
         QApplication::restoreOverrideCursor();