Changeset 91715 in vbox

Timestamp:

Oct 13, 2021 1:29:37 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9974. Renaming UIBootTimeError dialog.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/runtime/UIBootFailureDialog.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIBootTimeErrorDialog.cpp ) (10 diffs)
• src/runtime/UIBootFailureDialog.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIBootTimeErrorDialog.h ) (5 diffs)
• src/runtime/UIMachineLogic.cpp (modified) (3 diffs)

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

@@ -694 +694 @@
 VirtualBoxVM_QT_MOCHDRS = \
         src/globals/UIStarter.h \
-        src/runtime/UIBootTimeErrorDialog.h \
+        src/runtime/UIBootFailureDialog.h \
         src/runtime/UIConsoleEventHandler.h \
         src/runtime/UIFrameBuffer.h \
@@ -1215 +1215 @@
         src/main.cpp \
         src/globals/UIStarter.cpp \
-        src/runtime/UIBootTimeErrorDialog.cpp \
+        src/runtime/UIBootFailureDialog.cpp \
         src/runtime/UIConsoleEventHandler.cpp \
         src/runtime/UIFrameBuffer.cpp \

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

@@ -33 +33 @@
 
 #include "UIFilePathSelector.h"
-#include "UIBootTimeErrorDialog.h"
+#include "UIBootFailureDialog.h"
 
 #include "UIIconPool.h"
@@ -43 +43 @@
 #include "CStorageController.h"
 
-UIBootTimeErrorDialog::UIBootTimeErrorDialog(QWidget *pParent, const CMachine &comMachine)
+UIBootFailureDialog::UIBootFailureDialog(QWidget *pParent, const CMachine &comMachine)
     :QIWithRetranslateUI<QIMainDialog>(pParent)
     , m_pParent(pParent)
@@ -59 +59 @@
 }
 
-QString UIBootTimeErrorDialog::bootMediumPath() const
+QString UIBootFailureDialog::bootMediumPath() const
 {
     if (!m_pBootImageSelector)
@@ -66 +66 @@
 }
 
-void UIBootTimeErrorDialog::retranslateUi()
+void UIBootFailureDialog::retranslateUi()
 {
     if (m_pCloseButton)
@@ -81 +81 @@
 }
 
-void UIBootTimeErrorDialog::configure()
+void UIBootFailureDialog::configure()
 {
     setWindowIcon(UIIconPool::iconSetFull(":/media_manager_32px.png", ":/media_manager_16px.png"));
@@ -89 +89 @@
 }
 
-void UIBootTimeErrorDialog::prepareConnections()
+void UIBootFailureDialog::prepareConnections()
 {
     if (m_pCloseButton)
-        connect(m_pCloseButton, &QPushButton::clicked, this, &UIBootTimeErrorDialog::sltCancel);
+        connect(m_pCloseButton, &QPushButton::clicked, this, &UIBootFailureDialog::sltCancel);
     if (m_pResetButton)
-        connect(m_pResetButton, &QPushButton::clicked, this, &UIBootTimeErrorDialog::sltReset);
-}
-
-void UIBootTimeErrorDialog::prepareWidgets()
+        connect(m_pResetButton, &QPushButton::clicked, this, &UIBootFailureDialog::sltReset);
+}
+
+void UIBootFailureDialog::prepareWidgets()
 {
     m_pCentralWidget = new QWidget;
@@ -132 +132 @@
         pSelectorLayout->addWidget(m_pBootImageSelector);
         connect(m_pBootImageSelector, &UIFilePathSelector::pathChanged,
-                this, &UIBootTimeErrorDialog::sltFileSelectorPathChanged);
+                this, &UIBootFailureDialog::sltFileSelectorPathChanged);
     }
     m_pMainLayout->addLayout(pSelectorLayout);
@@ -148 +148 @@
 }
 
-void UIBootTimeErrorDialog::sltCancel()
+void UIBootFailureDialog::sltCancel()
 {
     done(static_cast<int>(ReturnCode_Close));
 }
 
-void UIBootTimeErrorDialog::sltReset()
+void UIBootFailureDialog::sltReset()
 {
     done(static_cast<int>(ReturnCode_Reset));
 }
 
-void UIBootTimeErrorDialog::showEvent(QShowEvent *pEvent)
+void UIBootFailureDialog::showEvent(QShowEvent *pEvent)
 {
     Q_UNUSED(pEvent);
@@ -187 +187 @@
 }
 
-void UIBootTimeErrorDialog::setTitle()
-{
-}
-
-bool UIBootTimeErrorDialog::insertBootMedium(const QUuid &uMediumId)
+void UIBootFailureDialog::setTitle()
+{
+}
+
+bool UIBootFailureDialog::insertBootMedium(const QUuid &uMediumId)
 {
     AssertReturn(!uMediumId.isNull(), false);
@@ -243 +243 @@
 }
 
-void UIBootTimeErrorDialog::sltFileSelectorPathChanged(const QString &strPath)
+void UIBootFailureDialog::sltFileSelectorPathChanged(const QString &strPath)
 {
     insertBootMedium(uiCommon().openMedium(UIMediumDeviceType_DVD, strPath));

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIBootTimeErrorDialog class declaration.
+ * VBox Qt GUI - UIBootFailureDialog class declaration.
  */
 
@@ -16 +16 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_runtime_UIBootTimeErrorDialog_h
-#define FEQT_INCLUDED_SRC_runtime_UIBootTimeErrorDialog_h
+#ifndef FEQT_INCLUDED_SRC_runtime_UIBootFailureDialog_h
+#define FEQT_INCLUDED_SRC_runtime_UIBootFailureDialog_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -41 +41 @@
 
 /** QIDialog extension providing GUI with a dialog to select an existing medium. */
-class UIBootTimeErrorDialog : public QIWithRetranslateUI<QIMainDialog>
+class UIBootFailureDialog : public QIWithRetranslateUI<QIMainDialog>
 {
 
@@ -57 +57 @@
     };
 
-    UIBootTimeErrorDialog(QWidget *pParent, const CMachine &comMachine);
+    UIBootFailureDialog(QWidget *pParent, const CMachine &comMachine);
     QString bootMediumPath() const;
 
@@ -103 +103 @@
 };
 
-#endif /* !FEQT_INCLUDED_SRC_runtime_UIBootTimeErrorDialog_h */
+#endif /* !FEQT_INCLUDED_SRC_runtime_UIBootFailureDialog_h */

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

@@ -34 +34 @@
 #include "UIActionPoolRuntime.h"
 #include "UIAddDiskEncryptionPasswordDialog.h"
-#include "UIBootTimeErrorDialog.h"
+#include "UIBootFailureDialog.h"
 #include "UICommon.h"
 #include "UIConverter.h"
@@ -3259 +3259 @@
 {
     QWidget *pParent = windowManager().realParentWindow(activeMachineWindow());
-    UIBootTimeErrorDialog *pBootFailureDialog = new UIBootTimeErrorDialog(pParent, machine());
+    UIBootFailureDialog *pBootFailureDialog = new UIBootFailureDialog(pParent, machine());
     AssertPtrReturnVoid(pBootFailureDialog);
     connect(actionPool()->action(UIActionIndexRT_M_Machine_S_Reset), &UIAction::triggered,
@@ -3269 +3269 @@
     delete pBootFailureDialog;
 
-    if (iResult == static_cast<int>(UIBootTimeErrorDialog::ReturnCode_Reset))
+    if (iResult == static_cast<int>(UIBootFailureDialog::ReturnCode_Reset))
         sltReset(false);
 }