done: add/new/remove project unit

RedPandaIDE/mainwindow.cpp

@@ -1256,8 +1256,10 @@ void MainWindow::openProject(const QString &filename, bool openFiles)
         //parse the project
         //  UpdateClassBrowsing;
         scanActiveProject(true);
-        if (openFiles)
-            mProject->doAutoOpen();
+        if (openFiles) {
+            PProjectUnit unit = mProject->doAutoOpen();
+            setProjectViewCurrentUnit(unit);
+        }
 
         //update editor's inproject flag
         foreach (PProjectUnit unit, mProject->unitList()) {
@@ -4280,14 +4282,14 @@ void MainWindow::updateProjectView()
         if (mProjectProxyModel->sourceModel()!=mProject->model()) {
             mProjectProxyModel->setSourceModel(mProject->model());
             mProjectProxyModel->sort(0);
-            connect(mProject->model(), &ProjectModel::dataChanged,
-                    this, &MainWindow::invalidateProjectProxyModel);
-            connect(mProject->model(), &ProjectModel::rowsRemoved,
-                    this, &MainWindow::invalidateProjectProxyModel);
-            connect(mProject->model(), &ProjectModel::rowsInserted,
-                    this, &MainWindow::invalidateProjectProxyModel);
-            connect(mProject->model(), &QAbstractItemModel::modelReset,
-                    ui->projectView,&QTreeView::expandAll);
+//            connect(mProject->model(), &ProjectModel::dataChanged,
+//                    this, &MainWindow::invalidateProjectProxyModel);
+//            connect(mProject->model(), &ProjectModel::rowsRemoved,
+//                    this, &MainWindow::invalidateProjectProxyModel);
+//            connect(mProject->model(), &ProjectModel::rowsInserted,
+//                    this, &MainWindow::invalidateProjectProxyModel);
+//            connect(mProject->model(), &QAbstractItemModel::modelReset,
+//                    ui->projectView,&QTreeView::expandAll);
         } else
             mProjectProxyModel->invalidate();
         //ui->projectView->expandAll();
@@ -5927,7 +5929,7 @@ void MainWindow::on_actionAdd_to_project_triggered()
             }
         }
         mProject->saveAll();
-        updateProjectActions();
+        updateProjectView();
         parseFileList(mProject->cppParser());
     }
 }
@@ -5954,8 +5956,9 @@ void MainWindow::on_actionRemove_from_project_triggered()
             continue;
         mProject->removeUnit(folderNode->unitIndex, true, removeFile);
     };
-    mProject->saveUnits();
-    updateProjectActions();
+    ui->projectView->selectionModel()->clearSelection();
+    mProject->saveAll();
+    updateProjectView();
 }
 
 
@@ -6217,6 +6220,8 @@ void MainWindow::newProjectUnitFile()
     newUnit = mProject->newUnit(
                     pNode,newFileName);
 
+    setProjectViewCurrentUnit(newUnit);
+
 //    mProject->rebuildNodes();
     mProject->saveAll();
 //        updateProjectView();
@@ -6233,7 +6238,7 @@ void MainWindow::newProjectUnitFile()
         mProject->model()->beginUpdate();
         mProject->model()->endUpdate();
     }
-    updateProjectActions();
+    updateProjectView();
 }
 
 void MainWindow::fillProblemCaseInputAndExpected(const POJProblemCase &problemCase)
@@ -6287,6 +6292,22 @@ void MainWindow::doFilesViewRemoveFile(const QModelIndex &index)
     }
 }
 
