Index: /trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetails.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetails.cpp (revision 74676) +++ /trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetails.cpp (revision 74677) @@ -5,5 +5,5 @@ /* - * Copyright (C) 2012-2017 Oracle Corporation + * Copyright (C) 2012-2018 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as @@ -35,19 +35,9 @@ UIDetails::UIDetails(QWidget *pParent /* = 0 */) : QWidget(pParent) - , m_pMainLayout(0) , m_pDetailsModel(0) , m_pDetailsView(0) { - /* Prepare layout: */ - prepareLayout(); - - /* Prepare model: */ - prepareModel(); - - /* Prepare view: */ - prepareView(); - - /* Prepare connections: */ - prepareConnections(); + /* Prepare: */ + prepare(); } @@ -58,48 +48,48 @@ } -void UIDetails::prepareLayout() +void UIDetails::prepare() { - /* Setup main-layout: */ - m_pMainLayout = new QVBoxLayout(this); - const int iL = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 9; - m_pMainLayout->setContentsMargins(iL, 0, 0, 0); - m_pMainLayout->setSpacing(0); -} + /* Create main-layout: */ + QVBoxLayout *pMainLayout = new QVBoxLayout(this); + if (pMainLayout) + { + const int iL = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 9; + pMainLayout->setContentsMargins(iL, 0, 0, 0); + pMainLayout->setSpacing(0); -void UIDetails::prepareModel() -{ - /* Setup details-model: */ - m_pDetailsModel = new UIDetailsModel(this); -} + /* Create details-model: */ + m_pDetailsModel = new UIDetailsModel(this); + if (m_pDetailsModel) + { + /* Create details-view: */ + m_pDetailsView = new UIDetailsView(this); + if (m_pDetailsView) + { + m_pDetailsView->setScene(m_pDetailsModel->scene()); + m_pDetailsView->show(); + setFocusProxy(m_pDetailsView); -void UIDetails::prepareView() -{ - /* Setup details-view: */ - m_pDetailsView = new UIDetailsView(this); - m_pDetailsView->setScene(m_pDetailsModel->scene()); - m_pDetailsView->show(); - setFocusProxy(m_pDetailsView); - m_pMainLayout->addWidget(m_pDetailsView); -} + /* Add into layout: */ + pMainLayout->addWidget(m_pDetailsView); + } + } + } -void UIDetails::prepareConnections() -{ /* Setup details-model connections: */ - connect(m_pDetailsModel, SIGNAL(sigRootItemMinimumWidthHintChanged(int)), - m_pDetailsView, SLOT(sltMinimumWidthHintChanged(int))); - connect(m_pDetailsModel, SIGNAL(sigRootItemMinimumHeightHintChanged(int)), - m_pDetailsView, SLOT(sltMinimumHeightHintChanged(int))); - connect(m_pDetailsModel, SIGNAL(sigLinkClicked(const QString&, const QString&, const QString&)), - this, SIGNAL(sigLinkClicked(const QString&, const QString&, const QString&))); - connect(this, SIGNAL(sigSlidingStarted()), - m_pDetailsModel, SLOT(sltHandleSlidingStarted())); - connect(this, SIGNAL(sigToggleStarted()), - m_pDetailsModel, SLOT(sltHandleToggleStarted())); - connect(this, SIGNAL(sigToggleFinished()), - m_pDetailsModel, SLOT(sltHandleToggleFinished())); + connect(m_pDetailsModel, &UIDetailsModel::sigRootItemMinimumWidthHintChanged, + m_pDetailsView, &UIDetailsView::sltMinimumWidthHintChanged); + connect(m_pDetailsModel, &UIDetailsModel::sigRootItemMinimumHeightHintChanged, + m_pDetailsView, &UIDetailsView::sltMinimumHeightHintChanged); + connect(m_pDetailsModel, &UIDetailsModel::sigLinkClicked, + this, &UIDetails::sigLinkClicked); + connect(this, &UIDetails::sigSlidingStarted, + m_pDetailsModel, &UIDetailsModel::sltHandleSlidingStarted); + connect(this, &UIDetails::sigToggleStarted, + m_pDetailsModel, &UIDetailsModel::sltHandleToggleStarted); + connect(this, &UIDetails::sigToggleFinished, + m_pDetailsModel, &UIDetailsModel::sltHandleToggleFinished); /* Setup details-view connections: */ - connect(m_pDetailsView, SIGNAL(sigResized()), - m_pDetailsModel, SLOT(sltHandleViewResize())); + connect(m_pDetailsView, &UIDetailsView::sigResized, + m_pDetailsModel, &UIDetailsModel::sltHandleViewResize); } - Index: /trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetails.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetails.h (revision 74676) +++ /trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetails.h (revision 74677) @@ -5,5 +5,5 @@ /* - * Copyright (C) 2012-2017 Oracle Corporation + * Copyright (C) 2012-2018 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as @@ -16,6 +16,6 @@ */ -#ifndef __UIDetails_h__ -#define __UIDetails_h__ +#ifndef ___UIDetails_h___ +#define ___UIDetails_h___ /* Qt includes: */ @@ -24,9 +24,10 @@ /* Forward declartions: */ class QVBoxLayout; +class QWidget; class UIDetailsModel; class UIDetailsView; class UIVirtualMachineItem; -/* Details widget: */ +/** QWidget-based Details pane container. */ class UIDetails : public QWidget { @@ -35,17 +36,23 @@ signals: - /* Notifier: Link processing stuff: */ - void sigLinkClicked(const QString &strCategory, const QString &strControl, const QString &strId); + /** Notifies listeners about link click. + * @param strCategory Brings link category. + * @param strControl Brings control name. + * @param strId Brings machine ID. */ + void sigLinkClicked(const QString &strCategory, + const QString &strControl, + const QString &strId); - /* Notifier: Sliding stuff: */ + /** Notifies listeners about sliding started. */ void sigSlidingStarted(); - /* Notifiers: Toggle stuff: */ + /** Notifies listeners about toggling started. */ void sigToggleStarted(); + /** Notifies listeners about toggling finished. */ void sigToggleFinished(); public: - /* Constructor: */ + /** Constructs Details pane passing @a pParent to the base-class. */ UIDetails(QWidget *pParent = 0); @@ -55,21 +62,17 @@ UIDetailsView *view() const { return m_pDetailsView; } - /* API: Current item(s) stuff: */ + /** Replaces current model @a items. */ void setItems(const QList &items); private: - /* Helpers: Prepare stuff: */ - void prepareLayout(); - void prepareModel(); - void prepareView(); - void prepareConnections(); + /** Prepares all. */ + void prepare(); - /* Variables: */ - QVBoxLayout *m_pMainLayout; + /** Holds the details model instance. */ UIDetailsModel *m_pDetailsModel; - UIDetailsView *m_pDetailsView; + /** Holds the details view instance. */ + UIDetailsView *m_pDetailsView; }; -#endif /* __UIDetails_h__ */ - +#endif /* !___UIDetails_h___ */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsModel.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsModel.cpp (revision 74676) +++ /trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsModel.cpp (revision 74677) @@ -117,4 +117,19 @@ /* Relayout: */ updateLayout(); +} + +void UIDetailsModel::sltHandleSlidingStarted() +{ + m_pRoot->stopBuildingGroup(); +} + +void UIDetailsModel::sltHandleToggleStarted() +{ + m_pRoot->stopBuildingGroup(); +} + +void UIDetailsModel::sltHandleToggleFinished() +{ + m_pRoot->rebuildGroup(); } @@ -197,19 +212,4 @@ } -void UIDetailsModel::sltHandleSlidingStarted() -{ - m_pRoot->stopBuildingGroup(); -} - -void UIDetailsModel::sltHandleToggleStarted() -{ - m_pRoot->stopBuildingGroup(); -} - -void UIDetailsModel::sltHandleToggleFinished() -{ - m_pRoot->rebuildGroup(); -} - QVariant UIDetailsModel::data(int iKey) const { Index: /trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsModel.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsModel.h (revision 74676) +++ /trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsModel.h (revision 74677) @@ -84,8 +84,15 @@ const QMap& settings() const { return m_settings; } -private slots: +public slots: /* Handler: Details-view stuff: */ void sltHandleViewResize(); + + /* Handlers: Chooser stuff: */ + void sltHandleSlidingStarted(); + void sltHandleToggleStarted(); + void sltHandleToggleFinished(); + +private slots: /* Handlers: Element-items stuff: */ @@ -93,9 +100,4 @@ void sltToggleAnimationFinished(DetailsElementType type, bool fToggled); void sltElementTypeToggled(); - - /* Handlers: Chooser stuff: */ - void sltHandleSlidingStarted(); - void sltHandleToggleStarted(); - void sltHandleToggleFinished(); private: Index: /trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsView.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsView.h (revision 74676) +++ /trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsView.h (revision 74677) @@ -45,5 +45,5 @@ UIDetails *details() const { return m_pDetails; } -private slots: +public slots: /* Handlers: Size-hint stuff: */