VirtualBox

Ignore:
Timestamp:
Aug 23, 2023 6:05:09 PM (18 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
158899
Message:

FE/Qt: UISettingsDialog: Moving UIWarningPane from widgets to UISettingsWarningPane class under settings folder as it contains a lot of private (to settings code) references; A bit of corresponding refactoring.

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

Legend:

Unmodified
Added
Removed

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

    r100959 r100961  
    882882        src/settings/UISettingsSelector.h \
    883883        src/settings/UISettingsSerializer.h \
     884        src/settings/UISettingsWarningPane.h \
    884885        src/settings/editors/UIAccelerationFeaturesEditor.h \
    885886        src/settings/editors/UIAudioControllerEditor.h \
    … …  
    972973        src/widgets/UISearchLineEdit.h \
    973974        src/widgets/UIToolBox.h \
    974         src/widgets/UIWarningPane.h \
    975975        src/wizards/UINativeWizard.h \
    976976        src/wizards/UINativeWizardPage.h \
    … …  
    14651465        src/settings/UISettingsSelector.cpp \
    14661466        src/settings/UISettingsSerializer.cpp \
     1467        src/settings/UISettingsWarningPane.cpp \
    14671468        src/settings/editors/UIAccelerationFeaturesEditor.cpp \
    14681469        src/settings/editors/UIAudioControllerEditor.cpp \
    … …  
    15551556        src/widgets/UIStatusBarEditorWindow.cpp \
    15561557        src/widgets/UIToolBox.cpp \
    1557         src/widgets/UIWarningPane.cpp \
    15581558        src/wizards/UINativeWizard.cpp \
    15591559        src/wizards/UINativeWizardPage.cpp \

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

    r100960 r100961  
    3737/* GUI includes: */
    3838#include "QIDialogButtonBox.h"
     39#include "QIToolBar.h"
    3940#include "QIWidgetValidator.h"
    4041#include "UICommon.h"
    … …  
    5051#include "UISettingsSelector.h"
    5152#include "UISettingsSerializer.h"
    52 #include "QIToolBar.h"
    53 #include "UIWarningPane.h"
     53#include "UISettingsWarningPane.h"
    5454#ifdef VBOX_WS_MAC
    5555# include "VBoxUtils.h"
    … …  
    717717
    718718            /* Prepare warning-pane: */
    719             m_pWarningPane = new UIWarningPane(m_pStatusBar);
     719            m_pWarningPane = new UISettingsWarningPane(m_pStatusBar);
    720720            if (m_pWarningPane)
    721721            {
    722                 connect(m_pWarningPane, &UIWarningPane::sigHoverEnter,
     722                connect(m_pWarningPane, &UISettingsWarningPane::sigHoverEnter,
    723723                        this, &UISettingsDialog::sltHandleWarningPaneHovered);
    724                 connect(m_pWarningPane, &UIWarningPane::sigHoverLeave,
     724                connect(m_pWarningPane, &UISettingsWarningPane::sigHoverLeave,
    725725                        this, &UISettingsDialog::sltHandleWarningPaneUnhovered);
    726726                m_pStatusBar->addWidget(m_pWarningPane);

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.h

    r100959 r100961  
    5353class UISettingsSelector;
    5454class UISettingsSerializer;
    55 class UIWarningPane;
     55class UISettingsWarningPane;
    5656
    5757/* Using declarations: */
    … …  
    218218
    219219    /** Holds the status-bar widget instance. */
    220     QStackedWidget *m_pStatusBar;
     220    QStackedWidget         *m_pStatusBar;
    221221    /** Holds the process-bar widget instance. */
    222     QProgressBar   *m_pProcessBar;
     222    QProgressBar           *m_pProcessBar;
    223223    /** Holds the warning-pane instance. */
    224     UIWarningPane  *m_pWarningPane;
     224    UISettingsWarningPane  *m_pWarningPane;
    225225
    226226    /** Holds whether settings dialog is valid (no errors, can be warnings). */

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

    r100960 r100961  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWarningPane class implementation.
     3 * VBox Qt GUI - UISettingsWarningPane class implementation.
    44 */
    55
    … …  
    3434/* GUI includes: */
    3535#include "UISettingsPageValidator.h"
    36 #include "UIWarningPane.h"
     36#include "UISettingsWarningPane.h"
    3737
    3838/* Other VBox includes: */
    … …  
    4040
    4141
    42 UIWarningPane::UIWarningPane(QWidget *pParent)
     42UISettingsWarningPane::UISettingsWarningPane(QWidget *pParent)
    4343    : QWidget(pParent)
    4444    , m_pIconLayout(0)
    … …  
    4747    , m_iHoveredIconLabelPosition(-1)
    4848{
    49     /* Prepare: */
    5049    prepare();
    5150}
    5251
    53 void UIWarningPane::setWarningLabel(const QString &strWarningLabel)
     52void UISettingsWarningPane::setWarningLabel(const QString &strWarningLabel)
    5453{
    5554    /* Assign passed text directly to warning-label: */
    … …  
    5756}
    5857
    59 void UIWarningPane::registerValidator(UISettingsPageValidator *pValidator)
     58void UISettingsWarningPane::registerValidator(UISettingsPageValidator *pValidator)
    6059{
    6160    /* Make sure validator exists: */
    … …  
    9291}
    9392
    94 bool UIWarningPane::eventFilter(QObject *pObject, QEvent *pEvent)
     93bool UISettingsWarningPane::eventFilter(QObject *pObject, QEvent *pEvent)
    9594{
    9695    /* Depending on event-type: */
    … …  
    155154}
    156155
    157 void UIWarningPane::sltHandleHoverTimer()
     156void UISettingsWarningPane::sltHandleHoverTimer()
    158157{
    159158    /* Notify listeners about hovering: */
    … …  
    162161}
    163162
    164 void UIWarningPane::prepare()
     163void UISettingsWarningPane::prepare()
    165164{
    166165    /* Create main-layout: */
    … …  
    196195            m_pHoverTimer->setInterval(200);
    197196            m_pHoverTimer->setSingleShot(true);
    198             connect(m_pHoverTimer, &QTimer::timeout, this, &UIWarningPane::sltHandleHoverTimer);
     197            connect(m_pHoverTimer, &QTimer::timeout, this, &UISettingsWarningPane::sltHandleHoverTimer);
    199198        }
    200199

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsWarningPane.h

    r100960 r100961  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWarningPane class declaration.
     3 * VBox Qt GUI - UISettingsWarningPane class declaration.
    44 */
    55
    … …  
    2626 */
    2727
    28 #ifndef FEQT_INCLUDED_SRC_widgets_UIWarningPane_h
    29 #define FEQT_INCLUDED_SRC_widgets_UIWarningPane_h
     28#ifndef FEQT_INCLUDED_SRC_settings_UISettingsWarningPane_h
     29#define FEQT_INCLUDED_SRC_settings_UISettingsWarningPane_h
    3030#ifndef RT_WITHOUT_PRAGMA_ONCE
    3131# pragma once
    … …  
    4848class UISettingsPageValidator;
    4949
    50 /** QWidget subclass used a settings dialog warning-pane. */
    51 class SHARED_LIBRARY_STUFF UIWarningPane : public QWidget
     50/** QWidget sub-class,
     51  * used a settings dialog warning-pane. */
     52class SHARED_LIBRARY_STUFF UISettingsWarningPane : public QWidget
    5253{
    5354    Q_OBJECT;
    … …  
    6566
    6667    /** Constructs warning-pane passing @a pParent to the base-class. */
    67     UIWarningPane(QWidget *pParent = 0);
     68    UISettingsWarningPane(QWidget *pParent = 0);
    6869
    6970    /** Defines current @a strWarningLabel text. */
    … …  
    106107};
    107108
    108 #endif /* !FEQT_INCLUDED_SRC_widgets_UIWarningPane_h */
     109#endif /* !FEQT_INCLUDED_SRC_settings_UISettingsWarningPane_h */
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