Plugin: fix AdaptWindows in COperateDesktop bug

Author: KangLin

Src/OperateDesktop.cpp

@@ -47,7 +47,7 @@ const QString COperateDesktop::Id()
         if(!GetParameter()->m_Net.GetHost().isEmpty())
             szId += "_" + GetParameter()->m_Net.GetHost()
                     + "_" + QString::number(GetParameter()->m_Net.GetPort());
-
+        
         CParameterNet* net = nullptr;
         QString szType;
         switch(GetParameter()->m_Proxy.GetUsedType())
@@ -72,7 +72,7 @@ const QString COperateDesktop::Id()
         default:
             break;
         }
-
+        
         if(!szType.isEmpty() && !net->GetHost().isEmpty()) {
             szId += "_" + szType + "_";
             szId += net->GetHost() + "_" + QString::number(net->GetPort());
@@ -89,7 +89,7 @@ const QString COperateDesktop::Name()
     if(GetParameter() && GetParameter()->GetGlobalParameters()
         && GetParameter()->GetGlobalParameters()->GetShowProtocolPrefix())
         szName = Protocol() + ":";
-
+    
     if(GetParameter() && !(GetParameter()->GetName().isEmpty()))
         szName += GetParameter()->GetName();
     else
@@ -102,10 +102,10 @@ const QString COperateDesktop::Description()
     QString szDescription;
     if(!Name().isEmpty())
         szDescription = tr("Name: ") + Name() + "\n";
-
+    
     if(!GetTypeName().isEmpty())
         szDescription += tr("Type:") + GetTypeName() + "\n";
-
+    
     if(!Protocol().isEmpty()) {
         szDescription += tr("Protocol: ") + Protocol();
 #ifdef DEBUG
@@ -165,21 +165,21 @@ int COperateDesktop::Initial()
     qDebug(log) << Q_FUNC_INFO;
     int nRet = 0;
     bool check = false;
-
+    
     nRet = COperate::Initial();
     if(nRet)
         return nRet;
-
+    
     Q_ASSERT(!(m_pFrmViewer && m_pScroll));
     m_pFrmViewer = new CFrmViewer(); // The owner is m_pScroll
     m_pScroll = new CFrmScroll(m_pFrmViewer);
-
+    
     check = connect(m_pFrmViewer, SIGNAL(sigViewerFocusIn(QWidget*)),
                     this, SIGNAL(sigViewerFocusIn(QWidget*)));
     Q_ASSERT(check);
-
+    
     nRet = InitialMenu();
-
+    
     return nRet;
 }
 
@@ -213,6 +213,9 @@ int COperateDesktop::InitialMenu()
                     [&](){
                         m_pScroll->slotSetAdaptWindows(
                             CFrmViewer::ADAPT_WINDOWS::ZoomToWindow);
+                        if(GetParameter())
+                            GetParameter()->SetAdaptWindows(
+                                CFrmViewer::ADAPT_WINDOWS::ZoomToWindow);
                     });
     Q_ASSERT(check);
     m_pZoomAspectRatio = pMenuZoom->addAction(
@@ -223,6 +226,9 @@ int COperateDesktop::InitialMenu()
                     [&](){
                         m_pScroll->slotSetAdaptWindows(
                             CFrmViewer::ADAPT_WINDOWS::KeepAspectRationToWindow);
+                        if(GetParameter())
+                            GetParameter()->SetAdaptWindows(
+                                CFrmViewer::ADAPT_WINDOWS::KeepAspectRationToWindow);
                     });
     Q_ASSERT(check);
     m_pZoomOriginal = pMenuZoom->addAction(
@@ -232,15 +238,26 @@ int COperateDesktop::InitialMenu()
                     [&](){
                         m_pScroll->slotSetAdaptWindows(
                             CFrmViewer::ADAPT_WINDOWS::Original);
+                        if(GetParameter())
+                            GetParameter()->SetAdaptWindows(
+                                CFrmViewer::ADAPT_WINDOWS::Original);
                     });
     Q_ASSERT(check);
     m_pZoomIn = pMenuZoom->addAction(QIcon::fromTheme("zoom-in"), tr("Zoom in"));
     m_pZoomIn->setCheckable(true);
     check = connect(
         m_pZoomIn, &QAction::toggled, this,
         [&](){
-            if(m_psbZoomFactor)
-                m_psbZoomFactor->setValue((m_pFrmViewer->GetZoomFactor() + 0.1) * 100);
+            double factor = 0;
+            if(m_psbZoomFactor) {
+                factor = (m_pFrmViewer->GetZoomFactor() + 0.1) * 100;
+                m_psbZoomFactor->setValue(factor);
+            }
+            if(GetParameter()) {
+                GetParameter()->SetAdaptWindows(
+                    CFrmViewer::ADAPT_WINDOWS::Zoom);
+                GetParameter()->SetZoomFactor(factor);
+            }
         });
     Q_ASSERT(check);
     m_pZoomOut = pMenuZoom->addAction(
@@ -249,8 +266,16 @@ int COperateDesktop::InitialMenu()
     check = connect(
         m_pZoomOut, &QAction::toggled, this,
         [&](){
-            if(m_psbZoomFactor)
-                m_psbZoomFactor->setValue((m_pFrmViewer->GetZoomFactor() - 0.1) * 100);
+            double factor = 100;
+            if(m_psbZoomFactor) {
+                factor = (m_pFrmViewer->GetZoomFactor() - 0.1) * 100;
+                m_psbZoomFactor->setValue(factor);
+            }
+            if(GetParameter()) {
+                GetParameter()->SetAdaptWindows(
+                    CFrmViewer::ADAPT_WINDOWS::Zoom);
+                GetParameter()->SetZoomFactor(factor);
+            }
         });
     Q_ASSERT(check);
     QActionGroup* pGBViewZoom = new QActionGroup(this);
@@ -363,6 +388,7 @@ int COperateDesktop::SetGlobalParameters(CParameterPlugin *pPara)
                             this, SLOT(slotUpdateName()));
             Q_ASSERT(check);
         }
