Changeset 79641 in vbox

Timestamp:

Jul 9, 2019 12:58:12 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6143

-Checking the file size before parsing the xml files.
-Centering the keyboard to the machine window in case there are no saved geometry around

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• runtime/UIMachineLogic.cpp (modified) (1 diff)
• softkeyboard/UISoftKeyboard.cpp (modified) (6 diffs)
• softkeyboard/UISoftKeyboard.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -1609 +1609 @@
         return;
     }
-    m_pSoftKeyboardDialog = new UISoftKeyboard(0, uisession(), machine().GetName());
+    QWidget *pCenterWidget = windowManager().realParentWindow(activeMachineWindow());
+    m_pSoftKeyboardDialog = new UISoftKeyboard(0, uisession(), pCenterWidget, machine().GetName());
     if (m_pSoftKeyboardDialog)
     {

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

@@ -72 +72 @@
 const int iScrollLockPosition = 125;
 
+/** Set a generous file size limit. */
+const qint64 iFileSizeLimit = _256K;
 
 const QString strSubDirectorName("keyboardLayouts");
@@ -2316 +2318 @@
     {
         if (!msgCenter().questionBinary(this, MessageType_Question,
-                                        QString(UISoftKeyboard::tr("This will delete the keyboard layout file as well, Proceed?")),
+                                        QString(UISoftKeyboard::tr("This will delete the keyboard layout file as well. Proceed?")),
                                         0 /* auto-confirm id */,
                                         QString("Delete") /* ok button text */,
@@ -2812 +2814 @@
     QFile xmlFile(strFileName);
     if (!xmlFile.exists())
+        return false;
+
+    if (xmlFile.size() >= iFileSizeLimit)
         return false;
 
@@ -3040 +3045 @@
         return false;
 
+    if (xmlFile.size() >= iFileSizeLimit)
+        return false;
+
     if (!xmlFile.open(QIODevice::ReadOnly))
         return false;
@@ -3323 +3331 @@
 
 UISoftKeyboard::UISoftKeyboard(QWidget *pParent,
-                               UISession *pSession, QString strMachineName /* = QString()*/)
+                               UISession *pSession, QWidget *pCenterWidget, QString strMachineName /* = QString()*/)
     :QIWithRetranslateUI<QMainWindow>(pParent)
     , m_pSession(pSession)
+    , m_pCenterWidget(pCenterWidget)
     , m_pMainLayout(0)
     , m_pKeyboardWidget(0)
@@ -3632 +3641 @@
     QRect defaultGeometry(0, 0, iDefaultWidth, iDefaultHeight);
 
-    QWidget *pParentWidget = qobject_cast<QWidget*>(parent());
-    if (pParentWidget)
-        defaultGeometry.moveCenter(pParentWidget->geometry().center());
-
+
+    if (m_pCenterWidget)
+        defaultGeometry.moveCenter(m_pCenterWidget->geometry().center());
     /* Load geometry from extradata: */
     QRect geometry = gEDataManager->softKeyboardDialogGeometry(this, defaultGeometry);

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

@@ -55 +55 @@
 public:
 
-    UISoftKeyboard(QWidget *pParent, UISession *pSession,
+    UISoftKeyboard(QWidget *pParent, UISession *pSession, QWidget *pCenterWidget,
                    QString strMachineName = QString());
     ~UISoftKeyboard();
@@ -102 +102 @@
 
     UISession     *m_pSession;
+    QWidget       *m_pCenterWidget;
     QHBoxLayout   *m_pMainLayout;
     UISoftKeyboardWidget       *m_pKeyboardWidget;