Changeset 71523 in vbox

Timestamp:

Mar 27, 2018 9:52:56 AM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

121496

Message:

FE/Qt: bugref:6699: Save/load splitter sizes in guest control dialogs

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataDefs.cpp (modified) (2 diffs)
• extradata/UIExtraDataDefs.h (modified) (2 diffs)
• extradata/UIExtraDataManager.cpp (modified) (3 diffs)
• extradata/UIExtraDataManager.h (modified) (2 diffs)
• runtime/guestctrl/UIGuestControlFileManager.cpp (modified) (4 diffs)
• runtime/guestctrl/UIGuestControlFileManager.h (modified) (1 diff)
• runtime/guestctrl/UIGuestControlWidget.cpp (modified) (3 diffs)
• runtime/guestctrl/UIGuestControlWidget.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp

@@ -191 +191 @@
 const char *UIExtraDataDefs::GUI_InformationWindowGeometry = "GUI/InformationWindowGeometry";
 const char *UIExtraDataDefs::GUI_InformationWindowElements = "GUI/InformationWindowElements";
+const char *UIExtraDataDefs::GUI_GuestSessionManagerTabSplitterHints = "GUI/GuestSessionManagerTabSplitterHints";
+const char *UIExtraDataDefs::GUI_GuestFileManagerTabSplitterHints = "GUI/GuestFileManagerTabSplitterHints";
 
 /* Virtual Machine: Close dialog: */
@@ -206 +208 @@
 /* Virtual Machine: Log-viewer: */
 const char *UIExtraDataDefs::GUI_LogWindowGeometry = "GUI/LogWindowGeometry";
-

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -332 +332 @@
         /** Holds information-window elements. */
         extern const char *GUI_InformationWindowElements;
+        extern const char *GUI_GuestSessionManagerTabSplitterHints;
+        extern const char *GUI_GuestFileManagerTabSplitterHints;
     /** @} */
 
@@ -815 +817 @@
 
 #endif /* !___UIExtraDataDefs_h___ */
-

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -2027 +2027 @@
            << GUI_InformationWindowGeometry
            << GUI_InformationWindowElements
+           << GUI_GuestSessionManagerTabSplitterHints
+           << GUI_GuestFileManagerTabSplitterHints
            << GUI_DefaultCloseAction << GUI_RestrictedCloseActions
            << GUI_LastCloseAction << GUI_CloseActionHook
@@ -4056 +4058 @@
     /* Re-cache corresponding extra-data: */
     setExtraDataStringList(GUI_InformationWindowGeometry, data, strID);
+}
+
+
+void UIExtraDataManager::setGuestSessionManagerTabSplitterHints(const QList<int> &hints)
+{
+    QStringList data;
+    data << (hints.size() > 0 ? QString::number(hints[0]) : QString());
+    data << (hints.size() > 1 ? QString::number(hints[1]) : QString());
+
+    /* Re-cache corresponding extra-data: */
+    setExtraDataStringList(GUI_GuestSessionManagerTabSplitterHints, data);
+}
+
+QList<int> UIExtraDataManager::guestSessionManagerTabSplitterHints()
+{
+    /* Get corresponding extra-data: */
+    const QStringList data = extraDataStringList(GUI_GuestSessionManagerTabSplitterHints);
+
+    /* Parse loaded data: */
+    QList<int> hints;
+    hints << (data.size() > 0 ? data[0].toInt() : 0);
+    hints << (data.size() > 1 ? data[1].toInt() : 0);
+
+    /* Return hints: */
+    return hints;
+}
+
+void UIExtraDataManager::setGuestFileManagerTabSplitterHints(const QList<int> &hints)
+{
+    QStringList data;
+    data << (hints.size() > 0 ? QString::number(hints[0]) : QString());
+    data << (hints.size() > 1 ? QString::number(hints[1]) : QString());
+
+    /* Re-cache corresponding extra-data: */
+    setExtraDataStringList(GUI_GuestFileManagerTabSplitterHints, data);
+}
+
+QList<int> UIExtraDataManager::guestFileManagerTabSplitterHints()
+{
+    /* Get corresponding extra-data: */
+    const QStringList data = extraDataStringList(GUI_GuestFileManagerTabSplitterHints);
+
+    /* Parse loaded data: */
+    QList<int> hints;
+    hints << (data.size() > 0 ? data[0].toInt() : 0);
+    hints << (data.size() > 1 ? data[1].toInt() : 0);
+
+    /* Return hints: */
+    return hints;
 }
 