+        LoadAdaptWindows();
         return 0;
     } else {
         QString szMsg = "There is not parameters! "
@@ -424,25 +450,8 @@ int COperateDesktop::SetParameter(CParameterBase *p)
     return 0;
 }
 
-int COperateDesktop::Load(QSettings &set)
+int COperateDesktop::LoadAdaptWindows()
 {
-    int nRet = 0;
-    Q_ASSERT(m_pFrmViewer);
-    nRet = COperate::Load(set);
-    if(m_pPara)
-        nRet = m_pPara->Load(set);
-    else {
-        QString szMsg = "There is not parameters! "
-                        "please first create parameters, "
-                        "then call SetParameter() in the ";
-        szMsg += metaObject()->className() + QString("::")
-                 + metaObject()->className();
-        szMsg += QString("() or ") + metaObject()->className()
-                 + QString("::") + "Initial()";
-        szMsg += " to set the parameters pointer. ";
-        qWarning(log) << szMsg.toStdString().c_str();
-        Q_ASSERT(false);//TODO: delete it
-    }
     if(m_pFrmViewer && GetParameter())
     {
         m_pFrmViewer->slotSetZoomFactor(GetParameter()->GetZoomFactor());
@@ -463,6 +472,30 @@ int COperateDesktop::Load(QSettings &set)
                 m_pZoomIn->setChecked(true);
         }
     }
+    return 0;
+}
+
+int COperateDesktop::Load(QSettings &set)
+{
+    int nRet = 0;
+    Q_ASSERT(m_pFrmViewer);
+    nRet = COperate::Load(set);
+    if(m_pPara)
+        nRet = m_pPara->Load(set);
+    else {
+        QString szMsg = "There is not parameters! "
+                        "please first create parameters, "
+                        "then call SetParameter() in the ";
+        szMsg += metaObject()->className() + QString("::")
+                 + metaObject()->className();
+        szMsg += QString("() or ") + metaObject()->className()
+                 + QString("::") + "Initial()";
+        szMsg += " to set the parameters pointer. ";
+        qWarning(log) << szMsg.toStdString().c_str();
+        Q_ASSERT(false);//TODO: delete it
+    }
+    
+    LoadAdaptWindows();
     return nRet;
 }
 

Src/OperateDesktop.h

@@ -169,6 +169,9 @@ private Q_SLOTS:
     //! \~chinese \note 仅由 CBackendDesktop::SetConnect() 使用
     //! \~english \note The slot only is used by CBackendDesktop::SetConnect()
     virtual void slotSetServerName(const QString &szName);
+    
+private:
+    int LoadAdaptWindows();
 
 protected:
     QAction* m_pMenuZoom;