VirtualBox

Changeset 33882 in vbox


Ignore:
Timestamp:
Nov 9, 2010 9:32:27 AM (14 years ago)
Author:
vboxsync
Message:

FE/Qt: Global & Machine settings refactoring, part 1 (files & classes renaming).

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
38 deleted
7 edited
38 copied
19 moved

Legend:

Unmodified
Added
Removed

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

    r33631 r33882  
    169169        ./src/settings \
    170170        ./src/settings/global \
    171         ./src/settings/vm \
     171        ./src/settings/machine \
    172172        ./src/wizards/newvm \
    173173        ./src/wizards/newhd \
    … …  
    293293        src/settings/UISettingsPage.h \
    294294        src/settings/VBoxSettingsSelector.h \
    295         src/settings/global/VBoxGLSettingsGeneral.h \
    296         src/settings/global/VBoxGLSettingsInput.h \
    297         src/settings/global/VBoxGLSettingsUpdate.h \
    298         src/settings/global/VBoxGLSettingsLanguage.h \
    299         src/settings/global/VBoxGLSettingsNetwork.h \
    300         src/settings/global/VBoxGLSettingsNetworkDetails.h \
    301         src/settings/vm/VBoxVMSettingsGeneral.h \
    302         src/settings/vm/VBoxVMSettingsSystem.h \
    303         src/settings/vm/VBoxVMSettingsDisplay.h \
    304         src/settings/vm/VBoxVMSettingsHD.h \
    305         src/settings/vm/VBoxVMSettingsAudio.h \
    306         src/settings/vm/VBoxVMSettingsNetwork.h \
    307         src/settings/vm/VBoxVMSettingsPortForwardingDlg.h \
    308         src/settings/vm/VBoxVMSettingsSerial.h \
    309         src/settings/vm/VBoxVMSettingsParallel.h \
    310         src/settings/vm/VBoxVMSettingsUSB.h \
    311         src/settings/vm/VBoxVMSettingsUSBFilterDetails.h \
    312         src/settings/vm/VBoxVMSettingsSF.h \
    313         src/settings/vm/VBoxVMSettingsSFDetails.h \
     295        src/settings/global/UIGlobalSettingsGeneral.h \
     296        src/settings/global/UIGlobalSettingsInput.h \
     297        src/settings/global/UIGlobalSettingsUpdate.h \
     298        src/settings/global/UIGlobalSettingsLanguage.h \
     299        src/settings/global/UIGlobalSettingsNetwork.h \
     300        src/settings/global/UIGlobalSettingsNetworkDetails.h \
     301        src/settings/machine/UIMachineSettingsGeneral.h \
     302        src/settings/machine/UIMachineSettingsSystem.h \
     303        src/settings/machine/UIMachineSettingsDisplay.h \
     304        src/settings/machine/UIMachineSettingsStorage.h \
     305        src/settings/machine/UIMachineSettingsAudio.h \
     306        src/settings/machine/UIMachineSettingsNetwork.h \
     307        src/settings/machine/UIMachineSettingsPortForwardingDlg.h \
     308        src/settings/machine/UIMachineSettingsSerial.h \
     309        src/settings/machine/UIMachineSettingsParallel.h \
     310        src/settings/machine/UIMachineSettingsUSB.h \
     311        src/settings/machine/UIMachineSettingsUSBFilterDetails.h \
     312        src/settings/machine/UIMachineSettingsSF.h \
     313        src/settings/machine/UIMachineSettingsSFDetails.h \
    314314        src/wizards/newvm/UINewVMWzd.h \
    315315        src/wizards/newhd/UINewHDWzd.h \
    … …  
    380380        src/selector/UIVMDesktop.cpp \
    381381        src/settings/UISettingsDialogSpecific.cpp \
    382         src/settings/vm/VBoxVMSettingsPortForwardingDlg.cpp \
     382        src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp \
    383383        src/runtime/UIActionsPool.cpp \
    384384        src/runtime/UIIndicatorsPool.cpp \
    … …  
    454454        src/settings/UISettingsPage.cpp \
    455455        src/settings/VBoxSettingsSelector.cpp \
    456         src/settings/global/VBoxGLSettingsGeneral.cpp \
    457         src/settings/global/VBoxGLSettingsInput.cpp \
    458         src/settings/global/VBoxGLSettingsUpdate.cpp \
    459         src/settings/global/VBoxGLSettingsLanguage.cpp \
    460         src/settings/global/VBoxGLSettingsNetwork.cpp \
    461         src/settings/global/VBoxGLSettingsNetworkDetails.cpp \
    462         src/settings/vm/VBoxVMSettingsGeneral.cpp \
    463         src/settings/vm/VBoxVMSettingsSystem.cpp \
    464         src/settings/vm/VBoxVMSettingsDisplay.cpp \
    465         src/settings/vm/VBoxVMSettingsHD.cpp \
    466         src/settings/vm/VBoxVMSettingsAudio.cpp \
    467         src/settings/vm/VBoxVMSettingsNetwork.cpp \
    468         src/settings/vm/VBoxVMSettingsPortForwardingDlg.cpp \
    469         src/settings/vm/VBoxVMSettingsSerial.cpp \
    470         src/settings/vm/VBoxVMSettingsParallel.cpp \
    471         src/settings/vm/VBoxVMSettingsUSB.cpp \
    472         src/settings/vm/VBoxVMSettingsUSBFilterDetails.cpp \
    473         src/settings/vm/VBoxVMSettingsSF.cpp \
    474         src/settings/vm/VBoxVMSettingsSFDetails.cpp \
     456        src/settings/global/UIGlobalSettingsGeneral.cpp \
     457        src/settings/global/UIGlobalSettingsInput.cpp \
     458        src/settings/global/UIGlobalSettingsUpdate.cpp \
     459        src/settings/global/UIGlobalSettingsLanguage.cpp \
     460        src/settings/global/UIGlobalSettingsNetwork.cpp \
     461        src/settings/global/UIGlobalSettingsNetworkDetails.cpp \
     462        src/settings/machine/UIMachineSettingsGeneral.cpp \
     463        src/settings/machine/UIMachineSettingsSystem.cpp \
     464        src/settings/machine/UIMachineSettingsDisplay.cpp \
     465        src/settings/machine/UIMachineSettingsStorage.cpp \
     466        src/settings/machine/UIMachineSettingsAudio.cpp \
     467        src/settings/machine/UIMachineSettingsNetwork.cpp \
     468        src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp \
     469        src/settings/machine/UIMachineSettingsSerial.cpp \
     470        src/settings/machine/UIMachineSettingsParallel.cpp \
     471        src/settings/machine/UIMachineSettingsUSB.cpp \
     472        src/settings/machine/UIMachineSettingsUSBFilterDetails.cpp \
     473        src/settings/machine/UIMachineSettingsSF.cpp \
     474        src/settings/machine/UIMachineSettingsSFDetails.cpp \
    475475        src/wizards/newvm/UINewVMWzd.cpp \
    476476        src/wizards/newhd/UINewHDWzd.cpp \

  • trunk/src/VBox/Frontends/VirtualBox/VBoxUI.pro

    r32667 r33882  
    2929    src/VBoxVMLogViewer.ui \
    3030    src/settings/UISettingsDialog.ui \
    31     src/settings/vm/VBoxVMSettingsGeneral.ui \
    32     src/settings/vm/VBoxVMSettingsSystem.ui \
    33     src/settings/vm/VBoxVMSettingsDisplay.ui \
    34     src/settings/vm/VBoxVMSettingsHD.ui \
    35     src/settings/vm/VBoxVMSettingsAudio.ui \
    36     src/settings/vm/VBoxVMSettingsNetwork.ui \
    37     src/settings/vm/VBoxVMSettingsSerial.ui \
    38     src/settings/vm/VBoxVMSettingsParallel.ui \
    39     src/settings/vm/VBoxVMSettingsUSB.ui \
    40     src/settings/vm/VBoxVMSettingsUSBFilterDetails.ui \
    41     src/settings/vm/VBoxVMSettingsSF.ui \
    42     src/settings/vm/VBoxVMSettingsSFDetails.ui \
    43     src/settings/global/VBoxGLSettingsGeneral.ui \
    44     src/settings/global/VBoxGLSettingsInput.ui \
    45     src/settings/global/VBoxGLSettingsUpdate.ui \
    46     src/settings/global/VBoxGLSettingsLanguage.ui \
    47     src/settings/global/VBoxGLSettingsNetwork.ui \
    48     src/settings/global/VBoxGLSettingsNetworkDetails.ui \
     31    src/settings/global/UIGlobalSettingsGeneral.ui \
     32    src/settings/global/UIGlobalSettingsInput.ui \
     33    src/settings/global/UIGlobalSettingsUpdate.ui \
     34    src/settings/global/UIGlobalSettingsLanguage.ui \
     35    src/settings/global/UIGlobalSettingsNetwork.ui \
     36    src/settings/global/UIGlobalSettingsNetworkDetails.ui \
     37    src/settings/machine/UIMachineSettingsGeneral.ui \
     38    src/settings/machine/UIMachineSettingsSystem.ui \
     39    src/settings/machine/UIMachineSettingsDisplay.ui \
     40    src/settings/machine/UIMachineSettingsStorage.ui \
     41    src/settings/machine/UIMachineSettingsAudio.ui \
     42    src/settings/machine/UIMachineSettingsNetwork.ui \
     43    src/settings/machine/UIMachineSettingsSerial.ui \
     44    src/settings/machine/UIMachineSettingsParallel.ui \
     45    src/settings/machine/UIMachineSettingsUSB.ui \
     46    src/settings/machine/UIMachineSettingsUSBFilterDetails.ui \
     47    src/settings/machine/UIMachineSettingsSF.ui \
     48    src/settings/machine/UIMachineSettingsSFDetails.ui \
    4949    src/wizards/newvm/UINewVMWzdPage1.ui \
    5050    src/wizards/newvm/UINewVMWzdPage2.ui \

  • trunk/src/VBox/Frontends/VirtualBox/src/precomp.h

    r32814 r33882  
    207207#include "VBoxFilePathSelectorWidget.h"
    208208#include "VBoxFrameBuffer.h"
    209 #include "VBoxGLSettingsGeneral.h"
    210 #include "VBoxGLSettingsInput.h"
    211 #include "VBoxGLSettingsLanguage.h"
    212 #include "VBoxGLSettingsNetwork.h"
    213 #include "VBoxGLSettingsNetworkDetails.h"
    214 #include "VBoxGLSettingsUpdate.h"
     209#include "UIGlobalSettingsGeneral.h"
     210#include "UIGlobalSettingsInput.h"
     211#include "UIGlobalSettingsLanguage.h"
     212#include "UIGlobalSettingsNetwork.h"
     213#include "UIGlobalSettingsNetworkDetails.h"
     214#include "UIGlobalSettingsUpdate.h"
    215215#include "VBoxGlobal.h"
    216216#include "VBoxGlobalSettings.h"
    … …  
    252252#include "UIVMListView.h"
    253253#include "VBoxVMLogViewer.h"
    254 #include "VBoxVMSettingsAudio.h"
    255 #include "VBoxVMSettingsDisplay.h"
    256 #include "VBoxVMSettingsGeneral.h"
    257 #include "VBoxVMSettingsHD.h"
    258 #include "VBoxVMSettingsNetwork.h"
    259 #include "VBoxVMSettingsParallel.h"
    260 #include "VBoxVMSettingsSF.h"
    261 #include "VBoxVMSettingsSFDetails.h"
    262 #include "VBoxVMSettingsSerial.h"
    263 #include "VBoxVMSettingsSystem.h"
    264 #include "VBoxVMSettingsUSB.h"
    265 #include "VBoxVMSettingsUSBFilterDetails.h"
     254#include "UIMachineSettingsAudio.h"
     255#include "UIMachineSettingsDisplay.h"
     256#include "UIMachineSettingsGeneral.h"
     257#include "UIMachineSettingsStorage.h"
     258#include "UIMachineSettingsNetwork.h"
     259#include "UIMachineSettingsParallel.h"
     260#include "UIMachineSettingsSF.h"
     261#include "UIMachineSettingsSFDetails.h"
     262#include "UIMachineSettingsSerial.h"
     263#include "UIMachineSettingsSystem.h"
     264#include "UIMachineSettingsUSB.h"
     265#include "UIMachineSettingsUSBFilterDetails.h"
    266266
    267267#ifdef Q_WS_X11

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

    r33712 r33882  
    3838#include "VBoxTakeSnapshotDlg.h"
    3939#include "VBoxVMInformationDlg.h"
    40 #include "VBoxVMSettingsNetwork.h"
    41 #include "VBoxVMSettingsSF.h"
     40#include "UIMachineSettingsNetwork.h"
     41#include "UIMachineSettingsSF.h"
    4242#ifdef Q_WS_MAC
    4343# include "DockIconPreview.h"
    … …  
    112112
    113113        /* Setup settings layout */
    114         m_pSettings = new VBoxVMSettingsNetworkPage(true);
     114        m_pSettings = new UIMachineSettingsNetworkPage(true);
    115115        m_pSettings->setOrderAfter(this);
    116116        VBoxGlobal::setLayoutMargin(m_pSettings->layout(), 0);
    … …  
    160160private:
    161161
    162     VBoxVMSettingsNetworkPage *m_pSettings;
     162    UIMachineSettingsNetworkPage *m_pSettings;
    163163    CSession &m_session;
    164164};
    … …  
    186186
    187187        /* Setup settings layout */
    188         m_pSettings = new VBoxVMSettingsSF;
     188        m_pSettings = new UIMachineSettingsSF;
    189189        VBoxGlobal::setLayoutMargin(m_pSettings->layout(), 0);
    190190        m_pSettings->loadDirectlyFrom(m_session.GetConsole());
    … …  
    234234private:
    235235
    236     VBoxVMSettingsSF *m_pSettings;
     236    UIMachineSettingsSF *m_pSettings;
    237237    CSession &m_session;
    238238};

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

    r33689 r33882  
    3232#include "VBoxSettingsSelector.h"
    3333
    34 #include "VBoxGLSettingsGeneral.h"
    35 #include "VBoxGLSettingsInput.h"
    36 #include "VBoxGLSettingsUpdate.h"
    37 #include "VBoxGLSettingsLanguage.h"
    38 #include "VBoxGLSettingsNetwork.h"
    39 
    40 #include "VBoxVMSettingsGeneral.h"
    41 #include "VBoxVMSettingsSystem.h"
    42 #include "VBoxVMSettingsDisplay.h"
    43 #include "VBoxVMSettingsHD.h"
    44 #include "VBoxVMSettingsAudio.h"
    45 #include "VBoxVMSettingsNetwork.h"
    46 #include "VBoxVMSettingsSerial.h"
    47 #include "VBoxVMSettingsParallel.h"
    48 #include "VBoxVMSettingsUSB.h"
    49 #include "VBoxVMSettingsSF.h"
     34#include "UIGlobalSettingsGeneral.h"
     35#include "UIGlobalSettingsInput.h"
     36#include "UIGlobalSettingsUpdate.h"
     37#include "UIGlobalSettingsLanguage.h"
     38#include "UIGlobalSettingsNetwork.h"
     39
     40#include "UIMachineSettingsGeneral.h"
     41#include "UIMachineSettingsSystem.h"
     42#include "UIMachineSettingsDisplay.h"
     43#include "UIMachineSettingsStorage.h"
     44#include "UIMachineSettingsAudio.h"
     45#include "UIMachineSettingsNetwork.h"
     46#include "UIMachineSettingsSerial.h"
     47#include "UIMachineSettingsParallel.h"
     48#include "UIMachineSettingsUSB.h"
     49#include "UIMachineSettingsSF.h"
    5050
    5151#if 0 /* Global USB filters are DISABLED now: */
    … …  
    303303                case GLSettingsPage_General:
    304304                {
    305                     UISettingsPage *pSettingsPage = new VBoxGLSettingsGeneral;
     305                    UISettingsPage *pSettingsPage = new UIGlobalSettingsGeneral;
    306306                    pSettingsPage->setId(i);
    307307                    addItem(":/machine_32px.png", ":/machine_disabled_32px.png",
    … …  
    313313                case GLSettingsPage_Input:
    314314                {
    315                     UISettingsPage *pSettingsPage = new VBoxGLSettingsInput;
     315                    UISettingsPage *pSettingsPage = new UIGlobalSettingsInput;
    316316                    pSettingsPage->setId(i);
    317317                    addItem(":/hostkey_32px.png", ":/hostkey_disabled_32px.png",
    … …  
    323323                case GLSettingsPage_Update:
    324324                {
    325                     UISettingsPage *pSettingsPage = new VBoxGLSettingsUpdate;
     325                    UISettingsPage *pSettingsPage = new UIGlobalSettingsUpdate;
    326326                    pSettingsPage->setId(i);
    327327                    addItem(":/refresh_32px.png", ":/refresh_disabled_32px.png",
    … …  
    333333                case GLSettingsPage_Language:
    334334                {
    335                     UISettingsPage *pSettingsPage = new VBoxGLSettingsLanguage;
     335                    UISettingsPage *pSettingsPage = new UIGlobalSettingsLanguage;
    336336                    pSettingsPage->setId(i);
    337337                    addItem(":/site_32px.png", ":/site_disabled_32px.png",
    … …  
    343343                case GLSettingsPage_USB:
    344344                {
    345                     UISettingsPage *pSettingsPage = new VBoxVMSettingsUSB(UISettingsPageType_Global);
     345                    UISettingsPage *pSettingsPage = new UIMachineSettingsUSB(UISettingsPageType_Global);
    346346                    pSettingsPage->setId(i);
    347347                    addItem(":/usb_32px.png", ":/usb_disabled_32px.png",
    … …  
    353353                case GLSettingsPage_Network:
    354354                {
    355                     UISettingsPage *pSettingsPage = new VBoxGLSettingsNetwork;
     355                    UISettingsPage *pSettingsPage = new UIGlobalSettingsNetwork;
    356356                    pSettingsPage->setId(i);
    357357                    addItem(":/nw_32px.png", ":/nw_disabled_32px.png",
    … …  
    518518                case VMSettingsPage_General:
    519519                {
    520                     UISettingsPage *pSettingsPage = new VBoxVMSettingsGeneral;
     520                    UISettingsPage *pSettingsPage = new UIMachineSettingsGeneral;
    521521                    pSettingsPage->setId(i);
    522522                    addItem(":/machine_32px.png", ":/machine_disabled_32px.png",
    … …  
    528528                case VMSettingsPage_System:
    529529                {
    530                     UISettingsPage *pSettingsPage = new VBoxVMSettingsSystem;
     530                    UISettingsPage *pSettingsPage = new UIMachineSettingsSystem;
    531531                    pSettingsPage->setId(i);
    532532                    connect(pSettingsPage, SIGNAL(tableChanged()), this, SLOT(sltResetFirstRunFlag()));
    … …  
    539539                case VMSettingsPage_Display:
    540540                {
    541                     UISettingsPage *pSettingsPage = new VBoxVMSettingsDisplay;
     541                    UISettingsPage *pSettingsPage = new UIMachineSettingsDisplay;
    542542                    pSettingsPage->setId(i);
    543543                    addItem(":/vrdp_32px.png", ":/vrdp_disabled_32px.png",
    … …  
    549549                case VMSettingsPage_Storage:
    550550                {
    551                     UISettingsPage *pSettingsPage = new VBoxVMSettingsHD;
     551                    UISettingsPage *pSettingsPage = new UIMachineSettingsStorage;
    552552                    pSettingsPage->setId(i);
    553553                    connect(pSettingsPage, SIGNAL(storageChanged()), this, SLOT(sltResetFirstRunFlag()));
    … …  
    560560                case VMSettingsPage_Audio:
    561561                {
    562                     UISettingsPage *pSettingsPage = new VBoxVMSettingsAudio;
     562                    UISettingsPage *pSettingsPage = new UIMachineSettingsAudio;
    563563                    pSettingsPage->setId(i);
    564564                    addItem(":/sound_32px.png", ":/sound_disabled_32px.png",
    … …  
    570570                case VMSettingsPage_Network:
    571571                {
    572                     UISettingsPage *pSettingsPage = new VBoxVMSettingsNetworkPage;
     572                    UISettingsPage *pSettingsPage = new UIMachineSettingsNetworkPage;
    573573                    pSettingsPage->setId(i);
    574574                    addItem(":/nw_32px.png", ":/nw_disabled_32px.png",
    … …  
    588588                case VMSettingsPage_Serial:
    589589                {
    590                     UISettingsPage *pSettingsPage = new VBoxVMSettingsSerialPage;
     590                    UISettingsPage *pSettingsPage = new UIMachineSettingsSerialPage;
    591591                    pSettingsPage->setId(i);
    592592                    addItem(":/serial_port_32px.png", ":/serial_port_disabled_32px.png",
    … …  
    598598                case VMSettingsPage_Parallel:
    599599                {
    600                     UISettingsPage *pSettingsPage = new VBoxVMSettingsParallelPage;
     600                    UISettingsPage *pSettingsPage = new UIMachineSettingsParallelPage;
    601601                    pSettingsPage->setId(i);
    602602                    addItem(":/parallel_port_32px.png", ":/parallel_port_disabled_32px.png",
    … …  
    608608                case VMSettingsPage_USB:
    609609                {
    610                     UISettingsPage *pSettingsPage = new VBoxVMSettingsUSB(UISettingsPageType_Machine);
     610                    UISettingsPage *pSettingsPage = new UIMachineSettingsUSB(UISettingsPageType_Machine);
    611611                    pSettingsPage->setId(i);
    612612                    addItem(":/usb_32px.png", ":/usb_disabled_32px.png",
    … …  
    618618                case VMSettingsPage_SF:
    619619                {
    620                     UISettingsPage *pSettingsPage = new VBoxVMSettingsSF;
     620                    UISettingsPage *pSettingsPage = new UIMachineSettingsSF;
    621621                    pSettingsPage->setId(i);
    622622                    addItem(":/shared_folder_32px.png", ":/shared_folder_disabled_32px.png",
    … …  
    709709
    710710    /* Guest OS type & VT-x/AMD-V option correlation auto-fix: */
    711     VBoxVMSettingsGeneral *pGeneralPage =
    712         qobject_cast<VBoxVMSettingsGeneral*>(m_pSelector->idToPage(VMSettingsPage_General));
    713     VBoxVMSettingsSystem *pSystemPage =
    714         qobject_cast<VBoxVMSettingsSystem*>(m_pSelector->idToPage(VMSettingsPage_System));
     711    UIMachineSettingsGeneral *pGeneralPage =
     712        qobject_cast<UIMachineSettingsGeneral*>(m_pSelector->idToPage(VMSettingsPage_General));
     713    UIMachineSettingsSystem *pSystemPage =
     714        qobject_cast<UIMachineSettingsSystem*>(m_pSelector->idToPage(VMSettingsPage_System));
    715715    if (pGeneralPage && pSystemPage &&
    716716        pGeneralPage->is64BitOSTypeSelected() && !pSystemPage->isHWVirtExEnabled())
    … …  
    721721    if (pGeneralPage && !pGeneralPage->isWindowsOSTypeSelected())
    722722    {
    723         VBoxVMSettingsDisplay *pDisplayPage =
    724             qobject_cast<VBoxVMSettingsDisplay*>(m_pSelector->idToPage(VMSettingsPage_Display));
     723        UIMachineSettingsDisplay *pDisplayPage =
     724            qobject_cast<UIMachineSettingsDisplay*>(m_pSelector->idToPage(VMSettingsPage_Display));
    725725        if (pDisplayPage && pDisplayPage->isAcceleration2DVideoSelected())
    726726            m_machine.SetAccelerate2DVideoEnabled(false);
    … …  
    825825    {
    826826        /* Get General & System pages: */
    827         VBoxVMSettingsGeneral *pGeneralPage =
    828             qobject_cast<VBoxVMSettingsGeneral*>(m_pSelector->idToPage(VMSettingsPage_General));
    829         VBoxVMSettingsSystem *pSystemPage =
    830             qobject_cast<VBoxVMSettingsSystem*>(m_pSelector->idToPage(VMSettingsPage_System));
     827        UIMachineSettingsGeneral *pGeneralPage =
     828            qobject_cast<UIMachineSettingsGeneral*>(m_pSelector->idToPage(VMSettingsPage_General));
     829        UIMachineSettingsSystem *pSystemPage =
     830            qobject_cast<UIMachineSettingsSystem*>(m_pSelector->idToPage(VMSettingsPage_System));
    831831
    832832        /* Guest OS type & VT-x/AMD-V option correlation test: */
    … …  
    847847    {
    848848        /* Get General & Display pages: */
    849         VBoxVMSettingsGeneral *pGeneralPage =
    850             qobject_cast<VBoxVMSettingsGeneral*>(m_pSelector->idToPage(VMSettingsPage_General));
    851         VBoxVMSettingsDisplay *pDisplayPage =
    852             qobject_cast<VBoxVMSettingsDisplay*>(m_pSelector->idToPage(VMSettingsPage_Display));
     849        UIMachineSettingsGeneral *pGeneralPage =
     850            qobject_cast<UIMachineSettingsGeneral*>(m_pSelector->idToPage(VMSettingsPage_General));
     851        UIMachineSettingsDisplay *pDisplayPage =
     852            qobject_cast<UIMachineSettingsDisplay*>(m_pSelector->idToPage(VMSettingsPage_Display));
    853853#ifdef VBOX_WITH_CRHGSMI
    854854        if (pGeneralPage && pDisplayPage)
    … …  
    875875    {
    876876        /* Get System & USB pages: */
    877         VBoxVMSettingsSystem *pSystemPage =
    878             qobject_cast<VBoxVMSettingsSystem*>(m_pSelector->idToPage(VMSettingsPage_System));
    879         VBoxVMSettingsUSB *pUsbPage =
    880             qobject_cast<VBoxVMSettingsUSB*>(m_pSelector->idToPage(VMSettingsPage_USB));
     877        UIMachineSettingsSystem *pSystemPage =
     878            qobject_cast<UIMachineSettingsSystem*>(m_pSelector->idToPage(VMSettingsPage_System));
     879        UIMachineSettingsUSB *pUsbPage =
     880            qobject_cast<UIMachineSettingsUSB*>(m_pSelector->idToPage(VMSettingsPage_USB));
    881881        if (pSystemPage && pUsbPage &&
    882882            pSystemPage->isHIDEnabled() && !pUsbPage->isOHCIEnabled())

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

    r33879 r33882  
    33 *
    44 * VBox frontends: Qt4 GUI ("VirtualBox"):
    5  * VBoxGLSettingsGeneral class implementation
     5 * UIGlobalSettingsGeneral class implementation
    66 */
    77
    … …  
    2222
    2323/* Local includes */
    24 #include "VBoxGLSettingsGeneral.h"
     24#include "UIGlobalSettingsGeneral.h"
    2525#include "VBoxGlobal.h"
    2626
    27 VBoxGLSettingsGeneral::VBoxGLSettingsGeneral()
     27UIGlobalSettingsGeneral::UIGlobalSettingsGeneral()
    2828{
    2929    /* Apply UI decorations */
    30     Ui::VBoxGLSettingsGeneral::setupUi (this);
     30    Ui::UIGlobalSettingsGeneral::setupUi (this);
    3131
    3232#ifndef VBOX_GUI_WITH_SYSTRAY
    … …  
    5858/* Load data to cashe from corresponding external object(s),
    5959 * this task COULD be performed in other than GUI thread: */
    60 void VBoxGLSettingsGeneral::loadToCacheFrom(QVariant &data)
     60void UIGlobalSettingsGeneral::loadToCacheFrom(QVariant &data)
    6161{
    6262    /* Fetch data to properties & settings: */
    … …  
    7878/* Load data to corresponding widgets from cache,
    7979 * this task SHOULD be performed in GUI thread only: */
    80 void VBoxGLSettingsGeneral::getFromCache()
     80void UIGlobalSettingsGeneral::getFromCache()
    8181{
    8282    /* Fetch from cache: */
    … …  
    9292/* Save data from corresponding widgets to cache,
    9393 * this task SHOULD be performed in GUI thread only: */
    94 void VBoxGLSettingsGeneral::putToCache()
     94void UIGlobalSettingsGeneral::putToCache()
    9595{
    9696    /* Upload to cache: */
    … …  
    106106/* Save data from cache to corresponding external object(s),
    107107 * this task COULD be performed in other than GUI thread: */
    108 void VBoxGLSettingsGeneral::saveFromCacheTo(QVariant &data)
     108void UIGlobalSettingsGeneral::saveFromCacheTo(QVariant &data)
    109109{
    110110    /* Fetch data to properties & settings: */
    … …  
    126126}
    127127
    128 void VBoxGLSettingsGeneral::setOrderAfter (QWidget *aWidget)
     128void UIGlobalSettingsGeneral::setOrderAfter (QWidget *aWidget)
    129129{
    130130    setTabOrder (aWidget, mPsMach);
    … …  
    135135}
    136136
    137 void VBoxGLSettingsGeneral::retranslateUi()
     137void UIGlobalSettingsGeneral::retranslateUi()
    138138{
    139139    /* Translate uic generated strings */
    140     Ui::VBoxGLSettingsGeneral::retranslateUi (this);
     140    Ui::UIGlobalSettingsGeneral::retranslateUi (this);
    141141
    142142    mPsMach->setWhatsThis (tr ("Displays the path to the default virtual "

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.h

    r33879 r33882  
    22 *
    33 * VBox frontends: Qt4 GUI ("VirtualBox"):
    4  * VBoxGLSettingsGeneral class declaration
     4 * UIGlobalSettingsGeneral class declaration
    55 */
    66
    … …  
    1717 */
    1818
    19 #ifndef __VBoxGLSettingsGeneral_h__
    20 #define __VBoxGLSettingsGeneral_h__
     19#ifndef __UIGlobalSettingsGeneral_h__
     20#define __UIGlobalSettingsGeneral_h__
    2121
    2222#include "UISettingsPage.h"
    23 #include "VBoxGLSettingsGeneral.gen.h"
     23#include "UIGlobalSettingsGeneral.gen.h"
    2424
    2525/* Global settings / General page / Cache: */
    … …  
    3636
    3737/* Global settings / General page: */
    38 class VBoxGLSettingsGeneral : public UISettingsPageGlobal,
    39                               public Ui::VBoxGLSettingsGeneral
     38class UIGlobalSettingsGeneral : public UISettingsPageGlobal,
     39                              public Ui::UIGlobalSettingsGeneral
    4040{
    4141    Q_OBJECT;
    … …  
    4343public:
    4444
    45     VBoxGLSettingsGeneral();
     45    UIGlobalSettingsGeneral();
    4646
    4747protected:
    … …  
    7171};
    7272
    73 #endif // __VBoxGLSettingsGeneral_h__
     73#endif // __UIGlobalSettingsGeneral_h__
    7474

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.ui

    r33879 r33882  
    1414     hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1515 </comment>
    16  <class>VBoxGLSettingsGeneral</class>
    17  <widget class="QWidget" name="VBoxGLSettingsGeneral">
     16 <class>UIGlobalSettingsGeneral</class>
     17 <widget class="QWidget" name="UIGlobalSettingsGeneral">
    1818  <property name="geometry">
    1919   <rect>

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

    r33879 r33882  
    33 *
    44 * VBox frontends: Qt4 GUI ("VirtualBox"):
    5  * VBoxGLSettingsInput class implementation
     5 * UIGlobalSettingsInput class implementation
    66 */
    77
    … …  
    1818 */
    1919
    20 #include "VBoxGLSettingsInput.h"
     20#include "UIGlobalSettingsInput.h"
    2121#include "VBoxGlobalSettings.h"
    2222
    23 VBoxGLSettingsInput::VBoxGLSettingsInput()
     23UIGlobalSettingsInput::UIGlobalSettingsInput()
    2424{
    2525    /* Apply UI decorations */
    26     Ui::VBoxGLSettingsInput::setupUi (this);
     26    Ui::UIGlobalSettingsInput::setupUi (this);
    2727
    2828    /* Applying language settings */
    … …  
    3232/* Load data to cashe from corresponding external object(s),
    3333 * this task COULD be performed in other than GUI thread: */
    34 void VBoxGLSettingsInput::loadToCacheFrom(QVariant &data)
     34void UIGlobalSettingsInput::loadToCacheFrom(QVariant &data)
    3535{
    3636    /* Fetch data to properties & settings: */
    … …  
    4747/* Load data to corresponding widgets from cache,
    4848 * this task SHOULD be performed in GUI thread only: */
    49 void VBoxGLSettingsInput::getFromCache()
     49void UIGlobalSettingsInput::getFromCache()
    5050{
    5151    /* Fetch from cache: */
    … …  
    5656/* Save data from corresponding widgets to cache,
    5757 * this task SHOULD be performed in GUI thread only: */
    58 void VBoxGLSettingsInput::putToCache()
     58void UIGlobalSettingsInput::putToCache()
    5959{
    6060    /* Upload to cache: */
    … …  
    6565/* Save data from cache to corresponding external object(s),
    6666 * this task COULD be performed in other than GUI thread: */
    67 void VBoxGLSettingsInput::saveFromCacheTo(QVariant &data)
     67void UIGlobalSettingsInput::saveFromCacheTo(QVariant &data)
    6868{
    6969    /* Fetch data to properties & settings: */
    … …  
    7878}
    7979
    80 void VBoxGLSettingsInput::setOrderAfter (QWidget *aWidget)
     80void UIGlobalSettingsInput::setOrderAfter (QWidget *aWidget)
    8181{
    8282    setTabOrder (aWidget, mHeHostKey);
    … …  
    8585}
    8686
    87 void VBoxGLSettingsInput::retranslateUi()
     87void UIGlobalSettingsInput::retranslateUi()
    8888{
    8989    /* Translate uic generated strings */
    90     Ui::VBoxGLSettingsInput::retranslateUi (this);
     90    Ui::UIGlobalSettingsInput::retranslateUi (this);
    9191}
    9292

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.h

    r33879 r33882  
    22 *
    33 * VBox frontends: Qt4 GUI ("VirtualBox"):
    4  * VBoxGLSettingsInput class declaration
     4 * UIGlobalSettingsInput class declaration
    55 */
    66
    … …  
    1717 */
    1818
    19 #ifndef __VBoxGLSettingsInput_h__
    20 #define __VBoxGLSettingsInput_h__
     19#ifndef __UIGlobalSettingsInput_h__
     20#define __UIGlobalSettingsInput_h__
    2121
    2222#include "UISettingsPage.h"
    23 #include "VBoxGLSettingsInput.gen.h"
     23#include "UIGlobalSettingsInput.gen.h"
    2424
    2525/* Global settings / Input page / Cache: */
    … …  
    3131
    3232/* Global settings / Input page: */
    33 class VBoxGLSettingsInput : public UISettingsPageGlobal,
    34                             public Ui::VBoxGLSettingsInput
     33class UIGlobalSettingsInput : public UISettingsPageGlobal,
     34                            public Ui::UIGlobalSettingsInput
    3535{
    3636    Q_OBJECT;
    … …  
    3838public:
    3939
    40     VBoxGLSettingsInput();
     40    UIGlobalSettingsInput();
    4141
    4242protected:
    … …  
    6666};
    6767
    68 #endif // __VBoxGLSettingsInput_h__
     68#endif // __UIGlobalSettingsInput_h__
    6969

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.ui

    r33879 r33882  
    1414     hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1515 </comment>
    16  <class>VBoxGLSettingsInput</class>
    17  <widget class="QWidget" name="VBoxGLSettingsInput">
     16 <class>UIGlobalSettingsInput</class>
     17 <widget class="QWidget" name="UIGlobalSettingsInput">
    1818  <property name="geometry">
    1919   <rect>

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

    r33879 r33882  
    33 *
    44 * VBox frontends: Qt4 GUI ("VirtualBox"):
    5  * VBoxGLSettingsLanguage class implementation
     5 * UIGlobalSettingsLanguage class implementation
    66 */
    77
    … …  
    1818 */
    1919
    20 #include "VBoxGLSettingsLanguage.h"
     20#include "UIGlobalSettingsLanguage.h"
    2121#include "VBoxGlobalSettings.h"
    2222#include "VBoxGlobal.h"
    … …  
    8686        else
    8787        {
    88             itemName += VBoxGLSettingsLanguage::tr (" (built-in)", "Language");
    89             langName += VBoxGLSettingsLanguage::tr (" (built-in)", "Language");
     88            itemName += UIGlobalSettingsLanguage::tr (" (built-in)", "Language");
     89            langName += UIGlobalSettingsLanguage::tr (" (built-in)", "Language");
    9090        }
    9191
    … …  
    113113        setText (0, QString ("<%1>").arg (aId));
    114114        setText (1, aId);
    115         setText (2, VBoxGLSettingsLanguage::tr ("<unavailable>", "Language"));
    116         setText (3, VBoxGLSettingsLanguage::tr ("<unknown>", "Author(s)"));
     115        setText (2, UIGlobalSettingsLanguage::tr ("<unavailable>", "Language"));
     116        setText (3, UIGlobalSettingsLanguage::tr ("<unknown>", "Author(s)"));
    117117
    118118        /* Invalid language appears in italic */
    … …  
    127127        : QTreeWidgetItem (aParent, LanguageItemType), mBuiltIn (false)
    128128    {
    129         setText (0, VBoxGLSettingsLanguage::tr ("Default", "Language"));
     129        setText (0, UIGlobalSettingsLanguage::tr ("Default", "Language"));
    130130        setText (1, QString::null);
    131131        /* Empty strings of some reasonable length to prevent the info part
    … …  
    168168
    169169
    170 VBoxGLSettingsLanguage::VBoxGLSettingsLanguage()
     170UIGlobalSettingsLanguage::UIGlobalSettingsLanguage()
    171171    : mLanguageChanged(false)
    172172{
    173173    /* Apply UI decorations */
    174     Ui::VBoxGLSettingsLanguage::setupUi (this);
     174    Ui::UIGlobalSettingsLanguage::setupUi (this);
    175175
    176176    /* Setup dialog */
    … …  
    192192/* Load data to cashe from corresponding external object(s),
    193193 * this task COULD be performed in other than GUI thread: */
    194 void VBoxGLSettingsLanguage::loadToCacheFrom(QVariant &data)
     194void UIGlobalSettingsLanguage::loadToCacheFrom(QVariant &data)
    195195{
    196196    /* Fetch data to properties & settings: */
    … …  
    206206/* Load data to corresponding widgets from cache,
    207207 * this task SHOULD be performed in GUI thread only: */
    208 void VBoxGLSettingsLanguage::getFromCache()
     208void UIGlobalSettingsLanguage::getFromCache()
    209209{
    210210    /* Fetch from cache: */
    … …  
    215215/* Save data from corresponding widgets to cache,
    216216 * this task SHOULD be performed in GUI thread only: */
    217 void VBoxGLSettingsLanguage::putToCache()
     217void UIGlobalSettingsLanguage::putToCache()
    218218{
    219219    /* Upload to cache: */
    … …  
    226226/* Save data from cache to corresponding external object(s),
    227227 * this task COULD be performed in other than GUI thread: */
    228 void VBoxGLSettingsLanguage::saveFromCacheTo(QVariant &data)
     228void UIGlobalSettingsLanguage::saveFromCacheTo(QVariant &data)
    229229{
    230230    /* Fetch data to properties & settings: */
    … …  
    242242}
    243243
    244 void VBoxGLSettingsLanguage::setOrderAfter (QWidget *aWidget)
     244void UIGlobalSettingsLanguage::setOrderAfter (QWidget *aWidget)
    245245{
    246246    setTabOrder (aWidget, mTwLanguage);
    247247}
    248248
    249 void VBoxGLSettingsLanguage::reload (const QString &aLangId)
     249void UIGlobalSettingsLanguage::reload (const QString &aLangId)
    250250{
    251251    /* Clear languages list */
    … …  
    320320}
    321321
    322 void VBoxGLSettingsLanguage::retranslateUi()
     322void UIGlobalSettingsLanguage::retranslateUi()
    323323{
    324324    /* Translate uic generated strings */
    325     Ui::VBoxGLSettingsLanguage::retranslateUi (this);
     325    Ui::UIGlobalSettingsLanguage::retranslateUi (this);
    326326    reload (VBoxGlobal::languageId());
    327327}
    328328
    329 void VBoxGLSettingsLanguage::mTwItemPainted (QTreeWidgetItem *aItem, QPainter *aPainter)
     329void UIGlobalSettingsLanguage::mTwItemPainted (QTreeWidgetItem *aItem, QPainter *aPainter)
    330330{
    331331    if (aItem && aItem->type() == LanguageItem::LanguageItemType)
    … …  
    342342}
    343343
    344 void VBoxGLSettingsLanguage::mTwLanguageChanged (QTreeWidgetItem *aItem)
     344void UIGlobalSettingsLanguage::mTwLanguageChanged (QTreeWidgetItem *aItem)
    345345{
    346346    if (!aItem) return;

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.h

    r33879 r33882  
    22 *
    33 * VBox frontends: Qt4 GUI ("VirtualBox"):
    4  * VBoxGLSettingsLanguage class declaration
     4 * UIGlobalSettingsLanguage class declaration
    55 */
    66
    … …  
    1717 */
    1818
    19 #ifndef __VBoxGLSettingsLanguage_h__
    20 #define __VBoxGLSettingsLanguage_h__
     19#ifndef __UIGlobalSettingsLanguage_h__
     20#define __UIGlobalSettingsLanguage_h__
    2121
    2222#include "UISettingsPage.h"
    23 #include "VBoxGLSettingsLanguage.gen.h"
     23#include "UIGlobalSettingsLanguage.gen.h"
    2424
    2525/* Global settings / Language page / Cache: */
    … …  
    3030
    3131/* Global settings / Language page: */
    32 class VBoxGLSettingsLanguage : public UISettingsPageGlobal,
    33                                public Ui::VBoxGLSettingsLanguage
     32class UIGlobalSettingsLanguage : public UISettingsPageGlobal,
     33                               public Ui::UIGlobalSettingsLanguage
    3434{
    3535    Q_OBJECT;
    … …  
    3737public:
    3838
    39     VBoxGLSettingsLanguage();
     39    UIGlobalSettingsLanguage();
    4040
    4141protected:
    … …  
    7474};
    7575
    76 #endif // __VBoxGLSettingsLanguage_h__
     76#endif // __UIGlobalSettingsLanguage_h__
    7777

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.ui

    r33879 r33882  
    1313     hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1414 </comment>
    15  <class>VBoxGLSettingsLanguage</class>
    16  <widget class="QWidget" name="VBoxGLSettingsLanguage" >
     15 <class>UIGlobalSettingsLanguage</class>
     16 <widget class="QWidget" name="UIGlobalSettingsLanguage" >
    1717  <property name="geometry" >
    1818   <rect>

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

    r33879 r33882  
    33 *
    44 * VBox frontends: Qt4 GUI ("VirtualBox"):
    5  * VBoxGLSettingsNetwork class implementation
     5 * UIGlobalSettingsNetwork class implementation
    66 */
    77
    … …  
    2121#include "QIWidgetValidator.h"
    2222#include "UIIconPool.h"
    23 #include "VBoxGLSettingsNetwork.h"
    24 #include "VBoxGLSettingsNetworkDetails.h"
     23#include "UIGlobalSettingsNetwork.h"
     24#include "UIGlobalSettingsNetworkDetails.h"
    2525#include "VBoxGlobal.h"
    2626#include "VBoxProblemReporter.h"
    … …  
    5959             QHostAddress (m_data.m_interface.m_strInterfaceAddress).protocol() != QAbstractSocket::IPv4Protocol))
    6060        {
    61             aWarning = VBoxGLSettingsNetwork::tr ("host IPv4 address of <b>%1</b> is wrong").arg (text (0));
     61            aWarning = UIGlobalSettingsNetwork::tr ("host IPv4 address of <b>%1</b> is wrong").arg (text (0));
    6262            return false;
    6363        }
    … …  
    6666             QHostAddress (m_data.m_interface.m_strInterfaceMask).protocol() != QAbstractSocket::IPv4Protocol))
    6767        {
    68             aWarning = VBoxGLSettingsNetwork::tr ("host IPv4 network mask of <b>%1</b> is wrong").arg (text (0));
     68            aWarning = UIGlobalSettingsNetwork::tr ("host IPv4 network mask of <b>%1</b> is wrong").arg (text (0));
    6969            return false;
    7070        }
    … …  
    7575                 QHostAddress (m_data.m_interface.m_strInterfaceAddress6).protocol() != QAbstractSocket::IPv6Protocol))
    7676            {
    77                 aWarning = VBoxGLSettingsNetwork::tr ("host IPv6 address of <b>%1</b> is wrong").arg (text (0));
     77                aWarning = UIGlobalSettingsNetwork::tr ("host IPv6 address of <b>%1</b> is wrong").arg (text (0));
    7878                return false;
    7979            }
    … …  
    8787            QHostAddress (m_data.m_dhcpserver.m_strDhcpServerAddress).protocol() != QAbstractSocket::IPv4Protocol)
    8888        {
    89             aWarning = VBoxGLSettingsNetwork::tr ("DHCP server address of <b>%1</b> is wrong").arg (text (0));
     89            aWarning = UIGlobalSettingsNetwork::tr ("DHCP server address of <b>%1</b> is wrong").arg (text (0));
    9090            return false;
    9191        }
    … …  
    9393            QHostAddress (m_data.m_dhcpserver.m_strDhcpServerMask).protocol() != QAbstractSocket::IPv4Protocol)
    9494        {
    95             aWarning = VBoxGLSettingsNetwork::tr ("DHCP server network mask of <b>%1</b> is wrong").arg (text (0));
     95            aWarning = UIGlobalSettingsNetwork::tr ("DHCP server network mask of <b>%1</b> is wrong").arg (text (0));
    9696            return false;
    9797        }
    … …  
    9999            QHostAddress (m_data.m_dhcpserver.m_strDhcpLowerAddress).protocol() != QAbstractSocket::IPv4Protocol)
    100100        {
    101             aWarning = VBoxGLSettingsNetwork::tr ("DHCP lower address bound of <b>%1</b> is wrong").arg (text (0));
     101            aWarning = UIGlobalSettingsNetwork::tr ("DHCP lower address bound of <b>%1</b> is wrong").arg (text (0));
    102102            return false;
    103103        }
    … …  
    105105            QHostAddress (m_data.m_dhcpserver.m_strDhcpUpperAddress).protocol() != QAbstractSocket::IPv4Protocol)
    106106        {
    107             aWarning = VBoxGLSettingsNetwork::tr ("DHCP upper address bound of <b>%1</b> is wrong").arg (text (0));
     107            aWarning = UIGlobalSettingsNetwork::tr ("DHCP upper address bound of <b>%1</b> is wrong").arg (text (0));
    108108            return false;
    109109        }
    … …  
    125125
    126126    /* Host-only Interface information */
    127     buffer = hdr.arg (VBoxGLSettingsNetwork::tr ("Adapter"))
    128                 .arg (m_data.m_interface.m_fDhcpClientEnabled ? VBoxGLSettingsNetwork::tr ("Automatically configured", "interface")
    129                                                               : VBoxGLSettingsNetwork::tr ("Manually configured", "interface"));
     127    buffer = hdr.arg (UIGlobalSettingsNetwork::tr ("Adapter"))
     128                .arg (m_data.m_interface.m_fDhcpClientEnabled ? UIGlobalSettingsNetwork::tr ("Automatically configured", "interface")
     129                                                              : UIGlobalSettingsNetwork::tr ("Manually configured", "interface"));
    130130    data += buffer;
    131131    tip += buffer;
    … …  
    133133    if (!m_data.m_interface.m_fDhcpClientEnabled)
    134134    {
    135         buffer = sub.arg (VBoxGLSettingsNetwork::tr ("IPv4 Address"))
    136                     .arg (m_data.m_interface.m_strInterfaceAddress.isEmpty() ? VBoxGLSettingsNetwork::tr ("Not set", "address")
     135        buffer = sub.arg (UIGlobalSettingsNetwork::tr ("IPv4 Address"))
     136                    .arg (m_data.m_interface.m_strInterfaceAddress.isEmpty() ? UIGlobalSettingsNetwork::tr ("Not set", "address")
    137137                                                                             : m_data.m_interface.m_strInterfaceAddress) +
    138                  sub.arg (VBoxGLSettingsNetwork::tr ("IPv4 Network Mask"))
    139                     .arg (m_data.m_interface.m_strInterfaceMask.isEmpty() ? VBoxGLSettingsNetwork::tr ("Not set", "mask")
     138                 sub.arg (UIGlobalSettingsNetwork::tr ("IPv4 Network Mask"))
     139                    .arg (m_data.m_interface.m_strInterfaceMask.isEmpty() ? UIGlobalSettingsNetwork::tr ("Not set", "mask")
    140140                                                                          : m_data.m_interface.m_strInterfaceMask);
    141141        tip += buffer;
    … …  
    143143        if (m_data.m_interface.m_fIpv6Supported)
    144144        {
    145             buffer = sub.arg (VBoxGLSettingsNetwork::tr ("IPv6 Address"))
    146                         .arg (m_data.m_interface.m_strInterfaceAddress6.isEmpty() ? VBoxGLSettingsNetwork::tr ("Not set", "address")
     145            buffer = sub.arg (UIGlobalSettingsNetwork::tr ("IPv6 Address"))
     146                        .arg (m_data.m_interface.m_strInterfaceAddress6.isEmpty() ? UIGlobalSettingsNetwork::tr ("Not set", "address")
    147147                                                                                  : m_data.m_interface.m_strInterfaceAddress6) +
    148                      sub.arg (VBoxGLSettingsNetwork::tr ("IPv6 Network Mask Length"))
    149                         .arg (m_data.m_interface.m_strInterfaceMaskLength6.isEmpty() ? VBoxGLSettingsNetwork::tr ("Not set", "length")
     148                     sub.arg (UIGlobalSettingsNetwork::tr ("IPv6 Network Mask Length"))
     149                        .arg (m_data.m_interface.m_strInterfaceMaskLength6.isEmpty() ? UIGlobalSettingsNetwork::tr ("Not set", "length")
    150150                                                              : m_data.m_interface.m_strInterfaceMaskLength6);
    151151            tip += buffer;
    … …  
    154154
    155155    /* DHCP Server information */
    156     buffer = hdr.arg (VBoxGLSettingsNetwork::tr ("DHCP Server"))
    157                 .arg (m_data.m_dhcpserver.m_fDhcpServerEnabled ? VBoxGLSettingsNetwork::tr ("Enabled", "server")
    158                                                                : VBoxGLSettingsNetwork::tr ("Disabled", "server"));
     156    buffer = hdr.arg (UIGlobalSettingsNetwork::tr ("DHCP Server"))
     157                .arg (m_data.m_dhcpserver.m_fDhcpServerEnabled ? UIGlobalSettingsNetwork::tr ("Enabled", "server")
     158                                                               : UIGlobalSettingsNetwork::tr ("Disabled", "server"));
    159159    data += buffer;
    160160    tip += buffer;
    … …  
    162162    if (m_data.m_dhcpserver.m_fDhcpServerEnabled)
    163163    {
    164         buffer = sub.arg (VBoxGLSettingsNetwork::tr ("Address"))
    165                     .arg (m_data.m_dhcpserver.m_strDhcpServerAddress.isEmpty() ? VBoxGLSettingsNetwork::tr ("Not set", "address")
     164        buffer = sub.arg (UIGlobalSettingsNetwork::tr ("Address"))
     165                    .arg (m_data.m_dhcpserver.m_strDhcpServerAddress.isEmpty() ? UIGlobalSettingsNetwork::tr ("Not set", "address")
    166166                                                                               : m_data.m_dhcpserver.m_strDhcpServerAddress) +
    167                  sub.arg (VBoxGLSettingsNetwork::tr ("Network Mask"))
    168                     .arg (m_data.m_dhcpserver.m_strDhcpServerMask.isEmpty() ? VBoxGLSettingsNetwork::tr ("Not set", "mask")
     167                 sub.arg (UIGlobalSettingsNetwork::tr ("Network Mask"))
     168                    .arg (m_data.m_dhcpserver.m_strDhcpServerMask.isEmpty() ? UIGlobalSettingsNetwork::tr ("Not set", "mask")
    169169                                                                            : m_data.m_dhcpserver.m_strDhcpServerMask) +
    170                  sub.arg (VBoxGLSettingsNetwork::tr ("Lower Bound"))
    171                     .arg (m_data.m_dhcpserver.m_strDhcpLowerAddress.isEmpty() ? VBoxGLSettingsNetwork::tr ("Not set", "bound")
     170                 sub.arg (UIGlobalSettingsNetwork::tr ("Lower Bound"))
     171                    .arg (m_data.m_dhcpserver.m_strDhcpLowerAddress.isEmpty() ? UIGlobalSettingsNetwork::tr ("Not set", "bound")
    172172                                                                              : m_data.m_dhcpserver.m_strDhcpLowerAddress) +
    173                  sub.arg (VBoxGLSettingsNetwork::tr ("Upper Bound"))
    174                     .arg (m_data.m_dhcpserver.m_strDhcpUpperAddress.isEmpty() ? VBoxGLSettingsNetwork::tr ("Not set", "bound")
     173                 sub.arg (UIGlobalSettingsNetwork::tr ("Upper Bound"))
     174                    .arg (m_data.m_dhcpserver.m_strDhcpUpperAddress.isEmpty() ? UIGlobalSettingsNetwork::tr ("Not set", "bound")
    175175                                                                              : m_data.m_dhcpserver.m_strDhcpUpperAddress);
    176176        tip += buffer;
    … …  
    182182}
    183183
    184 VBoxGLSettingsNetwork::VBoxGLSettingsNetwork()
     184UIGlobalSettingsNetwork::UIGlobalSettingsNetwork()
    185185    : mValidator(0)
    186186    , mAddInterface(0), mRemInterface(0), mEditInterface(0)
    … …  
    188188{
    189189    /* Apply UI decorations */
    190     Ui::VBoxGLSettingsNetwork::setupUi (this);
     190    Ui::UIGlobalSettingsNetwork::setupUi (this);
    191191
    192192#ifdef Q_WS_MAC
    … …  
    252252/* Load data to cashe from corresponding external object(s),
    253253 * this task COULD be performed in other than GUI thread: */
    254 void VBoxGLSettingsNetwork::loadToCacheFrom(QVariant &data)
     254void UIGlobalSettingsNetwork::loadToCacheFrom(QVariant &data)
    255255{
    256256    /* Fetch data to properties & settings: */
    … …  
    295295/* Load data to corresponding widgets from cache,
    296296 * this task SHOULD be performed in GUI thread only: */
    297 void VBoxGLSettingsNetwork::getFromCache()
     297void UIGlobalSettingsNetwork::getFromCache()
    298298{
    299299    /* Fetch from cache: */
    … …  
    318318/* Save data from corresponding widgets to cache,
    319319 * this task SHOULD be performed in GUI thread only: */
    320 void VBoxGLSettingsNetwork::putToCache()
     320void UIGlobalSettingsNetwork::putToCache()
    321321{
    322322    /* Upload to cache: */
    … …  
    333333/* Save data from cache to corresponding external object(s),
    334334 * this task COULD be performed in other than GUI thread: */
    335 void VBoxGLSettingsNetwork::saveFromCacheTo(QVariant &data)
     335void UIGlobalSettingsNetwork::saveFromCacheTo(QVariant &data)
    336336{
    337337    /* Ensure settings were changed: */
    … …  
    450450}
    451451
    452 void VBoxGLSettingsNetwork::setValidator (QIWidgetValidator *aValidator)
     452void UIGlobalSettingsNetwork::setValidator (QIWidgetValidator *aValidator)
    453453{
    454454    mValidator = aValidator;
    455455}
    456456
    457 bool VBoxGLSettingsNetwork::revalidate (QString &aWarning, QString &aTitle)
     457bool UIGlobalSettingsNetwork::revalidate (QString &aWarning, QString &aTitle)
    458458{
    459459    NetworkItem *item = static_cast <NetworkItem*> (mTwInterfaces->currentItem());
    … …  
    461461}
    462462
    463 void VBoxGLSettingsNetwork::setOrderAfter (QWidget *aWidget)
     463void UIGlobalSettingsNetwork::setOrderAfter (QWidget *aWidget)
    464464{
    465465    setTabOrder (aWidget, mTwInterfaces);
    466466}
    467467
    468 void VBoxGLSettingsNetwork::retranslateUi()
     468void UIGlobalSettingsNetwork::retranslateUi()
    469469{
    470470    /* Translate uic generated strings */
    471     Ui::VBoxGLSettingsNetwork::retranslateUi (this);
     471    Ui::UIGlobalSettingsNetwork::retranslateUi (this);
    472472
    473473    /* Translate action tool-tips */
    … …  
    484484}
    485485
    486 void VBoxGLSettingsNetwork::addInterface()
     486void UIGlobalSettingsNetwork::addInterface()
    487487{
    488488    /* Creating interface item: */
    … …  
    507507}
    508508
    509 void VBoxGLSettingsNetwork::remInterface()
     509void UIGlobalSettingsNetwork::remInterface()
    510510{
    511511    /* Get interface item: */
    … …  
    523523}
    524524
    525 void VBoxGLSettingsNetwork::editInterface()
     525void UIGlobalSettingsNetwork::editInterface()
    526526{
    527527    /* Check interface presence */
    … …  
    529529    AssertMsg (item, ("Current item should be selected!\n"));
    530530    /* Edit current item data */
    531     VBoxGLSettingsNetworkDetails details (this);
     531    UIGlobalSettingsNetworkDetails details (this);
    532532    details.getFromItem (item);
    533533    if (details.exec() == QDialog::Accepted)
    … …  
    542542}
    543543
    544 void VBoxGLSettingsNetwork::updateCurrentItem()
     544void UIGlobalSettingsNetwork::updateCurrentItem()
    545545{
    546546    /* Get current item */
    … …  
    553553}
    554554
    555 void VBoxGLSettingsNetwork::showContextMenu (const QPoint &aPos)
     555void UIGlobalSettingsNetwork::showContextMenu (const QPoint &aPos)
    556556{
    557557    QMenu menu;

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.h

    r33879 r33882  
    22 *
    33 * VBox frontends: Qt4 GUI ("VirtualBox"):
    4  * VBoxGLSettingsNetwork class declaration
     4 * UIGlobalSettingsNetwork class declaration
    55 */
    66
    … …  
    1717 */
    1818
    19 #ifndef __VBoxGLSettingsNetwork_h__
    20 #define __VBoxGLSettingsNetwork_h__
     19#ifndef __UIGlobalSettingsNetwork_h__
     20#define __UIGlobalSettingsNetwork_h__
    2121
    2222#include "UISettingsPage.h"
    23 #include "VBoxGLSettingsNetwork.gen.h"
     23#include "UIGlobalSettingsNetwork.gen.h"
    2424
    2525/* Host interface data: */
    … …  
    109109
    110110/* Global settings / Network page: */
    111 class VBoxGLSettingsNetwork : public UISettingsPageGlobal,
    112                               public Ui::VBoxGLSettingsNetwork
     111class UIGlobalSettingsNetwork : public UISettingsPageGlobal,
     112                              public Ui::UIGlobalSettingsNetwork
    113113{
    114114    Q_OBJECT;
    … …  
    116116public:
    117117
    118     VBoxGLSettingsNetwork();
     118    UIGlobalSettingsNetwork();
    119119
    120120protected:
    … …  
    163163};
    164164
    165 #endif // __VBoxGLSettingsNetwork_h__
     165#endif // __UIGlobalSettingsNetwork_h__
    166166

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.ui

    r33879 r33882  
    1414     hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1515 </comment>
    16  <class>VBoxGLSettingsNetwork</class>
    17  <widget class="QWidget" name="VBoxGLSettingsNetwork">
     16 <class>UIGlobalSettingsNetwork</class>
     17 <widget class="QWidget" name="UIGlobalSettingsNetwork">
    1818  <property name="geometry">
    1919   <rect>

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

    r33879 r33882  
    33 *
    44 * VBox frontends: Qt4 GUI ("VirtualBox"):
    5  * VBoxGLSettingsNetworkDetails class implementation
     5 * UIGlobalSettingsNetworkDetails class implementation
    66 */
    77
    … …  
    1919
    2020/* VBox Includes */
    21 #include "VBoxGLSettingsNetwork.h"
    22 #include "VBoxGLSettingsNetworkDetails.h"
     21#include "UIGlobalSettingsNetwork.h"
     22#include "UIGlobalSettingsNetworkDetails.h"
    2323
    2424/* Qt Includes */
    … …  
    2626#include <QRegExpValidator>
    2727
    28 VBoxGLSettingsNetworkDetails::VBoxGLSettingsNetworkDetails (QWidget *aParent)
     28UIGlobalSettingsNetworkDetails::UIGlobalSettingsNetworkDetails (QWidget *aParent)
    2929    : QIWithRetranslateUI2 <QIDialog> (aParent
    3030#ifdef Q_WS_MAC
    … …  
    3535{
    3636    /* Apply UI decorations */
    37     Ui::VBoxGLSettingsNetworkDetails::setupUi (this);
     37    Ui::UIGlobalSettingsNetworkDetails::setupUi (this);
    3838
    3939    /* Setup dialog */
    … …  
    9999}
    100100
    101 void VBoxGLSettingsNetworkDetails::getFromItem (NetworkItem *aItem)
     101void UIGlobalSettingsNetworkDetails::getFromItem (NetworkItem *aItem)
    102102{
    103103    mItem = aItem;
    … …  
    117117}
    118118
    119 void VBoxGLSettingsNetworkDetails::putBackToItem()
     119void UIGlobalSettingsNetworkDetails::putBackToItem()
    120120{
    121121    /* Host-only Interface */
    … …  
    143143}
    144144
    145 void VBoxGLSettingsNetworkDetails::retranslateUi()
     145void UIGlobalSettingsNetworkDetails::retranslateUi()
    146146{
    147147    /* Translate uic generated strings */
    148     Ui::VBoxGLSettingsNetworkDetails::retranslateUi (this);
    149 }
    150 
    151 void VBoxGLSettingsNetworkDetails::dhcpClientStatusChanged()
     148    Ui::UIGlobalSettingsNetworkDetails::retranslateUi (this);
     149}
     150
     151void UIGlobalSettingsNetworkDetails::dhcpClientStatusChanged()
    152152{
    153153    bool isManual = mCbManual->isChecked();
    … …  
    180180}
    181181
    182 void VBoxGLSettingsNetworkDetails::dhcpServerStatusChanged()
     182void UIGlobalSettingsNetworkDetails::dhcpServerStatusChanged()
    183183{
    184184    bool isEnabled = mCbDhcpServerEnabled->isChecked();

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetails.h

    r33879 r33882  
    22 *
    33 * VBox frontends: Qt4 GUI ("VirtualBox"):
    4  * VBoxGLSettingsNetworkDetails class declaration
     4 * UIGlobalSettingsNetworkDetails class declaration
    55 */
    66
    … …  
    1717 */
    1818
    19 #ifndef __VBoxGLSettingsNetworkDetails_h__
    20 #define __VBoxGLSettingsNetworkDetails_h__
     19#ifndef __UIGlobalSettingsNetworkDetails_h__
     20#define __UIGlobalSettingsNetworkDetails_h__
    2121
    2222/* VBox includes */
    2323#include "QIDialog.h"
    2424#include "QIWithRetranslateUI.h"
    25 #include "VBoxGLSettingsNetworkDetails.gen.h"
     25#include "UIGlobalSettingsNetworkDetails.gen.h"
    2626
    2727/* VBox forwards */
    2828class NetworkItem;
    2929
    30 class VBoxGLSettingsNetworkDetails : public QIWithRetranslateUI2 <QIDialog>,
    31                                      public Ui::VBoxGLSettingsNetworkDetails
     30class UIGlobalSettingsNetworkDetails : public QIWithRetranslateUI2 <QIDialog>,
     31                                     public Ui::UIGlobalSettingsNetworkDetails
    3232{
    3333    Q_OBJECT;
    … …  
    3535public:
    3636
    37     VBoxGLSettingsNetworkDetails (QWidget *aParent);
     37    UIGlobalSettingsNetworkDetails (QWidget *aParent);
    3838
    3939    void getFromItem (NetworkItem *aItem);
    … …  
    5454};
    5555
    56 #endif // __VBoxGLSettingsNetworkDetails_h__
     56#endif // __UIGlobalSettingsNetworkDetails_h__
    5757

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetails.ui

    r33879 r33882  
    1313     hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1414 </comment>
    15  <class>VBoxGLSettingsNetworkDetails</class>
    16  <widget class="QWidget" name="VBoxGLSettingsNetworkDetails" >
     15 <class>UIGlobalSettingsNetworkDetails</class>
     16 <widget class="QWidget" name="UIGlobalSettingsNetworkDetails" >
    1717  <property name="geometry" >
    1818   <rect>
    … …  
    342342   <sender>mButtonBox</sender>
    343343   <signal>accepted()</signal>
    344    <receiver>VBoxGLSettingsNetworkDetails</receiver>
     344   <receiver>UIGlobalSettingsNetworkDetails</receiver>
    345345   <slot>accept()</slot>
    346346   <hints>
    … …  
    358358   <sender>mButtonBox</sender>
    359359   <signal>rejected()</signal>
    360    <receiver>VBoxGLSettingsNetworkDetails</receiver>
     360   <receiver>UIGlobalSettingsNetworkDetails</receiver>
    361361   <slot>reject()</slot>
    362362   <hints>

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

    r33879 r33882  
    33 *
    44 * VBox frontends: Qt4 GUI ("VirtualBox"):
    5  * VBoxGLSettingsUpdate class implementation
     5 * UIGlobalSettingsUpdate class implementation
    66 */
    77
    … …  
    1818 */
    1919
    20 #include "VBoxGLSettingsUpdate.h"
     20#include "UIGlobalSettingsUpdate.h"
    2121#include "VBoxGlobal.h"
    2222
    23 VBoxGLSettingsUpdate::VBoxGLSettingsUpdate()
     23UIGlobalSettingsUpdate::UIGlobalSettingsUpdate()
    2424    : mSettingsChanged(false)
    2525    , mLastChosen(0)
    2626{
    2727    /* Apply UI decorations */
    28     Ui::VBoxGLSettingsUpdate::setupUi (this);
     28    Ui::UIGlobalSettingsUpdate::setupUi (this);
    2929
    3030    /* Setup connections */
    … …  
    4141/* Load data to cashe from corresponding external object(s),
    4242 * this task COULD be performed in other than GUI thread: */
    43 void VBoxGLSettingsUpdate::loadToCacheFrom(QVariant &data)
     43void UIGlobalSettingsUpdate::loadToCacheFrom(QVariant &data)
    4444{
    4545    /* Fetch data to properties & settings: */
    … …  
    5959/* Load data to corresponding widgets from cache,
    6060 * this task SHOULD be performed in GUI thread only: */
    61 void VBoxGLSettingsUpdate::getFromCache()
     61void UIGlobalSettingsUpdate::getFromCache()
    6262{
    6363    /* Apply internal variables data to QWidget(s): */
    … …  
    8181/* Save data from corresponding widgets to cache,
    8282 * this task SHOULD be performed in GUI thread only: */
    83 void VBoxGLSettingsUpdate::putToCache()
     83void UIGlobalSettingsUpdate::putToCache()
    8484{
    8585    /* Gather internal variables data from QWidget(s): */
    … …  
    9090/* Save data from cache to corresponding external object(s),
    9191 * this task COULD be performed in other than GUI thread: */
    92 void VBoxGLSettingsUpdate::saveFromCacheTo(QVariant &data)
     92void UIGlobalSettingsUpdate::saveFromCacheTo(QVariant &data)
    9393{
    9494    /* Test settings altering flag: */
    … …  
    107107}
    108108
    109 void VBoxGLSettingsUpdate::setOrderAfter (QWidget *aWidget)
     109void UIGlobalSettingsUpdate::setOrderAfter (QWidget *aWidget)
    110110{
    111111    setTabOrder (aWidget, mCbCheck);
    … …  
    116116}
    117117
    118 void VBoxGLSettingsUpdate::retranslateUi()
     118void UIGlobalSettingsUpdate::retranslateUi()
    119119{
    120120    /* Translate uic generated strings */
    121     Ui::VBoxGLSettingsUpdate::retranslateUi (this);
     121    Ui::UIGlobalSettingsUpdate::retranslateUi (this);
    122122
    123123    /* Retranslate mCbOncePer combobox */
    … …  
    129129}
    130130
    131 void VBoxGLSettingsUpdate::toggleUpdater (bool aOn)
     131void UIGlobalSettingsUpdate::toggleUpdater (bool aOn)
    132132{
    133133    /* Enable/disable the sub widget */
    … …  
    158158}
    159159
    160 void VBoxGLSettingsUpdate::activatedPeriod (int /*aIndex*/)
     160void UIGlobalSettingsUpdate::activatedPeriod (int /*aIndex*/)
    161161{
    162162    VBoxUpdateData data (periodType(), branchType());
    … …  
    165165}
    166166
    167 void VBoxGLSettingsUpdate::toggledBranch()
     167void UIGlobalSettingsUpdate::toggledBranch()
    168168{
    169169    mSettingsChanged = true;
    170170}
    171171
    172 void VBoxGLSettingsUpdate::showEvent (QShowEvent *aEvent)
     172void UIGlobalSettingsUpdate::showEvent (QShowEvent *aEvent)
    173173{
    174174    UISettingsPage::showEvent (aEvent);
    … …  
    181181}
    182182
    183 VBoxUpdateData::PeriodType VBoxGLSettingsUpdate::periodType() const
     183VBoxUpdateData::PeriodType UIGlobalSettingsUpdate::periodType() const
    184184{
    185185    VBoxUpdateData::PeriodType result = mCbCheck->isChecked() ?
    … …  
    188188}
    189189
    190 VBoxUpdateData::BranchType VBoxGLSettingsUpdate::branchType() const
     190VBoxUpdateData::BranchType UIGlobalSettingsUpdate::branchType() const
    191191{
    192192    if (mRbWithBetas->isChecked())

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.h

    r33879 r33882  
    22 *
    33 * VBox frontends: Qt4 GUI ("VirtualBox"):
    4  * VBoxGLSettingsUpdate class declaration
     4 * UIGlobalSettingsUpdate class declaration
    55 */
    66
    … …  
    1717 */
    1818
    19 #ifndef __VBoxGLSettingsUpdate_h__
    20 #define __VBoxGLSettingsUpdate_h__
     19#ifndef __UIGlobalSettingsUpdate_h__
     20#define __UIGlobalSettingsUpdate_h__
    2121
    2222#include "UISettingsPage.h"
    23 #include "VBoxGLSettingsUpdate.gen.h"
     23#include "UIGlobalSettingsUpdate.gen.h"
    2424#include "VBoxUpdateDlg.h"
    2525
    … …  
    3434
    3535/* Global settings / Update page: */
    36 class VBoxGLSettingsUpdate : public UISettingsPageGlobal,
    37                              public Ui::VBoxGLSettingsUpdate
     36class UIGlobalSettingsUpdate : public UISettingsPageGlobal,
     37                             public Ui::UIGlobalSettingsUpdate
    3838{
    3939    Q_OBJECT;
    … …  
    4141public:
    4242
    43     VBoxGLSettingsUpdate();
     43    UIGlobalSettingsUpdate();
    4444
    4545protected:
    … …  
    8383};
    8484
    85 #endif // __VBoxGLSettingsUpdate_h__
     85#endif // __UIGlobalSettingsUpdate_h__
    8686

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.ui

    r33879 r33882  
    1313     hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1414 </comment>
    15  <class>VBoxGLSettingsUpdate</class>
    16  <widget class="QWidget" name="VBoxGLSettingsUpdate" >
     15 <class>UIGlobalSettingsUpdate</class>
     16 <widget class="QWidget" name="UIGlobalSettingsUpdate" >
    1717  <property name="geometry" >
    1818   <rect>

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.cpp

    r33879 r33882  
    33 *
    44 * VBox frontends: Qt4 GUI ("VirtualBox"):
    5  * VBoxVMSettingsAudio class implementation
     5 * UIMachineSettingsAudio class implementation
    66 */
    77
    … …  
    1818 */
    1919
    20 #include "VBoxVMSettingsAudio.h"
     20#include "UIMachineSettingsAudio.h"
    2121#include "VBoxGlobal.h"
    2222
    23 VBoxVMSettingsAudio::VBoxVMSettingsAudio()
     23UIMachineSettingsAudio::UIMachineSettingsAudio()
    2424{
    2525    /* Apply UI decorations */
    26     Ui::VBoxVMSettingsAudio::setupUi (this);
     26    Ui::UIMachineSettingsAudio::setupUi (this);
    2727    /* Applying language settings */
    2828    retranslateUi();
    … …  
    3131/* Load data to cashe from corresponding external object(s),
    3232 * this task COULD be performed in other than GUI thread: */
    33 void VBoxVMSettingsAudio::loadToCacheFrom(QVariant &data)
     33void UIMachineSettingsAudio::loadToCacheFrom(QVariant &data)
    3434{
    3535    /* Fetch data to machine: */
    … …  
    4848/* Load data to corresponding widgets from cache,
    4949 * this task SHOULD be performed in GUI thread only: */
    50 void VBoxVMSettingsAudio::getFromCache()
     50void UIMachineSettingsAudio::getFromCache()
    5151{
    5252    /* Apply internal variables data to QWidget(s): */
    … …  
    5858/* Save data from corresponding widgets to cache,
    5959 * this task SHOULD be performed in GUI thread only: */
    60 void VBoxVMSettingsAudio::putToCache()
     60void UIMachineSettingsAudio::putToCache()
    6161{
    6262    /* Gather internal variables data from QWidget(s): */
    … …  
    6868/* Save data from cache to corresponding external object(s),
    6969 * this task COULD be performed in other than GUI thread: */
    70 void VBoxVMSettingsAudio::saveFromCacheTo(QVariant &data)
     70void UIMachineSettingsAudio::saveFromCacheTo(QVariant &data)
    7171{
    7272    /* Fetch data to machine: */
    … …  
    8383}
    8484
    85 void VBoxVMSettingsAudio::setOrderAfter (QWidget *aWidget)
     85void UIMachineSettingsAudio::setOrderAfter (QWidget *aWidget)
    8686{
    8787    setTabOrder (aWidget, mGbAudio);
    … …  
    9090}
    9191
    92 void VBoxVMSettingsAudio::retranslateUi()
     92void UIMachineSettingsAudio::retranslateUi()
    9393{
    9494    /* Translate uic generated strings */
    95     Ui::VBoxVMSettingsAudio::retranslateUi (this);
     95    Ui::UIMachineSettingsAudio::retranslateUi (this);
    9696    /* Fill the comboboxes */
    9797    prepareComboboxes();
    9898}
    9999
    100 void VBoxVMSettingsAudio::prepareComboboxes()
     100void UIMachineSettingsAudio::prepareComboboxes()
    101101{
    102102    /* Save the current selected value */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.h

    r33879 r33882  
    22 *
    33 * VBox frontends: Qt4 GUI ("VirtualBox"):
    4  * VBoxVMSettingsAudio class declaration
     4 * UIMachineSettingsAudio class declaration
    55 */
    66
    … …  
    1717 */
    1818
    19 #ifndef __VBoxVMSettingsAudio_h__
    20 #define __VBoxVMSettingsAudio_h__
     19#ifndef __UIMachineSettingsAudio_h__
     20#define __UIMachineSettingsAudio_h__
    2121
    2222#include "UISettingsPage.h"
    23 #include "VBoxVMSettingsAudio.gen.h"
     23#include "UIMachineSettingsAudio.gen.h"
    2424#include "COMDefs.h"
    2525
    … …  
    3333
    3434/* Machine settings / Audio page: */
    35 class VBoxVMSettingsAudio : public UISettingsPageMachine,
    36                             public Ui::VBoxVMSettingsAudio
     35class UIMachineSettingsAudio : public UISettingsPageMachine,
     36                            public Ui::UIMachineSettingsAudio
    3737{
    3838    Q_OBJECT;
    … …  
    4040public:
    4141
    42     VBoxVMSettingsAudio();
     42    UIMachineSettingsAudio();
    4343
    4444protected:
    … …  
    7070};
    7171
    72 #endif // __VBoxVMSettingsAudio_h__
     72#endif // __UIMachineSettingsAudio_h__
    7373

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.ui

    r33879 r33882  
    1313     hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1414 </comment>
    15  <class>VBoxVMSettingsAudio</class>
    16  <widget class="QWidget" name="VBoxVMSettingsAudio" >
     15 <class>UIMachineSettingsAudio</class>
     16 <widget class="QWidget" name="UIMachineSettingsAudio" >
    1717  <property name="geometry" >
    1818   <rect>

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp

    r33879 r33882  
    33 *
    44 * VBox frontends: Qt4 GUI ("VirtualBox"):
    5  * VBoxVMSettingsDisplay class implementation
     5 * UIMachineSettingsDisplay class implementation
    66 */
    77
    … …  
    1919
    2020#include "QIWidgetValidator.h"
    21 #include "VBoxVMSettingsDisplay.h"
     21#include "UIMachineSettingsDisplay.h"
    2222#include "VBoxGlobal.h"
    2323#include "VBoxProblemReporter.h"
    … …  
    4545}
    4646
    47 VBoxVMSettingsDisplay::VBoxVMSettingsDisplay()
     47UIMachineSettingsDisplay::UIMachineSettingsDisplay()
    4848    : mValidator(0)
    4949    , m_minVRAM(0)
    … …  
    5656{
    5757    /* Apply UI decorations */
    58     Ui::VBoxVMSettingsDisplay::setupUi (this);
     58    Ui::UIMachineSettingsDisplay::setupUi (this);
    5959
    6060    /* Setup constants */
    … …  
    129129
    130130#ifdef VBOX_WITH_VIDEOHWACCEL
    131 bool VBoxVMSettingsDisplay::isAcceleration2DVideoSelected() const
     131bool UIMachineSettingsDisplay::isAcceleration2DVideoSelected() const
    132132{
    133133    return mCb2DVideo->isChecked();
    … …  
    136136
    137137#ifdef VBOX_WITH_CRHGSMI
    138 void VBoxVMSettingsDisplay::setWddmMode(bool bWddm)
     138void UIMachineSettingsDisplay::setWddmMode(bool bWddm)
    139139{
    140140    if (bWddm == m_bWddmMode)
    … …  
    148148/* Load data to cashe from corresponding external object(s),
    149149 * this task COULD be performed in other than GUI thread: */
    150 void VBoxVMSettingsDisplay::loadToCacheFrom(QVariant &data)
     150void UIMachineSettingsDisplay::loadToCacheFrom(QVariant &data)
    151151{
    152152    /* Fetch data to machine: */
    … …  
    177177/* Load data to corresponding widgets from cache,
    178178 * this task SHOULD be performed in GUI thread only: */
    179 void VBoxVMSettingsDisplay::getFromCache()
     179void UIMachineSettingsDisplay::getFromCache()
    180180{
    181181    /* Apply internal variables data to QWidget(s): */
    … …  
    206206/* Save data from corresponding widgets to cache,
    207207 * this task SHOULD be performed in GUI thread only: */
    208 void VBoxVMSettingsDisplay::putToCache()
     208void UIMachineSettingsDisplay::putToCache()
    209209{
    210210    /* Gather internal variables data from QWidget(s): */
    … …  
    227227/* Save data from cache to corresponding external object(s),
    228228 * this task COULD be performed in other than GUI thread: */
    229 void VBoxVMSettingsDisplay::saveFromCacheTo(QVariant &data)
     229void UIMachineSettingsDisplay::saveFromCacheTo(QVariant &data)
    230230{
    231231    /* Fetch data to machine: */
    … …  
    253253}
    254254
    255 void VBoxVMSettingsDisplay::setValidator (QIWidgetValidator *aVal)
     255void UIMachineSettingsDisplay::setValidator (QIWidgetValidator *aVal)
    256256{
    257257    mValidator = aVal;
    … …  
    270270}
    271271
    272 bool VBoxVMSettingsDisplay::revalidate (QString &aWarning, QString & /* aTitle */)
     272bool UIMachineSettingsDisplay::revalidate (QString &aWarning, QString & /* aTitle */)
    273273{
    274274    /* Video RAM amount test */
    … …  
    319319}
    320320
    321 void VBoxVMSettingsDisplay::setOrderAfter (QWidget *aWidget)
     321void UIMachineSettingsDisplay::setOrderAfter (QWidget *aWidget)
    322322{
    323323    /* Video tab-order */
    … …  
    342342}
    343343
    344 void VBoxVMSettingsDisplay::retranslateUi()
     344void UIMachineSettingsDisplay::retranslateUi()
    345345{
    346346    /* Translate uic generated strings */
    347     Ui::VBoxVMSettingsDisplay::retranslateUi (this);
     347    Ui::UIMachineSettingsDisplay::retranslateUi (this);
    348348
    349349    CSystemProperties sys = vboxGlobal().virtualBox().GetSystemProperties();
    … …  
    361361}
    362362
    363 void VBoxVMSettingsDisplay::valueChangedVRAM (int aVal)
     363void UIMachineSettingsDisplay::valueChangedVRAM (int aVal)
    364364{
    365365    mLeMemory->setText (QString().setNum (aVal));
    366366}
    367367
    368 void VBoxVMSettingsDisplay::textChangedVRAM (const QString &aText)
     368void UIMachineSettingsDisplay::textChangedVRAM (const QString &aText)
    369369{
    370370    mSlMemory->setValue (aText.toInt());
    371371}
    372372
    373 void VBoxVMSettingsDisplay::valueChangedMonitors (int aVal)
     373void UIMachineSettingsDisplay::valueChangedMonitors (int aVal)
    374374{
    375375    mLeMonitors->setText (QString().setNum (aVal));
    … …  
    377377}
    378378
    379 void VBoxVMSettingsDisplay::textChangedMonitors (const QString &aText)
     379void UIMachineSettingsDisplay::textChangedMonitors (const QString &aText)
    380380{
    381381    mSlMonitors->setValue (aText.toInt());
    382382}
    383383
    384 void VBoxVMSettingsDisplay::checkVRAMRequirements()
     384void UIMachineSettingsDisplay::checkVRAMRequirements()
    385385{
    386386    int cVal = mSlMonitors->value();

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.h

    r33879 r33882  
    22 *
    33 * VBox frontends: Qt4 GUI ("VirtualBox"):
    4  * VBoxVMSettingsDisplay class declaration
     4 * UIMachineSettingsDisplay class declaration
    55 */
    66
    … …  
    1717 */
    1818
    19 #ifndef __VBoxVMSettingsDisplay_h__
    20 #define __VBoxVMSettingsDisplay_h__
     19#ifndef __UIMachineSettingsDisplay_h__
     20#define __UIMachineSettingsDisplay_h__
    2121
    2222#include "COMDefs.h"
    2323#include "UISettingsPage.h"
    24 #include "VBoxVMSettingsDisplay.gen.h"
     24#include "UIMachineSettingsDisplay.gen.h"
    2525
    2626/* Machine settings / Display page / Cache: */
    … …  
    4040
    4141/* Machine settings / Display page: */
    42 class VBoxVMSettingsDisplay : public UISettingsPageMachine,
    43                               public Ui::VBoxVMSettingsDisplay
     42class UIMachineSettingsDisplay : public UISettingsPageMachine,
     43                              public Ui::UIMachineSettingsDisplay
    4444{
    4545    Q_OBJECT;
    … …  
    4747public:
    4848
    49     VBoxVMSettingsDisplay();
     49    UIMachineSettingsDisplay();
    5050
    5151#ifdef VBOX_WITH_VIDEOHWACCEL
    … …  
    111111};
    112112
    113 #endif // __VBoxVMSettingsDisplay_h__
     113#endif // __UIMachineSettingsDisplay_h__
    114114

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.ui

    r33879 r33882  
    1414     hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1515 </comment>
    16  <class>VBoxVMSettingsDisplay</class>
    17  <widget class="QWidget" name="VBoxVMSettingsDisplay">
     16 <class>UIMachineSettingsDisplay</class>
     17 <widget class="QWidget" name="UIMachineSettingsDisplay">
    1818  <property name="geometry">
    1919   <rect>

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp

    r33879 r33882  
    33 *
    44 * VBox frontends: Qt4 GUI ("VirtualBox"):
    5  * VBoxVMSettingsGeneral class implementation
     5 * UIMachineSettingsGeneral class implementation
    66 */
    77
    … …  
    1818 */
    1919
    20 #include "VBoxVMSettingsGeneral.h"
     20#include "UIMachineSettingsGeneral.h"
    2121#include "VBoxGlobal.h"
    2222#include "VBoxProblemReporter.h"
    … …  
    2525#include <QDir>
    2626
    27 VBoxVMSettingsGeneral::VBoxVMSettingsGeneral()
     27UIMachineSettingsGeneral::UIMachineSettingsGeneral()
    2828    : mValidator(0)
    2929{
    3030    /* Apply UI decorations */
    31     Ui::VBoxVMSettingsGeneral::setupUi (this);
     31    Ui::UIMachineSettingsGeneral::setupUi (this);
    3232
    3333    /* Setup validators */
    … …  
    4848}
    4949
    50 bool VBoxVMSettingsGeneral::is64BitOSTypeSelected() const
     50bool UIMachineSettingsGeneral::is64BitOSTypeSelected() const
    5151{
    5252    return mOSTypeSelector->type().GetIs64Bit();
    … …  
    5454
    5555#ifdef VBOX_WITH_VIDEOHWACCEL
    56 bool VBoxVMSettingsGeneral::isWindowsOSTypeSelected() const
     56bool UIMachineSettingsGeneral::isWindowsOSTypeSelected() const
    5757{
    5858    return mOSTypeSelector->type().GetFamilyId() == "Windows";
    … …  
    6161
    6262#ifdef VBOX_WITH_CRHGSMI
    63 bool VBoxVMSettingsGeneral::isWddmSupportedForOSType() const
     63bool UIMachineSettingsGeneral::isWddmSupportedForOSType() const
    6464{
    6565    const QString &strOsId = mOSTypeSelector->type().GetId();
    … …  
    7070/* Load data to cashe from corresponding external object(s),
    7171 * this task COULD be performed in other than GUI thread: */
    72 void VBoxVMSettingsGeneral::loadToCacheFrom(QVariant &data)
     72void UIMachineSettingsGeneral::loadToCacheFrom(QVariant &data)
    7373{
    7474    /* Fetch data to machine: */
    … …  
    9595/* Load data to corresponding widgets from cache,
    9696 * this task SHOULD be performed in GUI thread only: */
    97 void VBoxVMSettingsGeneral::getFromCache()
     97void UIMachineSettingsGeneral::getFromCache()
    9898{
    9999    /* Apply internal variables data to QWidget(s): */
    … …  
    115115/* Save data from corresponding widgets to cache,
    116116 * this task SHOULD be performed in GUI thread only: */
    117 void VBoxVMSettingsGeneral::putToCache()
     117void UIMachineSettingsGeneral::putToCache()
    118118{
    119119    /* Gather internal variables data from QWidget(s): */
    … …  
    131131/* Save data from cache to corresponding external object(s),
    132132 * this task COULD be performed in other than GUI thread: */
    133 void VBoxVMSettingsGeneral::saveFromCacheTo(QVariant &data)
     133void UIMachineSettingsGeneral::saveFromCacheTo(QVariant &data)
    134134{
    135135    /* Fetch data to machine: */
    … …  
    150150}
    151151
    152 void VBoxVMSettingsGeneral::setValidator (QIWidgetValidator *aVal)
     152void UIMachineSettingsGeneral::setValidator (QIWidgetValidator *aVal)
    153153{
    154154    mValidator = aVal;
    … …  
    156156}
    157157
    158 void VBoxVMSettingsGeneral::setOrderAfter (QWidget *aWidget)
     158void UIMachineSettingsGeneral::setOrderAfter (QWidget *aWidget)
    159159{
    160160    /* Basic tab-order */
    … …  
    174174}
    175175
    176 void VBoxVMSettingsGeneral::retranslateUi()
     176void UIMachineSettingsGeneral::retranslateUi()
    177177{
    178178    /* Translate uic generated strings */
    179     Ui::VBoxVMSettingsGeneral::retranslateUi (this);
     179    Ui::UIMachineSettingsGeneral::retranslateUi (this);
    180180
    181181    /* Path selector */
    … …  
    192192}
    193193
    194 void VBoxVMSettingsGeneral::showEvent (QShowEvent *aEvent)
     194void UIMachineSettingsGeneral::showEvent (QShowEvent *aEvent)
    195195{
    196196    QCoreApplication::sendPostedEvents();

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.h

    r33879 r33882  
    22 *
    33 * VBox frontends: Qt4 GUI ("VirtualBox"):
    4  * VBoxVMSettingsGeneral class declaration
     4 * UIMachineSettingsGeneral class declaration
    55 */
    66
    … …  
    1717 */
    1818
    19 #ifndef __VBoxVMSettingsGeneral_h__
    20 #define __VBoxVMSettingsGeneral_h__
     19#ifndef __UIMachineSettingsGeneral_h__
     20#define __UIMachineSettingsGeneral_h__
    2121
    2222#include "UISettingsPage.h"
    23 #include "VBoxVMSettingsGeneral.gen.h"
     23#include "UIMachineSettingsGeneral.gen.h"
    2424#include "COMDefs.h"
    2525
    … …  
    3939
    4040/* Machine settings / General page: */
    41 class VBoxVMSettingsGeneral : public UISettingsPageMachine,
    42                               public Ui::VBoxVMSettingsGeneral
     41class UIMachineSettingsGeneral : public UISettingsPageMachine,
     42                              public Ui::UIMachineSettingsGeneral
    4343{
    4444    Q_OBJECT;
    … …  
    4646public:
    4747
    48     VBoxVMSettingsGeneral();
     48    UIMachineSettingsGeneral();
    4949
    5050    bool is64BitOSTypeSelected() const;
    … …  
    9090};
    9191
    92 #endif // __VBoxVMSettingsGeneral_h__
     92#endif // __UIMachineSettingsGeneral_h__
    9393

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.ui

    r33879 r33882  
    1313     hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1414 </comment>
    15  <class>VBoxVMSettingsGeneral</class>
    16  <widget class="QWidget" name="VBoxVMSettingsGeneral" >
     15 <class>UIMachineSettingsGeneral</class>
     16 <widget class="QWidget" name="UIMachineSettingsGeneral" >
    1717  <property name="geometry" >
    1818   <rect>

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp

    r33879 r33882  
    33 *
    44 * VBox frontends: Qt4 GUI ("VirtualBox"):
    5  * VBoxVMSettingsNetwork class implementation
     5 * UIMachineSettingsNetwork class implementation
    66 */
    77
    … …  
    2727#include "QIArrowButtonSwitch.h"
    2828#include "VBoxGlobal.h"
    29 #include "VBoxVMSettingsNetwork.h"
     29#include "UIMachineSettingsNetwork.h"
    3030#include "QITabWidget.h"
    3131
    … …  
    3737const char *emptyItemCode = "#empty#";
    3838
    39 /* VBoxVMSettingsNetwork Stuff */
    40 VBoxVMSettingsNetwork::VBoxVMSettingsNetwork (VBoxVMSettingsNetworkPage *aParent, bool aDisableStaticControls)
     39/* UIMachineSettingsNetwork Stuff */
     40UIMachineSettingsNetwork::UIMachineSettingsNetwork (UIMachineSettingsNetworkPage *aParent, bool aDisableStaticControls)
    4141    : QIWithRetranslateUI <QWidget> (0)
    4242    , mParent (aParent)
    … …  
    4747{
    4848    /* Apply UI decorations */
    49     Ui::VBoxVMSettingsNetwork::setupUi (this);
     49    Ui::UIMachineSettingsNetwork::setupUi (this);
    5050
    5151    /* Setup widgets */
    … …  
    7979}
    8080
    81 void VBoxVMSettingsNetwork::fetchAdapterData(const UINetworkAdapterData &data)
     81void UIMachineSettingsNetwork::fetchAdapterData(const UINetworkAdapterData &data)
    8282{
    8383    /* Load adapter & slot number: */
    … …  
    130130}
    131131
    132 void VBoxVMSettingsNetwork::uploadAdapterData(UINetworkAdapterData &data)
     132void UIMachineSettingsNetwork::uploadAdapterData(UINetworkAdapterData &data)
    133133{
    134134    /* Save adapter activity state: */
    … …  
    172172}
    173173
    174 void VBoxVMSettingsNetwork::setValidator (QIWidgetValidator *aValidator)
     174void UIMachineSettingsNetwork::setValidator (QIWidgetValidator *aValidator)
    175175{
    176176    mValidator = aValidator;
    … …  
    190190}
    191191
    192 bool VBoxVMSettingsNetwork::revalidate (QString &aWarning, QString &aTitle)
     192bool UIMachineSettingsNetwork::revalidate (QString &aWarning, QString &aTitle)
    193193{
    194194    /* 'True' for disabled adapter */
    … …  
    231231}
    232232
    233 QWidget* VBoxVMSettingsNetwork::setOrderAfter (QWidget *aAfter)
     233QWidget* UIMachineSettingsNetwork::setOrderAfter (QWidget *aAfter)
    234234{
    235235    setTabOrder (aAfter, mCbEnableAdapter);
    … …  
    245245}
    246246
    247 QString VBoxVMSettingsNetwork::pageTitle() const
     247QString UIMachineSettingsNetwork::pageTitle() const
    248248{
    249249    return VBoxGlobal::tr("Adapter %1", "network").arg(QString("&%1").arg(m_iSlot + 1));;
    250250}
    251251
    252 KNetworkAttachmentType VBoxVMSettingsNetwork::attachmentType() const
     252KNetworkAttachmentType UIMachineSettingsNetwork::attachmentType() const
    253253{
    254254    return (KNetworkAttachmentType) mCbAttachmentType->itemData (
    … …  
    256256}
    257257
    258 QString VBoxVMSettingsNetwork::alternativeName (int aType) const
     258QString UIMachineSettingsNetwork::alternativeName (int aType) const
    259259{
    260260    if (aType == -1) aType = attachmentType();
    … …  
    283283}
    284284
    285 void VBoxVMSettingsNetwork::showEvent (QShowEvent *aEvent)
     285void UIMachineSettingsNetwork::showEvent (QShowEvent *aEvent)
    286286{
    287287    if (!mPolished)
    … …  
    312312}
    313313
    314 void VBoxVMSettingsNetwork::retranslateUi()
     314void UIMachineSettingsNetwork::retranslateUi()
    315315{
    316316    /* Translate uic generated strings */
    317     Ui::VBoxVMSettingsNetwork::retranslateUi (this);
     317    Ui::UIMachineSettingsNetwork::retranslateUi (this);
    318318
    319319    /* Translate combo-boxes content */
    … …  
    324324}
    325325
    326 void VBoxVMSettingsNetwork::updateAttachmentAlternative()
     326void UIMachineSettingsNetwork::updateAttachmentAlternative()
    327327{
    328328    /* Blocking signals to change content manually */
    … …  
    421421}
    422422
    423 void VBoxVMSettingsNetwork::updateAlternativeName()
     423void UIMachineSettingsNetwork::updateAlternativeName()
    424424{
    425425    switch (attachmentType())
    … …  
    483483}
    484484
    485 void VBoxVMSettingsNetwork::toggleAdvanced()
     485void UIMachineSettingsNetwork::toggleAdvanced()
    486486{
    487487    mLbAdapterType->setVisible (mAbsAdvanced->isExpanded());
    … …  
    494494}
    495495
    496 void VBoxVMSettingsNetwork::generateMac()
     496void UIMachineSettingsNetwork::generateMac()
    497497{
    498498    m_adapter.SetMACAddress(QString::null);
    … …  
    500500}
    501501
    502 void VBoxVMSettingsNetwork::sltOpenPortForwardingDlg()
    503 {
    504     VBoxVMSettingsPortForwardingDlg dlg(this, mPortForwardingRules);
     502void UIMachineSettingsNetwork::sltOpenPortForwardingDlg()
     503{
     504    UIMachineSettingsPortForwardingDlg dlg(this, mPortForwardingRules);
    505505    if (dlg.exec() == QDialog::Accepted)
    506506        mPortForwardingRules = dlg.rules();
    507507}
    508508
    509 void VBoxVMSettingsNetwork::populateComboboxes()
     509void UIMachineSettingsNetwork::populateComboboxes()
    510510{
    511511    /* Save the current selected adapter */
    … …  
    616616}
    617617
    618 /* VBoxVMSettingsNetworkPage Stuff */
    619 VBoxVMSettingsNetworkPage::VBoxVMSettingsNetworkPage(bool aDisableStaticControls)
     618/* UIMachineSettingsNetworkPage Stuff */
     619UIMachineSettingsNetworkPage::UIMachineSettingsNetworkPage(bool aDisableStaticControls)
    620620    : mValidator(0)
    621621    , mTwAdapters(0)
    … …  
    636636}
    637637
    638 void VBoxVMSettingsNetworkPage::loadDirectlyFrom(const CMachine &machine)
     638void UIMachineSettingsNetworkPage::loadDirectlyFrom(const CMachine &machine)
    639639{
    640640    qRegisterMetaType<UISettingsDataMachine>();
    … …  
    645645}
    646646
    647 void VBoxVMSettingsNetworkPage::saveDirectlyTo(CMachine &machine)
     647void UIMachineSettingsNetworkPage::saveDirectlyTo(CMachine &machine)
    648648{
    649649    qRegisterMetaType<UISettingsDataMachine>();
    … …  
    654654}
    655655
    656 QStringList VBoxVMSettingsNetworkPage::brgList (bool aRefresh)
     656QStringList UIMachineSettingsNetworkPage::brgList (bool aRefresh)
    657657{
    658658    if (aRefresh)
    … …  
    673673}
    674674
    675 QStringList VBoxVMSettingsNetworkPage::intList (bool aRefresh)
     675QStringList UIMachineSettingsNetworkPage::intList (bool aRefresh)
    676676{
    677677    if (aRefresh)
    … …  
    699699}
    700700
    701 QStringList VBoxVMSettingsNetworkPage::fullIntList (bool aRefresh)
     701QStringList UIMachineSettingsNetworkPage::fullIntList (bool aRefresh)
    702702{
    703703    QStringList list (intList (aRefresh));
    … …  
    705705    for (int index = 0; index < mTwAdapters->count(); ++ index)
    706706    {
    707         VBoxVMSettingsNetwork *page =
    708             qobject_cast <VBoxVMSettingsNetwork*> (mTwAdapters->widget (index));
     707        UIMachineSettingsNetwork *page =
     708            qobject_cast <UIMachineSettingsNetwork*> (mTwAdapters->widget (index));
    709709        if (page)
    710710        {
    … …  
    717717}
    718718
    719 QStringList VBoxVMSettingsNetworkPage::hoiList (bool aRefresh)
     719QStringList UIMachineSettingsNetworkPage::hoiList (bool aRefresh)
    720720{
    721721    if (aRefresh)
    … …  
    738738/* Load data to cashe from corresponding external object(s),
    739739 * this task COULD be performed in other than GUI thread: */
    740 void VBoxVMSettingsNetworkPage::loadToCacheFrom(QVariant &data)
     740void UIMachineSettingsNetworkPage::loadToCacheFrom(QVariant &data)
    741741{
    742742    /* Fetch data to machine: */
    … …  
    816816/* Load data to corresponding widgets from cache,
    817817 * this task SHOULD be performed in GUI thread only: */
    818 void VBoxVMSettingsNetworkPage::getFromCache()
     818void UIMachineSettingsNetworkPage::getFromCache()
    819819{
    820820    /* Setup tab order: */
    … …  
    827827    {
    828828        /* Creating adapter's page: */
    829         VBoxVMSettingsNetwork *pPage = new VBoxVMSettingsNetwork(this, mDisableStaticControls);
     829        UIMachineSettingsNetwork *pPage = new UIMachineSettingsNetwork(this, mDisableStaticControls);
    830830
    831831        /* Loading adapter's data into page: */
    … …  
    855855/* Save data from corresponding widgets to cache,
    856856 * this task SHOULD be performed in GUI thread only: */
    857 void VBoxVMSettingsNetworkPage::putToCache()
     857void UIMachineSettingsNetworkPage::putToCache()
    858858{
    859859    /* Gather internal variables data from QWidget(s): */
    … …  
    861861    {
    862862        /* Getting adapter's page: */
    863         VBoxVMSettingsNetwork *pPage = qobject_cast<VBoxVMSettingsNetwork*>(mTwAdapters->widget(iSlot));
     863        UIMachineSettingsNetwork *pPage = qobject_cast<UIMachineSettingsNetwork*>(mTwAdapters->widget(iSlot));
    864864
    865865        /* Loading Adapter's data from page: */
    … …  
    870870/* Save data from cache to corresponding external object(s),
    871871 * this task COULD be performed in other than GUI thread: */
    872 void VBoxVMSettingsNetworkPage::saveFromCacheTo(QVariant &data)
     872void UIMachineSettingsNetworkPage::saveFromCacheTo(QVariant &data)
    873873{
    874874    /* Fetch data to machine: */
    … …  
    939939}
    940940
    941 void VBoxVMSettingsNetworkPage::setValidator (QIWidgetValidator *aVal)
     941void UIMachineSettingsNetworkPage::setValidator (QIWidgetValidator *aVal)
    942942{
    943943    mValidator = aVal;
    944944}
    945945
    946 bool VBoxVMSettingsNetworkPage::revalidate (QString &aWarning, QString &aTitle)
     946bool UIMachineSettingsNetworkPage::revalidate (QString &aWarning, QString &aTitle)
    947947{
    948948    bool valid = true;
    … …  
    950950    for (int i = 0; i < mTwAdapters->count(); ++ i)
    951951    {
    952         VBoxVMSettingsNetwork *page =
    953             qobject_cast <VBoxVMSettingsNetwork*> (mTwAdapters->widget (i));
     952        UIMachineSettingsNetwork *page =
     953            qobject_cast <UIMachineSettingsNetwork*> (mTwAdapters->widget (i));
    954954        Assert (page);
    955955        valid = page->revalidate (aWarning, aTitle);
    … …  
    960960}
    961961
    962 void VBoxVMSettingsNetworkPage::retranslateUi()
     962void UIMachineSettingsNetworkPage::retranslateUi()
    963963{
    964964    for (int i = 0; i < mTwAdapters->count(); ++ i)
    965965    {
    966         VBoxVMSettingsNetwork *page =
    967             qobject_cast <VBoxVMSettingsNetwork*> (mTwAdapters->widget (i));
     966        UIMachineSettingsNetwork *page =
     967            qobject_cast <UIMachineSettingsNetwork*> (mTwAdapters->widget (i));
    968968        Assert (page);
    969969        mTwAdapters->setTabText (i, page->pageTitle());
    … …  
    971971}
    972972
    973 void VBoxVMSettingsNetworkPage::updatePages()
     973void UIMachineSettingsNetworkPage::updatePages()
    974974{
    975975    for (int i = 0; i < mTwAdapters->count(); ++ i)
    976976    {
    977977        /* Get the iterated page */
    978         VBoxVMSettingsNetwork *page =
    979             qobject_cast <VBoxVMSettingsNetwork*> (mTwAdapters->widget (i));
     978        UIMachineSettingsNetwork *page =
     979            qobject_cast <UIMachineSettingsNetwork*> (mTwAdapters->widget (i));
    980980        Assert (page);
    981981

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.h

    r33879 r33882  
    22 *
    33 * VBox frontends: Qt4 GUI ("VirtualBox"):
    4  * VBoxVMSettingsNetwork class declaration
     4 * UIMachineSettingsNetwork class declaration
    55 */
    66
    … …  
    1717 */
    1818
    19 #ifndef __VBoxVMSettingsNetwork_h__
    20 #define __VBoxVMSettingsNetwork_h__
     19#ifndef __UIMachineSettingsNetwork_h__
     20#define __UIMachineSettingsNetwork_h__
    2121
    2222/* VBox Includes */
    2323#include "COMDefs.h"
    2424#include "UISettingsPage.h"
    25 #include "VBoxVMSettingsNetwork.gen.h"
    26 #include "VBoxVMSettingsPortForwardingDlg.h"
     25#include "UIMachineSettingsNetwork.gen.h"
     26#include "UIMachineSettingsPortForwardingDlg.h"
    2727
    2828/* VBox Forwards */
    29 class VBoxVMSettingsNetworkPage;
     29class UIMachineSettingsNetworkPage;
    3030class QITabWidget;
    3131
    … …  
    5656};
    5757
    58 class VBoxVMSettingsNetwork : public QIWithRetranslateUI <QWidget>,
    59                               public Ui::VBoxVMSettingsNetwork
     58class UIMachineSettingsNetwork : public QIWithRetranslateUI <QWidget>,
     59                              public Ui::UIMachineSettingsNetwork
    6060{
    6161    Q_OBJECT;
    … …  
    6363public:
    6464
    65     VBoxVMSettingsNetwork (VBoxVMSettingsNetworkPage *aParent, bool aDisableStaticControls = false);
     65    UIMachineSettingsNetwork (UIMachineSettingsNetworkPage *aParent, bool aDisableStaticControls = false);
    6666
    6767    void fetchAdapterData(const UINetworkAdapterData &data);
    … …  
    9595    void populateComboboxes();
    9696
    97     VBoxVMSettingsNetworkPage *mParent;
     97    UIMachineSettingsNetworkPage *mParent;
    9898    QIWidgetValidator *mValidator;
    9999    int m_iSlot;
    … …  
    113113
    114114/* Machine settings / Network page: */
    115 class VBoxVMSettingsNetworkPage : public UISettingsPageMachine
     115class UIMachineSettingsNetworkPage : public UISettingsPageMachine
    116116{
    117117    Q_OBJECT;
    … …  
    119119public:
    120120
    121     VBoxVMSettingsNetworkPage (bool aDisableStaticControls = false);
     121    UIMachineSettingsNetworkPage (bool aDisableStaticControls = false);
    122122
    123123    void loadDirectlyFrom(const CMachine &machine);
    … …  
    169169};
    170170
    171 #endif // __VBoxVMSettingsNetwork_h__
     171#endif // __UIMachineSettingsNetwork_h__
    172172

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.ui

    r33879 r33882  
    1313     hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1414 </comment>
    15  <class>VBoxVMSettingsNetwork</class>
    16  <widget class="QWidget" name="VBoxVMSettingsNetwork" >
     15 <class>UIMachineSettingsNetwork</class>
     16 <widget class="QWidget" name="UIMachineSettingsNetwork" >
    1717  <property name="geometry" >
    1818   <rect>

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsParallel.cpp

    r33879 r33882  
    33 *
    44 * VBox frontends: Qt4 GUI ("VirtualBox"):
    5  * VBoxVMSettingsParallel class implementation
     5 * UIMachineSettingsParallel class implementation
    66 */
    77
    … …  
    1818 */
    1919
    20 #include "VBoxVMSettingsParallel.h"
     20#include "UIMachineSettingsParallel.h"
    2121#include "QIWidgetValidator.h"
    2222#include "VBoxGlobal.h"
    … …  
    2525#include <QDir>
    2626
    27 /* VBoxVMSettingsParallel stuff */
    28 VBoxVMSettingsParallel::VBoxVMSettingsParallel()
     27/* UIMachineSettingsParallel stuff */
     28UIMachineSettingsParallel::UIMachineSettingsParallel()
    2929    : QIWithRetranslateUI<QWidget> (0)
    3030    , mValidator(0)
    … …  
    3232{
    3333    /* Apply UI decorations */
    34     Ui::VBoxVMSettingsParallel::setupUi (this);
     34    Ui::UIMachineSettingsParallel::setupUi (this);
    3535
    3636    /* Setup validation */
    … …  
    5858}
    5959
    60 void VBoxVMSettingsParallel::fetchPortData(const UIParallelPortData &data)
     60void UIMachineSettingsParallel::fetchPortData(const UIParallelPortData &data)
    6161{
    6262    /* Load port slot number: */
    … …  
    7474}
    7575
    76 void VBoxVMSettingsParallel::uploadPortData(UIParallelPortData &data)
     76void UIMachineSettingsParallel::uploadPortData(UIParallelPortData &data)
    7777{
    7878    /* Upload port data: */
    … …  
    8383}
    8484
    85 void VBoxVMSettingsParallel::setValidator (QIWidgetValidator *aVal)
     85void UIMachineSettingsParallel::setValidator (QIWidgetValidator *aVal)
    8686{
    8787    Assert (aVal);
    … …  
    9696}
    9797
    98 QWidget* VBoxVMSettingsParallel::setOrderAfter (QWidget *aAfter)
     98QWidget* UIMachineSettingsParallel::setOrderAfter (QWidget *aAfter)
    9999{
    100100    setTabOrder (aAfter, mGbParallel);
    … …  
    106106}
    107107
    108 QString VBoxVMSettingsParallel::pageTitle() const
     108QString UIMachineSettingsParallel::pageTitle() const
    109109{
    110110    return QString(tr("Port %1", "parallel ports")).arg(QString("&%1").arg(m_iSlot + 1));
    111111}
    112112
    113 bool VBoxVMSettingsParallel::isUserDefined()
     113bool UIMachineSettingsParallel::isUserDefined()
    114114{
    115115    ulong a, b;
    … …  
    117117}
    118118
    119 void VBoxVMSettingsParallel::retranslateUi()
     119void UIMachineSettingsParallel::retranslateUi()
    120120{
    121121    /* Translate uic generated strings */
    122     Ui::VBoxVMSettingsParallel::retranslateUi (this);
     122    Ui::UIMachineSettingsParallel::retranslateUi (this);
    123123
    124124    mCbNumber->setItemText (mCbNumber->count() - 1, vboxGlobal().toCOMPortName (0, 0));
    125125}
    126126
    127 void VBoxVMSettingsParallel::mGbParallelToggled (bool aOn)
     127void UIMachineSettingsParallel::mGbParallelToggled (bool aOn)
    128128{
    129129    if (aOn)
    … …  
    133133}
    134134
    135 void VBoxVMSettingsParallel::mCbNumberActivated (const QString &aText)
     135void UIMachineSettingsParallel::mCbNumberActivated (const QString &aText)
    136136{
    137137    ulong IRQ, IOBase;
    … …  
    148148
    149149
    150 /* VBoxVMSettingsParallelPage stuff */
    151 VBoxVMSettingsParallelPage::VBoxVMSettingsParallelPage()
     150/* UIMachineSettingsParallelPage stuff */
     151UIMachineSettingsParallelPage::UIMachineSettingsParallelPage()
    152152    : mValidator(0)
    153153    , mTabWidget(0)
    … …  
    162162/* Load data to cashe from corresponding external object(s),
    163163 * this task COULD be performed in other than GUI thread: */
    164 void VBoxVMSettingsParallelPage::loadToCacheFrom(QVariant &data)
     164void UIMachineSettingsParallelPage::loadToCacheFrom(QVariant &data)
    165165{
    166166    /* Fetch data to machine: */
    … …  
    194194/* Load data to corresponding widgets from cache,
    195195 * this task SHOULD be performed in GUI thread only: */
    196 void VBoxVMSettingsParallelPage::getFromCache()
     196void UIMachineSettingsParallelPage::getFromCache()
    197197{
    198198    Assert(m_pFirstWidget);
    … …  
    204204    {
    205205        /* Creating port's page: */
    206         VBoxVMSettingsParallel *pPage = new VBoxVMSettingsParallel;
     206        UIMachineSettingsParallel *pPage = new UIMachineSettingsParallel;
    207207
    208208        /* Loading port's data into page: */
    … …  
    228228/* Save data from corresponding widgets to cache,
    229229 * this task SHOULD be performed in GUI thread only: */
    230 void VBoxVMSettingsParallelPage::putToCache()
     230void UIMachineSettingsParallelPage::putToCache()
    231231{
    232232    /* Gather internal variables data from QWidget(s): */
    … …  
    234234    {
    235235        /* Getting adapter's page: */
    236         VBoxVMSettingsParallel *pPage = qobject_cast<VBoxVMSettingsParallel*>(mTabWidget->widget(iSlot));
     236        UIMachineSettingsParallel *pPage = qobject_cast<UIMachineSettingsParallel*>(mTabWidget->widget(iSlot));
    237237
    238238        /* Loading Adapter's data from page: */
    … …  
    243243/* Save data from cache to corresponding external object(s),
    244244 * this task COULD be performed in other than GUI thread: */
    245 void VBoxVMSettingsParallelPage::saveFromCacheTo(QVariant &data)
     245void UIMachineSettingsParallelPage::saveFromCacheTo(QVariant &data)
    246246{
    247247    /* Fetch data to machine: */
    … …  
    268268}
    269269
    270 void VBoxVMSettingsParallelPage::setValidator (QIWidgetValidator *aVal)
     270void UIMachineSettingsParallelPage::setValidator (QIWidgetValidator *aVal)
    271271{
    272272    mValidator = aVal;
    273273}
    274274
    275 bool VBoxVMSettingsParallelPage::revalidate (QString &aWarning, QString &aTitle)
     275bool UIMachineSettingsParallelPage::revalidate (QString &aWarning, QString &aTitle)
    276276{
    277277    bool valid = true;
    … …  
    283283    {
    284284        QWidget *tab = mTabWidget->widget (index);
    285         VBoxVMSettingsParallel *page =
    286             static_cast<VBoxVMSettingsParallel*> (tab);
     285        UIMachineSettingsParallel *page =
     286            static_cast<UIMachineSettingsParallel*> (tab);
    287287
    288288        /* Check the predefined port number unicity */
    … …  
    322322}
    323323
    324 void VBoxVMSettingsParallelPage::retranslateUi()
     324void UIMachineSettingsParallelPage::retranslateUi()
    325325{
    326326    for (int i = 0; i < mTabWidget->count(); ++ i)
    327327    {
    328         VBoxVMSettingsParallel *page =
    329             static_cast<VBoxVMSettingsParallel*> (mTabWidget->widget (i));
     328        UIMachineSettingsParallel *page =
     329            static_cast<UIMachineSettingsParallel*> (mTabWidget->widget (i));
    330330        mTabWidget->setTabText (i, page->pageTitle());
    331331    }

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsParallel.h

    r33879 r33882  
    22 *
    33 * VBox frontends: Qt4 GUI ("VirtualBox"):
    4  * VBoxVMSettingsParallel class declaration
     4 * UIMachineSettingsParallel class declaration
    55 */
    66
    … …  
    1717 */
    1818
    19 #ifndef __VBoxVMSettingsParallel_h__
    20 #define __VBoxVMSettingsParallel_h__
     19#ifndef __UIMachineSettingsParallel_h__
     20#define __UIMachineSettingsParallel_h__
    2121
    2222#include "UISettingsPage.h"
    23 #include "VBoxVMSettingsParallel.gen.h"
     23#include "UIMachineSettingsParallel.gen.h"
    2424#include "COMDefs.h"
    2525
    … …  
    4141};
    4242
    43 class VBoxVMSettingsParallel : public QIWithRetranslateUI<QWidget>,
    44                                public Ui::VBoxVMSettingsParallel
     43class UIMachineSettingsParallel : public QIWithRetranslateUI<QWidget>,
     44                               public Ui::UIMachineSettingsParallel
    4545{
    4646    Q_OBJECT;
    … …  
    4848public:
    4949
    50     VBoxVMSettingsParallel();
     50    UIMachineSettingsParallel();
    5151
    5252    void fetchPortData(const UIParallelPortData &data);
    … …  
    7676
    7777/* Machine settings / Parallel page: */
    78 class VBoxVMSettingsParallelPage : public UISettingsPageMachine
     78class UIMachineSettingsParallelPage : public UISettingsPageMachine
    7979{
    8080    Q_OBJECT;
    … …  
    8282public:
    8383
    84     VBoxVMSettingsParallelPage();
     84    UIMachineSettingsParallelPage();
    8585
    8686protected:
    … …  
    114114};
    115115
    116 #endif // __VBoxVMSettingsParallel_h__
     116#endif // __UIMachineSettingsParallel_h__
    117117

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsParallel.ui

    r33879 r33882  
    1313     hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1414 </comment>
    15  <class>VBoxVMSettingsParallel</class>
    16  <widget class="QWidget" name="VBoxVMSettingsParallel" >
     15 <class>UIMachineSettingsParallel</class>
     16 <widget class="QWidget" name="UIMachineSettingsParallel" >
    1717  <property name="geometry" >
    1818   <rect>

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp

    r33879 r33882  
    33 *
    44 * VBox frontends: Qt4 GUI ("VirtualBox"):
    5  * VBoxVMSettingsPortForwardingDlg class implementation
     5 * UIMachineSettingsPortForwardingDlg class implementation
    66 */
    77
    … …  
    3030
    3131/* Local includes */
    32 #include "VBoxVMSettingsPortForwardingDlg.h"
     32#include "UIMachineSettingsPortForwardingDlg.h"
    3333#include "VBoxGlobal.h"
    3434#include "VBoxProblemReporter.h"
    … …  
    414414
    415415/* Port forwarding dialog constructor: */
    416 VBoxVMSettingsPortForwardingDlg::VBoxVMSettingsPortForwardingDlg(QWidget *pParent,
     416UIMachineSettingsPortForwardingDlg::UIMachineSettingsPortForwardingDlg(QWidget *pParent,
    417417                                                                 const UIPortForwardingDataList &rules)
    418418    : QIWithRetranslateUI<QIDialog>(pParent)
    … …  
    537537
    538538/* Port forwarding dialog destructor: */
    539 VBoxVMSettingsPortForwardingDlg::~VBoxVMSettingsPortForwardingDlg()
    540 {
    541 }
    542 
    543 const UIPortForwardingDataList& VBoxVMSettingsPortForwardingDlg::rules() const
     539UIMachineSettingsPortForwardingDlg::~UIMachineSettingsPortForwardingDlg()
     540{
     541}
     542
     543const UIPortForwardingDataList& UIMachineSettingsPortForwardingDlg::rules() const
    544544{
    545545    return m_pModel->rules();
    … …  
    547547
    548548/* Add rule slot: */
    549 void VBoxVMSettingsPortForwardingDlg::sltAddRule()
     549void UIMachineSettingsPortForwardingDlg::sltAddRule()
    550550{
    551551    m_pModel->addRule(QModelIndex());
    … …  
    557557
    558558/* Copy rule slot: */
    559 void VBoxVMSettingsPortForwardingDlg::sltCopyRule()
     559void UIMachineSettingsPortForwardingDlg::sltCopyRule()
    560560{
    561561    m_pModel->addRule(m_pTableView->currentIndex());
    … …  
    567567
    568568/* Del rule slot: */
    569 void VBoxVMSettingsPortForwardingDlg::sltDelRule()
     569void UIMachineSettingsPortForwardingDlg::sltDelRule()
    570570{
    571571    m_pModel->delRule(m_pTableView->currentIndex());
    … …  
    576576
    577577/* Table data change handler: */
    578 void VBoxVMSettingsPortForwardingDlg::sltTableDataChanged()
     578void UIMachineSettingsPortForwardingDlg::sltTableDataChanged()
    579579{
    580580    fIsTableDataChanged = true;
    … …  
    582582
    583583/* Table index-change handler: */
    584 void VBoxVMSettingsPortForwardingDlg::sltCurrentChanged()
     584void UIMachineSettingsPortForwardingDlg::sltCurrentChanged()
    585585{
    586586    bool fTableFocused = m_pTableView->hasFocus();
    … …  
    592592
    593593/* Table context-menu handler: */
    594 void VBoxVMSettingsPortForwardingDlg::sltShowTableContexMenu(const QPoint &pos)
     594void UIMachineSettingsPortForwardingDlg::sltShowTableContexMenu(const QPoint &pos)
    595595{
    596596    /* Prepare context menu: */
    … …  
    611611
    612612/* Adjusts table column's sizes: */
    613 void VBoxVMSettingsPortForwardingDlg::sltAdjustTable()
     613void UIMachineSettingsPortForwardingDlg::sltAdjustTable()
    614614{
    615615    m_pTableView->horizontalHeader()->setStretchLastSection(false);
    … …  
    635635}
    636636
    637 void VBoxVMSettingsPortForwardingDlg::accept()
     637void UIMachineSettingsPortForwardingDlg::accept()
    638638{
    639639    /* Validate table: */
    … …  
    651651}
    652652
    653 void VBoxVMSettingsPortForwardingDlg::reject()
     653void UIMachineSettingsPortForwardingDlg::reject()
    654654{
    655655    /* Check if table data was changed: */
    … …  
    661661
    662662/* UI Retranslation slot: */
    663 void VBoxVMSettingsPortForwardingDlg::retranslateUi()
     663void UIMachineSettingsPortForwardingDlg::retranslateUi()
    664664{
    665665    /* Set window title: */
    … …  
    680680
    681681/* Extended event-handler: */
    682 bool VBoxVMSettingsPortForwardingDlg::eventFilter(QObject *pObj, QEvent *pEvent)
     682bool UIMachineSettingsPortForwardingDlg::eventFilter(QObject *pObj, QEvent *pEvent)
    683683{
    684684    /* Process table: */
    … …  
    710710}
    711711
    712 #include "VBoxVMSettingsPortForwardingDlg.moc"
    713 
     712#include "UIMachineSettingsPortForwardingDlg.moc"
     713

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsPortForwardingDlg.h

    r33879 r33882  
    22 *
    33 * VBox frontends: Qt4 GUI ("VirtualBox"):
    4  * VBoxVMSettingsPortForwardingDlg class declaration
     4 * UIMachineSettingsPortForwardingDlg class declaration
    55 */
    66
    … …  
    1717 */
    1818
    19 #ifndef __VBoxVMSettingsPortForwardingDlg_h__
    20 #define __VBoxVMSettingsPortForwardingDlg_h__
     19#ifndef __UIMachineSettingsPortForwardingDlg_h__
     20#define __UIMachineSettingsPortForwardingDlg_h__
    2121
    2222/* Local includes */
    … …  
    8888
    8989/* Port forwarding dialog: */
    90 class VBoxVMSettingsPortForwardingDlg : public QIWithRetranslateUI<QIDialog>
     90class UIMachineSettingsPortForwardingDlg : public QIWithRetranslateUI<QIDialog>
    9191{
    9292    Q_OBJECT;
    … …  
    9595
    9696    /* Port forwarding dialog constructor: */
    97     VBoxVMSettingsPortForwardingDlg(QWidget *pParent = 0,
     97    UIMachineSettingsPortForwardingDlg(QWidget *pParent = 0,
    9898                                    const UIPortForwardingDataList &rules = UIPortForwardingDataList());
    9999    /* Port forwarding dialog destructor: */
    100     ~VBoxVMSettingsPortForwardingDlg();
     100    ~UIMachineSettingsPortForwardingDlg();
    101101
    102102    /* The list of chosen rules: */
    … …  
    145145};
    146146
    147 #endif // __VBoxVMSettingsPortForwardingDlg_h__
     147#endif // __UIMachineSettingsPortForwardingDlg_h__
    148148

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.cpp

    r33879 r33882  
    33 *
    44 * VBox frontends: Qt4 GUI ("VirtualBox"):
    5  * VBoxVMSettingsSF class implementation
     5 * UIMachineSettingsSF class implementation
    66 */
    77
    … …  
    2323#include "VBoxProblemReporter.h"
    2424#include "VBoxUtils.h"
    25 #include "VBoxVMSettingsSF.h"
    26 #include "VBoxVMSettingsSFDetails.h"
     25#include "UIMachineSettingsSF.h"
     26#include "UIMachineSettingsSFDetails.h"
    2727
    2828/* Global includes */
    … …  
    165165};
    166166
    167 VBoxVMSettingsSF::VBoxVMSettingsSF()
     167UIMachineSettingsSF::UIMachineSettingsSF()
    168168    : m_type(WrongType)
    169169    , mNewAction(0), mEdtAction(0), mDelAction(0)
    … …  
    171171{
    172172    /* Apply UI decorations */
    173     Ui::VBoxVMSettingsSF::setupUi (this);
     173    Ui::UIMachineSettingsSF::setupUi (this);
    174174
    175175    /* Prepare actions */
    … …  
    212212}
    213213
    214 void VBoxVMSettingsSF::loadDirectlyFrom(const CConsole &console)
     214void UIMachineSettingsSF::loadDirectlyFrom(const CConsole &console)
    215215{
    216216    loadToCacheFromMachine(console.GetMachine());
    … …  
    219219}
    220220
    221 void VBoxVMSettingsSF::saveDirectlyTo(CConsole &console)
     221void UIMachineSettingsSF::saveDirectlyTo(CConsole &console)
    222222{
    223223    putToCache();
    … …  
    227227}
    228228
    229 void VBoxVMSettingsSF::resizeEvent (QResizeEvent *aEvent)
     229void UIMachineSettingsSF::resizeEvent (QResizeEvent *aEvent)
    230230{
    231231    NOREF(aEvent);
    … …  
    235235/* Load data to cashe from corresponding external object(s),
    236236 * this task COULD be performed in other than GUI thread: */
    237 void VBoxVMSettingsSF::loadToCacheFrom(QVariant &data)
     237void UIMachineSettingsSF::loadToCacheFrom(QVariant &data)
    238238{
    239239    /* Fetch data to machine: */
    … …  
    247247}
    248248
    249 void VBoxVMSettingsSF::loadToCacheFromMachine(const CMachine &machine)
     249void UIMachineSettingsSF::loadToCacheFromMachine(const CMachine &machine)
    250250{
    251251    /* Update dialog type: */
    … …  
    256256}
    257257
    258 void VBoxVMSettingsSF::loadToCacheFromConsole(const CConsole &console)
     258void UIMachineSettingsSF::loadToCacheFromConsole(const CConsole &console)
    259259{
    260260    /* Update dialog type: */
    … …  
    265265}
    266266
    267 void VBoxVMSettingsSF::loadToCacheFromVector(const CSharedFolderVector &vector, UISharedFolderType type)
     267void UIMachineSettingsSF::loadToCacheFromVector(const CSharedFolderVector &vector, UISharedFolderType type)
    268268{
    269269    /* Cache shared folders in internal variables: */
    … …  
    283283/* Load data to corresponding widgets from cache,
    284284 * this task SHOULD be performed in GUI thread only: */
    285 void VBoxVMSettingsSF::getFromCache()
     285void UIMachineSettingsSF::getFromCache()
    286286{
    287287    /* Apply internal variables data to QWidget(s): */
    … …  
    313313/* Save data from corresponding widgets to cache,
    314314 * this task SHOULD be performed in GUI thread only: */
    315 void VBoxVMSettingsSF::putToCache()
     315void UIMachineSettingsSF::putToCache()
    316316{
    317317    /* Reset cache: */
    … …  
    342342/* Save data from cache to corresponding external object(s),
    343343 * this task COULD be performed in other than GUI thread: */
    344 void VBoxVMSettingsSF::saveFromCacheTo(QVariant &data)
     344void UIMachineSettingsSF::saveFromCacheTo(QVariant &data)
    345345{
    346346    /* Fetch data to machine: */
    … …  
    354354}
    355355
    356 void VBoxVMSettingsSF::saveFromCacheToMachine(CMachine &machine)
     356void UIMachineSettingsSF::saveFromCacheToMachine(CMachine &machine)
    357357{
    358358    /* Save machine items from internal cache: */
    … …  
    392392}
    393393
    394 void VBoxVMSettingsSF::saveFromCacheToConsole(CConsole &console)
     394void UIMachineSettingsSF::saveFromCacheToConsole(CConsole &console)
    395395{
    396396    /* Save console items from internal cache: */
    … …  
    430430}
    431431
    432 void VBoxVMSettingsSF::setOrderAfter (QWidget *aWidget)
     432void UIMachineSettingsSF::setOrderAfter (QWidget *aWidget)
    433433{
    434434    setTabOrder (aWidget, mTwFolders);
    435435}
    436436
    437 void VBoxVMSettingsSF::retranslateUi()
     437void UIMachineSettingsSF::retranslateUi()
    438438{
    439439    /* Translate uic generated strings */
    440     Ui::VBoxVMSettingsSF::retranslateUi (this);
     440    Ui::UIMachineSettingsSF::retranslateUi (this);
    441441
    442442    mNewAction->setText (tr ("&Add Shared Folder"));
    … …  
    460460}
    461461
    462 void VBoxVMSettingsSF::addTriggered()
     462void UIMachineSettingsSF::addTriggered()
    463463{
    464464    /* Invoke Add-Box Dialog */
    465     VBoxVMSettingsSFDetails dlg (VBoxVMSettingsSFDetails::AddType, m_type == ConsoleType, usedList (true), this);
     465    UIMachineSettingsSFDetails dlg (UIMachineSettingsSFDetails::AddType, m_type == ConsoleType, usedList (true), this);
    466466    if (dlg.exec() == QDialog::Accepted)
    467467    {
    … …  
    491491}
    492492
    493 void VBoxVMSettingsSF::edtTriggered()
     493void UIMachineSettingsSF::edtTriggered()
    494494{
    495495    /* Check selected item */
    … …  
    501501
    502502    /* Invoke Edit-Box Dialog */
    503     VBoxVMSettingsSFDetails dlg (VBoxVMSettingsSFDetails::EditType, m_type == ConsoleType, usedList (false), this);
     503    UIMachineSettingsSFDetails dlg (UIMachineSettingsSFDetails::EditType, m_type == ConsoleType, usedList (false), this);
    504504    dlg.setPath (item->getText (1));
    505505    dlg.setName (item->getText (0));
    … …  
    540540}
    541541
    542 void VBoxVMSettingsSF::delTriggered()
     542void UIMachineSettingsSF::delTriggered()
    543543{
    544544    QTreeWidgetItem *selectedItem = mTwFolders->selectedItems().size() == 1 ? mTwFolders->selectedItems() [0] : 0;
    … …  
    549549}
    550550
    551 void VBoxVMSettingsSF::processCurrentChanged (QTreeWidgetItem *aCurrentItem)
     551void UIMachineSettingsSF::processCurrentChanged (QTreeWidgetItem *aCurrentItem)
    552552{
    553553    if (aCurrentItem && aCurrentItem->parent() && !aCurrentItem->isSelected())
    … …  
    562562}
    563563
    564 void VBoxVMSettingsSF::processDoubleClick (QTreeWidgetItem *aItem)
     564void UIMachineSettingsSF::processDoubleClick (QTreeWidgetItem *aItem)
    565565{
    566566    bool editEnabled = aItem && aItem->parent();
    … …  
    569569}
    570570
    571 void VBoxVMSettingsSF::showContextMenu (const QPoint &aPos)
     571void UIMachineSettingsSF::showContextMenu (const QPoint &aPos)
    572572{
    573573    QMenu menu;
    … …  
    585585}
    586586
    587 void VBoxVMSettingsSF::adjustList()
     587void UIMachineSettingsSF::adjustList()
    588588{
    589589    /*
    … …  
    616616}
    617617
    618 void VBoxVMSettingsSF::adjustFields()
     618void UIMachineSettingsSF::adjustFields()
    619619{
    620620    QTreeWidgetItem *mainRoot = mTwFolders->invisibleRootItem();
    … …  
    633633}
    634634
    635 void VBoxVMSettingsSF::showEvent (QShowEvent *aEvent)
     635void UIMachineSettingsSF::showEvent (QShowEvent *aEvent)
    636636{
    637637    QWidget::showEvent (aEvent);
    … …  
    644644}
    645645
    646 SFTreeViewItem* VBoxVMSettingsSF::root(UISharedFolderType type)
     646SFTreeViewItem* UIMachineSettingsSF::root(UISharedFolderType type)
    647647{
    648648    /* Prepare empty item: */
    … …  
    692692}
    693693
    694 SFoldersNameList VBoxVMSettingsSF::usedList (bool aIncludeSelected)
     694SFoldersNameList UIMachineSettingsSF::usedList (bool aIncludeSelected)
    695695{
    696696    /* Make the used names list: */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.h

    r33879 r33882  
    22 *
    33 * VBox frontends: Qt4 GUI ("VirtualBox"):
    4  * VBoxVMSettingsSF class declaration
     4 * UIMachineSettingsSF class declaration
    55 */
    66
    … …  
    1717 */
    1818
    19 #ifndef __VBoxVMSettingsSF_h__
    20 #define __VBoxVMSettingsSF_h__
     19#ifndef __UIMachineSettingsSF_h__
     20#define __UIMachineSettingsSF_h__
    2121
    2222/* Local includes */
    2323#include "UISettingsPage.h"
    24 #include "VBoxVMSettingsSF.gen.h"
     24#include "UIMachineSettingsSF.gen.h"
    2525
    2626/* Local forwards */
    … …  
    5353};
    5454
    55 class VBoxVMSettingsSF : public UISettingsPageMachine,
    56                          public Ui::VBoxVMSettingsSF
     55class UIMachineSettingsSF : public UISettingsPageMachine,
     56                         public Ui::UIMachineSettingsSF
    5757{
    5858    Q_OBJECT;
    … …  
    6060public:
    6161
    62     VBoxVMSettingsSF();
     62    UIMachineSettingsSF();
    6363
    6464    void loadDirectlyFrom(const CConsole &console);
    … …  
    126126};
    127127
    128 #endif // __VBoxVMSettingsSF_h__
     128#endif // __UIMachineSettingsSF_h__
    129129

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.ui

    r33879 r33882  
    1313     hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1414 </comment>
    15  <class>VBoxVMSettingsSF</class>
    16  <widget class="QWidget" name="VBoxVMSettingsSF">
     15 <class>UIMachineSettingsSF</class>
     16 <widget class="QWidget" name="UIMachineSettingsSF">
    1717  <property name="geometry">
    1818   <rect>

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSFDetails.cpp

    r33879 r33882  
    33 *
    44 * VBox frontends: Qt4 GUI ("VirtualBox"):
    5  * VBoxVMSettingsSFDetails class implementation
     5 * UIMachineSettingsSFDetails class implementation
    66 */
    77
    … …  
    1818 */
    1919
    20 #include "VBoxVMSettingsSFDetails.h"
     20#include "UIMachineSettingsSFDetails.h"
    2121#include "VBoxGlobal.h"
    2222
    … …  
    2525#include <QPushButton>
    2626
    27 VBoxVMSettingsSFDetails::VBoxVMSettingsSFDetails (DialogType aType,
     27UIMachineSettingsSFDetails::UIMachineSettingsSFDetails (DialogType aType,
    2828                                                  bool aEnableSelector, /* for "permanent" checkbox */
    2929                                                  const SFoldersNameList &aUsedNames,
    … …  
    3535{
    3636    /* Apply UI decorations */
    37     Ui::VBoxVMSettingsSFDetails::setupUi (this);
     37    Ui::UIMachineSettingsSFDetails::setupUi (this);
    3838
    3939    mCbPermanent->setHidden (!aEnableSelector);
    … …  
    7070}
    7171
    72 void VBoxVMSettingsSFDetails::setPath (const QString &aPath)
     72void UIMachineSettingsSFDetails::setPath (const QString &aPath)
    7373{
    7474    mPsPath->setPath (aPath);
    7575}
    7676
    77 QString VBoxVMSettingsSFDetails::path() const
     77QString UIMachineSettingsSFDetails::path() const
    7878{
    7979    return mPsPath->path();
    8080}
    8181
    82 void VBoxVMSettingsSFDetails::setName (const QString &aName)
     82void UIMachineSettingsSFDetails::setName (const QString &aName)
    8383{
    8484    mLeName->setText (aName);
    8585}
    8686
    87 QString VBoxVMSettingsSFDetails::name() const
     87QString UIMachineSettingsSFDetails::name() const
    8888{
    8989    return mLeName->text();
    9090}
    9191
    92 void VBoxVMSettingsSFDetails::setWriteable (bool aWritable)
     92void UIMachineSettingsSFDetails::setWriteable (bool aWritable)
    9393{
    9494    mCbReadonly->setChecked (!aWritable);
    9595}
    9696
    97 bool VBoxVMSettingsSFDetails::isWriteable() const
     97bool UIMachineSettingsSFDetails::isWriteable() const
    9898{
    9999    return !mCbReadonly->isChecked();
    100100}
    101101
    102 void VBoxVMSettingsSFDetails::setAutoMount (bool aAutoMount)
     102void UIMachineSettingsSFDetails::setAutoMount (bool aAutoMount)
    103103{
    104104    mCbAutoMount->setChecked (aAutoMount);
    105105}
    106106
    107 bool VBoxVMSettingsSFDetails::isAutoMounted() const
     107bool UIMachineSettingsSFDetails::isAutoMounted() const
    108108{
    109109    return mCbAutoMount->isChecked();
    110110}
    111111
    112 void VBoxVMSettingsSFDetails::setPermanent (bool aPermanent)
     112void UIMachineSettingsSFDetails::setPermanent (bool aPermanent)
    113113{
    114114    mCbPermanent->setChecked (aPermanent);
    115115}
    116116
    117 bool VBoxVMSettingsSFDetails::isPermanent() const
     117bool UIMachineSettingsSFDetails::isPermanent() const
    118118{
    119119    return mUsePermanent ? mCbPermanent->isChecked() : true;
    120120}
    121121
    122 void VBoxVMSettingsSFDetails::retranslateUi()
     122void UIMachineSettingsSFDetails::retranslateUi()
    123123{
    124124    /* Translate uic generated strings */
    125     Ui::VBoxVMSettingsSFDetails::retranslateUi (this);
     125    Ui::UIMachineSettingsSFDetails::retranslateUi (this);
    126126
    127127    switch (mType)
    … …  
    138138}
    139139
    140 void VBoxVMSettingsSFDetails::validate()
     140void UIMachineSettingsSFDetails::validate()
    141141{
    142142    UISharedFolderType resultType =
    … …  
    151151}
    152152
    153 void VBoxVMSettingsSFDetails::onSelectPath()
     153void UIMachineSettingsSFDetails::onSelectPath()
    154154{
    155155    if (!mPsPath->isPathSelected())

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSFDetails.h

    r33879 r33882  
    22 *
    33 * VBox frontends: Qt4 GUI ("VirtualBox"):
    4  * VBoxVMSettingsSFDetails class declaration
     4 * UIMachineSettingsSFDetails class declaration
    55 */
    66
    … …  
    1717 */
    1818
    19 #ifndef __VBoxVMSettingsSFDetails_h__
    20 #define __VBoxVMSettingsSFDetails_h__
     19#ifndef __UIMachineSettingsSFDetails_h__
     20#define __UIMachineSettingsSFDetails_h__
    2121
    22 #include "VBoxVMSettingsSFDetails.gen.h"
     22#include "UIMachineSettingsSFDetails.gen.h"
    2323#include "QIDialog.h"
    2424#include "QIWithRetranslateUI.h"
    25 #include "VBoxVMSettingsSF.h"
     25#include "UIMachineSettingsSF.h"
    2626
    27 class VBoxVMSettingsSFDetails : public QIWithRetranslateUI2<QIDialog>,
    28                                 public Ui::VBoxVMSettingsSFDetails
     27class UIMachineSettingsSFDetails : public QIWithRetranslateUI2<QIDialog>,
     28                                public Ui::UIMachineSettingsSFDetails
    2929{
    3030    Q_OBJECT;
    … …  
    3838    };
    3939
    40     VBoxVMSettingsSFDetails (DialogType aType,
     40    UIMachineSettingsSFDetails (DialogType aType,
    4141                             bool aEnableSelector, /* for "permanent" checkbox */
    4242                             const SFoldersNameList &aUsedNames,
    … …  
    7575};
    7676
    77 #endif // __VBoxVMSettingsSFDetails_h__
     77#endif // __UIMachineSettingsSFDetails_h__
    7878

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSFDetails.ui

    r33879 r33882  
    1313     hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1414 </comment>
    15  <class>VBoxVMSettingsSFDetails</class>
    16  <widget class="QDialog" name="VBoxVMSettingsSFDetails" >
     15 <class>UIMachineSettingsSFDetails</class>
     16 <widget class="QDialog" name="UIMachineSettingsSFDetails" >
    1717  <property name="geometry" >
    1818   <rect>
    … …  
    127127   <sender>mButtonBox</sender>
    128128   <signal>accepted()</signal>
    129    <receiver>VBoxVMSettingsSFDetails</receiver>
     129   <receiver>UIMachineSettingsSFDetails</receiver>
    130130   <slot>accept()</slot>
    131131   <hints>
    … …  
    143143   <sender>mButtonBox</sender>
    144144   <signal>rejected()</signal>
    145    <receiver>VBoxVMSettingsSFDetails</receiver>
     145   <receiver>UIMachineSettingsSFDetails</receiver>
    146146   <slot>reject()</slot>
    147147   <hints>

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.cpp

    r33879 r33882  
    33 *
    44 * VBox frontends: Qt4 GUI ("VirtualBox"):
    5  * VBoxVMSettingsSerial class implementation
     5 * UIMachineSettingsSerial class implementation
    66 */
    77
    … …  
    1818 */
    1919
    20 #include "VBoxVMSettingsSerial.h"
     20#include "UIMachineSettingsSerial.h"
    2121#include "QIWidgetValidator.h"
    2222#include "VBoxGlobal.h"
    … …  
    2525#include <QDir>
    2626
    27 /* VBoxVMSettingsSerial stuff */
    28 VBoxVMSettingsSerial::VBoxVMSettingsSerial()
     27/* UIMachineSettingsSerial stuff */
     28UIMachineSettingsSerial::UIMachineSettingsSerial()
    2929    : QIWithRetranslateUI<QWidget> (0)
    3030    , mValidator(0)
    … …  
    3232{
    3333    /* Apply UI decorations */
    34     Ui::VBoxVMSettingsSerial::setupUi (this);
     34    Ui::UIMachineSettingsSerial::setupUi (this);
    3535
    3636    /* Setup validation */
    … …  
    6565}
    6666
    67 void VBoxVMSettingsSerial::fetchPortData(const UISerialPortData &data)
     67void UIMachineSettingsSerial::fetchPortData(const UISerialPortData &data)
    6868{
    6969    /* Load port slot number: */
    … …  
    8383}
    8484
    85 void VBoxVMSettingsSerial::uploadPortData(UISerialPortData &data)
     85void UIMachineSettingsSerial::uploadPortData(UISerialPortData &data)
    8686{
    8787    /* Upload port data: */
    … …  
    9494}
    9595
    96 void VBoxVMSettingsSerial::setValidator (QIWidgetValidator *aVal)
     96void UIMachineSettingsSerial::setValidator (QIWidgetValidator *aVal)
    9797{
    9898    Assert (aVal);
    … …  
    107107}
    108108
    109 QWidget* VBoxVMSettingsSerial::setOrderAfter (QWidget *aAfter)
     109QWidget* UIMachineSettingsSerial::setOrderAfter (QWidget *aAfter)
    110110{
    111111    setTabOrder (aAfter, mGbSerial);
    … …  
    119119}
    120120
    121 QString VBoxVMSettingsSerial::pageTitle() const
     121QString UIMachineSettingsSerial::pageTitle() const
    122122{
    123123    return QString(tr("Port %1", "serial ports")).arg(QString("&%1").arg(m_iSlot + 1));
    124124}
    125125
    126 bool VBoxVMSettingsSerial::isUserDefined()
     126bool UIMachineSettingsSerial::isUserDefined()
    127127{
    128128    ulong a, b;
    … …  
    130130}
    131131
    132 void VBoxVMSettingsSerial::retranslateUi()
     132void UIMachineSettingsSerial::retranslateUi()
    133133{
    134134    /* Translate uic generated strings */
    135     Ui::VBoxVMSettingsSerial::retranslateUi (this);
     135    Ui::UIMachineSettingsSerial::retranslateUi (this);
    136136
    137137    mCbNumber->setItemText (mCbNumber->count() - 1, vboxGlobal().toCOMPortName (0, 0));
    … …  
    143143}
    144144
    145 void VBoxVMSettingsSerial::mGbSerialToggled (bool aOn)
     145void UIMachineSettingsSerial::mGbSerialToggled (bool aOn)
    146146{
    147147    if (aOn)
    … …  
    154154}
    155155
    156 void VBoxVMSettingsSerial::mCbNumberActivated (const QString &aText)
     156void UIMachineSettingsSerial::mCbNumberActivated (const QString &aText)
    157157{
    158158    ulong IRQ, IOBase;
    … …  
    168168}
    169169
    170 void VBoxVMSettingsSerial::mCbModeActivated (const QString &aText)
     170void UIMachineSettingsSerial::mCbModeActivated (const QString &aText)
    171171{
    172172    KPortMode mode = vboxGlobal().toPortMode (aText);
    … …  
    179179
    180180
    181 /* VBoxVMSettingsSerialPage stuff */
    182 VBoxVMSettingsSerialPage::VBoxVMSettingsSerialPage()
     181/* UIMachineSettingsSerialPage stuff */
     182UIMachineSettingsSerialPage::UIMachineSettingsSerialPage()
    183183    : mValidator(0)
    184184    , mTabWidget(0)
    … …  
    196196/* Load data to cashe from corresponding external object(s),
    197197 * this task COULD be performed in other than GUI thread: */
    198 void VBoxVMSettingsSerialPage::loadToCacheFrom(QVariant &data)
     198void UIMachineSettingsSerialPage::loadToCacheFrom(QVariant &data)
    199199{
    200200    /* Fetch data to machine: */
    … …  
    230230/* Load data to corresponding widgets from cache,
    231231 * this task SHOULD be performed in GUI thread only: */
    232 void VBoxVMSettingsSerialPage::getFromCache()
     232void UIMachineSettingsSerialPage::getFromCache()
    233233{
    234234    Assert(m_pFirstWidget);
    … …  
    240240    {
    241241        /* Creating port's page: */
    242         VBoxVMSettingsSerial *pPage = new VBoxVMSettingsSerial;
     242        UIMachineSettingsSerial *pPage = new UIMachineSettingsSerial;
    243243
    244244        /* Loading port's data into page: */
    … …  
    264264/* Save data from corresponding widgets to cache,
    265265 * this task SHOULD be performed in GUI thread only: */
    266 void VBoxVMSettingsSerialPage::putToCache()
     266void UIMachineSettingsSerialPage::putToCache()
    267267{
    268268    /* Gather internal variables data from QWidget(s): */
    … …  
    270270    {
    271271        /* Getting adapter's page: */
    272         VBoxVMSettingsSerial *pPage = qobject_cast<VBoxVMSettingsSerial*>(mTabWidget->widget(iSlot));
     272        UIMachineSettingsSerial *pPage = qobject_cast<UIMachineSettingsSerial*>(mTabWidget->widget(iSlot));
    273273
    274274        /* Loading Adapter's data from page: */
    … …  
    279279/* Save data from cache to corresponding external object(s),
    280280 * this task COULD be performed in other than GUI thread: */
    281 void VBoxVMSettingsSerialPage::saveFromCacheTo(QVariant &data)
     281void UIMachineSettingsSerialPage::saveFromCacheTo(QVariant &data)
    282282{
    283283    /* Fetch data to machine: */
    … …  
    309309}
    310310
    311 void VBoxVMSettingsSerialPage::setValidator (QIWidgetValidator * aVal)
     311void UIMachineSettingsSerialPage::setValidator (QIWidgetValidator * aVal)
    312312{
    313313    mValidator = aVal;
    314314}
    315315
    316 bool VBoxVMSettingsSerialPage::revalidate (QString &aWarning, QString &aTitle)
     316bool UIMachineSettingsSerialPage::revalidate (QString &aWarning, QString &aTitle)
    317317{
    318318    bool valid = true;
    … …  
    324324    {
    325325        QWidget *tab = mTabWidget->widget (index);
    326         VBoxVMSettingsSerial *page =
    327             static_cast<VBoxVMSettingsSerial*> (tab);
     326        UIMachineSettingsSerial *page =
     327            static_cast<UIMachineSettingsSerial*> (tab);
    328328
    329329        if (!page->mGbSerial->isChecked())
    … …  
    373373}
    374374
    375 void VBoxVMSettingsSerialPage::retranslateUi()
     375void UIMachineSettingsSerialPage::retranslateUi()
    376376{
    377377    for (int i = 0; i < mTabWidget->count(); ++ i)
    378378    {
    379         VBoxVMSettingsSerial *page =
    380             static_cast<VBoxVMSettingsSerial*> (mTabWidget->widget (i));
     379        UIMachineSettingsSerial *page =
     380            static_cast<UIMachineSettingsSerial*> (mTabWidget->widget (i));
    381381        mTabWidget->setTabText (i, page->pageTitle());
    382382    }

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.h

    r33879 r33882  
    22 *
    33 * VBox frontends: Qt4 GUI ("VirtualBox"):
    4  * VBoxVMSettingsSerial class declaration
     4 * UIMachineSettingsSerial class declaration
    55 */
    66
    … …  
    1717 */
    1818
    19 #ifndef __VBoxVMSettingsSerial_h__
    20 #define __VBoxVMSettingsSerial_h__
     19#ifndef __UIMachineSettingsSerial_h__
     20#define __UIMachineSettingsSerial_h__
    2121
    2222#include "UISettingsPage.h"
    23 #include "VBoxVMSettingsSerial.gen.h"
     23#include "UIMachineSettingsSerial.gen.h"
    2424#include "COMDefs.h"
    2525
    … …  
    4444};
    4545
    46 class VBoxVMSettingsSerial : public QIWithRetranslateUI<QWidget>,
    47                              public Ui::VBoxVMSettingsSerial
     46class UIMachineSettingsSerial : public QIWithRetranslateUI<QWidget>,
     47                             public Ui::UIMachineSettingsSerial
    4848{
    4949    Q_OBJECT;
    … …  
    5151public:
    5252
    53     VBoxVMSettingsSerial();
     53    UIMachineSettingsSerial();
    5454
    5555    void fetchPortData(const UISerialPortData &data);
    … …  
    8080
    8181/* Machine settings / Serial page: */
    82 class VBoxVMSettingsSerialPage : public UISettingsPageMachine
     82class UIMachineSettingsSerialPage : public UISettingsPageMachine
    8383{
    8484    Q_OBJECT;
    … …  
    8686public:
    8787
    88     VBoxVMSettingsSerialPage();
     88    UIMachineSettingsSerialPage();
    8989
    9090protected:
    … …  
    118118};
    119119
    120 #endif // __VBoxVMSettingsSerial_h__
     120#endif // __UIMachineSettingsSerial_h__
    121121

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.ui

    r33879 r33882  
    1313     hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1414 </comment>
    15  <class>VBoxVMSettingsSerial</class>
    16  <widget class="QWidget" name="VBoxVMSettingsSerial" >
     15 <class>UIMachineSettingsSerial</class>
     16 <widget class="QWidget" name="UIMachineSettingsSerial" >
    1717  <property name="geometry" >
    1818   <rect>

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp

    r33879 r33882  
    33 *
    44 * VBox frontends: Qt4 GUI ("VirtualBox"):
    5  * VBoxVMSettingsHD class implementation
     5 * UIMachineSettingsStorage class implementation
    66 */
    77
    … …  
    2525#include "QIFileDialog.h"
    2626#include "VBoxProblemReporter.h"
    27 #include "VBoxVMSettingsHD.h"
     27#include "UIMachineSettingsStorage.h"
    2828
    2929/* Global Includes */
    … …  
    579579QString ControllerItem::tip() const
    580580{
    581     return VBoxVMSettingsHD::tr ("<nobr><b>%1</b></nobr><br>"
     581    return UIMachineSettingsStorage::tr ("<nobr><b>%1</b></nobr><br>"
    582582                                 "<nobr>Bus:&nbsp;&nbsp;%2</nobr><br>"
    583583                                 "<nobr>Type:&nbsp;&nbsp;%3</nobr>")
    … …  
    934934                        case ExpanderToolTip:
    935935                            if (aIndex.child (0, 0).isValid())
    936                                 tip = VBoxVMSettingsHD::tr ("<nobr>Expand/Collapse&nbsp;Item</nobr>");
     936                                tip = UIMachineSettingsStorage::tr ("<nobr>Expand/Collapse&nbsp;Item</nobr>");
    937937                            break;
    938938                        case HDAdderToolTip:
    939                             tip = VBoxVMSettingsHD::tr ("<nobr>Add&nbsp;Hard&nbsp;Disk</nobr>");
     939                            tip = UIMachineSettingsStorage::tr ("<nobr>Add&nbsp;Hard&nbsp;Disk</nobr>");
    940940                            break;
    941941                        case CDAdderToolTip:
    942                             tip = VBoxVMSettingsHD::tr ("<nobr>Add&nbsp;CD/DVD&nbsp;Device</nobr>");
     942                            tip = UIMachineSettingsStorage::tr ("<nobr>Add&nbsp;CD/DVD&nbsp;Device</nobr>");
    943943                            break;
    944944                        case FDAdderToolTip:
    945                             tip = VBoxVMSettingsHD::tr ("<nobr>Add&nbsp;Floppy&nbsp;Device</nobr>");
     945                            tip = UIMachineSettingsStorage::tr ("<nobr>Add&nbsp;Floppy&nbsp;Device</nobr>");
    946946                            break;
    947947                        default:
    … …  
    16241624 * Used as HD Settings widget.
    16251625 */
    1626 VBoxVMSettingsHD::VBoxVMSettingsHD()
     1626UIMachineSettingsStorage::UIMachineSettingsStorage()
    16271627    : mValidator(0)
    16281628    , mStorageModel(0)
    … …  
    16361636{
    16371637    /* Apply UI decorations */
    1638     Ui::VBoxVMSettingsHD::setupUi (this);
     1638    Ui::UIMachineSettingsStorage::setupUi (this);
    16391639
    16401640    /* Initialize pixmap pool */
    … …  
    17901790/* Load data to cashe from corresponding external object(s),
    17911791 * this task COULD be performed in other than GUI thread: */
    1792 void VBoxVMSettingsHD::loadToCacheFrom(QVariant &data)
     1792void UIMachineSettingsStorage::loadToCacheFrom(QVariant &data)
    17931793{
    17941794    /* Fetch data to machine: */
    … …  
    18341834/* Load data to corresponding widgets from cache,
    18351835 * this task SHOULD be performed in GUI thread only: */
    1836 void VBoxVMSettingsHD::getFromCache()
     1836void UIMachineSettingsStorage::getFromCache()
    18371837{
    18381838    /* Apply internal variables data to QWidget(s): */
    … …  
    18711871/* Save data from corresponding widgets to cache,
    18721872 * this task SHOULD be performed in GUI thread only: */
    1873 void VBoxVMSettingsHD::putToCache()
     1873void UIMachineSettingsStorage::putToCache()
    18741874{
    18751875    /* Gather internal variables data from QWidget(s): */
    … …  
    19021902/* Save data from cache to corresponding external object(s),
    19031903 * this task COULD be performed in other than GUI thread: */
    1904 void VBoxVMSettingsHD::saveFromCacheTo(QVariant &data)
     1904void UIMachineSettingsStorage::saveFromCacheTo(QVariant &data)
    19051905{
    19061906    /* Fetch data to machine: */
    … …  
    19661966}
    19671967
    1968 void VBoxVMSettingsHD::setValidator (QIWidgetValidator *aVal)
     1968void UIMachineSettingsStorage::setValidator (QIWidgetValidator *aVal)
    19691969{
    19701970    mValidator = aVal;
    19711971}
    19721972
    1973 bool VBoxVMSettingsHD::revalidate (QString &aWarning, QString &)
     1973bool UIMachineSettingsStorage::revalidate (QString &aWarning, QString &)
    19741974{
    19751975    QModelIndex rootIndex = mStorageModel->root();
    … …  
    20052005}
    20062006
    2007 void VBoxVMSettingsHD::retranslateUi()
     2007void UIMachineSettingsStorage::retranslateUi()
    20082008{
    20092009    /* Translate uic generated strings */
    2010     Ui::VBoxVMSettingsHD::retranslateUi (this);
     2010    Ui::UIMachineSettingsStorage::retranslateUi (this);
    20112011
    20122012    mAddCtrAction->setShortcut (QKeySequence ("Ins"));
    … …  
    20482048}
    20492049
    2050 void VBoxVMSettingsHD::showEvent (QShowEvent *aEvent)
     2050void UIMachineSettingsStorage::showEvent (QShowEvent *aEvent)
    20512051{
    20522052    if (!mIsPolished)
    … …  
    20802080}
    20812081
    2082 void VBoxVMSettingsHD::mediumUpdated (const VBoxMedium &aMedium)
     2082void UIMachineSettingsStorage::mediumUpdated (const VBoxMedium &aMedium)
    20832083{
    20842084    QModelIndex rootIndex = mStorageModel->root();
    … …  
    20992099}
    21002100
    2101 void VBoxVMSettingsHD::mediumRemoved (VBoxDefs::MediumType /* aType */, const QString &aMediumId)
     2101void UIMachineSettingsStorage::mediumRemoved (VBoxDefs::MediumType /* aType */, const QString &aMediumId)
    21022102{
    21032103    QModelIndex rootIndex = mStorageModel->root();
    … …  
    21182118}
    21192119
    2120 void VBoxVMSettingsHD::addController()
     2120void UIMachineSettingsStorage::addController()
    21212121{
    21222122    QMenu menu;
    … …  
    21292129}
    21302130
    2131 void VBoxVMSettingsHD::addIDEController()
     2131void UIMachineSettingsStorage::addIDEController()
    21322132{
    21332133    addControllerWrapper (generateUniqueName (tr ("IDE Controller")), KStorageBus_IDE, KStorageControllerType_PIIX4);
    21342134}
    21352135
    2136 void VBoxVMSettingsHD::addSATAController()
     2136void UIMachineSettingsStorage::addSATAController()
    21372137{
    21382138    addControllerWrapper (generateUniqueName (tr ("SATA Controller")), KStorageBus_SATA, KStorageControllerType_IntelAhci);
    21392139}
    21402140
    2141 void VBoxVMSettingsHD::addSCSIController()
     2141void UIMachineSettingsStorage::addSCSIController()
    21422142{
    21432143    addControllerWrapper (generateUniqueName (tr ("SCSI Controller")), KStorageBus_SCSI, KStorageControllerType_LsiLogic);
    21442144}
    21452145
    2146 void VBoxVMSettingsHD::addFloppyController()
     2146void UIMachineSettingsStorage::addFloppyController()
    21472147{
    21482148    addControllerWrapper (generateUniqueName (tr ("Floppy Controller")), KStorageBus_Floppy, KStorageControllerType_I82078);
    21492149}
    21502150
    2151 void VBoxVMSettingsHD::addSASController()
     2151void UIMachineSettingsStorage::addSASController()
    21522152{
    21532153    addControllerWrapper (generateUniqueName (tr ("SAS Controller")), KStorageBus_SAS, KStorageControllerType_LsiLogicSas);
    21542154}
    21552155
    2156 void VBoxVMSettingsHD::delController()
     2156void UIMachineSettingsStorage::delController()
    21572157{
    21582158    QModelIndex index = mTwStorageTree->currentIndex();
    … …  
    21642164}
    21652165
    2166 void VBoxVMSettingsHD::addAttachment()
     2166void UIMachineSettingsStorage::addAttachment()
    21672167{
    21682168    QModelIndex index = mTwStorageTree->currentIndex();
    … …  
    22032203}
    22042204
    2205 void VBoxVMSettingsHD::addHDAttachment()
     2205void UIMachineSettingsStorage::addHDAttachment()
    22062206{
    22072207    addAttachmentWrapper (KDeviceType_HardDisk);
    22082208}
    22092209
    2210 void VBoxVMSettingsHD::addCDAttachment()
     2210void UIMachineSettingsStorage::addCDAttachment()
    22112211{
    22122212    addAttachmentWrapper (KDeviceType_DVD);
    22132213}
    22142214
    2215 void VBoxVMSettingsHD::addFDAttachment()
     2215void UIMachineSettingsStorage::addFDAttachment()
    22162216{
    22172217    addAttachmentWrapper (KDeviceType_Floppy);
    22182218}
    22192219
    2220 void VBoxVMSettingsHD::delAttachment()
     2220void UIMachineSettingsStorage::delAttachment()
    22212221{
    22222222    QModelIndex index = mTwStorageTree->currentIndex();
    … …  
    22432243}
    22442244
    2245 void VBoxVMSettingsHD::getInformation()
     2245void UIMachineSettingsStorage::getInformation()
    22462246{
    22472247    mIsLoadingInProgress = true;
    … …  
    23542354}
    23552355
    2356 void VBoxVMSettingsHD::setInformation()
     2356void UIMachineSettingsStorage::setInformation()
    23572357{
    23582358    QModelIndex index = mTwStorageTree->currentIndex();
    … …  
    24072407}
    24082408
    2409 void VBoxVMSettingsHD::sltOpenMedium()
     2409void UIMachineSettingsStorage::sltOpenMedium()
    24102410{
    24112411    QString id = vboxGlobal().openMediumWithFileOpenDialog(mCbVdi->type(), this);
    … …  
    24142414}
    24152415
    2416 void VBoxVMSettingsHD::sltNewMedium()
     2416void UIMachineSettingsStorage::sltNewMedium()
    24172417{
    24182418    QString id = getWithNewHDWizard();
    … …  
    24212421}
    24222422
    2423 void VBoxVMSettingsHD::updateActionsState()
     2423void UIMachineSettingsStorage::updateActionsState()
    24242424{
    24252425    QModelIndex index = mTwStorageTree->currentIndex();
    … …  
    24512451}
    24522452
    2453 void VBoxVMSettingsHD::onRowInserted (const QModelIndex &aParent, int aPosition)
     2453void UIMachineSettingsStorage::onRowInserted (const QModelIndex &aParent, int aPosition)
    24542454{
    24552455    QModelIndex index = mStorageModel->index (aPosition, 0, aParent);
    … …  
    24912491}
    24922492
    2493 void VBoxVMSettingsHD::onRowRemoved()
     2493void UIMachineSettingsStorage::onRowRemoved()
    24942494{
    24952495    if (mStorageModel->rowCount (mStorageModel->root()) == 0)
    … …  
    25002500}
    25012501
    2502 void VBoxVMSettingsHD::onCurrentItemChanged()
     2502void UIMachineSettingsStorage::onCurrentItemChanged()
    25032503{
    25042504    updateActionsState();
    … …  
    25062506}
    25072507
    2508 void VBoxVMSettingsHD::onContextMenuRequested (const QPoint &aPosition)
     2508void UIMachineSettingsStorage::onContextMenuRequested (const QPoint &aPosition)
    25092509{
    25102510    QModelIndex index = mTwStorageTree->indexAt (aPosition);
    … …  
    25492549}
    25502550
    2551 void VBoxVMSettingsHD::onDrawItemBranches (QPainter *aPainter, const QRect &aRect, const QModelIndex &aIndex)
     2551void UIMachineSettingsStorage::onDrawItemBranches (QPainter *aPainter, const QRect &aRect, const QModelIndex &aIndex)
    25522552{
    25532553    if (!aIndex.parent().isValid() || !aIndex.parent().parent().isValid()) return;
    … …  
    25702570}
    25712571
    2572 void VBoxVMSettingsHD::onMouseMoved (QMouseEvent *aEvent)
     2572void UIMachineSettingsStorage::onMouseMoved (QMouseEvent *aEvent)
    25732573{
    25742574    QModelIndex index = mTwStorageTree->indexAt (aEvent->pos());
    … …  
    26572657}
    26582658
    2659 void VBoxVMSettingsHD::onMouseClicked (QMouseEvent *aEvent)
     2659void UIMachineSettingsStorage::onMouseClicked (QMouseEvent *aEvent)
    26602660{
    26612661    QModelIndex index = mTwStorageTree->indexAt (aEvent->pos());
    … …  
    27182718}
    27192719
    2720 void VBoxVMSettingsHD::addControllerWrapper (const QString &aName, KStorageBus aBus, KStorageControllerType aType)
     2720void UIMachineSettingsStorage::addControllerWrapper (const QString &aName, KStorageBus aBus, KStorageControllerType aType)
    27212721{
    27222722    QModelIndex index = mTwStorageTree->currentIndex();
    … …  
    27462746}
    27472747
    2748 void VBoxVMSettingsHD::addAttachmentWrapper (KDeviceType aDevice)
     2748void UIMachineSettingsStorage::addAttachmentWrapper (KDeviceType aDevice)
    27492749{
    27502750    QModelIndex index = mTwStorageTree->currentIndex();
    … …  
    27582758}
    27592759
    2760 QString VBoxVMSettingsHD::getWithNewHDWizard()
     2760QString UIMachineSettingsStorage::getWithNewHDWizard()
    27612761{
    27622762    /* Run New HD Wizard */
    … …  
    27722772}
    27732773
    2774 void VBoxVMSettingsHD::updateAdditionalObjects (KDeviceType aType)
     2774void UIMachineSettingsStorage::updateAdditionalObjects (KDeviceType aType)
    27752775{
    27762776    mCbShowDiffs->setVisible (aType == KDeviceType_HardDisk);
    … …  
    27902790}
    27912791
    2792 QString VBoxVMSettingsHD::generateUniqueName (const QString &aTemplate) const
     2792QString UIMachineSettingsStorage::generateUniqueName (const QString &aTemplate) const
    27932793{
    27942794    int maxNumber = 0;
    … …  
    28092809}
    28102810
    2811 uint32_t VBoxVMSettingsHD::deviceCount (KDeviceType aType) const
     2811uint32_t UIMachineSettingsStorage::deviceCount (KDeviceType aType) const
    28122812{
    28132813    uint32_t cDevices = 0;

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h

    r33879 r33882  
    22 *
    33 * VBox frontends: Qt4 GUI ("VirtualBox"):
    4  * VBoxVMSettingsHD class declaration
     4 * UIMachineSettingsStorage class declaration
    55 */
    66
    … …  
    1717 */
    1818
    19 #ifndef __VBoxVMSettingsHD_h__
    20 #define __VBoxVMSettingsHD_h__
     19#ifndef __UIMachineSettingsStorage_h__
     20#define __UIMachineSettingsStorage_h__
    2121
    2222/* Global includes */
    … …  
    3333/* Local includes */
    3434#include "UISettingsPage.h"
    35 #include "VBoxVMSettingsHD.gen.h"
     35#include "UIMachineSettingsStorage.gen.h"
    3636#include "COMDefs.h"
    3737
    … …  
    558558
    559559/* Machine settings / Storage page: */
    560 class VBoxVMSettingsHD : public UISettingsPageMachine,
    561                          public Ui::VBoxVMSettingsHD
     560class UIMachineSettingsStorage : public UISettingsPageMachine,
     561                         public Ui::UIMachineSettingsStorage
    562562{
    563563    Q_OBJECT;
    … …  
    565565public:
    566566
    567     VBoxVMSettingsHD();
     567    UIMachineSettingsStorage();
    568568
    569569signals:
    … …  
    671671};
    672672
    673 #endif // __VBoxVMSettingsHD_h__
    674 
     673#endif // __UIMachineSettingsStorage_h__
     674

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.ui

    r33879 r33882  
    1313     hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1414 </comment>
    15  <class>VBoxVMSettingsHD</class>
    16  <widget class="QWidget" name="VBoxVMSettingsHD" >
     15 <class>UIMachineSettingsStorage</class>
     16 <widget class="QWidget" name="UIMachineSettingsStorage" >
    1717  <property name="geometry" >
    1818   <rect>

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp

    r33879 r33882  
    33 *
    44 * VBox frontends: Qt4 GUI ("VirtualBox"):
    5  * VBoxVMSettingsSystem class implementation
     5 * UIMachineSettingsSystem class implementation
    66 */
    77
    … …  
    2222#include "UIIconPool.h"
    2323#include "VBoxGlobal.h"
    24 #include "VBoxVMSettingsSystem.h"
     24#include "UIMachineSettingsSystem.h"
    2525
    2626/* Global includes */
    … …  
    3030#define ITEM_TYPE_ROLE Qt::UserRole + 1
    3131
    32 VBoxVMSettingsSystem::VBoxVMSettingsSystem()
     32UIMachineSettingsSystem::UIMachineSettingsSystem()
    3333    : mValidator(0)
    3434    , mMinGuestCPU(0), mMaxGuestCPU(0)
    3535{
    3636    /* Apply UI decorations */
    37     Ui::VBoxVMSettingsSystem::setupUi (this);
     37    Ui::UIMachineSettingsSystem::setupUi (this);
    3838
    3939    /* Setup constants */
    … …  
    145145}
    146146
    147 bool VBoxVMSettingsSystem::isHWVirtExEnabled() const
     147bool UIMachineSettingsSystem::isHWVirtExEnabled() const
    148148{
    149149    return mCbVirt->isChecked();
    150150}
    151151
    152 int VBoxVMSettingsSystem::cpuCount() const
     152int UIMachineSettingsSystem::cpuCount() const
    153153{
    154154    return mSlCPU->value();
    155155}
    156156
    157 bool VBoxVMSettingsSystem::isHIDEnabled() const
     157bool UIMachineSettingsSystem::isHIDEnabled() const
    158158{
    159159    return mCbUseAbsHID->isChecked();
    … …  
    162162/* Load data to cashe from corresponding external object(s),
    163163 * this task COULD be performed in other than GUI thread: */
    164 void VBoxVMSettingsSystem::loadToCacheFrom(QVariant &data)
     164void UIMachineSettingsSystem::loadToCacheFrom(QVariant &data)
    165165{
    166166    /* Fetch data to machine: */
    … …  
    213213/* Load data to corresponding widgets from cache,
    214214 * this task SHOULD be performed in GUI thread only: */
    215 void VBoxVMSettingsSystem::getFromCache()
     215void UIMachineSettingsSystem::getFromCache()
    216216{
    217217    /* Apply internal variables data to QWidget(s): */
    … …  
    251251/* Save data from corresponding widgets to cache,
    252252 * this task SHOULD be performed in GUI thread only: */
    253 void VBoxVMSettingsSystem::putToCache()
     253void UIMachineSettingsSystem::putToCache()
    254254{
    255255    /* Gather internal variables data from QWidget(s): */
    … …  
    278278/* Save data from cache to corresponding external object(s),
    279279 * this task COULD be performed in other than GUI thread: */
    280 void VBoxVMSettingsSystem::saveFromCacheTo(QVariant &data)
     280void UIMachineSettingsSystem::saveFromCacheTo(QVariant &data)
    281281{
    282282    /* Fetch data to machine: */
    … …  
    312312}
    313313
    314 void VBoxVMSettingsSystem::setValidator (QIWidgetValidator *aVal)
     314void UIMachineSettingsSystem::setValidator (QIWidgetValidator *aVal)
    315315{
    316316    mValidator = aVal;
    … …  
    321321}
    322322
    323 bool VBoxVMSettingsSystem::revalidate (QString &aWarning, QString & /* aTitle */)
     323bool UIMachineSettingsSystem::revalidate (QString &aWarning, QString & /* aTitle */)
    324324{
    325325    ulong fullSize = vboxGlobal().virtualBox().GetHost().GetMemorySize();
    … …  
    403403}
    404404
    405 void VBoxVMSettingsSystem::setOrderAfter (QWidget *aWidget)
     405void UIMachineSettingsSystem::setOrderAfter (QWidget *aWidget)
    406406{
    407407    /* Motherboard tab-order */
    … …  
    427427}
    428428
    429 void VBoxVMSettingsSystem::retranslateUi()
     429void UIMachineSettingsSystem::retranslateUi()
    430430{
    431431    /* Translate uic generated strings */
    432     Ui::VBoxVMSettingsSystem::retranslateUi (this);
     432    Ui::UIMachineSettingsSystem::retranslateUi (this);
    433433
    434434    /* Adjust the boot order tree widget */
    … …  
    459459}
    460460
    461 void VBoxVMSettingsSystem::valueChangedRAM (int aVal)
     461void UIMachineSettingsSystem::valueChangedRAM (int aVal)
    462462{
    463463    mLeMemory->setText (QString().setNum (aVal));
    464464}
    465465
    466 void VBoxVMSettingsSystem::textChangedRAM (const QString &aText)
     466void UIMachineSettingsSystem::textChangedRAM (const QString &aText)
    467467{
    468468    mSlMemory->setValue (aText.toInt());
    469469}
    470470
    471 void VBoxVMSettingsSystem::moveBootItemUp()
     471void UIMachineSettingsSystem::moveBootItemUp()
    472472{
    473473    QTreeWidgetItem *item = mTwBootOrder->currentItem();
    … …  
    486486}
    487487
    488 void VBoxVMSettingsSystem::moveBootItemDown()
     488void UIMachineSettingsSystem::moveBootItemDown()
    489489{
    490490    QTreeWidgetItem *item = mTwBootOrder->currentItem();
    … …  
    503503}
    504504
    505 void VBoxVMSettingsSystem::onCurrentBootItemChanged (QTreeWidgetItem *aItem,
     505void UIMachineSettingsSystem::onCurrentBootItemChanged (QTreeWidgetItem *aItem,
    506506                                                     QTreeWidgetItem *)
    507507{
    … …  
    515515}
    516516
    517 void VBoxVMSettingsSystem::adjustBootOrderTWSize()
     517void UIMachineSettingsSystem::adjustBootOrderTWSize()
    518518{
    519519    /* Calculate the optimal size of the tree widget & set it as fixed
    … …  
    544544}
    545545
    546 void VBoxVMSettingsSystem::valueChangedCPU (int aVal)
     546void UIMachineSettingsSystem::valueChangedCPU (int aVal)
    547547{
    548548    mLeCPU->setText (QString().setNum (aVal));
    549549}
    550550
    551 void VBoxVMSettingsSystem::textChangedCPU (const QString &aText)
     551void UIMachineSettingsSystem::textChangedCPU (const QString &aText)
    552552{
    553553    mSlCPU->setValue (aText.toInt());
    554554}
    555555
    556 bool VBoxVMSettingsSystem::eventFilter (QObject *aObject, QEvent *aEvent)
     556bool UIMachineSettingsSystem::eventFilter (QObject *aObject, QEvent *aEvent)
    557557{
    558558    if (!aObject->isWidgetType())

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.h

    r33879 r33882  
    22 *
    33 * VBox frontends: Qt4 GUI ("VirtualBox"):
    4  * VBoxVMSettingsSystem class declaration
     4 * UIMachineSettingsSystem class declaration
    55 */
    66
    … …  
    1717 */
    1818
    19 #ifndef __VBoxVMSettingsSystem_h__
    20 #define __VBoxVMSettingsSystem_h__
     19#ifndef __UIMachineSettingsSystem_h__
     20#define __UIMachineSettingsSystem_h__
    2121
    2222#include "COMDefs.h"
    2323#include "UISettingsPage.h"
    24 #include "VBoxVMSettingsSystem.gen.h"
     24#include "UIMachineSettingsSystem.gen.h"
    2525
    2626/* Machine settings / System page / Boot item: */
    … …  
    5050
    5151/* Machine settings / System page: */
    52 class VBoxVMSettingsSystem : public UISettingsPageMachine,
    53                              public Ui::VBoxVMSettingsSystem
     52class UIMachineSettingsSystem : public UISettingsPageMachine,
     53                             public Ui::UIMachineSettingsSystem
    5454{
    5555    Q_OBJECT;
    … …  
    5757public:
    5858
    59     VBoxVMSettingsSystem();
     59    UIMachineSettingsSystem();
    6060
    6161    bool isHWVirtExEnabled() const;
    … …  
    120120};
    121121
    122 #endif // __VBoxVMSettingsSystem_h__
     122#endif // __UIMachineSettingsSystem_h__
    123123

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.ui

    r33879 r33882  
    1414     hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1515 </comment>
    16  <class>VBoxVMSettingsSystem</class>
    17  <widget class="QWidget" name="VBoxVMSettingsSystem">
     16 <class>UIMachineSettingsSystem</class>
     17 <widget class="QWidget" name="UIMachineSettingsSystem">
    1818  <property name="geometry">
    1919   <rect>

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp

    r33879 r33882  
    33 *
    44 * VBox frontends: Qt4 GUI ("VirtualBox"):
    5  * VBoxVMSettingsUSB class implementation
     5 * UIMachineSettingsUSB class implementation
    66 */
    77
    … …  
    2323#include "VBoxGlobal.h"
    2424#include "UIToolBar.h"
    25 #include "VBoxVMSettingsUSB.h"
    26 #include "VBoxVMSettingsUSBFilterDetails.h"
     25#include "UIMachineSettingsUSB.h"
     26#include "UIMachineSettingsUSBFilterDetails.h"
    2727
    2828/* Global includes */
    2929#include <QHeaderView>
    3030
    31 VBoxVMSettingsUSB::VBoxVMSettingsUSB(UISettingsPageType type)
     31UIMachineSettingsUSB::UIMachineSettingsUSB(UISettingsPageType type)
    3232    : UISettingsPage(type)
    3333    , mValidator(0)
    … …  
    3838{
    3939    /* Apply UI decorations */
    40     Ui::VBoxVMSettingsUSB::setupUi (this);
     40    Ui::UIMachineSettingsUSB::setupUi (this);
    4141
    4242    /* Prepare actions */
    … …  
    135135}
    136136
    137 bool VBoxVMSettingsUSB::isOHCIEnabled() const
     137bool UIMachineSettingsUSB::isOHCIEnabled() const
    138138{
    139139    return mGbUSB->isChecked();
    … …  
    142142/* Load data to cashe from corresponding external object(s),
    143143 * this task COULD be performed in other than GUI thread: */
    144 void VBoxVMSettingsUSB::loadToCacheFrom(QVariant &data)
     144void UIMachineSettingsUSB::loadToCacheFrom(QVariant &data)
    145145{
    146146    /* Fetch data to properties & settings or machine: */
    … …  
    228228/* Load data to corresponding widgets from cache,
    229229 * this task SHOULD be performed in GUI thread only: */
    230 void VBoxVMSettingsUSB::getFromCache()
     230void UIMachineSettingsUSB::getFromCache()
    231231{
    232232    /* Depending on page type: */
    … …  
    266266/* Save data from corresponding widgets to cache,
    267267 * this task SHOULD be performed in GUI thread only: */
    268 void VBoxVMSettingsUSB::putToCache()
     268void UIMachineSettingsUSB::putToCache()
    269269{
    270270    /* Depending on page type: */
    … …  
    285285/* Save data from cache to corresponding external object(s),
    286286 * this task COULD be performed in other than GUI thread: */
    287 void VBoxVMSettingsUSB::saveFromCacheTo(QVariant &data)
     287void UIMachineSettingsUSB::saveFromCacheTo(QVariant &data)
    288288{
    289289    /* Fetch data to properties & settings or machine: */
    … …  
    367367}
    368368
    369 void VBoxVMSettingsUSB::setValidator (QIWidgetValidator *aVal)
     369void UIMachineSettingsUSB::setValidator (QIWidgetValidator *aVal)
    370370{
    371371    mValidator = aVal;
    … …  
    373373}
    374374
    375 void VBoxVMSettingsUSB::setOrderAfter (QWidget *aWidget)
     375void UIMachineSettingsUSB::setOrderAfter (QWidget *aWidget)
    376376{
    377377    setTabOrder (aWidget, mGbUSB);
    … …  
    380380}
    381381
    382 void VBoxVMSettingsUSB::retranslateUi()
     382void UIMachineSettingsUSB::retranslateUi()
    383383{
    384384    /* Translate uic generated strings */
    385     Ui::VBoxVMSettingsUSB::retranslateUi (this);
     385    Ui::UIMachineSettingsUSB::retranslateUi (this);
    386386
    387387    mNewAction->setText (tr ("&Add Empty Filter"));
    … …  
    420420}
    421421
    422 void VBoxVMSettingsUSB::usbAdapterToggled (bool aOn)
     422void UIMachineSettingsUSB::usbAdapterToggled (bool aOn)
    423423{
    424424    mGbUSBFilters->setEnabled (aOn);
    425425}
    426426
    427 void VBoxVMSettingsUSB::currentChanged (QTreeWidgetItem *aItem,
     427void UIMachineSettingsUSB::currentChanged (QTreeWidgetItem *aItem,
    428428                                        QTreeWidgetItem *)
    429429{
    … …  
    446446}
    447447
    448 void VBoxVMSettingsUSB::newClicked()
     448void UIMachineSettingsUSB::newClicked()
    449449{
    450450    /* Search for the max available filter index */
    … …  
    486486}
    487487
    488 void VBoxVMSettingsUSB::addClicked()
     488void UIMachineSettingsUSB::addClicked()
    489489{
    490490    mUSBDevicesMenu->exec (QCursor::pos());
    491491}
    492492
    493 void VBoxVMSettingsUSB::addConfirmed (QAction *aAction)
     493void UIMachineSettingsUSB::addConfirmed (QAction *aAction)
    494494{
    495495    /* Get USB device: */
    … …  
    541541}
    542542
    543 void VBoxVMSettingsUSB::edtClicked()
     543void UIMachineSettingsUSB::edtClicked()
    544544{
    545545    /* Get current USB filter item: */
    … …  
    549549
    550550    /* Configure USB filter details dialog: */
    551     VBoxVMSettingsUSBFilterDetails dlgFilterDetails(type(), this);
     551    UIMachineSettingsUSBFilterDetails dlgFilterDetails(type(), this);
    552552    dlgFilterDetails.mLeName->setText(data.m_strName);
    553553    dlgFilterDetails.mLeVendorID->setText(data.m_strVendorId);
    … …  
    624624}
    625625
    626 void VBoxVMSettingsUSB::delClicked()
     626void UIMachineSettingsUSB::delClicked()
    627627{
    628628    /* Get current USB filter item: */
    … …  
    649649}
    650650
    651 void VBoxVMSettingsUSB::mupClicked()
     651void UIMachineSettingsUSB::mupClicked()
    652652{
    653653    QTreeWidgetItem *item = mTwFilters->currentItem();
    … …  
    664664}
    665665
    666 void VBoxVMSettingsUSB::mdnClicked()
     666void UIMachineSettingsUSB::mdnClicked()
    667667{
    668668    QTreeWidgetItem *item = mTwFilters->currentItem();
    … …  
    679679}
    680680
    681 void VBoxVMSettingsUSB::showContextMenu (const QPoint &aPos)
     681void UIMachineSettingsUSB::showContextMenu (const QPoint &aPos)
    682682{
    683683    mMenu->exec (mTwFilters->mapToGlobal (aPos));
    684684}
    685685
    686 void VBoxVMSettingsUSB::sltUpdateActivityState(QTreeWidgetItem *pChangedItem)
     686void UIMachineSettingsUSB::sltUpdateActivityState(QTreeWidgetItem *pChangedItem)
    687687{
    688688    /* Check changed USB filter item: */
    … …  
    696696}
    697697
    698 void VBoxVMSettingsUSB::markSettingsChanged()
     698void UIMachineSettingsUSB::markSettingsChanged()
    699699{
    700700    mUSBFilterListModified = true;
    701701}
    702702
    703 void VBoxVMSettingsUSB::addUSBFilter(const UIUSBFilterData &data, bool fIsNew)
     703void UIMachineSettingsUSB::addUSBFilter(const UIUSBFilterData &data, bool fIsNew)
    704704{
    705705    /* Append tree-widget with item: */
    … …  
    716716
    717717/* Fetch data to m_properties & m_settings or m_machine: */
    718 void VBoxVMSettingsUSB::fetchData(const QVariant &data)
     718void UIMachineSettingsUSB::fetchData(const QVariant &data)
    719719{
    720720    switch (type())
    … …  
    737737
    738738/* Upload m_properties & m_settings or m_machine to data: */
    739 void VBoxVMSettingsUSB::uploadData(QVariant &data) const
     739void UIMachineSettingsUSB::uploadData(QVariant &data) const
    740740{
    741741    switch (type())
    … …  
    756756}
    757757
    758 /* static */ QString VBoxVMSettingsUSB::toolTipFor(const UIUSBFilterData &data)
     758/* static */ QString UIMachineSettingsUSB::toolTipFor(const UIUSBFilterData &data)
    759759{
    760760    /* Prepare tool-tip: */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.h

    r33879 r33882  
    22 *
    33 * VBox frontends: Qt4 GUI ("VirtualBox"):
    4  * VBoxVMSettingsUSB class declaration
     4 * UIMachineSettingsUSB class declaration
    55 */
    66
    … …  
    1717 */
    1818
    19 #ifndef __VBoxVMSettingsUSB_h__
    20 #define __VBoxVMSettingsUSB_h__
     19#ifndef __UIMachineSettingsUSB_h__
     20#define __UIMachineSettingsUSB_h__
    2121
    2222#include "UISettingsPage.h"
    23 #include "VBoxVMSettingsUSB.gen.h"
     23#include "UIMachineSettingsUSB.gen.h"
    2424#include "COMDefs.h"
    2525
    … …  
    5656
    5757/* Common settings / USB page: */
    58 class VBoxVMSettingsUSB : public UISettingsPage,
    59                           public Ui::VBoxVMSettingsUSB
     58class UIMachineSettingsUSB : public UISettingsPage,
     59                          public Ui::UIMachineSettingsUSB
    6060{
    6161    Q_OBJECT;
    … …  
    7070    };
    7171
    72     VBoxVMSettingsUSB(UISettingsPageType type);
     72    UIMachineSettingsUSB(UISettingsPageType type);
    7373
    7474    bool isOHCIEnabled() const;
    … …  
    150150};
    151151
    152 #endif // __VBoxVMSettingsUSB_h__
     152#endif // __UIMachineSettingsUSB_h__
    153153

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.ui

    r33879 r33882  
    1313     hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1414 </comment>
    15  <class>VBoxVMSettingsUSB</class>
    16  <widget class="QWidget" name="VBoxVMSettingsUSB" >
     15 <class>UIMachineSettingsUSB</class>
     16 <widget class="QWidget" name="UIMachineSettingsUSB" >
    1717  <property name="geometry" >
    1818   <rect>

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSBFilterDetails.cpp

    r33879 r33882  
    33 *
    44 * VBox frontends: Qt4 GUI ("VirtualBox"):
    5  * VBoxVMSettingsUSBFilterDetails class implementation
     5 * UIMachineSettingsUSBFilterDetails class implementation
    66 */
    77
    … …  
    1818 */
    1919
    20 #include "VBoxVMSettingsUSBFilterDetails.h"
     20#include "UIMachineSettingsUSBFilterDetails.h"
    2121#include "VBoxGlobal.h"
    2222
    23 VBoxVMSettingsUSBFilterDetails::VBoxVMSettingsUSBFilterDetails(UISettingsPageType type, QWidget *pParent /* = 0 */)
     23UIMachineSettingsUSBFilterDetails::UIMachineSettingsUSBFilterDetails(UISettingsPageType type, QWidget *pParent /* = 0 */)
    2424    : QIWithRetranslateUI2<QIDialog>(pParent, Qt::Sheet)
    2525    , m_type(type)
    2626{
    2727    /* Apply UI decorations */
    28     Ui::VBoxVMSettingsUSBFilterDetails::setupUi (this);
     28    Ui::UIMachineSettingsUSBFilterDetails::setupUi (this);
    2929
    30     mCbRemote->insertItem (VBoxVMSettingsUSB::ModeAny, ""); /* Any */
    31     mCbRemote->insertItem (VBoxVMSettingsUSB::ModeOn,  ""); /* Yes */
    32     mCbRemote->insertItem (VBoxVMSettingsUSB::ModeOff, ""); /* No */
     30    mCbRemote->insertItem (UIMachineSettingsUSB::ModeAny, ""); /* Any */
     31    mCbRemote->insertItem (UIMachineSettingsUSB::ModeOn,  ""); /* Yes */
     32    mCbRemote->insertItem (UIMachineSettingsUSB::ModeOff, ""); /* No */
    3333    mLbRemote->setHidden (m_type != UISettingsPageType_Machine);
    3434    mCbRemote->setHidden (m_type != UISettingsPageType_Machine);
    … …  
    5252}
    5353
    54 void VBoxVMSettingsUSBFilterDetails::retranslateUi()
     54void UIMachineSettingsUSBFilterDetails::retranslateUi()
    5555{
    5656    /* Translate uic generated strings */
    57     Ui::VBoxVMSettingsUSBFilterDetails::retranslateUi (this);
     57    Ui::UIMachineSettingsUSBFilterDetails::retranslateUi (this);
    5858
    59     mCbRemote->setItemText (VBoxVMSettingsUSB::ModeAny, tr ("Any", "remote"));
    60     mCbRemote->setItemText (VBoxVMSettingsUSB::ModeOn,  tr ("Yes", "remote"));
    61     mCbRemote->setItemText (VBoxVMSettingsUSB::ModeOff, tr ("No",  "remote"));
     59    mCbRemote->setItemText (UIMachineSettingsUSB::ModeAny, tr ("Any", "remote"));
     60    mCbRemote->setItemText (UIMachineSettingsUSB::ModeOn,  tr ("Yes", "remote"));
     61    mCbRemote->setItemText (UIMachineSettingsUSB::ModeOff, tr ("No",  "remote"));
    6262
    6363    mCbAction->setItemText (0,

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSBFilterDetails.h

    r33879 r33882  
    22 *
    33 * VBox frontends: Qt4 GUI ("VirtualBox"):
    4  * VBoxVMSettingsUSBFilterDetails class declaration
     4 * UIMachineSettingsUSBFilterDetails class declaration
    55 */
    66
    … …  
    1717 */
    1818
    19 #ifndef __VBoxVMSettingsUSBFilterDetails_h__
    20 #define __VBoxVMSettingsUSBFilterDetails_h__
     19#ifndef __UIMachineSettingsUSBFilterDetails_h__
     20#define __UIMachineSettingsUSBFilterDetails_h__
    2121
    22 #include "VBoxVMSettingsUSBFilterDetails.gen.h"
     22#include "UIMachineSettingsUSBFilterDetails.gen.h"
    2323#include "QIWithRetranslateUI.h"
    2424#include "QIDialog.h"
    25 #include "VBoxVMSettingsUSB.h"
     25#include "UIMachineSettingsUSB.h"
    2626
    27 class VBoxVMSettingsUSBFilterDetails : public QIWithRetranslateUI2<QIDialog>,
    28                                        public Ui::VBoxVMSettingsUSBFilterDetails
     27class UIMachineSettingsUSBFilterDetails : public QIWithRetranslateUI2<QIDialog>,
     28                                       public Ui::UIMachineSettingsUSBFilterDetails
    2929{
    3030    Q_OBJECT;
    … …  
    3232public:
    3333
    34     VBoxVMSettingsUSBFilterDetails(UISettingsPageType type, QWidget *pParent = 0);
     34    UIMachineSettingsUSBFilterDetails(UISettingsPageType type, QWidget *pParent = 0);
    3535
    3636protected:
    … …  
    4444};
    4545
    46 #endif /* __VBoxVMSettingsUSBFilterDetails_h__ */
     46#endif /* __UIMachineSettingsUSBFilterDetails_h__ */
    4747

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSBFilterDetails.ui

    r33879 r33882  
    1313     hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1414 </comment>
    15  <class>VBoxVMSettingsUSBFilterDetails</class>
    16  <widget class="QDialog" name="VBoxVMSettingsUSBFilterDetails" >
     15 <class>UIMachineSettingsUSBFilterDetails</class>
     16 <widget class="QDialog" name="UIMachineSettingsUSBFilterDetails" >
    1717  <property name="geometry" >
    1818   <rect>
    … …  
    279279   <sender>mButtonBox</sender>
    280280   <signal>accepted()</signal>
    281    <receiver>VBoxVMSettingsUSBFilterDetails</receiver>
     281   <receiver>UIMachineSettingsUSBFilterDetails</receiver>
    282282   <slot>accept()</slot>
    283283   <hints>
    … …  
    295295   <sender>mButtonBox</sender>
    296296   <signal>rejected()</signal>
    297    <receiver>VBoxVMSettingsUSBFilterDetails</receiver>
     297   <receiver>UIMachineSettingsUSBFilterDetails</receiver>
    298298   <slot>reject()</slot>
    299299   <hints>

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIFirstRunWzd.cpp

    r33712 r33882  
    2323#include "VBoxGlobal.h"
    2424#include "VBoxProblemReporter.h"
    25 #include "VBoxVMSettingsHD.h"
    2625
    2726UIFirstRunWzd::UIFirstRunWzd(QWidget *pParent, const CMachine &machine) : QIWizard(pParent)

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

    r33712 r33882  
    2727#include "QIFileDialog.h"
    2828#include "VBoxProblemReporter.h"
    29 #include "VBoxVMSettingsHD.h"
     29#include "UIMachineSettingsStorage.h"
    3030
    3131/* Globals */
    … …  
    878878        case KStorageBus_IDE:
    879879        {
    880             strControllerName = VBoxVMSettingsHD::tr("IDE Controller");
     880            strControllerName = UIMachineSettingsStorage::tr("IDE Controller");
    881881            ++m_iIDECount;
    882882            if (m_iIDECount > 1)
    … …  
    886886        case KStorageBus_SATA:
    887887        {
    888             strControllerName = VBoxVMSettingsHD::tr("SATA Controller");
     888            strControllerName = UIMachineSettingsStorage::tr("SATA Controller");
    889889            ++m_iSATACount;
    890890            if (m_iSATACount > 1)
    … …  
    894894        case KStorageBus_SCSI:
    895895        {
    896             strControllerName = VBoxVMSettingsHD::tr("SCSI Controller");
     896            strControllerName = UIMachineSettingsStorage::tr("SCSI Controller");
    897897            ++m_iSCSICount;
    898898            if (m_iSCSICount > 1)
    … …  
    902902        case KStorageBus_Floppy:
    903903        {
    904             strControllerName = VBoxVMSettingsHD::tr("Floppy Controller");
     904            strControllerName = UIMachineSettingsStorage::tr("Floppy Controller");
    905905            ++m_iFloppyCount;
    906906            if (m_iFloppyCount > 1)
    … …  
    910910        case KStorageBus_SAS:
    911911        {
    912             strControllerName = VBoxVMSettingsHD::tr("SAS Controller");
     912            strControllerName = UIMachineSettingsStorage::tr("SAS Controller");
    913913            ++m_iSASCount;
    914914            if (m_iSASCount > 1)
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