VirtualBox

Ignore:
Timestamp:
Oct 24, 2010 3:57:55 PM (15 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
66973
Message:

VRDE: API changes for the VRDP server separation.

Location:
trunk/src/VBox/Frontends/VirtualBox/src
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMInformationDlg.cpp

    r31436 r33386  
    475475        else
    476476            osType = vboxGlobal().vmGuestOSTypeDescription (osType);
    477         int vrdpPort = console.GetRemoteDisplayInfo().GetPort();
    478         QString vrdpInfo = (vrdpPort == 0 || vrdpPort == -1)?
    479             tr ("Not Available", "details report (VRDP server port)") :
    480             QString ("%1").arg (vrdpPort);
     477        int vrdePort = console.GetVRDEServerInfo().GetPort();
     478        QString vrdeInfo = (vrdePort == 0 || vrdePort == -1)?
     479            tr ("Not Available", "details report (VRDE server port)") :
     480            QString ("%1").arg (vrdePort);
    481481
    482482        /* Searching for longest string */
    483483        QStringList valuesList;
    484         valuesList << resolution << virtualization << nested << addVersionStr << osType << vrdpInfo;
     484        valuesList << resolution << virtualization << nested << addVersionStr << osType << vrdeInfo;
    485485        int maxLength = 0;
    486486        foreach (const QString &value, valuesList)
    … …  
    494494        result += formatValue (tr ("Guest Additions"), addVersionStr, maxLength);
    495495        result += formatValue (tr ("Guest OS Type"), osType, maxLength);
    496         result += formatValue (VBoxGlobal::tr ("Remote Display Server Port", "details report (VRDP Server)"), vrdpInfo, maxLength);
     496        result += formatValue (VBoxGlobal::tr ("Remote Desktop Server Port", "details report (VRDE Server)"), vrdeInfo, maxLength);
    497497        result += paragraph;
    498498    }

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.cpp

    r31813 r33386  
    172172        /* Not used *
    173173        case KVBoxEventType_OnCPUChange:
    174         case KVBoxEventType_OnVRDPServerChange:
    175         case KVBoxEventType_OnRemoteDisplayInfoChange:
     174        case KVBoxEventType_OnVRDEServerChange:
     175        case KVBoxEventType_OnVRDEServerInfoChange:
    176176         */
    177177        case KVBoxEventType_OnUSBControllerChanged:

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

    r33294 r33386  
    16571657
    16581658        /* VRDP tab */
    1659         CVRDPServer srv = aMachine.GetVRDPServer();
     1659        CVRDEServer srv = aMachine.GetVRDEServer();
    16601660        if (!srv.isNull())
    16611661        {
    16621662            if (srv.GetEnabled())
    16631663                item += QString (sSectionItemTpl2)
    1664                         .arg (tr ("Remote Display Server Port", "details report (VRDP Server)"))
    1665                         .arg (srv.GetPorts());
     1664                        .arg (tr ("Remote Desktop Server Port", "details report (VRDE Server)"))
     1665                        .arg (srv.GetVRDEProperty("TCP/Ports"));
    16661666            else
    16671667                item += QString (sSectionItemTpl2)
    1668                         .arg (tr ("Remote Display Server", "details report (VRDP Server)"))
    1669                         .arg (tr ("Disabled", "details report (VRDP Server)"));
     1668                        .arg (tr ("Remote Desktop Server", "details report (VRDE Server)"))
     1669                        .arg (tr ("Disabled", "details report (VRDE Server)"));
    16701670            ++ rows;
    16711671        }
    … …  
    27022702    mDiskTypes_Differencing =                   tr ("Differencing", "DiskType");
    27032703
    2704     mVRDPAuthTypes [KVRDPAuthType_Null] =       tr ("Null", "VRDPAuthType");
    2705     mVRDPAuthTypes [KVRDPAuthType_External] =   tr ("External", "VRDPAuthType");
    2706     mVRDPAuthTypes [KVRDPAuthType_Guest] =      tr ("Guest", "VRDPAuthType");
     2704    mAuthTypes [KAuthType_Null] =       tr ("Null", "AuthType");
     2705    mAuthTypes [KAuthType_External] =   tr ("External", "AuthType");
     2706    mAuthTypes [KAuthType_Guest] =      tr ("Guest", "AuthType");
    27072707
    27082708    mPortModeTypes [KPortMode_Disconnected] =   tr ("Disconnected", "PortMode");

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

    r32741 r33386  
    317317    }
    318318
    319     QString toString (KVRDPAuthType t) const
    320     {
    321         AssertMsg (!mVRDPAuthTypes.value (t).isNull(), ("No text for %d", t));
    322         return mVRDPAuthTypes.value (t);
     319    QString toString (KAuthType t) const
     320    {
     321        AssertMsg (!mAuthTypes.value (t).isNull(), ("No text for %d", t));
     322        return mAuthTypes.value (t);
    323323    }
    324324
    … …  
    365365    }
    366366
    367     KVRDPAuthType toVRDPAuthType (const QString &s) const
    368     {
    369         QULongStringHash::const_iterator it =
    370             qFind (mVRDPAuthTypes.begin(), mVRDPAuthTypes.end(), s);
    371         AssertMsg (it != mVRDPAuthTypes.end(), ("No value for {%s}",
     367    KAuthType toAuthType (const QString &s) const
     368    {
     369        QULongStringHash::const_iterator it =
     370            qFind (mAuthTypes.begin(), mAuthTypes.end(), s);
     371        AssertMsg (it != mAuthTypes.end(), ("No value for {%s}",
    372372                                                s.toLatin1().constData()));
    373         return KVRDPAuthType (it.key());
     373        return KAuthType (it.key());
    374374    }
    375375
    … …  
    797797    QString mDiskTypes_Differencing;
    798798
    799     QULongStringHash mVRDPAuthTypes;
     799    QULongStringHash mAuthTypes;
    800800    QULongStringHash mPortModeTypes;
    801801    QULongStringHash mUSBFilterActionTypes;

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionsPool.cpp

    r31286 r33386  
    796796};
    797797
    798 class ToggleVRDPAction : public UIToggleAction
    799 {
    800     Q_OBJECT;
    801 
    802 public:
    803 
    804     ToggleVRDPAction(QObject *pParent)
     798class ToggleVRDEServerAction : public UIToggleAction
     799{
     800    Q_OBJECT;
     801
     802public:
     803
     804    ToggleVRDEServerAction(QObject *pParent)
    805805        : UIToggleAction(pParent,
    806806                         ":/vrdp_on_16px.png", ":/vrdp_16px.png",
    … …  
    11971197    m_actionsPool[UIActionIndex_Simple_NetworkAdaptersDialog] = new ShowNetworkAdaptersDialogAction(this);
    11981198    m_actionsPool[UIActionIndex_Simple_SharedFoldersDialog] = new ShowSharedFoldersDialogAction(this);
    1199     m_actionsPool[UIActionIndex_Toggle_VRDP] = new ToggleVRDPAction(this);
     1199    m_actionsPool[UIActionIndex_Toggle_VRDEServer] = new ToggleVRDEServerAction(this);
    12001200    m_actionsPool[UIActionIndex_Simple_InstallGuestTools] = new PerformInstallGuestToolsAction(this);
    12011201

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionsPool.h

    r30753 r33386  
    8282    UIActionIndex_Menu_SharedFolders,
    8383    UIActionIndex_Simple_SharedFoldersDialog,
    84     UIActionIndex_Toggle_VRDP,
     84    UIActionIndex_Toggle_VRDEServer,
    8585    UIActionIndex_Simple_InstallGuestTools,
    8686

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp

    r31698 r33386  
    479479};
    480480
    481 class UIIndicatorVRDPDisks : public QIWithRetranslateUI<QIStateIndicator>
    482 {
    483     Q_OBJECT;
    484 
    485 public:
    486 
    487     UIIndicatorVRDPDisks(CSession &session)
     481class UIIndicatorVRDEDisks : public QIWithRetranslateUI<QIStateIndicator>
     482{
     483    Q_OBJECT;
     484
     485public:
     486
     487    UIIndicatorVRDEDisks(CSession &session)
    488488      : QIWithRetranslateUI<QIStateIndicator>()
    489489      , m_session(session)
    … …  
    502502    void updateAppearance()
    503503    {
    504         const CVRDPServer &vrdpsrv = m_session.GetMachine().GetVRDPServer();
    505         if (!vrdpsrv.isNull())
     504        CVRDEServer &srv = m_session.GetMachine().GetVRDEServer();
     505        if (!srv.isNull())
    506506        {
    507507            /* update menu&status icon state */
    508             bool fVRDPEnabled = vrdpsrv.GetEnabled();
    509 
    510             setState(fVRDPEnabled ? KDeviceActivity_Idle : KDeviceActivity_Null);
    511 
    512             QString tip = QApplication::translate("UIIndicatorsPool", "Indicates whether the Remote Display (VRDP Server) "
     508            bool fEnabled = srv.GetEnabled();
     509
     510            setState(fEnabled ? KDeviceActivity_Idle : KDeviceActivity_Null);
     511
     512            QString tip = QApplication::translate("UIIndicatorsPool", "Indicates whether the Remote Desktop Server "
    513513                             "is enabled (<img src=:/vrdp_16px.png/>) or not "
    514514                             "(<img src=:/vrdp_disabled_16px.png/>).");
    515             if (vrdpsrv.GetEnabled())
    516                 tip += QApplication::translate("UIIndicatorsPool", "<hr>The VRDP Server is listening on port %1").arg(vrdpsrv.GetPorts());
     515            if (srv.GetEnabled())
     516                tip += QApplication::translate("UIIndicatorsPool", "<hr>The Remote Desktop Server is listening on port %1").arg(srv.GetVRDEProperty("TCP/Ports"));
    517517            setToolTip(tip);
    518518        }

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

    r33300 r33386  
    497497    connect(actionsPool()->action(UIActionIndex_Simple_SharedFoldersDialog), SIGNAL(triggered()),
    498498            this, SLOT(sltOpenSharedFoldersDialog()));
    499     connect(actionsPool()->action(UIActionIndex_Toggle_VRDP), SIGNAL(toggled(bool)),
    500             this, SLOT(sltSwitchVrdp(bool)));
     499    connect(actionsPool()->action(UIActionIndex_Toggle_VRDEServer), SIGNAL(toggled(bool)),
     500            this, SLOT(sltSwitchVrde(bool)));
    501501    connect(actionsPool()->action(UIActionIndex_Simple_InstallGuestTools), SIGNAL(triggered()),
    502502            this, SLOT(sltInstallGuestAdditions()));
    … …  
    562562    m_pRunningOrPausedActions->addAction(actionsPool()->action(UIActionIndex_Menu_SharedFolders));
    563563    m_pRunningOrPausedActions->addAction(actionsPool()->action(UIActionIndex_Simple_SharedFoldersDialog));
    564     m_pRunningOrPausedActions->addAction(actionsPool()->action(UIActionIndex_Toggle_VRDP));
     564    m_pRunningOrPausedActions->addAction(actionsPool()->action(UIActionIndex_Toggle_VRDEServer));
    565565    m_pRunningOrPausedActions->addAction(actionsPool()->action(UIActionIndex_Simple_InstallGuestTools));
    566566}
    … …  
    14421442}
    14431443
    1444 void UIMachineLogic::sltSwitchVrdp(bool fOn)
    1445 {
    1446     /* Enable VRDP server if possible: */
    1447     CVRDPServer server = session().GetMachine().GetVRDPServer();
    1448     AssertMsg(!server.isNull(), ("VRDP server should not be null!\n"));
     1444void UIMachineLogic::sltSwitchVrde(bool fOn)
     1445{
     1446    /* Enable VRDE server if possible: */
     1447    CVRDEServer server = session().GetMachine().GetVRDEServer();
     1448    AssertMsg(!server.isNull(), ("VRDE server should not be null!\n"));
    14491449    server.SetEnabled(fOn);
    14501450}

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

    r30936 r33386  
    175175    void sltOpenNetworkAdaptersDialog();
    176176    void sltOpenSharedFoldersDialog();
    177     void sltSwitchVrdp(bool fOn);
     177    void sltSwitchVrde(bool fOn);
    178178    void sltInstallGuestAdditions();
    179179

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp

    r32741 r33386  
    186186    pMenu->addAction(pActionsPool->action(UIActionIndex_Simple_SharedFoldersDialog));
    187187    pMenu->addSeparator();
    188     pMenu->addAction(pActionsPool->action(UIActionIndex_Toggle_VRDP));
     188    pMenu->addAction(pActionsPool->action(UIActionIndex_Toggle_VRDEServer));
    189189    pMenu->addSeparator();
    190190    pMenu->addAction(pActionsPool->action(UIActionIndex_Simple_InstallGuestTools));

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

    r33140 r33386  
    582582    /* Availability settings: */
    583583    {
    584         /* VRDP Stuff: */
    585         CVRDPServer vrdpServer = machine.GetVRDPServer();
    586         if (vrdpServer.isNull())
    587         {
    588             /* Hide VRDP Action: */
    589             uimachine()->actionsPool()->action(UIActionIndex_Toggle_VRDP)->setVisible(false);
     584        /* VRDE Stuff: */
     585        CVRDEServer server = machine.GetVRDEServer();
     586        if (server.isNull())
     587        {
     588            /* Hide VRDE Action: */
     589            uimachine()->actionsPool()->action(UIActionIndex_Toggle_VRDEServer)->setVisible(false);
    590590        }
    591591        else
    592592        {
    593             /* Check/Uncheck VRDP action depending on VRDP server status: */
    594             uimachine()->actionsPool()->action(UIActionIndex_Toggle_VRDP)->setChecked(vrdpServer.GetEnabled());
     593            /* Check/Uncheck VRDE action depending on VRDE server status: */
     594            uimachine()->actionsPool()->action(UIActionIndex_Toggle_VRDEServer)->setChecked(server.GetEnabled());
    595595        }
    596596    }

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

    r32086 r33386  
    5353    UIConsoleEventType_MediumChange,
    5454    /* Not used: UIConsoleEventType_CPUChange, */
    55     UIConsoleEventType_VRDPServerChange,
    56     UIConsoleEventType_RemoteDisplayInfoChange,
     55    UIConsoleEventType_VRDEServerChange,
     56    UIConsoleEventType_VRDEServerInfoChange,
    5757    UIConsoleEventType_USBControllerChange,
    5858    UIConsoleEventType_USBDeviceStateChange,

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp

    r32760 r33386  
    586586                item += sSectionItemTpl2.arg(tr("Acceleration", "details report"), accel.join(", "));
    587587
    588             /* VRDP tab */
    589             const CVRDPServer &srv = m_machine.GetVRDPServer();
     588            /* VRDE tab */
     589            CVRDEServer &srv = m_machine.GetVRDEServer();
    590590            if (!srv.isNull())
    591591            {
    592592                if (srv.GetEnabled())
    593593                    item += QString(sSectionItemTpl2)
    594                         .arg(tr("Remote Display Server Port", "details report (VRDP Server)"))
    595                         .arg(srv.GetPorts());
     594                        .arg(tr("Remote Desktop Server Port", "details report (VRDE Server)"))
     595                        .arg(srv.GetVRDEProperty("TCP/Ports"));
    596596                else
    597597                    item += QString(sSectionItemTpl2)
    598                         .arg(tr("Remote Display Server", "details report (VRDP Server)"))
    599                         .arg(tr("Disabled", "details report (VRDP Server)"));
     598                        .arg(tr("Remote Desktop Server", "details report (VRDE Server)"))
     599                        .arg(tr("Disabled", "details report (VRDE Server)"));
    600600            }
    601601

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/VBoxGLSettingsGeneral.cpp

    r33238 r33386  
    6161{
    6262    mPsMach->setPath (aProps.GetDefaultMachineFolder());
    63     mPsVRDP->setPath (aProps.GetRemoteDisplayAuthLibrary());
     63    mPsVRDP->setPath (aProps.GetVRDEAuthLibrary());
    6464    mCbCheckTrayIcon->setChecked (aGs.trayIconEnabled());
    6565#ifdef Q_WS_MAC
    … …  
    7575        aProps.SetDefaultMachineFolder (mPsMach->path());
    7676    if (aProps.isOk() && mPsVRDP->isModified())
    77         aProps.SetRemoteDisplayAuthLibrary (mPsVRDP->path());
     77        aProps.SetVRDEAuthLibrary (mPsVRDP->path());
    7878    aGs.setTrayIconEnabled (mCbCheckTrayIcon->isChecked());
    7979#ifdef Q_WS_MAC

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsDisplay.cpp

    r32510 r33386  
    6666    mLeMemory->setValidator (new QIntValidator (m_minVRAM, m_maxVRAMVisible, this));
    6767    mLeMonitors->setValidator (new QIntValidator (MinMonitors, MaxMonitors, this));
    68     mLeVRDPPort->setValidator (new QRegExpValidator (QRegExp ("(([0-9]{1,5}(\\-[0-9]{1,5}){0,1}),)*([0-9]{1,5}(\\-[0-9]{1,5}){0,1})"), this));
    69     mLeVRDPTimeout->setValidator (new QIntValidator (this));
     68    mLeVRDEPort->setValidator (new QRegExpValidator (QRegExp ("(([0-9]{1,5}(\\-[0-9]{1,5}){0,1}),)*([0-9]{1,5}(\\-[0-9]{1,5}){0,1})"), this));
     69    mLeVRDETimeout->setValidator (new QIntValidator (this));
    7070
    7171    /* Setup connections */
    … …  
    101101    valueChangedVRAM (mSlMemory->value());
    102102    valueChangedMonitors (mSlMonitors->value());
    103     /* Setup VRDP widget */
    104     mCbVRDPMethod->insertItem (0, ""); /* KVRDPAuthType_Null */
    105     mCbVRDPMethod->insertItem (1, ""); /* KVRDPAuthType_External */
    106     mCbVRDPMethod->insertItem (2, ""); /* KVRDPAuthType_Guest */
     103    /* Setup VRDE widget */
     104    mCbVRDEMethod->insertItem (0, ""); /* KAuthType_Null */
     105    mCbVRDEMethod->insertItem (1, ""); /* KAuthType_External */
     106    mCbVRDEMethod->insertItem (2, ""); /* KAuthType_Guest */
    107107    /* Initially disabled */
    108     mCbVRDP->setChecked (false);
     108    mCbVRDE->setChecked (false);
    109109
    110110    mCb3D->setEnabled (false);
    … …  
    153153#endif
    154154
    155     /* VRDP Settings */
    156     CVRDPServer vrdp = mMachine.GetVRDPServer();
    157     if (!vrdp.isNull())
    158     {
    159         mCbVRDP->setChecked (vrdp.GetEnabled());
    160         mLeVRDPPort->setText (vrdp.GetPorts());
    161         mCbVRDPMethod->setCurrentIndex (mCbVRDPMethod->
    162                                         findText (vboxGlobal().toString (vrdp.GetAuthType())));
    163         mLeVRDPTimeout->setText (QString::number (vrdp.GetAuthTimeout()));
    164         mCbMultipleConn->setChecked(vrdp.GetAllowMultiConnection());
     155    /* Remote Desktop Settings */
     156    CVRDEServer vrdeServer = mMachine.GetVRDEServer();
     157    if (!vrdeServer.isNull())
     158    {
     159        mCbVRDE->setChecked (vrdeServer.GetEnabled());
     160        mLeVRDEPort->setText (vrdeServer.GetVRDEProperty("TCP/Ports"));
     161        mCbVRDEMethod->setCurrentIndex (mCbVRDEMethod->
     162                                        findText (vboxGlobal().toString (vrdeServer.GetAuthType())));
     163        mLeVRDETimeout->setText (QString::number (vrdeServer.GetAuthTimeout()));
     164        mCbMultipleConn->setChecked(vrdeServer.GetAllowMultiConnection());
    165165    }
    166166    else
    … …  
    187187#endif
    188188
    189     /* VRDP Settings */
    190     CVRDPServer vrdp = mMachine.GetVRDPServer();
    191     if (!vrdp.isNull())
    192     {
    193         vrdp.SetEnabled (mCbVRDP->isChecked());
    194         vrdp.SetPorts (mLeVRDPPort->text());
    195         vrdp.SetAuthType (vboxGlobal().toVRDPAuthType (mCbVRDPMethod->currentText()));
    196         vrdp.SetAuthTimeout (mLeVRDPTimeout->text().toULong());
    197         vrdp.SetAllowMultiConnection(mCbMultipleConn->isChecked());
     189    /* VRDE Settings */
     190    CVRDEServer vrdeServer = mMachine.GetVRDEServer();
     191    if (!vrdeServer.isNull())
     192    {
     193        vrdeServer.SetEnabled (mCbVRDE->isChecked());
     194        vrdeServer.SetVRDEProperty("TCP/Ports", mLeVRDEPort->text());
     195        vrdeServer.SetAuthType (vboxGlobal().toAuthType (mCbVRDEMethod->currentText()));
     196        vrdeServer.SetAuthTimeout (mLeVRDETimeout->text().toULong());
     197        vrdeServer.SetAllowMultiConnection(mCbMultipleConn->isChecked());
    198198    }
    199199}
    … …  
    208208             mValidator, SLOT (revalidate()));
    209209#endif
    210     connect (mCbVRDP, SIGNAL (toggled (bool)),
    211              mValidator, SLOT (revalidate()));
    212     connect (mLeVRDPPort, SIGNAL (textChanged (const QString&)),
    213              mValidator, SLOT (revalidate()));
    214     connect (mLeVRDPTimeout, SIGNAL (textChanged (const QString&)),
     210    connect (mCbVRDE, SIGNAL (toggled (bool)),
     211             mValidator, SLOT (revalidate()));
     212    connect (mLeVRDEPort, SIGNAL (textChanged (const QString&)),
     213             mValidator, SLOT (revalidate()));
     214    connect (mLeVRDETimeout, SIGNAL (textChanged (const QString&)),
    215215             mValidator, SLOT (revalidate()));
    216216}
    … …  
    261261#ifdef VBOX_WITH_VIDEOHWACCEL
    262262    setTabOrder (mCb3D, mCb2DVideo);
    263     setTabOrder (mCb2DVideo, mCbVRDP);
     263    setTabOrder (mCb2DVideo, mCbVRDE);
    264264#else
    265     setTabOrder (mCb3D, mCbVRDP);
     265    setTabOrder (mCb3D, mCbVRDE);
    266266#endif
    267267
    268268    /* Remote display tab-order */
    269     setTabOrder (mCbVRDP, mLeVRDPPort);
    270     setTabOrder (mLeVRDPPort, mCbVRDPMethod);
    271     setTabOrder (mCbVRDPMethod, mLeVRDPTimeout);
    272     setTabOrder (mLeVRDPTimeout, mCbMultipleConn);
     269    setTabOrder (mCbVRDE, mLeVRDEPort);
     270    setTabOrder (mLeVRDEPort, mCbVRDEMethod);
     271    setTabOrder (mCbVRDEMethod, mLeVRDETimeout);
     272    setTabOrder (mLeVRDETimeout, mCbMultipleConn);
    273273}
    274274
    … …  
    284284    mLbMonitorsMax->setText (tr ("<qt>%1</qt>").arg (sys.GetMaxGuestMonitors()));
    285285
    286     mCbVRDPMethod->setItemText (0,
    287         vboxGlobal().toString (KVRDPAuthType_Null));
    288     mCbVRDPMethod->setItemText (1,
    289         vboxGlobal().toString (KVRDPAuthType_External));
    290     mCbVRDPMethod->setItemText (2,
    291         vboxGlobal().toString (KVRDPAuthType_Guest));
     286    mCbVRDEMethod->setItemText (0,
     287        vboxGlobal().toString (KAuthType_Null));
     288    mCbVRDEMethod->setItemText (1,
     289        vboxGlobal().toString (KAuthType_External));
     290    mCbVRDEMethod->setItemText (2,
     291        vboxGlobal().toString (KAuthType_Guest));
    292292}
    293293

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsDisplay.ui

    r32242 r33386  
    324324          </property>
    325325          <item>
    326            <widget class="QCheckBox" name="mCbVRDP">
     326           <widget class="QCheckBox" name="mCbVRDE">
    327327            <property name="whatsThis">
    328328             <string>When checked, the VM will act as a Remote Desktop Protocol (RDP) server, allowing remote clients to connect and operate the VM (when it is running) using a standard RDP client.</string>
    … …  
    373373               </property>
    374374               <property name="buddy">
    375                 <cstring>mLeVRDPPort</cstring>
     375                <cstring>mLeVRDEPort</cstring>
    376376               </property>
    377377              </widget>
    378378             </item>
    379379             <item row="1" column="2">
    380               <widget class="QLineEdit" name="mLeVRDPPort">
     380              <widget class="QLineEdit" name="mLeVRDEPort">
    381381               <property name="whatsThis">
    382382                <string>The VRDP Server port number. You may specify &lt;tt&gt;0&lt;/tt&gt; (zero), to select port 3389, the standard port for RDP.</string>
    … …  
    393393               </property>
    394394               <property name="buddy">
    395                 <cstring>mCbVRDPMethod</cstring>
     395                <cstring>mCbVRDEMethod</cstring>
    396396               </property>
    397397              </widget>
    398398             </item>
    399399             <item row="2" column="2">
    400               <widget class="QComboBox" name="mCbVRDPMethod">
     400              <widget class="QComboBox" name="mCbVRDEMethod">
    401401               <property name="sizePolicy">
    402402                <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
    … …  
    419419               </property>
    420420               <property name="buddy">
    421                 <cstring>mLeVRDPTimeout</cstring>
     421                <cstring>mLeVRDETimeout</cstring>
    422422               </property>
    423423              </widget>
    424424             </item>
    425425             <item row="3" column="2">
    426               <widget class="QLineEdit" name="mLeVRDPTimeout">
     426              <widget class="QLineEdit" name="mLeVRDETimeout">
    427427               <property name="whatsThis">
    428428                <string>Specifies the timeout for guest authentication, in milliseconds.</string>
    … …  
    501501 <connections>
    502502  <connection>
    503    <sender>mCbVRDP</sender>
     503   <sender>mCbVRDE</sender>
    504504   <signal>toggled(bool)</signal>
    505505   <receiver>mWtVRDPServer</receiver>
Note: See TracChangeset for help on using the changeset viewer.

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