Changeset 89111 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 17, 2021 4:19:16 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8161. Saving options in file manager immediately not during dtor

Location:

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl

Files:

• UIFileManager.cpp (modified) (7 diffs)
• UIFileManager.h (modified) (3 diffs)
• UIFileManagerDialog.cpp (modified) (1 diff)
• UIFileManagerDialog.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.cpp

@@ -127 +127 @@
     , m_pSessionPanel(0)
     , m_pOperationsPanel(0)
+    , m_fDialogBeingClosed(false)
 {
     loadOptions();
@@ -141 +142 @@
 UIFileManager::~UIFileManager()
 {
-    saveOptions();
     UIFileManagerOptions::destroy();
+}
+
+void UIFileManager::setDialogBeingClosed(bool fFlag)
+{
+    m_fDialogBeingClosed = fFlag;
 }
 
@@ -523 +528 @@
     if (m_pHostFileTable)
         m_pHostFileTable->optionsUpdated();
+    saveOptions();
 }
 
@@ -679 +685 @@
 void UIFileManager::saveOptions()
 {
-    /* Save a list of currently visible panels: */
-    QStringList strNameList;
-    foreach(UIDialogPanel* pPanel, m_visiblePanelsList)
-        strNameList.append(pPanel->panelName());
-    gEDataManager->setFileManagerVisiblePanels(strNameList);
     /* Save the options: */
     UIFileManagerOptions *pOptions = UIFileManagerOptions::instance();
@@ -751 +752 @@
     m_visiblePanelsList.removeAll(panel);
     manageEscapeShortCut();
+    savePanelVisibility();
 }
 
@@ -766 +768 @@
         m_visiblePanelsList.push_back(panel);
     manageEscapeShortCut();
+    savePanelVisibility();
 }
 
@@ -794 +797 @@
 }
 
+void UIFileManager::savePanelVisibility()
+{
+    if (m_fDialogBeingClosed)
+        return;
+    /* Save a list of currently visible panels: */
+    QStringList strNameList;
+    foreach(UIDialogPanel* pPanel, m_visiblePanelsList)
+        strNameList.append(pPanel->panelName());
+    gEDataManager->setFileManagerVisiblePanels(strNameList);
+}
+
 #include "UIFileManager.moc"

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.h

@@ -95 +95 @@
     ~UIFileManager();
     QMenu *menu() const;
+
+    void setDialogBeingClosed(bool fFlag);
 
 #ifdef VBOX_WS_MAC
@@ -167 +169 @@
     QStringList               getFsObjInfoStringList(const T &fsObjectInfo) const;
     void                      appendLog(const QString &strLog, FileManagerLogType eLogType);
+    void                      savePanelVisibility();
     CGuest                    m_comGuest;
     CGuestSession             m_comGuestSession;
@@ -190 +193 @@
     UIFileManagerSessionPanel          *m_pSessionPanel;
     UIFileManagerOperationsPanel       *m_pOperationsPanel;
+    bool                                m_fDialogBeingClosed;
     friend class UIFileManagerOptionsPanel;
     friend class UIFileManagerDialog;

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerDialog.cpp

@@ -64 +64 @@
     , m_strMachineName(strMachineName)
 {
+}
+
+UIFileManagerDialog::~UIFileManagerDialog()
+{
+    UIFileManager *pWidget = qobject_cast<UIFileManager*>(widget());
+    if (pWidget)
+        pWidget->setDialogBeingClosed(true);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerDialog.h

@@ -71 +71 @@
       * @param  comGuest       Passes the com-guest reference. */
     UIFileManagerDialog(QWidget *pCenterWidget, UIActionPool *pActionPool, const CGuest &comGuest, const QString &strMachineName = QString());
+    ~UIFileManagerDialog();
 
 protected: