App: fix save to database display bug

Author: KangLin

App/Client/ParameterApp.cpp

@@ -1,13 +1,15 @@
-#include "ParameterApp.h"
+
 #include <QSettings>
 #include <QDir>
 #include "RabbitCommonDir.h"
 #ifdef HAVE_ICE
     #include "Ice.h"
 #endif
+#include "ParameterGlobal.h"
+#include "ParameterApp.h"
 
 CParameterApp::CParameterApp(QObject *parent) : CParameter(parent, "MainWindow"),
-    m_Database(this),
+    m_pGloablParamter(nullptr),
     m_bReceiveShortCut(false),
     m_bSaveMainWindowStatus(true),
     m_ViewType(ViewType::Tab),
@@ -172,6 +174,16 @@ int CParameterApp::OnSave(QSettings &set)
     return 0;
 }
 
+CParameterGlobal* CParameterApp::GetGlobalParameters() const
+{
+    return m_pGloablParamter;
+}
+
+void CParameterApp::SetGlobalParameters(CParameterGlobal* para)
+{
+    m_pGloablParamter = para;
+}
+
 bool CParameterApp::GetReceiveShortCut() const
 {
     return m_bReceiveShortCut;

App/Client/ParameterApp.h

@@ -5,6 +5,7 @@
 #include "Parameter.h"
 #include "ParameterDatabase.h"
 
+class CParameterGlobal;
 class CParameterApp : public CParameter
 {
     Q_OBJECT
@@ -14,6 +15,11 @@ class CParameterApp : public CParameter
     virtual ~CParameterApp();
 
     CParameterDatabase m_Database;
+    CParameterGlobal* GetGlobalParameters() const;
+
+private:
+    Q_INVOKABLE void SetGlobalParameters(CParameterGlobal* pGlobal);
+    CParameterGlobal* m_pGloablParamter;
 
 protected:
     virtual int OnLoad(QSettings &set);

App/Client/Recent/RecentModel.cpp

@@ -4,6 +4,7 @@
 #include <QLoggingCategory>
 #include "RecentModel.h"
 #include "ParameterApp.h"
+#include "ParameterGlobal.h"
 
 static Q_LOGGING_CATEGORY(log, "App.Recent.Model")
 CRecentModel::CRecentModel(CParameterApp *pPara, CRecentDatabase *pDb, QObject *parent)
@@ -23,11 +24,21 @@ Qt::ItemFlags CRecentModel::flags(const QModelIndex &index) const
         return f;
 
     auto item = m_Items.at(index.row());
-    QFileInfo fi(item.GetFile());
-    if(fi.exists())
-        f |= Qt::ItemIsEnabled;
-    else
-        f &= ~Qt::ItemIsEnabled;
+    QString szFile = item.GetFile();
+    if(szFile.isEmpty()) {
+        return f;
+    }
+
+    QFileInfo fi(szFile);
+    if(m_pParameterApp->GetGlobalParameters()->GetSaveSettingsType()
+        == CParameterGlobal::SaveSettingsType::File) {
+        if(fi.exists())
+            f |= Qt::ItemIsEnabled;
+        else
+            f &= ~Qt::ItemIsEnabled;
+        return f;
+    }
+
     return f;
 }
 

App/Client/mainwindow.cpp

@@ -424,8 +424,21 @@ int MainWindow::Initial()
         }
         m_Manager.EnumPlugins(this);
 
-        if(m_Manager.GetGlobalParameters())
+        if(m_Manager.GetGlobalParameters()) {
+            //m_Parameter.SetGlobalParameters(m_Manager.GetGlobalParameters());
+            bool bRet = QMetaObject::invokeMethod(
+                &m_Parameter,
+                "SetGlobalParameters",
+                Qt::DirectConnection,
+                Q_ARG(CParameterGlobal*, m_Manager.GetGlobalParameters()));
+            if(!bRet) {
+                szErr = tr("Failed to set global parameters");
+                qCritical(log) << szErr;
+                nRet = -1;
+                break;
+            }
             m_Parameter.m_Database = m_Manager.GetGlobalParameters()->m_Database;
+        }
 
         if(m_pRecent) {
             szMsg = tr("Load list recent dock ......");

Plugins/WebBrowser/Bookmark/BookmarkDatabase.cpp

@@ -59,10 +59,13 @@ CBookmarkDatabase::~CBookmarkDatabase()
 
 bool CBookmarkDatabase::OnInitializeDatabase()
 {
+    bool bRet = false;
     m_UrlDB.SetDatabase(GetDatabase(), m_pPara);
-    m_UrlDB.OnInitializeDatabase();
+    bRet = m_UrlDB.OnInitializeDatabase();
+    if(!bRet) return false;
     m_TreeDB.SetDatabase(GetDatabase(), m_pPara);
-    m_TreeDB.OnInitializeDatabase();
+    bRet = m_TreeDB.OnInitializeDatabase();
+    if(!bRet) return false;
 
     if(m_TreeDB.GetNodeCount() == 0) {
         m_TreeDB.AddNode(tr("Bookmarks"), 0);

Plugins/WebBrowser/History/HistoryDatabase.cpp

@@ -74,7 +74,7 @@ bool CHistoryDatabase::OnInitializeDatabase()
     success = CDatabase::OnInitializeDatabase();
     if(!success) return false;
     m_UrlDB.SetDatabase(GetDatabase(), m_pPara);
-    m_UrlDB.OnInitializeDatabase();
+    success = m_UrlDB.OnInitializeDatabase();
     return success;
 }