+void MainWindow::setProjectViewCurrentUnit(std::shared_ptr<ProjectUnit> unit)
+{
+    if (unit) {
+        QModelIndex parentIndex = mProject->model()->getParentIndex(unit->node().get());
+        parentIndex = mProjectProxyModel->mapFromSource(parentIndex);
+        if (parentIndex.isValid()) {
+            ui->projectView->expandRecursively(parentIndex);
+        }
+        QModelIndex index = mProject->model()->getNodeIndex(unit->node().get());
+        index = mProjectProxyModel->mapFromSource(index);
+        if (index.isValid()) {
+            ui->projectView->setCurrentIndex(index);
+        }
+    }
+}
+
 static void setDockTitlebarLocation(QDockWidget* dock, const Qt::DockWidgetArea &area) {
     switch(area) {
     case Qt::DockWidgetArea::BottomDockWidgetArea:
@@ -7344,7 +7365,7 @@ void MainWindow::on_actionNew_Header_triggered()
     NewHeaderDialog dialog;
     dialog.setPath(mProject->folder());
     QString newFileName;
-    int i=0;
+    int i=1;
     do {
         newFileName = tr("untitled")+QString("%1").arg(i);
         newFileName += ".h";
@@ -7377,11 +7398,12 @@ void MainWindow::on_actionNew_Header_triggered()
         header.append("#endif");
         stringsToFile(header, headerFilename);
 
-        mProject->addUnit(headerFilename,mProject->rootNode());
+        PProjectUnit newUnit=mProject->addUnit(headerFilename,mProject->rootNode());
         mProject->cppParser()->addFileToScan(headerFilename);
-        mProject->saveUnits();
+        mProject->saveAll();
         parseFileList(mProject->cppParser());
-        updateProjectActions();
+        setProjectViewCurrentUnit(newUnit);
+        updateProjectView();
 
         Editor * editor = mEditorList->getEditorByFilename(headerFilename);
         if (editor){
@@ -7446,13 +7468,15 @@ void MainWindow::on_actionNew_Class_triggered()
         source.append("");
         stringsToFile(source, sourceFilename);
 
-        mProject->addUnit(headerFilename,mProject->rootNode());
+        PProjectUnit newUnit=mProject->addUnit(headerFilename,mProject->rootNode());
         mProject->cppParser()->addFileToScan(headerFilename);
-        mProject->addUnit(sourceFilename,mProject->rootNode());
+        setProjectViewCurrentUnit(newUnit);
+        newUnit=mProject->addUnit(sourceFilename,mProject->rootNode());
         mProject->cppParser()->addFileToScan(sourceFilename);
-        mProject->saveUnits();
+        setProjectViewCurrentUnit(newUnit);
+        mProject->saveAll();
         parseFileList(mProject->cppParser());
-        updateProjectActions();
+        updateProjectView();
 
         Editor * editor = mEditorList->getEditorByFilename(headerFilename);
         if (editor){

RedPandaIDE/mainwindow.h

@@ -67,6 +67,7 @@ class CPUDialog;
 class QPlainTextEdit;
 class SearchDialog;
 class Project;
+class ProjectUnit;
 class ColorSchemeItem;
 
 #define DPI_CHANGED_EVENT ((QEvent::Type)(QEvent::User+1))
@@ -270,6 +271,8 @@ private:
 
     void doFilesViewRemoveFile(const QModelIndex& index);
 
+    void setProjectViewCurrentUnit(std::shared_ptr<ProjectUnit> unit);
+
 private slots:
     void setDockExplorerToArea(const Qt::DockWidgetArea &area);
     void setDockMessagesToArea(const Qt::DockWidgetArea &area);

RedPandaIDE/project.cpp

@@ -1596,9 +1596,9 @@ void Project::createFileSystemFolderNode(
     }
 }
 
-void Project::doAutoOpen()
+PProjectUnit Project::doAutoOpen()
 {
-    loadLayout();
+    return loadLayout();
 }
 
 bool Project::fileAlreadyExists(const QString &s)
@@ -1710,12 +1710,12 @@ void Project::incrementBuildNumber()
     setModified(true);
 }
 
-void Project::loadLayout()
+PProjectUnit Project::loadLayout()
 {
     SimpleIni layIni;
     SI_Error error = layIni.LoadFile(changeFileExt(filename(), "layout").toLocal8Bit());
     if (error!=SI_OK)
-        return;
+        return PProjectUnit();
     int topLeft = layIni.GetLongValue("Editors","Focused",1);
     //TopRight := layIni.ReadInteger('Editors', 'FocusedRight', -1);
     QString temp =layIni.GetValue("Editors","Order", "");
@@ -1740,6 +1740,7 @@ void Project::loadLayout()
         if (editor)
             editor->activate();
     }
+    return unit;
 }
 
 void Project::loadOptions(SimpleIni& ini)
@@ -2399,8 +2400,6 @@ CustomFileIconProvider *ProjectModel::iconProvider() const
 
 bool ProjectModel::insertRows(int row, int count, const QModelIndex &parent)
 {
-    qDebug()<<"insert rows";
-    qDebug()<<rowCount(parent);
     beginInsertRows(parent,row,row+count-1);
     endInsertRows();
     return true;

RedPandaIDE/project.h

@@ -195,7 +195,7 @@ public:
     QString folder();
     void buildPrivateResource(bool forceSave=false);
     void closeUnit(int id);
-    void doAutoOpen();
+    PProjectUnit doAutoOpen();
     bool fileAlreadyExists(const QString& s);
 
     QString getNodePath(PProjectModelNode node);
@@ -282,7 +282,7 @@ private:
     PProjectModelNode findFileSystemFolderNode(const QString& folderPath, ProjectModelNodeType nodeType);
     PProjectModelNode getCustomeFolderNodeFromName(const QString& name);
     void loadOptions(SimpleIni& ini);
-    void loadLayout(); // load all [UnitX]
+    PProjectUnit loadLayout(); // load all [UnitX]
     void loadUnitLayout(Editor *e, int index); // load single [UnitX] cursor positions
 
     PProjectModelNode makeNewFolderNode(