@@ -4578 +4629 @@
 
 #include "UIExtraDataManager.moc"
-

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

@@ -613 +613 @@
         /** Defines information-window @a elements. */
         void setInformationWindowElements(const QMap<InformationElementType, bool> &elements);
+        void setGuestSessionManagerTabSplitterHints(const QList<int> &hints);
+        void setGuestFileManagerTabSplitterHints(const QList<int> &hints);
+        QList<int> guestSessionManagerTabSplitterHints();
+        QList<int> guestFileManagerTabSplitterHints();
     /** @} */
 
@@ -747 +751 @@
 
 #endif /* !___UIExtraDataManager_h___ */
-

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestControlFileManager.cpp

@@ -282 +282 @@
     prepareConnections();
     retranslateUi();
+    loadSettings();
 }
 
@@ -290 +291 @@
     if (m_comGuestSession.isOk() && m_pQtSessionListener && m_comSessionListener.isOk())
         cleanupListener(m_pQtSessionListener, m_comSessionListener, m_comGuestSession.GetEventSource());
+    saveSettings();
 }
 
@@ -680 +682 @@
 
 template<typename T>
-QStringList   UIGuestControlFileManager::getFsObjInfoStringList(const T &fsObjectInfo) const
+QStringList UIGuestControlFileManager::getFsObjInfoStringList(const T &fsObjectInfo) const
 {
     QStringList objectInfo;
@@ -697 +699 @@
 }
 
+void UIGuestControlFileManager::saveSettings()
+{
+    if (!m_pVerticalSplitter)
+        return;
+    gEDataManager->setGuestFileManagerTabSplitterHints(m_pVerticalSplitter->sizes());
+}
+
+void UIGuestControlFileManager::loadSettings()
+{
+    if (!m_pVerticalSplitter)
+        return;
+    QList<int> splitterHints = gEDataManager->guestFileManagerTabSplitterHints();
+    if (splitterHints.size() != 2)
+        return;
+    if (splitterHints[0] != 0 && splitterHints[1] != 0)
+        m_pVerticalSplitter->setSizes(splitterHints);
+}
+
 #include "UIGuestControlFileManager.moc"

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestControlFileManager.h

@@ -94 +94 @@
     void postSessionCreated();
     void postSessionClosed();
+    void saveSettings();
+    void loadSettings();
 
     template<typename T>

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestControlWidget.cpp

@@ -179 +179 @@
     prepareConnections();
     initGuestSessionTree();
+    loadSettings();
+}
+
+UIGuestControlWidget::~UIGuestControlWidget()
+{
+    saveSettings();
 }
 
@@ -221 +227 @@
     }
 
-    m_pSplitter->setStretchFactor(0, 9);
-    m_pSplitter->setStretchFactor(1, 4);
+    m_pSplitter->setStretchFactor(0, 2);
+    m_pSplitter->setStretchFactor(1, 1);
 
     updateTreeWidget();
@@ -425 +431 @@
 }
 
+void UIGuestControlWidget::saveSettings()
+{
+    if (!m_pSplitter)
+        return;
+    gEDataManager->setGuestSessionManagerTabSplitterHints(m_pSplitter->sizes());
+}
+
+void UIGuestControlWidget::loadSettings()
+{
+    if (!m_pSplitter)
+        return;
+    QList<int> splitterHints = gEDataManager->guestSessionManagerTabSplitterHints();
+    if (splitterHints.size() != 2)
+        return;
+    if (splitterHints[0] != 0 && splitterHints[1] != 0)
+        m_pSplitter->setSizes(splitterHints);
+}
+
 #include "UIGuestControlWidget.moc"

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestControlWidget.h

@@ -48 +48 @@
 
     UIGuestControlWidget(QWidget *pParent, const CGuest &comGuest);
+    ~UIGuestControlWidget();
 
 private slots:
@@ -71 +72 @@
     void cleanupListener();
     void addGuestSession(CGuestSession guestSession);
+    void saveSettings();
+    void loadSettings();
 
     CGuest                    m_comGuest;