Changeset 91713 in vbox

Timestamp:

Oct 13, 2021 12:13:47 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9974. Removing first run wizard.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (4 diffs)
• src/converter/UIConverterBackendGlobal.cpp (modified) (2 diffs)
• src/extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• src/extradata/UIExtraDataDefs.h (modified) (2 diffs)
• src/extradata/UIExtraDataManager.cpp (modified) (3 diffs)
• src/extradata/UIExtraDataManager.h (modified) (1 diff)
• src/globals/UICommon.cpp (modified) (1 diff)
• src/runtime/UISession.cpp (modified) (4 diffs)
• src/runtime/UISession.h (modified) (2 diffs)
• src/settings/UISettingsDialogSpecific.cpp (modified) (5 diffs)
• src/settings/UISettingsDialogSpecific.h (modified) (2 diffs)
• src/wizards/UINativeWizard.cpp (modified) (1 diff)
• src/wizards/UIWizard.cpp (modified) (2 diffs)
• src/wizards/firstrun (deleted)
• src/wizards/newvm/UIWizardNewVM.cpp (modified) (1 diff)

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

@@ -299 +299 @@
         ./src/wizards/exportappliance \
         ./src/wizards/importappliance \
-        ./src/wizards/firstrun \
         ./src/wizards/editors
 
@@ -742 +741 @@
         src/runtime/seamless/UIMachineWindowSeamless.h \
         src/softkeyboard/UISoftKeyboard.h \
-        src/widgets/UIMiniToolBar.h \
-        src/wizards/firstrun/UIWizardFirstRun.h \
-        src/wizards/firstrun/UIWizardFirstRunPageBasic.h
+        src/widgets/UIMiniToolBar.h
 
 ifdef VBOX_WITH_DRAG_AND_DROP
@@ -1267 +1264 @@
         src/runtime/seamless/UIMachineWindowSeamless.cpp \
         src/softkeyboard/UISoftKeyboard.cpp \
-        src/widgets/UIMiniToolBar.cpp \
-        src/wizards/firstrun/UIWizardFirstRun.cpp \
-        src/wizards/firstrun/UIWizardFirstRunPageBasic.cpp
+        src/widgets/UIMiniToolBar.cpp
 
 ifdef VBOX_WITH_DRAG_AND_DROP
@@ -1984 +1979 @@
                 wizards/clonevm \
                 wizards/exportappliance \
-                wizards/firstrun \
                 wizards/importappliance \
                 wizards/newcloudvm \

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

@@ -2073 +2073 @@
         case WizardType_NewCloudVM:      strResult = "NewCloudVM"; break;
         case WizardType_AddCloudVM:      strResult = "AddCloudVM"; break;
-        case WizardType_FirstRun:        strResult = "FirstRun"; break;
         case WizardType_NewVD:           strResult = "NewVD"; break;
         case WizardType_CloneVD:         strResult = "CloneVD"; break;
@@ -2097 +2096 @@
     keys << "NewCloudVM";      values << WizardType_NewCloudVM;
     keys << "AddCloudVM";      values << WizardType_AddCloudVM;
-    keys << "FirstRun";        values << WizardType_FirstRun;
     keys << "NewVD";           values << WizardType_NewVD;
     keys << "CloneVD";         values << WizardType_CloneVD;

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

@@ -136 +136 @@
 const char *UIExtraDataDefs::GUI_PreventReconfiguration = "GUI/PreventReconfiguration";
 const char *UIExtraDataDefs::GUI_PreventSnapshotOperations = "GUI/PreventSnapshotOperations";
-const char *UIExtraDataDefs::GUI_FirstRun = "GUI/FirstRun";
 const char *UIExtraDataDefs::GUI_MachineWindowIcons = "GUI/MachineWindowIcons";
 #ifndef VBOX_WS_MAC

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -262 +262 @@
         /** Holds whether machine snapshot operations disabled. */
         SHARED_LIBRARY_STUFF extern const char *GUI_PreventSnapshotOperations;
-        /** Holds whether this machine is first time started. */
-        SHARED_LIBRARY_STUFF extern const char *GUI_FirstRun;
         /** Except Mac OS X: Holds redefined machine-window icon names. */
         SHARED_LIBRARY_STUFF extern const char *GUI_MachineWindowIcons;
@@ -877 +875 @@
     WizardType_NewCloudVM,
     WizardType_AddCloudVM,
-    WizardType_FirstRun,
     WizardType_NewVD,
     WizardType_CloneVD

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

@@ -1929 +1929 @@
            << GUI_HideFromManager << GUI_HideDetails
            << GUI_PreventReconfiguration << GUI_PreventSnapshotOperations
-           << GUI_FirstRun
 #ifndef VBOX_WS_MAC
            << GUI_MachineWindowIcons << GUI_MachineWindowNamePostfix
@@ -3097 +3096 @@
 WizardMode UIExtraDataManager::modeForWizardType(WizardType type)
 {
-    /* Some wizard use only 'basic' mode: */
-    if (type == WizardType_FirstRun)
-        return WizardMode_Basic;
     /* Otherwise get mode from cached extra-data: */
     return extraDataStringList(GUI_HideDescriptionForWizards).contains(gpConverter->toInternalString(type))
@@ -3145 +3141 @@
     /* 'True' unless 'restriction' feature allowed: */
     return !isFeatureAllowed(GUI_PreventSnapshotOperations, uID);
-}
-
-bool UIExtraDataManager::machineFirstTimeStarted(const QUuid &uID)
-{
-    /* 'True' only if feature is allowed: */
-    return isFeatureAllowed(GUI_FirstRun, uID);
-}
-
-void UIExtraDataManager::setMachineFirstTimeStarted(bool fFirstTimeStarted, const QUuid &uID)
-{
-    /* 'True' if feature allowed, null-string otherwise: */
-    setExtraDataString(GUI_FirstRun, toFeatureAllowed(fFirstTimeStarted), uID);
 }
 

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

@@ -487 +487 @@
         /** Returns whether machine snapshot operations enabled. */
         bool machineSnapshotOperationsEnabled(const QUuid &uID);
-
-        /** Returns whether this machine is first time started. */
-        bool machineFirstTimeStarted(const QUuid &uID);
-        /** Returns whether this machine is fFirstTimeStarted. */
-        void setMachineFirstTimeStarted(bool fFirstTimeStarted, const QUuid &uID);
 
         /** Except Mac OS X: Returns redefined machine-window icon names. */

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

@@ -2235 +2235 @@
             }
         }
-        /* If mounting was successful: */
-        if (fWasMounted)
-        {
-            /* Disable First RUN Wizard: */
-            if (gEDataManager->machineFirstTimeStarted(comMachine.GetId()))
-                gEDataManager->setMachineFirstTimeStarted(false, comMachine.GetId());
-        }
     }
 

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

@@ -47 +47 @@
 #include "UIMousePointerShapeData.h"
 #include "UINotificationCenter.h"
-#include "UIWizardFirstRun.h"
 #include "UIConsoleEventHandler.h"
 #include "UIFrameBuffer.h"
@@ -169 +168 @@
         UINotificationMessage::remindAboutAutoCapture();
 
-    /* Check if we are in teleportation waiting mode.
-     * In that case no first run wizard is necessary. */
     m_machineState = machine().GetState();
-    if (   isFirstTimeStarted()
-        && !((   m_machineState == KMachineState_PoweredOff
-              || m_machineState == KMachineState_Aborted
-              || m_machineState == KMachineState_AbortedSaved
-              || m_machineState == KMachineState_Teleported)
-             && machine().GetTeleporterEnabled()))
-    {
-        UISafePointerWizard pWizard = new UIWizardFirstRun(mainMachineWindow(), machine());
-        pWizard->prepare();
-        pWizard->exec();
-        if (pWizard)
-            delete pWizard;
-    }
 
     /* Apply debug settings from the command line. */
@@ -899 +883 @@
     /* Common flags: */
     , m_fInitialized(false)
-    , m_fIsFirstTimeStarted(false)
     , m_fIsGuestResizeIgnored(false)
     , m_fIsAutoCaptureDisabled(false)
@@ -1235 +1218 @@
 #endif
 
-        /* Should the First RUN wizard be here? */
-        m_fIsFirstTimeStarted = gEDataManager->machineFirstTimeStarted(uMachineID);
-        /* Disable First RUN wizard for subsequent start anyway: */
-        if (m_fIsFirstTimeStarted)
-            gEDataManager->setMachineFirstTimeStarted(false, uMachineID);
-
         /* Should guest autoresize? */
         QAction *pGuestAutoresizeSwitch = actionPool()->action(UIActionIndexRT_M_View_T_GuestAutoresize);

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

