Changeset 81228 in vbox

Timestamp:

Oct 11, 2019 2:13:21 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9080: Do not save/restore geometry for VISO creator dialog, it's inherited from QIMainDialog which isn't supposed to do that.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -82 +82 @@
 /* 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

@@ -154 +154 @@
         /** 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

@@ -1958 +1958 @@
            << GUI_Input_SelectorShortcuts << GUI_Input_MachineShortcuts
            << GUI_RecentFolderHD << GUI_RecentFolderCD << GUI_RecentFolderFD
-           << GUI_VISOCreator_RecentFolder << GUI_VISOCreator_DialogGeometry
+           << GUI_VISOCreator_RecentFolder
            << GUI_RecentListHD << GUI_RecentListCD << GUI_RecentListFD
            << GUI_RestrictedNetworkAttachmentTypes
@@ -2691 +2691 @@
 }
 
-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;
-}
-
 QRect UIExtraDataManager::selectorWindowGeometry(QWidget *pWidget)
 {

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

@@ -302 +302 @@
         /** 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/medium/viso/UIVisoCreator.cpp

@@ -60 +60 @@
 {
     m_visoOptions.m_strVisoName = !strMachineName.isEmpty() ? strMachineName : "ad-hoc";
-    loadSettings();
     prepareActions();
     prepareWidgets();
@@ -67 +66 @@
     manageEscapeShortCut();
     retranslateUi();
-}
-
-UIVisoCreator::~UIVisoCreator()
-{
-    saveSettings();
 }
 
@@ -573 +567 @@
     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: */
-    UICommon::setTopLevelGeometry(this, geometry);
-#endif /* !VBOX_WS_MAC */
-
-    /* Maximize (if necessary): */
-    if (gEDataManager->visoCreatorDialogShouldBeMaximized())
-        showMaximized();
-}

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

@@ -50 +50 @@
 
     UIVisoCreator(QWidget *pParent = 0, const QString& strMachineName = QString());
-    ~UIVisoCreator();
     /** Returns the content of the .viso file. Each element of the list corresponds to a line in the .viso file. */
     QStringList       entryList() const;
@@ -121 +120 @@
     void manageEscapeShortCut();
 
-    /** @name Save/Load dialog related extra data.
-     * @{ */
-       void loadSettings();
-       void saveSettings() const;
-    /** @} */
-    void setDialogGeometry(const QRect &geometry);
-
     /** @name Main toolbar (and main menu) actions
       * @{ */