Index: /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 91712) +++ /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 91713) @@ -299,5 +299,4 @@ ./src/wizards/exportappliance \ ./src/wizards/importappliance \ - ./src/wizards/firstrun \ ./src/wizards/editors @@ -742,7 +741,5 @@ 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,7 +1264,5 @@ 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,5 +1979,4 @@ wizards/clonevm \ wizards/exportappliance \ - wizards/firstrun \ wizards/importappliance \ wizards/newcloudvm \ Index: /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp (revision 91712) +++ /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp (revision 91713) @@ -2073,5 +2073,4 @@ 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,5 +2096,4 @@ 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; Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp (revision 91712) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp (revision 91713) @@ -136,5 +136,4 @@ 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 Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h (revision 91712) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h (revision 91713) @@ -262,6 +262,4 @@ /** 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,5 +875,4 @@ WizardType_NewCloudVM, WizardType_AddCloudVM, - WizardType_FirstRun, WizardType_NewVD, WizardType_CloneVD Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp (revision 91712) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp (revision 91713) @@ -1929,5 +1929,4 @@ << GUI_HideFromManager << GUI_HideDetails << GUI_PreventReconfiguration << GUI_PreventSnapshotOperations - << GUI_FirstRun #ifndef VBOX_WS_MAC << GUI_MachineWindowIcons << GUI_MachineWindowNamePostfix @@ -3097,7 +3096,4 @@ 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,16 +3141,4 @@ /* '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); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h (revision 91712) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h (revision 91713) @@ -487,9 +487,4 @@ /** 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. */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp (revision 91712) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp (revision 91713) @@ -2235,11 +2235,4 @@ } } - /* If mounting was successful: */ - if (fWasMounted) - { - /* Disable First RUN Wizard: */ - if (gEDataManager->machineFirstTimeStarted(comMachine.GetId())) - gEDataManager->setMachineFirstTimeStarted(false, comMachine.GetId()); - } } Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp (revision 91712) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp (revision 91713) @@ -47,5 +47,4 @@ #include "UIMousePointerShapeData.h" #include "UINotificationCenter.h" -#include "UIWizardFirstRun.h" #include "UIConsoleEventHandler.h" #include "UIFrameBuffer.h" @@ -169,20 +168,5 @@ 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,5 +883,4 @@ /* Common flags: */ , m_fInitialized(false) - , m_fIsFirstTimeStarted(false) , m_fIsGuestResizeIgnored(false) , m_fIsAutoCaptureDisabled(false) @@ -1235,10 +1218,4 @@ #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); Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h (revision 91712) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h (revision 91713) @@ -178,5 +178,4 @@ 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,5 +561,4 @@ /* Common flags: */ bool m_fInitialized : 1; - bool m_fIsFirstTimeStarted : 1; bool m_fIsGuestResizeIgnored : 1; bool m_fIsAutoCaptureDisabled : 1; Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp (revision 91712) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp (revision 91713) @@ -325,5 +325,4 @@ , m_strCategory(strCategory) , m_strControl(strControl) - , m_fResetFirstRunFlag(false) { /* Prepare: */ @@ -469,8 +468,4 @@ 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,7 +560,4 @@ UISettingsDialog::sltMarkLoaded(); - /* No need to reset 'first run' flag: */ - m_fResetFirstRunFlag = false; - /* Unlock the session if exists: */ if (!m_session.isNull()) @@ -646,9 +638,4 @@ /* Reload data: */ loadOwnData(); -} - -void UISettingsDialogMachine::sltResetFirstRunFlag() -{ - m_fResetFirstRunFlag = true; } @@ -719,6 +706,4 @@ { pSettingsPage = new UIMachineSettingsStorage; - connect(static_cast(pSettingsPage), &UIMachineSettingsStorage::sigStorageChanged, - this, &UISettingsDialogMachine::sltResetFirstRunFlag); addItem(":/hd_32px.png", ":/hd_24px.png", ":/hd_16px.png", iPageIndex, "#storage", pSettingsPage); Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h (revision 91712) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h (revision 91713) @@ -133,7 +133,4 @@ void sltMachineDataChanged(const QUuid &uMachineId); - /** Handles request to reset first run flag. */ - void sltResetFirstRunFlag(); - private: @@ -169,6 +166,4 @@ CConsole m_console; - /** Holds whether we have request to reset first run flag. */ - bool m_fResetFirstRunFlag; }; Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/UINativeWizard.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/UINativeWizard.cpp (revision 91712) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/UINativeWizard.cpp (revision 91713) @@ -262,7 +262,4 @@ 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); Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.cpp (revision 91712) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.cpp (revision 91713) @@ -293,7 +293,4 @@ 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,7 +430,4 @@ case WizardType_CloneVD: dRatio += 0.1; - break; - case WizardType_FirstRun: - dRatio += 0.3; break; default: Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp (revision 91712) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp (revision 91713) @@ -137,10 +137,4 @@ 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"); }