Client: add CView::SetCurrentView

KangLin · Feb 18, 2025 · 6e9bada · 6e9bada
1 parent c771e9c
commit 6e9bada
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 12 deletions.
diff --git a/App/Client/View.h b/App/Client/View.h
@@ -34,6 +34,7 @@ class CView : public QWidget
     virtual int RemoveView(QWidget* pView) = 0;
     //! \note The return QWidget* must is same as CConnecter::GetViewer()
     virtual QWidget* GetCurrentView() = 0;
+    virtual int SetCurrentView(QWidget* pView) = 0;
     virtual void SetWidowsTitle(QWidget* pView, const QString& szTitle, const QIcon& icon, const QString& szToolTip) = 0;
     virtual int SetFullScreen(bool bFull) = 0;
     virtual QSize GetDesktopSize() = 0;

diff --git a/App/Client/ViewTable.cpp b/App/Client/ViewTable.cpp
@@ -97,7 +97,9 @@ int CViewTable::AddView(QWidget *pView)
         return -1;
     }
     //qDebug(log) << "CViewTable::AddView: Window title:" << pView->windowTitle();
-    nIndex = m_pTab->addTab(pView, pView->windowTitle());
+    nIndex = m_pTab->indexOf(pView);
+    if(-1 == nIndex)
+        nIndex = m_pTab->addTab(pView, pView->windowTitle());
     m_pTab->setCurrentIndex(nIndex);
 
     return 0;
@@ -183,6 +185,16 @@ QWidget* CViewTable::GetCurrentView()
     return pView;
 }
 
+int CViewTable::SetCurrentView(QWidget* pView)
+{
+    int nIndex = m_pTab->indexOf(pView);
+    if(-1 != nIndex) {
+        m_pTab->setCurrentIndex(nIndex);
+        return 0;
+    }
+    return -1;
+}
+
 void CViewTable::resizeEvent(QResizeEvent *event)
 {
     if(!m_pTab)

diff --git a/App/Client/ViewTable.h b/App/Client/ViewTable.h
@@ -24,6 +24,7 @@ class CViewTable : public CView
     virtual int AddView(QWidget *pView) override;
     virtual int RemoveView(QWidget *pView) override;
     virtual QWidget *GetCurrentView() override;
+    virtual int SetCurrentView(QWidget* pView);
     virtual void SetWidowsTitle(QWidget* pView, const QString& szTitle, const QIcon& icon, const QString& szToolTip) override;
     virtual int SetFullScreen(bool bFull) override;
     int ShowTabBar(bool bShow);

diff --git a/App/Client/mainwindow.cpp b/App/Client/mainwindow.cpp
@@ -622,16 +622,16 @@ int MainWindow::Connect(CConnecter *p, bool set, QString szFile)
         slotInformation(tr("Connecting to ") + p->Name());
 
     //* Show view. \see: slotConnected()
+    if(-1 < m_Connecters.indexOf(p)) {
+        m_pView->SetCurrentView(p->GetViewer());
+        return 0;
+    }
     if(m_pView)
     {
         m_pView->AddView(p->GetViewer());
         m_pView->SetWidowsTitle(p->GetViewer(), p->Name(), p->Icon(), p->Description());
         //qDebug(log) << "View:" << p->GetViewer();
     }
-
-    if(-1 < m_Connecters.indexOf(p))
-        return 0;
-
     m_Connecters.push_back(p);
     //*/
 
@@ -654,14 +654,16 @@ void MainWindow::slotConnected()
        See: Connect(CConnecter *p, bool set, QString szFile)
      */
     /*
-    if(m_pView)
-    {
-        m_pView->SetAdaptWindows(CFrmViewer::Auto, p->GetViewer());
-        m_pView->AddView(p->GetViewer());
-        m_pView->SetWidowsTitle(p->GetViewer(), p->Name(), p->Icon(), p->Description());
-    }
-    if(-1 == m_Connecters.indexOf(p))
+    if(-1 == m_Connecters.indexOf(p)) {
         m_Connecters.push_back(p);
+        if(m_pView)
+        {
+            m_pView->AddView(p->GetViewer());
+            m_pView->SetWidowsTitle(p->GetViewer(), p->Name(), p->Icon(), p->Description());
+        }
+    } else {
+        m_pView->SetCurrentView(p->GetViewer());
+    }
     //*/
 
     slotLoadConnecterMenu();

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -16,6 +16,9 @@
     - Add CConnecter::GetSettingsFile
     - Add CConnecter::SetSettingsFile
 - WakeOnLan: make singleton
+- Applation: modify interfaces
+  - CView
+    - add CView::SetCurrentView
 
 ### v0.0.32
 - Fix player menu bug

diff --git a/ChangeLog_zh_CN.md b/ChangeLog_zh_CN.md
@@ -16,6 +16,9 @@
     - 增加 CConnecter::GetSettingsFile
     - 增加 CConnecter::SetSettingsFile
 - WakeOnLan: 单个实例
+- 应用: 修改接口
+  - CView
+    - 增加 CView::SetCurrentView
 
 ### v0.0.32
 - 修复播放器菜单错误