VirtualBox

Changeset 79948 in vbox


Ignore:
Timestamp:
Jul 24, 2019 10:59:09 AM (6 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
132373
Message:

FE/Qt: bugref:7720: Rename UIGuestRAMSlider to UIBaseMemorySlider.

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
5 edited
2 moved

Legend:

Unmodified
Added
Removed

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

    r79922 r79948  
    888888        src/settings/machine/UIMachineSettingsUSBFilterDetails.h \
    889889        src/widgets/UIAddDiskEncryptionPasswordDialog.h \
     890        src/widgets/UIBaseMemorySlider.h \
    890891        src/widgets/UIBootTable.h \
    891892        src/widgets/UIFilePathSelector.h \
    892893        src/widgets/UIFilmContainer.h \
    893         src/widgets/UIGuestRAMSlider.h \
    894894        src/widgets/UIHostComboEditor.h \
    895895        src/widgets/UIHotKeyEditor.h \
    … …  
    13781378        src/settings/machine/UIMachineSettingsUSBFilterDetails.cpp \
    13791379        src/widgets/UIAddDiskEncryptionPasswordDialog.cpp \
     1380        src/widgets/UIBaseMemorySlider.cpp \
    13801381        src/widgets/UIBootTable.cpp \
    13811382        src/widgets/UIFilePathSelector.cpp \
    13821383        src/widgets/UIFilmContainer.cpp \
    1383         src/widgets/UIGuestRAMSlider.cpp \
    13841384        src/widgets/UIHostComboEditor.cpp \
    13851385        src/widgets/UIHotKeyEditor.cpp \

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

    r75967 r79948  
    4949          </property>
    5050          <item>
    51            <widget class="UIGuestRAMSlider" name="m_pSliderMemorySize">
     51           <widget class="UIBaseMemorySlider" name="m_pSliderMemorySize">
    5252            <property name="whatsThis">
    5353             <string>Controls the amount of memory provided to the virtual machine. If you assign too much, the machine might not start.</string>
    … …  
    668668  </customwidget>
    669669  <customwidget>
    670    <class>UIGuestRAMSlider</class>
     670   <class>UIBaseMemorySlider</class>
    671671   <extends>QIAdvancedSlider</extends>
    672    <header>UIGuestRAMSlider.h</header>
     672   <header>UIBaseMemorySlider.h</header>
    673673  </customwidget>
    674674  <customwidget>

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIBaseMemorySlider.cpp

    r79947 r79948  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIGuestRAMSlider class implementation.
     3 * VBox Qt GUI - UIBaseMemorySlider class implementation.
    44 */
    55
    … …  
    1818/* GUI includes: */
    1919#include "UICommon.h"
    20 #include "UIGuestRAMSlider.h"
     20#include "UIBaseMemorySlider.h"
    2121
    2222/* COM includes: */
    … …  
    2424
    2525
    26 UIGuestRAMSlider::UIGuestRAMSlider(QWidget *pParent /* = 0 */)
     26UIBaseMemorySlider::UIBaseMemorySlider(QWidget *pParent /* = 0 */)
    2727  : QIAdvancedSlider(pParent)
    2828  , m_uMinRAM(0)
    … …  
    3535}
    3636
    37 UIGuestRAMSlider::UIGuestRAMSlider(Qt::Orientation enmOrientation, QWidget *pParent /* = 0 */)
     37UIBaseMemorySlider::UIBaseMemorySlider(Qt::Orientation enmOrientation, QWidget *pParent /* = 0 */)
    3838  : QIAdvancedSlider(enmOrientation, pParent)
    3939  , m_uMinRAM(0)
    … …  
    4646}
    4747
    48 uint UIGuestRAMSlider::minRAM() const
     48uint UIBaseMemorySlider::minRAM() const
    4949{
    5050    return m_uMinRAM;
    5151}
    5252
    53 uint UIGuestRAMSlider::maxRAMOpt() const
     53uint UIBaseMemorySlider::maxRAMOpt() const
    5454{
    5555    return m_uMaxRAMOpt;
    5656}
    5757
    58 uint UIGuestRAMSlider::maxRAMAlw() const
     58uint UIBaseMemorySlider::maxRAMAlw() const
    5959{
    6060    return m_uMaxRAMAlw;
    6161}
    6262
    63 uint UIGuestRAMSlider::maxRAM() const
     63uint UIBaseMemorySlider::maxRAM() const
    6464{
    6565    return m_uMaxRAM;
    6666}
    6767
    68 void UIGuestRAMSlider::prepare()
     68void UIBaseMemorySlider::prepare()
    6969{
    7070    ulong uFullSize = uiCommon().host().GetMemorySize();
    … …  
    164164}
    165165
    166 int UIGuestRAMSlider::calcPageStep(int iMaximum) const
     166int UIBaseMemorySlider::calcPageStep(int iMaximum) const
    167167{
    168168    /* Calculate a suitable page step size for the given max value.

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIBaseMemorySlider.h

    r79947 r79948  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIGuestRAMSlider class declaration.
     3 * VBox Qt GUI - UIBaseMemorySlider class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef FEQT_INCLUDED_SRC_widgets_UIGuestRAMSlider_h
    19 #define FEQT_INCLUDED_SRC_widgets_UIGuestRAMSlider_h
     18#ifndef FEQT_INCLUDED_SRC_widgets_UIBaseMemorySlider_h
     19#define FEQT_INCLUDED_SRC_widgets_UIBaseMemorySlider_h
    2020#ifndef RT_WITHOUT_PRAGMA_ONCE
    2121# pragma once
    … …  
    2626#include "UILibraryDefs.h"
    2727
    28 /** QIAdvancedSlider subclass used as a guest RAM slider. */
    29 class SHARED_LIBRARY_STUFF UIGuestRAMSlider : public QIAdvancedSlider
     28/** QIAdvancedSlider subclass used as a base memory slider. */
     29class SHARED_LIBRARY_STUFF UIBaseMemorySlider : public QIAdvancedSlider
    3030{
    3131    Q_OBJECT;
    … …  
    3434
    3535    /** Constructs guest RAM slider passing @a pParent to the base-class. */
    36     UIGuestRAMSlider(QWidget *pParent = 0);
     36    UIBaseMemorySlider(QWidget *pParent = 0);
    3737    /** Constructs guest RAM slider passing @a pParent and @a enmOrientation to the base-class. */
    38     UIGuestRAMSlider(Qt::Orientation enmOrientation, QWidget *pParent = 0);
     38    UIBaseMemorySlider(Qt::Orientation enmOrientation, QWidget *pParent = 0);
    3939
    4040    /** Returns the minimum RAM. */
    … …  
    6565};
    6666
    67 #endif /* !FEQT_INCLUDED_SRC_widgets_UIGuestRAMSlider_h */
     67#endif /* !FEQT_INCLUDED_SRC_widgets_UIBaseMemorySlider_h */

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

    r79365 r79948  
    2828#include "UIWizardNewVM.h"
    2929#include "UICommon.h"
    30 #include "UIGuestRAMSlider.h"
     30#include "UIBaseMemorySlider.h"
    3131#include "QIRichTextLabel.h"
    3232
    … …  
    6060        QGridLayout *pMemoryLayout = new QGridLayout;
    6161        {
    62             m_pRamSlider = new UIGuestRAMSlider(this);
     62            m_pRamSlider = new UIBaseMemorySlider(this);
    6363            {
    6464                m_pRamSlider->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
    … …  
    9696
    9797    /* Setup connections: */
    98     connect(m_pRamSlider, &UIGuestRAMSlider::valueChanged,
     98    connect(m_pRamSlider, &UIBaseMemorySlider::valueChanged,
    9999            this, &UIWizardNewVMPageBasic2::sltRamSliderValueChanged);
    100100    connect(m_pRamEditor, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged),

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

    r76581 r79948  
    2626
    2727/* Forward declarations: */
    28 class UIGuestRAMSlider;
     28class UIBaseMemorySlider;
    2929class QSpinBox;
    3030class QLabel;
    … …  
    4444
    4545    /* Widgets: */
    46     UIGuestRAMSlider *m_pRamSlider;
     46    UIBaseMemorySlider *m_pRamSlider;
    4747    QSpinBox *m_pRamEditor;
    4848    QLabel *m_pRamMin;

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

    r79885 r79948  
    2929/* GUI includes: */
    3030#include "QIToolButton.h"
    31 #include "UIGuestRAMSlider.h"
     31#include "UIBaseMemorySlider.h"
    3232#include "UIIconPool.h"
    3333#include "UIMediaComboBox.h"
    … …  
    5858            QGridLayout *pMemoryCntLayout = new QGridLayout(m_pMemoryCnt);
    5959            {
    60                 m_pRamSlider = new UIGuestRAMSlider(m_pMemoryCnt);
     60                m_pRamSlider = new UIBaseMemorySlider(m_pMemoryCnt);
    6161                {
    6262                    m_pRamSlider->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
    … …  
    135135    connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigOsTypeChanged,
    136136            this, &UIWizardNewVMPageExpert::sltOsTypeChanged);
    137     connect(m_pRamSlider, &UIGuestRAMSlider::valueChanged,
     137    connect(m_pRamSlider, &UIBaseMemorySlider::valueChanged,
    138138            this, &UIWizardNewVMPageExpert::sltRamSliderValueChanged);
    139139    connect(m_pRamEditor, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged),
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