Changeset 75272 in vbox for trunk/src

Timestamp:

Nov 6, 2018 10:56:59 AM (6 years ago)

Author:

vboxsync

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

126374

Message:

FE/Qt: bugref:6699. Handle the escape shourcut stuff during 'finalize' instead of 'prepare'

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIManagerDialog.h (modified) (1 diff)
• guestctrl/UIGuestControlFileManagerDialog.cpp (modified) (3 diffs)
• guestctrl/UIGuestControlFileManagerDialog.h (modified) (1 diff)
• logviewer/UIVMLogViewerDialog.cpp (modified) (2 diffs)
• logviewer/UIVMLogViewerDialog.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. */
-        virtual void prepare();
+        void prepare();
         /** Configures all.
           * @note Injected into prepare(), reimplement to configure all there. */

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

@@ -72 +72 @@
 }
 
-void UIGuestControlFileManagerDialog::prepare()
-{
-    QIManagerDialog::prepare();
-    manageEscapeShortCut();
-}
-
 void UIGuestControlFileManagerDialog::retranslateUi()
 {
@@ -118 +112 @@
     /* Apply language settings: */
     retranslateUi();
+    manageEscapeShortCut();
 }
 
@@ -161 +156 @@
 void UIGuestControlFileManagerDialog::sltSetCloseButtonShortCut(QKeySequence shortcut)
 {
+    printf("%s\n", qPrintable(shortcut.toString()));
     if (button(ButtonType_Close))
         button(ButtonType_Close)->setShortcut(shortcut);

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

@@ -72 +72 @@
 protected:
 
-    virtual void prepare() /* override */;
     /** @name Event-handling stuff.
       * @{ */

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

@@ -74 +74 @@
 }
 
-void UIVMLogViewerDialog::prepare()
-{
-    QIManagerDialog::prepare();
-    manageEscapeShortCut();
-}
-
 void UIVMLogViewerDialog::retranslateUi()
 {
@@ -122 +116 @@
     /* Apply language settings: */
     retranslateUi();
+    manageEscapeShortCut();
 }
 

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

@@ -78 +78 @@
 protected:
 
-    virtual void prepare() /* override */;
     /** @name Event-handling stuff.
       * @{ */