VirtualBox

Changeset 86020 in vbox


Ignore:
Timestamp:
Sep 3, 2020 1:10:51 PM (5 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
140220
Message:

FE/Qt: bugref:9812: Cumulative cleanup for layout rework done before for Global preferences.

Location:
trunk/src/VBox/Frontends/VirtualBox/src/settings/global
Files:
13 edited

Legend:

Unmodified
Added
Removed

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

    r85997 r86020  
    215215    if (pLayoutMain)
    216216    {
    217         pLayoutMain->setContentsMargins(0, 0, 0, 0);
     217        pLayoutMain->setColumnStretch(1, 1);
    218218        pLayoutMain->setRowStretch(6, 1);
    219219
    … …  
    235235            if (m_pLabelMaxGuestScreenSize)
    236236                m_pLabelMaxGuestScreenSize->setBuddy(m_pComboMaxGuestScreenSize);
    237             pLayoutMain->addWidget(m_pComboMaxGuestScreenSize, 0, 1);
     237            pLayoutMain->addWidget(m_pComboMaxGuestScreenSize, 0, 1, 1, 2);
    238238        }
    239239
    … …  
    254254            m_pSpinboxMaxGuestScreenWidth->setMaximum(iMaxSize);
    255255
    256             pLayoutMain->addWidget(m_pSpinboxMaxGuestScreenWidth, 1, 1);
     256            pLayoutMain->addWidget(m_pSpinboxMaxGuestScreenWidth, 1, 1, 1, 2);
    257257        }
    258258
    … …  
    273273            m_pSpinboxMaxGuestScreenHeight->setMaximum(iMaxSize);
    274274
    275             pLayoutMain->addWidget(m_pSpinboxMaxGuestScreenHeight, 2, 1);
     275            pLayoutMain->addWidget(m_pSpinboxMaxGuestScreenHeight, 2, 1, 1, 2);
    276276        }
    277277
    … …  
    286286        m_pEditorScaleFactor = new UIScaleFactorEditor(this);
    287287        if (m_pEditorScaleFactor)
    288             pLayoutMain->addWidget(m_pEditorScaleFactor, 3, 1, 2, 1);
     288            pLayoutMain->addWidget(m_pEditorScaleFactor, 3, 1, 2, 2);
    289289
    290290        /* Prepare 'machine-windows' label: */

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

    r86005 r86020  
    442442    if (pLayoutMain)
    443443    {
    444         pLayoutMain->setContentsMargins(0, 0, 0, 0);
    445 
    446444        /* Prepare separator: */
    447445        m_pLabelSeparator = new QILabelSeparator(this);
    … …  
    491489    if (m_pToolbar)
    492490    {
    493         /* Configure toolbar: */
    494491        const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
    495492        m_pToolbar->setIconSize(QSize(iIconMetric, iIconMetric));
    496493        m_pToolbar->setOrientation(Qt::Vertical);
    497494
    498         /* Prepare 'Add Package' action: */
     495        /* Prepare 'add package' action: */
    499496        m_pActionAdd = m_pToolbar->addAction(UIIconPool::iconSet(":/extension_pack_install_16px.png",
    500497                                                                 ":/extension_pack_install_disabled_16px.png"),
    501498                                             QString(), this, SLOT(sltAddPackage()));
    502499
    503         /* Prepare 'Remove Package' action: */
     500        /* Prepare 'remove package' action: */
    504501        m_pActionRemove = m_pToolbar->addAction(UIIconPool::iconSet(":/extension_pack_uninstall_16px.png",
    505502                                                                    ":/extension_pack_uninstall_disabled_16px.png"),

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

    r86005 r86020  
    109109        /** Holds the toolbar instance. */
    110110        UIToolBar        *m_pToolbar;
    111         /** Holds the Add action instance. */
     111        /** Holds the 'add package' action instance. */
    112112        QAction          *m_pActionAdd;
    113         /** Holds the Remove action instance. */
     113        /** Holds the 'remove package' action instance. */
    114114        QAction          *m_pActionRemove;
    115115    /** @} */

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

    r85978 r86020  
    6868    , m_pLabelMachineFolder(0)
    6969    , m_pSelectorMachineFolder(0)
    70     , m_pLabelVRDPLibName(0)
    71     , m_pSelectorVRDPLibName(0)
     70    , m_pLabelVRDPLibraryName(0)
     71    , m_pSelectorVRDPLibraryName(0)
    7272    , m_pLabelHostScreenSaver(0)
    7373    , m_pCheckBoxHostScreenSaver(0)
    … …  
    113113    /* Load old general data from the cache: */
    114114    m_pSelectorMachineFolder->setPath(oldGeneralData.m_strDefaultMachineFolder);
    115     m_pSelectorVRDPLibName->setPath(oldGeneralData.m_strVRDEAuthLibrary);
     115    m_pSelectorVRDPLibraryName->setPath(oldGeneralData.m_strVRDEAuthLibrary);
    116116    m_pCheckBoxHostScreenSaver->setChecked(oldGeneralData.m_fHostScreenSaverDisabled);
    117117}
    … …  
    124124    /* Gather new general data: */
    125125    newGeneralData.m_strDefaultMachineFolder = m_pSelectorMachineFolder->path();
    126     newGeneralData.m_strVRDEAuthLibrary = m_pSelectorVRDPLibName->path();
     126    newGeneralData.m_strVRDEAuthLibrary = m_pSelectorVRDPLibraryName->path();
    127127    newGeneralData.m_fHostScreenSaverDisabled = m_pCheckBoxHostScreenSaver->isChecked();
    128128
    … …  
    148148    m_pSelectorMachineFolder->setWhatsThis(tr("Holds the path to the default virtual machine folder. This folder is used, "
    149149                                              "if not explicitly specified otherwise, when creating new virtual machines."));
    150     m_pLabelVRDPLibName->setText(tr("V&RDP Authentication Library:"));
    151     m_pSelectorVRDPLibName->setWhatsThis(tr("Holds the path to the library that provides authentication for Remote Display (VRDP) clients."));
     150    m_pLabelVRDPLibraryName->setText(tr("V&RDP Authentication Library:"));
     151    m_pSelectorVRDPLibraryName->setWhatsThis(tr("Holds the path to the library that provides authentication for Remote Display (VRDP) clients."));
    152152    m_pLabelHostScreenSaver->setText(tr("Host Screensaver:"));
    153153    m_pCheckBoxHostScreenSaver->setWhatsThis(tr("When checked, the host screensaver will be disabled whenever a virtual machine is running."));
    … …  
    174174    if (pLayoutMain)
    175175    {
    176         pLayoutMain->setContentsMargins(0, 0, 0, 0);
    177176        pLayoutMain->setColumnStretch(1, 1);
    178177        pLayoutMain->setRowStretch(3, 1);
    … …  
    197196
    198197        /* Prepare VRDP library name label: */
    199         m_pLabelVRDPLibName = new QLabel(this);
    200         if (m_pLabelVRDPLibName)
    201         {
    202             m_pLabelVRDPLibName->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
    203             pLayoutMain->addWidget(m_pLabelVRDPLibName, 1, 0);
     198        m_pLabelVRDPLibraryName = new QLabel(this);
     199        if (m_pLabelVRDPLibraryName)
     200        {
     201            m_pLabelVRDPLibraryName->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
     202            pLayoutMain->addWidget(m_pLabelVRDPLibraryName, 1, 0);
    204203        }
    205204        /* Prepare VRDP library name selector: */
    206         m_pSelectorVRDPLibName = new UIFilePathSelector(this);
    207         if (m_pSelectorVRDPLibName)
    208         {
    209             if (m_pLabelVRDPLibName)
    210                 m_pLabelVRDPLibName->setBuddy(m_pSelectorVRDPLibName);
    211             m_pSelectorVRDPLibName->setHomeDir(uiCommon().homeFolder());
    212             m_pSelectorVRDPLibName->setMode(UIFilePathSelector::Mode_File_Open);
    213 
    214             pLayoutMain->addWidget(m_pSelectorVRDPLibName, 1, 1, 1, 2);
     205        m_pSelectorVRDPLibraryName = new UIFilePathSelector(this);
     206        if (m_pSelectorVRDPLibraryName)
     207        {
     208            if (m_pLabelVRDPLibraryName)
     209                m_pLabelVRDPLibraryName->setBuddy(m_pSelectorVRDPLibraryName);
     210            m_pSelectorVRDPLibraryName->setHomeDir(uiCommon().homeFolder());
     211            m_pSelectorVRDPLibraryName->setMode(UIFilePathSelector::Mode_File_Open);
     212
     213            pLayoutMain->addWidget(m_pSelectorVRDPLibraryName, 1, 1, 1, 2);
    215214        }
    216215

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

    r85978 r86020  
    8585        UIFilePathSelector *m_pSelectorMachineFolder;
    8686        /** Holds VRDP library name label instance. */
    87         QLabel             *m_pLabelVRDPLibName;
     87        QLabel             *m_pLabelVRDPLibraryName;
    8888        /** Holds VRDP library name selector instance. */
    89         UIFilePathSelector *m_pSelectorVRDPLibName;
     89        UIFilePathSelector *m_pSelectorVRDPLibraryName;
    9090        /** Holds screen-saver label instance. */
    9191        QLabel             *m_pLabelHostScreenSaver;

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

    r85979 r86020  
    884884
    885885UIGlobalSettingsInput::UIGlobalSettingsInput()
    886     : m_pModelSelector(0)
    887     , m_pModelMachine(0)
     886    : m_pModelManager(0)
     887    , m_pModelRuntime(0)
    888888    , m_pCache(0)
    889889    , m_pTabWidget(0)
    890     , m_pEditorSelectorFilter(0), m_pTableSelector(0)
    891     , m_pMachineFilterEditor(0), m_pTableMachine(0)
     890    , m_pEditorManagerFilter(0), m_pTableManager(0)
     891    , m_pEditorRuntimeFilter(0), m_pTableRuntime(0)
    892892    , m_pCheckBoxEnableAutoGrab(0)
    893893{
    … …  
    914914
    915915    /* Gather old input data: */
    916     oldInputData.shortcuts() << UIDataShortcutRow(m_pTableMachine,
     916    oldInputData.shortcuts() << UIDataShortcutRow(m_pTableRuntime,
    917917                                                  UIHostCombo::hostComboCacheKey(),
    918918                                                  QString(),
    … …  
    925925    {
    926926        const UIShortcut &shortcut = shortcuts[strShortcutKey];
    927         QITableView *pParent = strShortcutKey.startsWith(GUI_Input_MachineShortcuts) ? m_pTableMachine :
    928                                strShortcutKey.startsWith(GUI_Input_SelectorShortcuts) ? m_pTableSelector : 0;
     927        QITableView *pParent = strShortcutKey.startsWith(GUI_Input_MachineShortcuts) ? m_pTableRuntime :
     928                               strShortcutKey.startsWith(GUI_Input_SelectorShortcuts) ? m_pTableManager : 0;
    929929        AssertPtr(pParent);
    930930        oldInputData.shortcuts() << UIDataShortcutRow(pParent,
    … …  
    950950
    951951    /* Load old input data from the cache: */
    952     m_pModelSelector->load(oldInputData.shortcuts());
    953     m_pModelMachine->load(oldInputData.shortcuts());
     952    m_pModelManager->load(oldInputData.shortcuts());
     953    m_pModelRuntime->load(oldInputData.shortcuts());
    954954    m_pCheckBoxEnableAutoGrab->setChecked(oldInputData.autoCapture());
    955955
    … …  
    964964
    965965    /* Gather new input data: */
    966     m_pModelSelector->save(newInputData.shortcuts());
    967     m_pModelMachine->save(newInputData.shortcuts());
     966    m_pModelManager->save(newInputData.shortcuts());
     967    m_pModelRuntime->save(newInputData.shortcuts());
    968968    newInputData.setAutoCapture(m_pCheckBoxEnableAutoGrab->isChecked());
    969969
    … …  
    990990
    991991    /* Check VirtualBox Manager page for unique shortcuts: */
    992     if (!m_pModelSelector->isAllShortcutsUnique())
     992    if (!m_pModelManager->isAllShortcutsUnique())
    993993    {
    994994        UIValidationMessage message;
    … …  
    10001000
    10011001    /* Check Virtual Machine page for unique shortcuts: */
    1002     if (!m_pModelMachine->isAllShortcutsUnique())
     1002    if (!m_pModelRuntime->isAllShortcutsUnique())
    10031003    {
    10041004        UIValidationMessage message;
    … …  
    10161016{
    10171017    setTabOrder(pWidget, m_pTabWidget);
    1018     setTabOrder(m_pTabWidget, m_pEditorSelectorFilter);
    1019     setTabOrder(m_pEditorSelectorFilter, m_pTableSelector);
    1020     setTabOrder(m_pTableSelector, m_pMachineFilterEditor);
    1021     setTabOrder(m_pMachineFilterEditor, m_pTableMachine);
    1022     setTabOrder(m_pTableMachine, m_pCheckBoxEnableAutoGrab);
     1018    setTabOrder(m_pTabWidget, m_pEditorManagerFilter);
     1019    setTabOrder(m_pEditorManagerFilter, m_pTableManager);
     1020    setTabOrder(m_pTableManager, m_pEditorRuntimeFilter);
     1021    setTabOrder(m_pEditorRuntimeFilter, m_pTableRuntime);
     1022    setTabOrder(m_pTableRuntime, m_pCheckBoxEnableAutoGrab);
    10231023}
    10241024
    … …  
    10341034    m_pTabWidget->setTabText(UIHotKeyTableIndex_Selector, tr("&VirtualBox Manager"));
    10351035    m_pTabWidget->setTabText(UIHotKeyTableIndex_Machine, tr("Virtual &Machine"));
    1036     m_pTableSelector->setWhatsThis(tr("Lists all available shortcuts which can be configured."));
    1037     m_pTableMachine->setWhatsThis(tr("Lists all available shortcuts which can be configured."));
    1038     m_pEditorSelectorFilter->setWhatsThis(tr("Holds a sequence to filter the shortcut list."));
    1039     m_pMachineFilterEditor->setWhatsThis(tr("Holds a sequence to filter the shortcut list."));
     1036    m_pTableManager->setWhatsThis(tr("Lists all available shortcuts which can be configured."));
     1037    m_pTableRuntime->setWhatsThis(tr("Lists all available shortcuts which can be configured."));
     1038    m_pEditorManagerFilter->setWhatsThis(tr("Holds a sequence to filter the shortcut list."));
     1039    m_pEditorRuntimeFilter->setWhatsThis(tr("Holds a sequence to filter the shortcut list."));
    10401040}
    10411041
    … …  
    10641064        if (m_pTabWidget)
    10651065        {
    1066             m_pTabWidget->setMinimumWidth(400);
    1067 
    1068             /* Prepare 'Selector UI' tab: */
    1069             prepareTabSelector();
     1066            /* Prepare 'Manager UI' tab: */
     1067            prepareTabManager();
    10701068            /* Prepare 'Runtime UI' tab: */
    10711069            prepareTabMachine();
    … …  
    10751073        }
    10761074
    1077         /* Prepare enable auto-grab check-box: */
     1075        /* Prepare 'enable auto-grab' check-box: */
    10781076        m_pCheckBoxEnableAutoGrab = new QCheckBox(this);
    10791077        if (m_pCheckBoxEnableAutoGrab)
    … …  
    10821080}
    10831081
    1084 void UIGlobalSettingsInput::prepareTabSelector()
    1085 {
    1086     /* Prepare Selector UI tab: */
    1087     QWidget *pSelectorTab = new QWidget;
    1088     if (pSelectorTab)
    1089     {
    1090         /* Prepare Selector UI layout: */
    1091         QVBoxLayout *pSelectorLayout = new QVBoxLayout(pSelectorTab);
    1092         if (pSelectorLayout)
    1093         {
    1094             pSelectorLayout->setSpacing(1);
     1082void UIGlobalSettingsInput::prepareTabManager()
     1083{
     1084    /* Prepare Manager UI tab: */
     1085    QWidget *pTabManager = new QWidget;
     1086    if (pTabManager)
     1087    {
     1088        /* Prepare Manager UI layout: */
     1089        QVBoxLayout *pLayoutManager = new QVBoxLayout(pTabManager);
     1090        if (pLayoutManager)
     1091        {
     1092            pLayoutManager->setSpacing(1);
    10951093#ifdef VBOX_WS_MAC
    10961094            /* On Mac OS X and X11 we can do a bit of smoothness: */
    1097             pSelectorLayout->setContentsMargins(0, 0, 0, 0);
     1095            pLayoutManager->setContentsMargins(0, 0, 0, 0);
    10981096#endif
    10991097
    1100             /* Prepare Selector UI filter editor: */
    1101             m_pEditorSelectorFilter = new QLineEdit(pSelectorTab);
    1102             if (m_pEditorSelectorFilter)
    1103                 pSelectorLayout->addWidget(m_pEditorSelectorFilter);
    1104 
    1105             /* Prepare Selector UI model: */
    1106             m_pModelSelector = new UIHotKeyTableModel(this, UIActionPoolType_Manager);
    1107 
    1108             /* Prepare Selector UI table: */
    1109             m_pTableSelector = new UIHotKeyTable(pSelectorTab, m_pModelSelector, "m_pTableSelector");
    1110             if (m_pTableSelector)
    1111                 pSelectorLayout->addWidget(m_pTableSelector);
    1112         }
    1113 
    1114         m_pTabWidget->insertTab(UIHotKeyTableIndex_Selector, pSelectorTab, QString());
     1098            /* Prepare Manager UI filter editor: */
     1099            m_pEditorManagerFilter = new QLineEdit(pTabManager);
     1100            if (m_pEditorManagerFilter)
     1101                pLayoutManager->addWidget(m_pEditorManagerFilter);
     1102
     1103            /* Prepare Manager UI model: */
     1104            m_pModelManager = new UIHotKeyTableModel(this, UIActionPoolType_Manager);
     1105
     1106            /* Prepare Manager UI table: */
     1107            m_pTableManager = new UIHotKeyTable(pTabManager, m_pModelManager, "m_pTableManager");
     1108            if (m_pTableManager)
     1109                pLayoutManager->addWidget(m_pTableManager);
     1110        }
     1111
     1112        m_pTabWidget->insertTab(UIHotKeyTableIndex_Selector, pTabManager, QString());
    11151113    }
    11161114}
    … …  
    11191117{
    11201118    /* Create Runtime UI tab: */
    1121     QWidget *pMachineTab = new QWidget;
    1122     if (pMachineTab)
     1119    QWidget *pTabMachine = new QWidget;
     1120    if (pTabMachine)
    11231121    {
    11241122        /* Prepare Runtime UI layout: */
    1125         QVBoxLayout *pMachineLayout = new QVBoxLayout(pMachineTab);
    1126         if (pMachineLayout)
    1127         {
    1128             pMachineLayout->setSpacing(1);
     1123        QVBoxLayout *pLayoutMachine = new QVBoxLayout(pTabMachine);
     1124        if (pLayoutMachine)
     1125        {
     1126            pLayoutMachine->setSpacing(1);
    11291127#ifdef VBOX_WS_MAC
    1130             /* On Mac OS X and X11 we can do a bit of smoothness. */
    1131             pMachineLayout->setContentsMargins(0, 0, 0, 0);
     1128            /* On Mac OS X and X11 we can do a bit of smoothness: */
     1129            pLayoutMachine->setContentsMargins(0, 0, 0, 0);
    11321130#endif
    11331131
    11341132            /* Prepare Runtime UI filter editor: */
    1135             m_pMachineFilterEditor = new QLineEdit(pMachineTab);
    1136             if (m_pMachineFilterEditor)
    1137                 pMachineLayout->addWidget(m_pMachineFilterEditor);
     1133            m_pEditorRuntimeFilter = new QLineEdit(pTabMachine);
     1134            if (m_pEditorRuntimeFilter)
     1135                pLayoutMachine->addWidget(m_pEditorRuntimeFilter);
    11381136
    11391137            /* Prepare Runtime UI model: */
    1140             m_pModelMachine = new UIHotKeyTableModel(this, UIActionPoolType_Runtime);
     1138            m_pModelRuntime = new UIHotKeyTableModel(this, UIActionPoolType_Runtime);
    11411139
    11421140            /* Create Runtime UI table: */
    1143             m_pTableMachine = new UIHotKeyTable(pMachineTab, m_pModelMachine, "m_pTableMachine");
    1144             if (m_pTableMachine)
    1145                 pMachineLayout->addWidget(m_pTableMachine);
    1146         }
    1147 
    1148         m_pTabWidget->insertTab(UIHotKeyTableIndex_Machine, pMachineTab, QString());
     1141            m_pTableRuntime = new UIHotKeyTable(pTabMachine, m_pModelRuntime, "m_pTableRuntime");
     1142            if (m_pTableRuntime)
     1143                pLayoutMachine->addWidget(m_pTableRuntime);
     1144        }
     1145
     1146        m_pTabWidget->insertTab(UIHotKeyTableIndex_Machine, pTabMachine, QString());
    11491147
    11501148        /* In the VM process we start by displaying the Runtime UI tab: */
    11511149        if (uiCommon().uiType() == UICommon::UIType_RuntimeUI)
    1152             m_pTabWidget->setCurrentWidget(pMachineTab);
     1150            m_pTabWidget->setCurrentWidget(pTabMachine);
    11531151    }
    11541152}
    … …  
    11561154void UIGlobalSettingsInput::prepareConnections()
    11571155{
    1158     /* Configure 'Selector UI' connections: */
    1159     connect(m_pEditorSelectorFilter, &QLineEdit::textChanged,
    1160             m_pModelSelector, &UIHotKeyTableModel::sltHandleFilterTextChange);
    1161     connect(m_pModelSelector, &UIHotKeyTableModel::sigRevalidationRequired, this, &UIGlobalSettingsInput::revalidate);
     1156    /* Configure 'Manager UI' connections: */
     1157    connect(m_pEditorManagerFilter, &QLineEdit::textChanged, m_pModelManager, &UIHotKeyTableModel::sltHandleFilterTextChange);
     1158    connect(m_pModelManager, &UIHotKeyTableModel::sigRevalidationRequired, this, &UIGlobalSettingsInput::revalidate);
    11621159
    11631160    /* Configure 'Runtime UI' connections: */
    1164     connect(m_pMachineFilterEditor, &QLineEdit::textChanged,
    1165             m_pModelMachine, &UIHotKeyTableModel::sltHandleFilterTextChange);
    1166     connect(m_pModelMachine, &UIHotKeyTableModel::sigRevalidationRequired, this, &UIGlobalSettingsInput::revalidate);
     1161    connect(m_pEditorRuntimeFilter, &QLineEdit::textChanged, m_pModelRuntime, &UIHotKeyTableModel::sltHandleFilterTextChange);
     1162    connect(m_pModelRuntime, &UIHotKeyTableModel::sigRevalidationRequired, this, &UIGlobalSettingsInput::revalidate);
    11671163}
    11681164

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

    r85979 r86020  
    8080    /** Prepares widgets. */
    8181    void prepareWidgets();
    82     /** Prepares 'Selector UI' tab. */
    83     void prepareTabSelector();
    84     /** Prepares 'Runtime UI' tab. */
     82    /** Prepares Manager UI tab. */
     83    void prepareTabManager();
     84    /** Prepares Runtime UI tab. */
    8585    void prepareTabMachine();
    8686    /** Prepares connections. */
    … …  
    9292    bool saveInputData();
    9393
    94     /** Holds the Selector UI shortcuts model instance. */
    95     UIHotKeyTableModel *m_pModelSelector;
     94    /** Holds the Manager UI shortcuts model instance. */
     95    UIHotKeyTableModel *m_pModelManager;
    9696    /** Holds the Runtime UI shortcuts model instance. */
    97     UIHotKeyTableModel *m_pModelMachine;
     97    UIHotKeyTableModel *m_pModelRuntime;
    9898
    9999    /** Holds the page data cache instance. */
    … …  
    104104        /** Holds the tab-widget instance. */
    105105        QTabWidget    *m_pTabWidget;
    106         /** Holds the Selector UI shortcuts filter instance. */
    107         QLineEdit     *m_pEditorSelectorFilter;
    108         /** Holds the Selector UI shortcuts table instance. */
    109         UIHotKeyTable *m_pTableSelector;
     106        /** Holds the Manager UI shortcuts filter instance. */
     107        QLineEdit     *m_pEditorManagerFilter;
     108        /** Holds the Manager UI shortcuts table instance. */
     109        UIHotKeyTable *m_pTableManager;
    110110        /** Holds the Runtime UI shortcuts filter instance. */
    111         QLineEdit     *m_pMachineFilterEditor;
     111        QLineEdit     *m_pEditorRuntimeFilter;
    112112        /** Holds the Runtime UI shortcuts table instance. */
    113         UIHotKeyTable *m_pTableMachine;
    114         /** Holds the enable auto-grab checkbox instance. */
     113        UIHotKeyTable *m_pTableRuntime;
     114        /** Holds the 'enable auto-grab' checkbox instance. */
    115115        QCheckBox     *m_pCheckBoxEnableAutoGrab;
    116116    /** @} */

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

    r85990 r86020  
    364364    if (pLayoutMain)
    365365    {
    366         pLayoutMain->setContentsMargins(0, 0, 0, 0);
    367 
    368366        /* Prepare separator: */
    369367        m_pLabelSeparator = new QILabelSeparator(this);
    370368        if (m_pLabelSeparator)
    371369            pLayoutMain->addWidget(m_pLabelSeparator, 0, 0);
     370
    372371        /* Prepare tree-widget: */
    373372        m_pTreeWidget = new QITreeWidget(this);
    … …  
    400399void UIGlobalSettingsLanguage::prepareConnection()
    401400{
    402     connect(m_pTreeWidget, &QITreeWidget::painted,
    403             this, &UIGlobalSettingsLanguage::sltHandleItemPainting);
    404     connect(m_pTreeWidget, &QITreeWidget::currentItemChanged,
    405             this, &UIGlobalSettingsLanguage::sltHandleCurrentItemChange);
     401    connect(m_pTreeWidget, &QITreeWidget::painted, this, &UIGlobalSettingsLanguage::sltHandleItemPainting);
     402    connect(m_pTreeWidget, &QITreeWidget::currentItemChanged, this, &UIGlobalSettingsLanguage::sltHandleCurrentItemChange);
    406403}
    407404

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

    r85998 r86020  
    221221    , m_pLayoutNATNetwork(0)
    222222    , m_pTreeWidgetNATNetwork(0)
    223     , m_pToolbarNetworkNAT(0)
     223    , m_pToolbarNATNetwork(0)
    224224    , m_pActionAddNATNetwork(0)
    225225    , m_pActionRemoveNATNetwork(0)
    … …  
    514514
    515515        /* Prepare NAT network layout: */
    516         m_pLayoutNATNetwork = new QHBoxLayout(this);
     516        m_pLayoutNATNetwork = new QHBoxLayout;
    517517        if (m_pLayoutNATNetwork)
    518518        {
    … …  
    551551{
    552552    /* Prepare NAT network toolbar: */
    553     m_pToolbarNetworkNAT = new UIToolBar(this);
    554     if (m_pToolbarNetworkNAT)
     553    m_pToolbarNATNetwork = new UIToolBar(this);
     554    if (m_pToolbarNATNetwork)
    555555    {
    556556        const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
    557         m_pToolbarNetworkNAT->setIconSize(QSize(iIconMetric, iIconMetric));
    558         m_pToolbarNetworkNAT->setOrientation(Qt::Vertical);
    559 
    560         /* Prepare 'Add NAT Network' action: */
    561         m_pActionAddNATNetwork = m_pToolbarNetworkNAT->addAction(UIIconPool::iconSet(":/host_iface_add_16px.png",
     557        m_pToolbarNATNetwork->setIconSize(QSize(iIconMetric, iIconMetric));
     558        m_pToolbarNATNetwork->setOrientation(Qt::Vertical);
     559
     560        /* Prepare 'add NAT network' action: */
     561        m_pActionAddNATNetwork = m_pToolbarNATNetwork->addAction(UIIconPool::iconSet(":/host_iface_add_16px.png",
    562562                                                                                     ":/host_iface_add_disabled_16px.png"),
    563563                                                                 QString(), this, SLOT(sltAddNATNetwork()));
    … …  
    565565            m_pActionAddNATNetwork->setShortcuts(QList<QKeySequence>() << QKeySequence("Ins") << QKeySequence("Ctrl+N"));
    566566
    567         /* Prepare 'Remove NAT Network' action: */
    568         m_pActionRemoveNATNetwork = m_pToolbarNetworkNAT->addAction(UIIconPool::iconSet(":/host_iface_remove_16px.png",
     567        /* Prepare 'remove NAT network' action: */
     568        m_pActionRemoveNATNetwork = m_pToolbarNATNetwork->addAction(UIIconPool::iconSet(":/host_iface_remove_16px.png",
    569569                                                                                        ":/host_iface_remove_disabled_16px.png"),
    570570                                                                    QString(), this, SLOT(sltRemoveNATNetwork()));
    … …  
    572572            m_pActionRemoveNATNetwork->setShortcuts(QList<QKeySequence>() << QKeySequence("Del") << QKeySequence("Ctrl+R"));
    573573
    574         /* Prepare 'Edit NAT Network' action: */
    575         m_pActionEditNATNetwork = m_pToolbarNetworkNAT->addAction(UIIconPool::iconSet(":/host_iface_edit_16px.png",
     574        /* Prepare 'edit NAT network' action: */
     575        m_pActionEditNATNetwork = m_pToolbarNATNetwork->addAction(UIIconPool::iconSet(":/host_iface_edit_16px.png",
    576576                                                                                      ":/host_iface_edit_disabled_16px.png"),
    577577                                                                  QString(), this, SLOT(sltEditNATNetwork()));
    … …  
    579579            m_pActionEditNATNetwork->setShortcuts(QList<QKeySequence>() << QKeySequence("Space") << QKeySequence("F2"));
    580580
    581         m_pLayoutNATNetwork->addWidget(m_pToolbarNetworkNAT);
     581        m_pLayoutNATNetwork->addWidget(m_pToolbarNATNetwork);
    582582    }
    583583}

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

    r85998 r86020  
    139139        QITreeWidget     *m_pTreeWidgetNATNetwork;
    140140        /** Holds the NAT networt toolbar instance. */
    141         UIToolBar        *m_pToolbarNetworkNAT;
    142         /** Holds the Add NAT network action instance. */
     141        UIToolBar        *m_pToolbarNATNetwork;
     142        /** Holds the 'add NAT network' action instance. */
    143143        QAction          *m_pActionAddNATNetwork;
    144         /** Holds the Remove NAT network action instance. */
     144        /** Holds the 'remove NAT network' action instance. */
    145145        QAction          *m_pActionRemoveNATNetwork;
    146         /** Holds the Edit NAT network action instance. */
     146        /** Holds the 'edit NAT network' action instance. */
    147147        QAction          *m_pActionEditNATNetwork;
    148148    /** @} */

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

    r86019 r86020  
    253253    if (pLayoutMain)
    254254    {
    255         pLayoutMain->setContentsMargins(0, 0, 0, 0);
    256255        pLayoutMain->setRowStretch(4, 1);
    257256

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

    r85982 r86020  
    306306                    pLayoutUpdateSettings->addWidget(m_pLabelUpdateFilter, 2, 0);
    307307                }
    308                 /* Prepare 'stable' radio-button: */
     308                /* Prepare 'update to stable' radio-button: */
    309309                m_pRadioUpdateFilterStable = new QRadioButton(m_pWidgetUpdateSettings);
    310310                if (m_pRadioUpdateFilterStable)
    311311                    pLayoutUpdateSettings->addWidget(m_pRadioUpdateFilterStable, 2, 1);
    312                 /* Prepare 'every' radio-button: */
     312                /* Prepare 'update to every' radio-button: */
    313313                m_pRadioUpdateFilterEvery = new QRadioButton(m_pWidgetUpdateSettings);
    314314                if (m_pRadioUpdateFilterEvery)
    315315                    pLayoutUpdateSettings->addWidget(m_pRadioUpdateFilterEvery, 3, 1);
    316                 /* Prepare 'betas' radio-button: */
     316                /* Prepare 'update to betas' radio-button: */
    317317                m_pRadioUpdateFilterBetas = new QRadioButton(m_pWidgetUpdateSettings);
    318318                if (m_pRadioUpdateFilterBetas)

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

    r85982 r86020  
    9999    /** @name Widgets
    100100     * @{ */
    101         QCheckBox *m_pCheckBoxUpdate;
    102         QWidget *m_pWidgetUpdateSettings;
    103         QLabel *m_pLabelUpdatePeriod;
    104         QComboBox *m_pComboUpdatePeriod;
    105         QLabel *m_pLabelUpdateDate;
    106         QLabel *m_pFieldUpdateDate;
    107         QLabel *m_pLabelUpdateFilter;
     101        /** Holds the update check-box instance. */
     102        QCheckBox    *m_pCheckBoxUpdate;
     103        /** Holds the update settings widget instance. */
     104        QWidget      *m_pWidgetUpdateSettings;
     105        /** Holds the update period label instance. */
     106        QLabel       *m_pLabelUpdatePeriod;
     107        /** Holds the update period combo instance. */
     108        QComboBox    *m_pComboUpdatePeriod;
     109        /** Holds the update date label instance. */
     110        QLabel       *m_pLabelUpdateDate;
     111        /** Holds the update date field instance. */
     112        QLabel       *m_pFieldUpdateDate;
     113        /** Holds the update filter label instance. */
     114        QLabel       *m_pLabelUpdateFilter;
     115        /** Holds the 'update to stable' radio-button instance. */
    108116        QRadioButton *m_pRadioUpdateFilterStable;
     117        /** Holds the 'update to every' radio-button instance. */
    109118        QRadioButton *m_pRadioUpdateFilterEvery;
     119        /** Holds the 'update to betas' radio-button instance. */
    110120        QRadioButton *m_pRadioUpdateFilterBetas;
    111121    /** @} */
Note: See TracChangeset for help on using the changeset viewer.

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