Changeset 79387 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jun 27, 2019 12:11:36 PM (6 years ago)

Author:

vboxsync

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

131626

Message:

FE/Qt: bugref:6143. Some cleanup

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -1605 +1605 @@
     /* Create the soft keyboard only once: */
     if (m_pSoftKeyboardDialog)
-        return;
-
-    UISoftKeyboard *pSoftKeyboard = new UISoftKeyboard(0, uisession(), machine().GetName());
-    // UISoftKeyboardDialogFactory dialogFactory(uisession(), actionPool(), machine().GetName());
-    // dialogFactory.prepare(pSoftKeyboardDialog, activeMachineWindow());
-    if (pSoftKeyboard)
-    {
-        //m_pSoftKeyboardDialog = pSoftKeyboardDialog;
-
-        /* Show instance: */
-        pSoftKeyboard->show();
-        // pSoftKeyboardDialog->setWindowState(pSoftKeyboardDialog->windowState() & ~Qt::WindowMinimized);
-        // pSoftKeyboardDialog->activateWindow();
-        // connect(pSoftKeyboardDialog, &QIManagerDialog::sigClose,
-        //         this, &UIMachineLogic::sltCloseSoftKeyboard);
-    }
-}
-
-void UIMachineLogic::sltCloseSoftKeyboard()
-{
-    // QIManagerDialog* pDialog = qobject_cast<QIManagerDialog*>(sender());
-    // if (m_pSoftKeyboardDialog != pDialog || !pDialog)
-    //     return;
-
-    // /* Set the m_pSoftKeyboardDialog to NULL before closing the dialog. or we will have redundant deletes*/
-    // m_pSoftKeyboardDialog = 0;
-    // pDialog->close();
-    // UISoftKeyboardDialogFactory().cleanup(pDialog);
+    {
+        m_pSoftKeyboardDialog->raise();
+        return;
+    }
+    m_pSoftKeyboardDialog = new UISoftKeyboard(0, uisession(), machine().GetName());
+    if (m_pSoftKeyboardDialog)
+    {
+        connect(m_pSoftKeyboardDialog, &QMainWindow::destroyed, this, &UIMachineLogic::sltSoftKeyboardClosed);
+        m_pSoftKeyboardDialog->show();
+    }
+}
+
+void UIMachineLogic::sltSoftKeyboardClosed()
+{
+    m_pSoftKeyboardDialog = 0;
 }
 

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

@@ -40 +40 @@
 class UIMachineView;
 class UIDockIconPreview;
+class UISoftKeyboard;
 class CSession;
 class CMachine;
@@ -266 +267 @@
     void sltShowKeyboardSettings();
     void sltShowSoftKeyboard();
-    void sltCloseSoftKeyboard();
+    void sltSoftKeyboardClosed();
     void sltToggleMouseIntegration(bool fEnabled);
     void sltTypeCAD();
@@ -438 +439 @@
     QIManagerDialog *m_pFileManagerDialog;
     QIManagerDialog *m_pProcessControlDialog;
-    QIManagerDialog *m_pSoftKeyboardDialog;
+    UISoftKeyboard  *m_pSoftKeyboardDialog;
 
     /* Friend classes: */

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

@@ -1960 +1960 @@
     QString strNewName;
     if (!newLayout.name().isEmpty())
-        strNewName= QString("%1-%2").arg(newLayout.name()).arg(tr("Copy"));
+        strNewName= QString("%1-%2").arg(newLayout.name()).arg(UISoftKeyboard::tr("Copy"));
     QString strNewNativeName;
     if (!newLayout.nativeName().isEmpty())
-        strNewNativeName= QString("%1-%2").arg(newLayout.nativeName()).arg(tr("Copy"));
+        strNewNativeName= QString("%1-%2").arg(newLayout.nativeName()).arg(UISoftKeyboard::tr("Copy"));
     newLayout.setName(strNewName);
     newLayout.setNativeName(strNewNativeName);
@@ -2829 +2829 @@
 {
     if (m_pLayoutListButton)
-        m_pLayoutListButton->setToolTip(tr("Layout List"));
+        m_pLayoutListButton->setToolTip(UISoftKeyboard::tr("Layout List"));
     if (m_pSettingsButton)
-        m_pSettingsButton->setToolTip(tr("Settings"));
+        m_pSettingsButton->setToolTip(UISoftKeyboard::tr("Settings"));
 }