App: modify recent menu to add icon

Author: KangLin

App/Client/mainwindow.cpp

@@ -421,7 +421,7 @@ void MainWindow::slotInitial()
         auto recents = m_pRecentDb->GetRecents(m_Parameter.GetRecentMenuMaxCount());
         //qDebug(log) << "recents totaol:" << recents.size() << m_Parameter.GetRecentMenuMaxCount();
         for(auto it = recents.rbegin(); it != recents.rend(); it++) {
-            m_pRecentMenu->addRecentFile(it->szFile, it->szName);
+            m_pRecentMenu->addRecentFile(it->szFile, it->szName, it->icon);
         }
     }
 
@@ -939,7 +939,7 @@ int MainWindow::Start(COperate *pOperate, bool set, QString szFile)
     if(bSave)
         nRet = m_Manager.SaveOperate(pOperate);
     if(0 == nRet) {
-        m_pRecentMenu->addRecentFile(szFile, pOperate->Name());
+        m_pRecentMenu->addRecentFile(szFile, pOperate->Name(), pOperate->Icon());
         CRecentDatabase::RecentItem item;
         item.szOperateId = pOperate->Id();
         item.icon = pOperate->Icon();
@@ -1241,19 +1241,31 @@ void MainWindow::slotUpdateName(const QString& szName)
 {
     COperate* p = qobject_cast<COperate*>(sender());
     if(!p) return;
+    // Update view
     m_pView->SetWidowsTitle(p->GetViewer(), szName,
                             p->Icon(), p->Description());
+
+    // Update recent menu
+    if(m_pRecentMenu)
+        m_pRecentMenu->updateRecentFile(p->GetSettingsFile(), szName, p->Icon());
+
+    // Update recent list view dock widget
     if(m_pRecentDb) {
         m_pRecentDb->UpdateRecent(
             p->GetSettingsFile(), p->Name(), p->Description());
     }
+
+    // Update activity menu
     foreach(auto a, ui->menuActivity->actions()) {
         if(a->data().value<COperate*>() == p) {
             a->setText(szName);
             a->setIcon(p->Icon());
             break;
         }
     }
+
+    //Update activity list view dock widget
+    m_pFrmActive->slotLoad();
 }
 
 QAction* MainWindow::GetStartAction(QMenu* pMenu, CPlugin *pPlug)

Plugins/TigerVnc/Client/BackendVnc.cpp

@@ -588,7 +588,7 @@ void CBackendVnc::slotChannelError(int nErr, const QString& szErr)
 void CBackendVnc::initDone()
 {
     Q_ASSERT(m_pPara);
-    qDebug(log, "initDone:\n%s", ConnectInformation().toStdString().c_str());
+    qDebug(log, "initDone: %s", ConnectInformation().toStdString().c_str());
 
     emit sigSetDesktopSize(server.width(), server.height());
     QString szName = QString::fromUtf8(server.name());

Src/Database.cpp

@@ -24,6 +24,9 @@ CDatabase::~CDatabase()
 
 void CDatabase::SetDatabase(QSqlDatabase db)
 {
+    QString szErr = "Only one of OpenDatabase and SetDatabase can be called, and it can only be called once";
+    qCritical(log) << szErr;
+    Q_ASSERT_X(!IsOpen(), "Database", szErr.toStdString().c_str());
     m_database = db;
 }
 
@@ -47,8 +50,9 @@ bool CDatabase::OpenDatabase(const QString &connectionName, const QString &dbPat
         databasePath = dbPath;
     }
 
-    if(IsOpen())
-        CloseDatabase();
+    QString szErr = "Only one of OpenDatabase and SetDatabase can be called, and it can only be called once";
+    qCritical(log) << szErr;
+    Q_ASSERT_X(!IsOpen(), "Database", szErr.toStdString().c_str());
 
     if(!connectionName.isEmpty())
         m_szConnectName = connectionName;

Src/OperateDesktop.cpp

@@ -634,16 +634,17 @@ QString COperateDesktop::ServerName()
 
 void COperateDesktop::slotSetServerName(const QString& szName)
 {
-    if(m_szServerName == szName)
-        return;
-    
-    m_szServerName = szName;
-    if(GetParameter())
-    {
-        if(GetParameter()->GetServerName() == szName)
-            return;
-        GetParameter()->SetServerName(szName);
-    }
+    do{
+        if(m_szServerName == szName)
+            break;;
 
+        m_szServerName = szName;
+        if(GetParameter())
+        {
+            if(GetParameter()->GetServerName() == szName)
+                break;
+            GetParameter()->SetServerName(szName);
+        }
+    } while(0);
     slotUpdateName();
 }