Changeset 77376 in vbox

Timestamp:

Feb 20, 2019 12:32:25 PM (6 years ago)

Author:

vboxsync

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

128924

Message:

FE/Qt: bugref:9080. Save/load dialog geometry

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (2 diffs)
• extradata/UIExtraDataManager.cpp (modified) (4 diffs)
• extradata/UIExtraDataManager.h (modified) (3 diffs)
• globals/VBoxGlobal.cpp (modified) (2 diffs)
• medium/viso/UIVisoCreator.cpp (modified) (5 diffs)
• medium/viso/UIVisoCreator.h (modified) (1 diff)

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

@@ -73 +73 @@
 const char *UIExtraDataDefs::GUI_RecentFolderCD = "GUI/RecentFolderCD";
 const char *UIExtraDataDefs::GUI_RecentFolderFD = "GUI/RecentFolderFD";
-const char *UIExtraDataDefs::GUI_RecentFolderVISOContent = "GUI/RecentFolderVISOContent";
 const char *UIExtraDataDefs::GUI_RecentListHD = "GUI/RecentListHD";
 const char *UIExtraDataDefs::GUI_RecentListCD = "GUI/RecentListCD";
 const char *UIExtraDataDefs::GUI_RecentListFD = "GUI/RecentListFD";
 
+/* Viso Creator: */
+const char *UIExtraDataDefs::GUI_VisoCreator_RecentFolder   = "GUI/VisoCreator/RecentFolder";
+const char *UIExtraDataDefs::GUI_VisoCreator_DialogGeometry = "GUI/VisoCreator/DialogGeometry";
 
 /* VirtualBox Manager: */

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

@@ -136 +136 @@
         /** Holds recent folder for floppy-disks. */
         SHARED_LIBRARY_STUFF extern const char *GUI_RecentFolderFD;
-        /** Holds recent folder for VISO creation content. */
-        SHARED_LIBRARY_STUFF extern const char *GUI_RecentFolderVISOContent;
         /** Holds the list of recently used hard-drives. */
         SHARED_LIBRARY_STUFF extern const char *GUI_RecentListHD;
@@ -144 +142 @@
         /** Holds the list of recently used floppy-disks. */
         SHARED_LIBRARY_STUFF extern const char *GUI_RecentListFD;
+    /** @} */
+
+    /** @name Settings: Viso Creator
+      * @{ */
+        /** Holds recent folder for Viso creation content. */
+        SHARED_LIBRARY_STUFF extern const char *GUI_VisoCreator_RecentFolder;
+        /** Holds dialog geometry for Viso creation dialog. */
+        SHARED_LIBRARY_STUFF extern const char *GUI_VisoCreator_DialogGeometry;
     /** @} */
 

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

@@ -1957 +1957 @@
            << GUI_ActivateHoveredMachineWindow
            << GUI_Input_SelectorShortcuts << GUI_Input_MachineShortcuts
-           << GUI_RecentFolderHD << GUI_RecentFolderCD << GUI_RecentFolderFD << GUI_RecentFolderVISOContent
+           << GUI_RecentFolderHD << GUI_RecentFolderCD << GUI_RecentFolderFD
+           << GUI_VisoCreator_RecentFolder << GUI_VisoCreator_DialogGeometry
            << GUI_RecentListHD << GUI_RecentListCD << GUI_RecentListFD
            << GUI_LastSelectorWindowPosition << GUI_SplitterSizes
@@ -2618 +2619 @@
 }
 
-QString UIExtraDataManager::recentFolderForVISOContent()
-{
-    return extraDataString(GUI_RecentFolderVISOContent);
-}
-
 void UIExtraDataManager::setRecentFolderForHardDrives(const QString &strValue)
 {
@@ -2638 +2634 @@
 }
 
