Changeset 75268 in vbox for trunk/src

Timestamp:

Nov 6, 2018 10:10:47 AM (6 years ago)

Author:

vboxsync

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

126370

Message:

FE/Qt: bugref:6699. Make sure escape key management comes last during creration of manager dialog(s)

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIManagerDialog.h (modified) (1 diff)
• guestctrl/UIGuestControlFileManager.h (modified) (2 diffs)
• guestctrl/UIGuestControlFileManagerDialog.cpp (modified) (2 diffs)
• guestctrl/UIGuestControlFileManagerDialog.h (modified) (2 diffs)
• logviewer/UIVMLogViewerDialog.cpp (modified) (2 diffs)
• logviewer/UIVMLogViewerDialog.h (modified) (2 diffs)
• logviewer/UIVMLogViewerWidget.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.h

@@ -104 +104 @@
         /** Prepares all.
           * @note Normally you don't need to reimplement it. */
-        void prepare();
+        virtual void prepare();
         /** Configures all.
           * @note Injected into prepare(), reimplement to configure all there. */

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.h

@@ -68 +68 @@
 
 private:
+
     UIGuestControlFileManagerSettings();
     ~UIGuestControlFileManagerSettings();
@@ -170 +171 @@
     friend class UIGuestControlFileManagerSettingsPanel;
     friend class UIGuestControlFileManagerPanel;
+    friend class UIGuestControlFileManagerDialog;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerDialog.cpp

@@ -70 +70 @@
     , m_strMachineName(strMachineName)
 {
+}
+
+void UIGuestControlFileManagerDialog::prepare()
+{
+    QIManagerDialog::prepare();
+    manageEscapeShortCut();
 }
 
@@ -158 +164 @@
         button(ButtonType_Close)->setShortcut(shortcut);
 }
+
+void UIGuestControlFileManagerDialog::manageEscapeShortCut()
+{
+    UIGuestControlFileManager *pWidget = qobject_cast<UIGuestControlFileManager*>(widget());
+    if (!pWidget)
+        return;
+    pWidget->manageEscapeShortCut();
+}

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerDialog.h

@@ -72 +72 @@
 protected:
 
+    virtual void prepare() /* override */;
     /** @name Event-handling stuff.
       * @{ */
@@ -105 +106 @@
 private:
 
+    void manageEscapeShortCut();
     UIActionPool *m_pActionPool;
     CGuest      m_comGuest;

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerDialog.cpp

@@ -72 +72 @@
     , m_comMachine(comMachine)
 {
+}
+
+void UIVMLogViewerDialog::prepare()
+{
+    QIManagerDialog::prepare();
+    manageEscapeShortCut();
 }
 
@@ -174 +180 @@
         button(ButtonType_Close)->setShortcut(shortcut);
 }
+
+void UIVMLogViewerDialog::manageEscapeShortCut()
+{
+    UIVMLogViewerWidget *pWidget = qobject_cast<UIVMLogViewerWidget*>(widget());
+    if (!pWidget)
+        return;
+    pWidget->manageEscapeShortCut();
+}

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerDialog.h

@@ -78 +78 @@
 protected:
 
+    virtual void prepare() /* override */;
     /** @name Event-handling stuff.
       * @{ */
@@ -112 +113 @@
 private:
 
+    void manageEscapeShortCut();
     /** Holds the action-pool reference. */
     UIActionPool *m_pActionPool;

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.h

@@ -232 +232 @@
     friend class UIVMLogViewerSettingsPanel;
     friend class UIVMLogViewerPanel;
+    friend class UIVMLogViewerDialog;
 };