@@ -178 +178 @@
                                     machineStatePrevious() == KMachineState_TeleportingPausedVM; }
     bool isInitialized() const { return m_fInitialized; }
-    bool isFirstTimeStarted() const { return m_fIsFirstTimeStarted; }
     bool isGuestResizeIgnored() const { return m_fIsGuestResizeIgnored; }
     bool isAutoCaptureDisabled() const { return m_fIsAutoCaptureDisabled; }
@@ -562 +561 @@
     /* Common flags: */
     bool m_fInitialized : 1;
-    bool m_fIsFirstTimeStarted : 1;
     bool m_fIsGuestResizeIgnored : 1;
     bool m_fIsAutoCaptureDisabled : 1;

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp

@@ -325 +325 @@
     , m_strCategory(strCategory)
     , m_strControl(strControl)
-    , m_fResetFirstRunFlag(false)
 {
     /* Prepare: */
@@ -469 +468 @@
         if (pSystemPage && pSystemPage->isHIDEnabled() && m_machine.GetUSBControllers().isEmpty())
             m_machine.AddUSBController("OHCI", KUSBControllerType_OHCI);
-
-        /* Disable First RUN Wizard: */
-        if (m_fResetFirstRunFlag)
-            gEDataManager->setMachineFirstTimeStarted(false, m_uMachineId);
 
         /* Save settings finally: */
@@ -565 +560 @@
     UISettingsDialog::sltMarkLoaded();
 
-    /* No need to reset 'first run' flag: */
-    m_fResetFirstRunFlag = false;
-
     /* Unlock the session if exists: */
     if (!m_session.isNull())
@@ -646 +638 @@
     /* Reload data: */
     loadOwnData();
-}
-
-void UISettingsDialogMachine::sltResetFirstRunFlag()
-{
-    m_fResetFirstRunFlag = true;
 }
 
@@ -719 +706 @@
                 {
                     pSettingsPage = new UIMachineSettingsStorage;
-                    connect(static_cast<UIMachineSettingsStorage*>(pSettingsPage), &UIMachineSettingsStorage::sigStorageChanged,
-                            this, &UISettingsDialogMachine::sltResetFirstRunFlag);
                     addItem(":/hd_32px.png", ":/hd_24px.png", ":/hd_16px.png",
                             iPageIndex, "#storage", pSettingsPage);

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h

@@ -133 +133 @@
     void sltMachineDataChanged(const QUuid &uMachineId);
 
-    /** Handles request to reset first run flag. */
-    void sltResetFirstRunFlag();
-
 private:
 
@@ -169 +166 @@
     CConsole  m_console;
 
-    /** Holds whether we have request to reset first run flag. */
-    bool  m_fResetFirstRunFlag;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/UINativeWizard.cpp

@@ -262 +262 @@
     if (iIndex == 0)
         fIsExpertButtonAvailable = true;
-    /* But first-run wizard has no such button anyway: */
-    if (m_enmType == WizardType_FirstRun)
-        fIsExpertButtonAvailable = false;
     /* Hide/show Expert button finally: */
     QPushButton *pButtonExpert = wizardButton(WizardButtonType_Expert);

trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.cpp

@@ -293 +293 @@
     if (iId == 0)
         fIsHideShowDescriptionButtonAvailable = true;
-    /* But first-run wizard has no such button anyway: */
-    if (m_enmType == WizardType_FirstRun)
-        fIsHideShowDescriptionButtonAvailable = false;
     /* Set a flag for hide/show description button finally: */
     setOption(QWizard::HaveCustomButton1, fIsHideShowDescriptionButtonAvailable);
@@ -433 +430 @@
         case WizardType_CloneVD:
             dRatio += 0.1;
-            break;
-        case WizardType_FirstRun:
-            dRatio += 0.3;
             break;
         default:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

@@ -137 +137 @@
             return false;
         }
-
-        /* Disable first run wizard for now. We will soon remove it: */
-        if (ISOFilePath().isEmpty() &&
-            !isUnattendedEnabled() &&
-            !m_virtualDisk.isNull())
-            m_machine.SetExtraData(GUI_FirstRun, "no");
     }