-void UIExtraDataManager::setRecentFolderForVISOContent(const QString &strValue)
-{
-    setExtraDataString(GUI_RecentFolderVISOContent, strValue);
-}
-
 QStringList UIExtraDataManager::recentListOfHardDrives()
 {
@@ -2671 +2662 @@
 {
     setExtraDataStringList(GUI_RecentListFD, value);
+}
+
+QString UIExtraDataManager::visoCreatorRecentFolder()
+{
+    return extraDataString(GUI_VisoCreator_RecentFolder);
+}
+
+void UIExtraDataManager::setVisoCreatorRecentFolder(const QString &strValue)
+{
+    setExtraDataString(GUI_VisoCreator_RecentFolder, strValue);
+}
+
+QRect UIExtraDataManager::visoCreatorDialogGeometry(QWidget *pWidget, const QRect &defaultGeometry)
+{
+    return dialogGeometry(GUI_VisoCreator_DialogGeometry, pWidget, defaultGeometry);
+}
+
+void UIExtraDataManager::setVisoCreatorDialogGeometry(const QRect &geometry, bool fMaximized)
+{
+    setDialogGeometry(GUI_VisoCreator_DialogGeometry, geometry, fMaximized);
+}
+
+bool UIExtraDataManager::visoCreatorDialogShouldBeMaximized()
+{
+    /* Get corresponding extra-data: */
+    const QStringList data = extraDataStringList(GUI_VisoCreator_DialogGeometry);
+
+    /* Make sure 5th item has required value: */
+    return data.size() == 5 && data[4] == GUI_Geometry_State_Max;
 }
 

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

@@ -269 +269 @@
         /** Returns recent folder for floppy-disks. */
         QString recentFolderForFloppyDisks();
-        /** Returns recent folder for VISO creation content. */
-        QString recentFolderForVISOContent();
         /** Defines recent folder for hard-drives as @a strValue. */
         void setRecentFolderForHardDrives(const QString &strValue);
@@ -277 +275 @@
         /** Defines recent folder for floppy-disk as @a strValue. */
         void setRecentFolderForFloppyDisks(const QString &strValue);
-        /** Defines recent folder for VISO creation content as @a strValue. */
-        void setRecentFolderForVISOContent(const QString &strValue);
 
         /** Returns the list of recently used hard-drives. */
@@ -292 +288 @@
         /** Defines the list of recently used floppy-disks as @a value. */
         void setRecentListOfFloppyDisks(const QStringList &value);
+    /** @} */
+
+    /** @name Viso Creator
+      * @{ */
+        /** Returns recent folder for Viso creation content. */
+        QString visoCreatorRecentFolder();
+        /** Defines recent folder for Viso creation content as @a strValue. */
+        void setVisoCreatorRecentFolder(const QString &strValue);
+        /** Returns the Viso creation dialog geometry. */
+        QRect visoCreatorDialogGeometry(QWidget *pWidget, const QRect &defaultGeometry);
+        /** Defines the Viso creation dialog geometry. */
+        void setVisoCreatorDialogGeometry(const QRect &geometry, bool fMaximized);
+        /** Returns whether the Viso creation dialog should be maximized. */
+        bool visoCreatorDialogShouldBeMaximized();
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -2721 +2721 @@
 
     QWidget *pDialogParent = windowManager().realParentWindow(pParent);
-    QPointer<UIVisoCreator> pVisoCreator = new UIVisoCreator(pDialogParent, strMachineName);
+    UIVisoCreator *pVisoCreator = new UIVisoCreator(pDialogParent, strMachineName);
 
     if (!pVisoCreator)
         return QString();
     windowManager().registerNewParent(pVisoCreator, pDialogParent);
-    pVisoCreator->setCurrentPath(gEDataManager->recentFolderForVISOContent());
+    pVisoCreator->setCurrentPath(gEDataManager->visoCreatorRecentFolder());
 
     if (pVisoCreator->exec(false /* not application modal */))
@@ -2736 +2736 @@
 
         if (files.empty() || files[0].isEmpty())
+        {
+            delete pVisoCreator;
             return QUuid();
-
-        gEDataManager->setRecentFolderForVISOContent(pVisoCreator->currentPath());
+        }
+
+        gEDataManager->setVisoCreatorRecentFolder(pVisoCreator->currentPath());
 
         /* Produce the VISO. */

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp

@@ -24 +24 @@
 /* GUI includes: */
 #include "QIDialogButtonBox.h"
+#include "UIDesktopWidgetWatchdog.h"
+#include "UIExtraDataManager.h"
 #include "UIIconPool.h"
 #include "UIToolBar.h"
@@ -31 +33 @@
 #include "UIVisoCreatorOptionsPanel.h"
 #include "UIVisoContentBrowser.h"
-
+#include "VBoxGlobal.h"
 
 UIVisoCreator::UIVisoCreator(QWidget *pParent /* =0 */, const QString& strMachineName /* = QString() */)
@@ -55 +57 @@
 {
     m_visoOptions.m_strVisoName = !strMachineName.isEmpty() ? strMachineName : "ad-hoc";
+    loadSettings();
     prepareActions();
     prepareWidgets();
@@ -65 +68 @@
 UIVisoCreator::~UIVisoCreator()
 {
+    saveSettings();
 }
 
@@ -540 +544 @@
     m_pVerticalToolBar->addWidget(bottomSpacerWidget);
 }
+
+void UIVisoCreator::loadSettings()
+{
+    const QRect desktopRect = gpDesktop->availableGeometry(this);
+    int iDefaultWidth = desktopRect.width() / 2;
+    int iDefaultHeight = desktopRect.height() * 3 / 4;
+
+    QRect defaultGeometry(0, 0, iDefaultWidth, iDefaultHeight);
+    QWidget *pParent = qobject_cast<QWidget*>(parent());
+    if (pParent)
+        defaultGeometry.moveCenter(pParent->geometry().center());
+
+    /* Load geometry from extradata: */
+    QRect geometry = gEDataManager->visoCreatorDialogGeometry(this, defaultGeometry);
+    setDialogGeometry(geometry);
+}
+
+void UIVisoCreator::saveSettings() const
+{
+    /* Save window geometry to extradata: */
+    const QRect saveGeometry = geometry();
+#ifdef VBOX_WS_MAC
+    /* darwinIsWindowMaximized expects a non-const QWidget*. thus const_cast: */
+    QWidget *pw = const_cast<QWidget*>(qobject_cast<const QWidget*>(this));
+    gEDataManager->setVisoCreatorDialogGeometry(saveGeometry, ::darwinIsWindowMaximized(pw));
+#else /* !VBOX_WS_MAC */
+    gEDataManager->setVisoCreatorDialogGeometry(saveGeometry, isMaximized());
+#endif /* !VBOX_WS_MAC */
+}
+
+void UIVisoCreator::setDialogGeometry(const QRect &geometry)
+{
+#ifdef VBOX_WS_MAC
+    /* Use the old approach for OSX: */
+    move(geometry.topLeft());
+    resize(geometry.size());
+#else /* VBOX_WS_MAC */
+    /* Use the new approach for Windows/X11: */
+    VBoxGlobal::setTopLevelGeometry(this, geometry);
+#endif /* !VBOX_WS_MAC */
+
+    /* Maximize (if necessary): */
+    if (gEDataManager->visoCreatorDialogShouldBeMaximized())
+        showMaximized();
+}

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.h

@@ -121 +121 @@
       *  - assign it to the most recently "unhidden" panel */
     void manageEscapeShortCut();
+    void loadSettings();
+    void saveSettings() const;
+    void setDialogGeometry(const QRect &geometry);
 
     QAction              *m_pActionConfiguration;