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

Timestamp:

Oct 14, 2019 1:13:41 PM (6 years ago)

Author:

vboxsync

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

133953

Message:

It's too early for r133952.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/extensions/QIMainWindow.cpp (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMainWindow.cpp )
• src/extensions/QIMainWindow.h (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMainWindow.h )
• src/extradata/UIExtraDataManager.cpp (modified) (2 diffs)
• src/globals/QIWithRestorableGeometry.h (deleted)
• src/manager/UIVirtualBoxManager.cpp (modified) (5 diffs)
• src/manager/UIVirtualBoxManager.h (modified) (2 diffs)
• src/runtime/information/UIVMInformationDialog.cpp (modified) (1 diff)
• src/runtime/information/UIVMInformationDialog.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -785 +785 @@
         src/extensions/QILineEdit.h \
         src/extensions/QIMainDialog.h \
+        src/extensions/QIMainWindow.h \
         src/extensions/QIManagerDialog.h \
         src/extensions/QIMenu.h \
@@ -1266 +1267 @@
         src/extensions/QILineEdit.cpp \
         src/extensions/QIMainDialog.cpp \
+        src/extensions/QIMainWindow.cpp \
         src/extensions/QIManagerDialog.cpp \
         src/extensions/QIMenu.cpp \

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

@@ -53 +53 @@
 # include "QIDialogButtonBox.h"
 # include "QIFileDialog.h"
+# include "QIMainWindow.h"
 # include "QISplitter.h"
 # include "QIWidgetValidator.h"
-# include "QIWithRestorableGeometry.h"
 # include "VBoxUtils.h"
 # include "UIIconPool.h"
@@ -458 +458 @@
 
 
-/** QMainWindow extension
+/** QIMainWindow extension
   * providing Extra Data Manager with UI features. */
-class UIExtraDataManagerWindow : public QIWithRestorableGeometry<QMainWindow>
+class UIExtraDataManagerWindow : public QIMainWindow
 {
     Q_OBJECT;

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -128 +128 @@
     /* Ignore for non-active window except for FileOpen event which should be always processed: */
     if (!isActiveWindow() && pEvent->type() != QEvent::FileOpen)
-        return QMainWindowWithRestorableGeometryAndRetranslateUi::eventFilter(pObject, pEvent);
+        return QIWithRetranslateUI<QIMainWindow>::eventFilter(pObject, pEvent);
 
     /* Ignore for other objects: */
     if (qobject_cast<QWidget*>(pObject) &&
         qobject_cast<QWidget*>(pObject)->window() != this)
-        return QMainWindowWithRestorableGeometryAndRetranslateUi::eventFilter(pObject, pEvent);
+        return QIWithRetranslateUI<QIMainWindow>::eventFilter(pObject, pEvent);
 
     /* Which event do we have? */
@@ -150 +150 @@
 
     /* Call to base-class: */
-    return QMainWindowWithRestorableGeometryAndRetranslateUi::eventFilter(pObject, pEvent);
+    return QIWithRetranslateUI<QIMainWindow>::eventFilter(pObject, pEvent);
 }
 #endif /* VBOX_WS_MAC */
@@ -184 +184 @@
     }
     /* Call to base-class: */
-    return QMainWindowWithRestorableGeometryAndRetranslateUi::event(pEvent);
+    return QIWithRetranslateUI<QIMainWindow>::event(pEvent);
 }
 
@@ -190 +190 @@
 {
     /* Call to base-class: */
-    QMainWindowWithRestorableGeometryAndRetranslateUi::showEvent(pEvent);
+    QIWithRetranslateUI<QIMainWindow>::showEvent(pEvent);
 
     /* Is polishing required? */
@@ -211 +211 @@
 {
     /* Call to base-class: */
-    QMainWindowWithRestorableGeometryAndRetranslateUi::closeEvent(pEvent);
+    QIWithRetranslateUI<QIMainWindow>::closeEvent(pEvent);
 
     /* Quit application: */

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.h

@@ -23 +23 @@
 
 /* Qt includes: */
-#include <QMainWindow>
 #include <QUrl>
 
 /* GUI includes: */
-#include "QIWithRestorableGeometry.h"
+#include "QIMainWindow.h"
 #include "QIWithRetranslateUI.h"
 #include "UICommon.h"
@@ -40 +39 @@
 
 /* Type definitions: */
-typedef QIWithRestorableGeometry<QMainWindow> QMainWindowWithRestorableGeometry;
-typedef QIWithRetranslateUI<QMainWindowWithRestorableGeometry> QMainWindowWithRestorableGeometryAndRetranslateUi;
 typedef QMap<QString, QIManagerDialog*> VMLogViewerMap;
 
-/** Singleton QMainWindow extension used as VirtualBox Manager instance. */
-class UIVirtualBoxManager : public QMainWindowWithRestorableGeometryAndRetranslateUi
+/** Singleton QIMainWindow extension used as VirtualBox Manager instance. */
+class UIVirtualBoxManager : public QIWithRetranslateUI<QIMainWindow>
 {
     Q_OBJECT;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.cpp

@@ -79 +79 @@
 
 UIVMInformationDialog::UIVMInformationDialog(UIMachineWindow *pMachineWindow)
-    : QMainWindowWithRestorableGeometryAndRetranslateUi(0)
+    : QIWithRetranslateUI<QIMainWindow>(0)
     , m_pTabWidget(0)
     , m_pMachineWindow(pMachineWindow)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.h

@@ -22 +22 @@
 #endif
 
-/* Qt includes: */
-#include <QMainWindow>
-
 /* GUI includes: */
-#include "QIWithRestorableGeometry.h"
+#include "QIMainWindow.h"
 #include "QIWithRetranslateUI.h"
 
@@ -38 +35 @@
 class UIMachineWindow;
 
-/* Type definitions: */
-typedef QIWithRestorableGeometry<QMainWindow> QMainWindowWithRestorableGeometry;
-typedef QIWithRetranslateUI<QMainWindowWithRestorableGeometry> QMainWindowWithRestorableGeometryAndRetranslateUi;
 
-
-/** QMainWindow subclass providing user
+/** QIMainWindow subclass providing user
   * with the dialog unifying VM details and statistics. */
-class UIVMInformationDialog : public QMainWindowWithRestorableGeometryAndRetranslateUi
+class UIVMInformationDialog : public QIWithRetranslateUI<QIMainWindow>
 {
     Q_OBJECT;