VirtualBox

Ignore:
Timestamp:
Nov 14, 2024 1:56:24 PM (3 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
165939
Message:

FE/Qt: ​bugref:9831. Now each wizard page can have its own help keyword enabling help viewer to navigate to page specific sections.

Location:
trunk/src/VBox/Frontends/VirtualBox/src/wizards
Files:
14 edited

Legend:

Unmodified
Added
Removed

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

    r106282 r107002  
    317317    if (iIndex > m_iLastIndex)
    318318        pPage->initializePage();
     319
     320    /* If there is a help keyword assigned to this page, use it as help keyword of this wizard. */
     321    QString strPageHelpKeyword = uiCommon().helpKeyword(pPage);
     322    if (!strPageHelpKeyword.isEmpty())
     323        uiCommon().setHelpKeyword(this, strPageHelpKeyword);
    319324
    320325    /* Disable/enable Next button: */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/UINativeWizardPage.cpp

    r106061 r107002  
    2727
    2828/* GUI includes: */
     29#include "UICommon.h"
    2930#include "UINativeWizard.h"
    3031#include "UINativeWizardPage.h"
    3132#include "UITranslationEventListener.h"
    3233
    33 UINativeWizardPage::UINativeWizardPage()
     34UINativeWizardPage::UINativeWizardPage(const QString strHelpKeyword /* = QString() */)
    3435{
    3536    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
    3637            this, &UINativeWizardPage::sltRetranslateUI);
     38    if (!strHelpKeyword.isEmpty())
     39        uiCommon().setHelpKeyword(this, strHelpKeyword);
    3740}
    3841

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/UINativeWizardPage.h

    r106061 r107002  
    5454
    5555    /** Constructs wizard page. */
    56     UINativeWizardPage();
     56    UINativeWizardPage(const QString strHelpKeyword = QString());
    5757
    5858    /** Redirects the translation call to actual handler. */

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

    r106143 r107002  
    107107        case WizardMode_Basic:
    108108        {
    109             UIWizardNewVMNameOSTypePage *pNamePage = new UIWizardNewVMNameOSTypePage;
     109            UIWizardNewVMNameOSTypePage *pNamePage = new UIWizardNewVMNameOSTypePage("create-vm-wizard-name-os" /* help keyword*/);
    110110            addPage(pNamePage);
    111111            if (!m_strInitialISOFilePath.isEmpty())
    112112                pNamePage->setISOFilePath(m_strInitialISOFilePath);
    113             m_iUnattendedInstallPageIndex = addPage(new UIWizardNewVMUnattendedPage);
     113            m_iUnattendedInstallPageIndex = addPage(new UIWizardNewVMUnattendedPage("create-vm-wizard-unattended-install"));
    114114            setUnattendedPageVisible(false);
    115             addPage(new UIWizardNewVMHardwarePage);
    116             addPage(new UIWizardNewVMDiskPage(m_pActionPool));
     115            addPage(new UIWizardNewVMHardwarePage("create-vm-wizard-hardware" /* help keyword*/));
     116            addPage(new UIWizardNewVMDiskPage(m_pActionPool, "create-vm-wizard-virtual-hard-disk" /* help keyword*/));
    117117            addPage(new UIWizardNewVMSummaryPage);
    118118            break;

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMDiskPage.cpp

    r106061 r107002  
    6767}
    6868
    69 UIWizardNewVMDiskPage::UIWizardNewVMDiskPage(UIActionPool *pActionPool)
    70     : m_pDiskSourceButtonGroup(0)
     69UIWizardNewVMDiskPage::UIWizardNewVMDiskPage(UIActionPool *pActionPool, const QString strHelpKeyword /* = QString() */)
     70    : UINativeWizardPage(strHelpKeyword)
     71    , m_pDiskSourceButtonGroup(0)
    7172    , m_pDiskEmpty(0)
    7273    , m_pDiskNew(0)

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMDiskPage.h

    r106061 r107002  
    6767public:
    6868
    69     UIWizardNewVMDiskPage(UIActionPool *pActionPool);
     69    UIWizardNewVMDiskPage(UIActionPool *pActionPool, const QString strHelpKeyword = QString());
    7070
    7171protected:

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMHardwarePage.cpp

    r106061 r107002  
    4040
    4141
    42 UIWizardNewVMHardwarePage::UIWizardNewVMHardwarePage()
    43     : m_pLabel(0)
     42UIWizardNewVMHardwarePage::UIWizardNewVMHardwarePage(const QString strHelpKeyword /* = QString() */)
     43    : UINativeWizardPage(strHelpKeyword)
     44    , m_pLabel(0)
    4445    , m_pHardwareWidgetContainer(0)
    4546{

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMHardwarePage.h

    r106061 r107002  
    4848public:
    4949
    50     UIWizardNewVMHardwarePage();
     50    UIWizardNewVMHardwarePage(const QString strHelpKeyword = QString());
    5151
    5252private slots:

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp

    r106971 r107002  
    467467}
    468468
    469 UIWizardNewVMNameOSTypePage::UIWizardNewVMNameOSTypePage()
    470     : m_pNameAndSystemLayout(0)
     469UIWizardNewVMNameOSTypePage::UIWizardNewVMNameOSTypePage(const QString strHelpKeyword /* = QString() */)
     470    : UINativeWizardPage(strHelpKeyword)
     471    , m_pNameAndSystemLayout(0)
    471472    , m_pNameAndSystemEditor(0)
    472473    , m_pSkipUnattendedCheckBox(0)

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.h

    r106061 r107002  
    6868
    6969    /** Constructor. */
    70     UIWizardNewVMNameOSTypePage();
     70    UIWizardNewVMNameOSTypePage(const QString strHelpKeyword = QString());
    7171    void setISOFilePath(const QString &strISOFilePath);
    7272

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMSummaryPage.cpp

    r106061 r107002  
    419419*********************************************************************************************************************************/
    420420
    421 UIWizardNewVMSummaryPage::UIWizardNewVMSummaryPage()
    422     : m_pLabel(0)
     421UIWizardNewVMSummaryPage::UIWizardNewVMSummaryPage(const QString strHelpKeyword /* = QString() */)
     422    : UINativeWizardPage(strHelpKeyword)
     423    , m_pLabel(0)
    423424    , m_pTree(0)
    424425{

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMSummaryPage.h

    r106061 r107002  
    4646public:
    4747
    48     UIWizardNewVMSummaryPage();
     48    UIWizardNewVMSummaryPage(const QString strHelpKeyword = QString());
    4949
    5050private slots:

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMUnattendedPage.cpp

    r106061 r107002  
    4646}
    4747
    48 UIWizardNewVMUnattendedPage::UIWizardNewVMUnattendedPage()
    49     : m_pLabel(0)
     48UIWizardNewVMUnattendedPage::UIWizardNewVMUnattendedPage(const QString strHelpKeyword /* = QString() */)
     49    : UINativeWizardPage(strHelpKeyword)
     50    , m_pLabel(0)
    5051    , m_pAdditionalOptionsContainer(0)
    5152    , m_pGAInstallationISOContainer(0)

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMUnattendedPage.h

    r106061 r107002  
    5757public:
    5858
    59     UIWizardNewVMUnattendedPage();
     59    UIWizardNewVMUnattendedPage(const QString strHelpKeyword = QString());
    6060
    6161private slots:
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette