主页布局修改

QFD/view/HomeView.cpp

@@ -88,7 +88,7 @@ void HomeView::connectSignalsAndSlots()
 {
     connect(m_create, &PushButton::clicked, this, &HomeView::slotCreateProjClicked);
     connect(m_search, &LineEdit::textChanged, this, &HomeView::slotSearchTextChanged);
-    connect(m_createProjWidget, &CreateProjWidget::signalCreate, this, &HomeView::slotConfirmCreate);
+    connect(m_createProjWidget, &CreateProjWidget::signalConfirm, this, &HomeView::slotProjInfoConfirmed);
     connect(m_projListWidget, &ProjectListWidget::sigOpen, this, &HomeView::slotOpenProject);
     connect(m_projListWidget, &ProjectListWidget::sigInfo, this, &HomeView::slotProjectInfo);
     connect(m_projListWidget, &ProjectListWidget::sigDelete, this, &HomeView::slotDeleteProject);
@@ -133,7 +133,7 @@ void HomeView::slotSearchTextChanged()
     m_projListWidget->showProjects(searchResult());
 }
 
-void HomeView::slotConfirmCreate()
+void HomeView::slotProjInfoConfirmed()
 {
     int code         = -1;
     ProjectInfo info = m_createProjWidget->editedProjInfo();
@@ -168,7 +168,7 @@ void HomeView::slotOpenProject(ProjectInfo *proj) { }
 
 void HomeView::slotDeleteProject(ProjectInfo *proj)
 {
-    QString title = "确认删除工程 “" + proj->projectName + "” ?";
+    QString title = "删除工程 “" + proj->projectName + "” ?";
     MessageBox *m = new MessageBox(title, "删除后无法恢复", this);
 
     if (m->exec()) {

QFD/view/HomeView.h

@@ -39,7 +39,7 @@ private:
 private slots:
     void slotCreateProjClicked();
     void slotSearchTextChanged();
-    void slotConfirmCreate();
+    void slotProjInfoConfirmed();
     void slotProjectInfo(ProjectInfo *proj);
     void slotOpenProject(ProjectInfo *proj);
     void slotDeleteProject(ProjectInfo *proj);

QFD/view/MainWindow.cpp

@@ -139,36 +139,36 @@ void MainWindow::initNavigation()
 {
     m_homeView->setObjectName("homeView");
     m_stackWidget->addWidget(m_homeView);
-    m_naviInterface->addItem(m_homeView->objectName(), NEWFLICON(FluentIcon, HOME), "首页", this,
+    m_naviInterface->addItem(m_homeView->objectName(), NEWFLICON(FluentIcon, HOME), "评估项目管理", this,
                              SLOT(slotNaviItemClicked()));
 
+    m_settingView->setObjectName("settingView");
+    m_stackWidget->addWidget(m_settingView);
+    m_naviInterface->addItem(m_settingView->objectName(), NEWFLICON(FluentIcon, SETTING), "系统资源管理", this,
+                             SLOT(slotNaviItemClicked()));
+
+    m_naviInterface->addSeparator();
+
     m_projectView->setObjectName("projectName");
     m_stackWidget->addWidget(m_projectView);
     m_naviInterface->addItem(m_projectView->objectName(), NEWFLICON(QFDIcon, Project), "项目管理", this,
-                             SLOT(slotNaviItemClicked()));
+                             SLOT(slotNaviItemClicked()), true, NavigationItemPosition::SCROLL);
 
     m_expertManageView->setObjectName("expertManageView");
     m_stackWidget->addWidget(m_expertManageView);
     m_naviInterface->addItem(m_expertManageView->objectName(), NEWFLICON(QFDIcon, Expert), "专家信息管理", this,
-                             SLOT(slotNaviItemClicked()));
+                             SLOT(slotNaviItemClicked()), true, NavigationItemPosition::SCROLL);
 
     m_evaluateView->setObjectName("evaluateView");
     m_stackWidget->addWidget(m_evaluateView);
     m_naviInterface->addItem(m_evaluateView->objectName(), NEWFLICON(QFDIcon, Data), "评估数据分析", this,
-                             SLOT(slotNaviItemClicked()));
-
-    m_naviInterface->addSeparator();
+                             SLOT(slotNaviItemClicked()), true, NavigationItemPosition::SCROLL);
 
     m_userView->setObjectName("userView");
     m_stackWidget->addWidget(m_userView);
     m_naviInterface->addItem(m_userView->objectName(), NEWFLICON(QFDIcon, User), "用户", this,
                              SLOT(slotNaviItemClicked()), true, NavigationItemPosition::BOTTOM);
 
-    m_settingView->setObjectName("settingView");
-    m_stackWidget->addWidget(m_settingView);
-    m_naviInterface->addItem(m_settingView->objectName(), NEWFLICON(FluentIcon, SETTING), "设置", this,
-                             SLOT(slotNaviItemClicked()), true, NavigationItemPosition::BOTTOM);
-
     m_aboutView->setObjectName("aboutView");
     m_stackWidget->addWidget(m_aboutView);
     m_naviInterface->addItem(m_aboutView->objectName(), NEWFLICON(FluentIcon, INFO), "关于", this,

QFD/widgets/CreateProjWidget.cpp

@@ -272,7 +272,7 @@ void CreateProjWidget::connectSignalsAndSlots()
     connect(m_type2, &CheckBox::stateChanged, this, &CreateProjWidget::slotCheckBoxChanged);
     connect(m_type3, &CheckBox::stateChanged, this, &CreateProjWidget::slotCheckBoxChanged);
     connect(m_edit, &PushButton::clicked, this, &CreateProjWidget::slotEditClicked);
-    connect(m_confirm, &PushButton::clicked, this, &CreateProjWidget::slotCreateClicked);
+    connect(m_confirm, &PushButton::clicked, this, &CreateProjWidget::slotConfirmClicked);
     connect(m_cancel, &PushButton::clicked, this, &CreateProjWidget::slotCancelClicked);
 }
 
@@ -300,13 +300,13 @@ void CreateProjWidget::slotEditClicked()
     setMode(Update);
 }
 
-void CreateProjWidget::slotCreateClicked()
+void CreateProjWidget::slotConfirmClicked()
 {
     ProjectInfo p = editedProjInfo();
     qDebug() << __FUNCTION__ << p.taskName << p.estimateTime << p.estimateObjective << p.estimateDept
              << p.estimatePerson << p.positionalTitles << p.remark << p.projectName << p.estimateType;
 
-    emit signalCreate();
+    emit signalConfirm();
 }
 
 void CreateProjWidget::slotCancelClicked()

QFD/widgets/CreateProjWidget.h

@@ -40,7 +40,7 @@ public:
     void setProjectInfo(ProjectInfo *info);
 
 signals:
-    void signalCreate();
+    void signalConfirm();
 
 private:
     void initWindow();
@@ -53,7 +53,7 @@ private slots:
     void slotTextChanged();
     void slotCheckBoxChanged();
     void slotEditClicked();
-    void slotCreateClicked();
+    void slotConfirmClicked();
     void slotCancelClicked();
 
 private: