Changeset 78680 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

May 23, 2019 7:11:40 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6143. Saving/loading the dialog geometry.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• src/extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• src/extradata/UIExtraDataDefs.h (modified) (1 diff)
• src/extradata/UIExtraDataManager.cpp (modified) (1 diff)
• src/extradata/UIExtraDataManager.h (modified) (1 diff)
• src/softkeyboard/UISoftKeyboard.cpp (modified) (4 diffs)
• src/softkeyboard/UISoftKeyboardDialog.cpp (modified) (4 diffs)
• xml/us_layout.xml (modified) (6 diffs)

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

@@ -204 +204 @@
 const char *UIExtraDataDefs::GUI_GuestControl_ProcessControlDialogGeometry = "GUI/GuestControl/ProcessControlDialogGeometry";
 
+/* Soft Keyboard: */
+const char *UIExtraDataDefs::GUI_SoftKeyboard_DialogGeometry = "GUI/SoftKeyboardDialogGeometry";
+
 /* File Manager options: */
 const char *UIExtraDataDefs::GUI_GuestControl_FileManagerOptions = "GUI/GuestControl/FileManagerOptions";

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

@@ -382 +382 @@
     /** @} */
 
+    /** @name Soft Keyboard related data
+      * @{ */
+        extern const char *GUI_SoftKeyboard_DialogGeometry;
+    /** @} */
+
     /** @name File Manager options
       * @{ */

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

@@ -4289 +4289 @@
 }
 
+QRect UIExtraDataManager::softKeyboardDialogGeometry(QWidget *pWidget, const QRect &defaultGeometry)
+{
+    return dialogGeometry(GUI_SoftKeyboard_DialogGeometry, pWidget, defaultGeometry);
+}
+
+void UIExtraDataManager::setSoftKeyboardDialogGeometry(const QRect &geometry, bool fMaximized)
+{
+    setDialogGeometry(GUI_SoftKeyboard_DialogGeometry, geometry, fMaximized);
+}
+
+bool UIExtraDataManager::softKeyboardDialogShouldBeMaximized()
+{
+    /* Get corresponding extra-data: */
+    const QStringList data = extraDataStringList(GUI_SoftKeyboard_DialogGeometry);
+
+    /* Make sure 5th item has required value: */
+    return data.size() == 5 && data[4] == GUI_Geometry_State_Max;
+}
+
 void UIExtraDataManager::setFileManagerOptions(bool fListDirectoriesFirst,
                                                bool fShowDeleteConfirmation,

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

@@ -669 +669 @@
         void setFileManagerVisiblePanels(const QStringList &panelNameList);
         QStringList fileManagerVisiblePanels();
+    /** @} */
+
+    /** @name Soft Keyboard
+      * @{ */
+        QRect softKeyboardDialogGeometry(QWidget *pWidget, const QRect &defaultGeometry);
+        void setSoftKeyboardDialogGeometry(const QRect &geometry, bool fMaximized);
+        bool softKeyboardDialogShouldBeMaximized();
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp

@@ -636 +636 @@
     setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
     /* Create layout: */
-
     m_pMainLayout = new QHBoxLayout(this);
     if (!m_pMainLayout)
@@ -643 +642 @@
     if (!m_pContainerWidget)
         return;
-    m_pContainerWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    //m_pContainerWidget->setStyleSheet("background-color:red;");
     m_pMainLayout->addWidget(m_pContainerWidget);
 }
@@ -720 +719 @@
 
     int y = 0;
+    int totalHeight = 0;
+    int totalWidth = 0;
     for (int i = 0; i < m_rows.size(); ++i)
     {
@@ -728 +729 @@
         pRow->setVisible(true);
         y += fMultiplier * pRow->m_iHeight;
-         pRow->updateLayout();
-    }
-    update();
+        totalWidth += fMultiplier * pRow->m_iWidth;
+        totalHeight += fMultiplier * pRow->m_iHeight;
+        pRow->updateLayout();
+    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboardDialog.cpp

@@ -109 +109 @@
     const QRect desktopRect = gpDesktop->availableGeometry(this);
     int iDefaultWidth = desktopRect.width() / 2;
-    int iDefaultHeight = desktopRect.height() * 3 / 4;
+    int iDefaultHeight = 0.5 * iDefaultWidth;
 
     QRect defaultGeometry(0, 0, iDefaultWidth, iDefaultHeight);
@@ -116 +116 @@
 
     /* Load geometry from extradata: */
-    QRect geometry = gEDataManager->guestProcessControlDialogGeometry(this, defaultGeometry);
+    QRect geometry = gEDataManager->softKeyboardDialogGeometry(this, defaultGeometry);
 
     /* Restore geometry: */
@@ -131 +131 @@
     /* darwinIsWindowMaximized expects a non-const QWidget*. thus const_cast: */
     QWidget *pw = const_cast<QWidget*>(qobject_cast<const QWidget*>(this));
-    gEDataManager->setGuestProcessControlDialogGeometry(saveGeometry, ::darwinIsWindowMaximized(pw));
+    gEDataManager->setSoftKeyboardDialogGeometry(saveGeometry, ::darwinIsWindowMaximized(pw));
 #else /* !VBOX_WS_MAC */
-    gEDataManager->setGuestProcessControlDialogGeometry(saveGeometry, isMaximized());
+    gEDataManager->setSoftKeyboardDialogGeometry(saveGeometry, isMaximized());
 #endif /* !VBOX_WS_MAC */
-    LogRel2(("GUI: Guest Process Control Dialog: Geometry saved as: Origin=%dx%d, Size=%dx%d\n",
+    LogRel2(("GUI: Soft Keyboard Dialog: Geometry saved as: Origin=%dx%d, Size=%dx%d\n",
              saveGeometry.x(), saveGeometry.y(), saveGeometry.width(), saveGeometry.height()));
 }
@@ -141 +141 @@
 bool UISoftKeyboardDialog::shouldBeMaximized() const
 {
-    return gEDataManager->guestProcessControlDialogShouldBeMaximized();
+    return gEDataManager->softKeyboardDialogShouldBeMaximized();
 }
 

trunk/src/VBox/Frontends/VirtualBox/xml/us_layout.xml

@@ -2 +2 @@
 <layout>
     <row>
-        <height>50</height>
+        <height>40</height>
         <key>
             <width>50</width>
@@ -95 +95 @@
     </row>
     <row>
-        <height>50</height>
+        <height>40</height>
         <key>
             <width>50</width>
@@ -195 +195 @@
     </row>
     <row>
-        <height>50</height>
+        <height>40</height>
         <key>
             <width>70</width>
@@ -286 +286 @@
 
     <row>
-        <height>50</height>
+        <height>40</height>
         <key>
             <width>70</width>
@@ -370 +370 @@
     </row>
     <row>
-        <height>50</height>
+        <height>40</height>
         <key>
             <width>115</width>
@@ -451 +451 @@
 
     <row>
-        <height>50</height>
+        <height>40</height>
         <key>
             <width>90</width>