Changeset 85033 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 1, 2020 4:27:40 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

138934

Message:

FE/Qt: bugref:9653: Cloud Profile Manager: A bit of connections cleanup.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/cloud/profilemanager

Files:

• UICloudProfileManager.cpp (modified) (2 diffs)
• UICloudProfileManager.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/cloud/profilemanager/UICloudProfileManager.cpp

@@ -573 +573 @@
     addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_TryPage));
     addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Help));
-
-    /* Connect actions: */
+}
+
+void UICloudProfileManagerWidget::prepareWidgets()
+{
+    /* Create main-layout: */
+    new QVBoxLayout(this);
+    if (layout())
+    {
+        /* Configure layout: */
+        layout()->setContentsMargins(0, 0, 0, 0);
+#ifdef VBOX_WS_MAC
+        layout()->setSpacing(10);
+#else
+        layout()->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2);
+#endif
+
+        /* Prepare toolbar, if requested: */
+        if (m_fShowToolbar)
+            prepareToolBar();
+        /* Prepare tree-widget: */
+        prepareTreeWidget();
+        /* Prepare details-widget: */
+        prepareDetailsWidget();
+        /* Prepare connections: */
+        prepareConnections();
+    }
+}
+
+void UICloudProfileManagerWidget::prepareToolBar()
+{
+    /* Create toolbar: */
+    m_pToolBar = new UIToolBar(parentWidget());
+    if (m_pToolBar)
+    {
+        /* Configure toolbar: */
+        const int iIconMetric = (int)(QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize));
+        m_pToolBar->setIconSize(QSize(iIconMetric, iIconMetric));
+        m_pToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
+
+        /* Add toolbar actions: */
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Add));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Import));
+        m_pToolBar->addSeparator();
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Remove));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details));
+        m_pToolBar->addSeparator();
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_TryPage));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Help));
+
+#ifdef VBOX_WS_MAC
+        /* Check whether we are embedded into a stack: */
+        if (m_enmEmbedding == EmbedTo_Stack)
+        {
+            /* Add into layout: */
+            layout()->addWidget(m_pToolBar);
+        }
+#else
+        /* Add into layout: */
+        layout()->addWidget(m_pToolBar);
+#endif
+    }
+}
+
+void UICloudProfileManagerWidget::prepareTreeWidget()
+{
+    /* Create tree-widget: */
+    m_pTreeWidget = new QITreeWidget;
+    if (m_pTreeWidget)
+    {
+        /* Configure tree-widget: */
+        m_pTreeWidget->header()->hide();
+        m_pTreeWidget->setRootIsDecorated(false);
+        m_pTreeWidget->setAlternatingRowColors(true);
+        m_pTreeWidget->setContextMenuPolicy(Qt::CustomContextMenu);
+        m_pTreeWidget->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+        m_pTreeWidget->setColumnCount(Column_Max);
+        m_pTreeWidget->setSortingEnabled(true);
+        m_pTreeWidget->sortByColumn(Column_Name, Qt::AscendingOrder);
+        m_pTreeWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+
+        /* Add into layout: */
+        layout()->addWidget(m_pTreeWidget);
+    }
+}
+
+void UICloudProfileManagerWidget::prepareDetailsWidget()
+{
+    /* Create details-widget: */
+    m_pDetailsWidget = new UICloudProfileDetailsWidget(m_enmEmbedding);
+    if (m_pDetailsWidget)
+    {
+        /* Configure details-widget: */
+        m_pDetailsWidget->setVisible(false);
+        m_pDetailsWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+
+        /* Add into layout: */
+        layout()->addWidget(m_pDetailsWidget);
+    }
+}
+
+void UICloudProfileManagerWidget::prepareConnections()
+{
+    /* Action connections: */
     connect(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Add), &QAction::triggered,
             this, &UICloudProfileManagerWidget::sltAddCloudProfile);
@@ -587 +688 @@
     connect(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Help), &QAction::triggered,
             this, &UICloudProfileManagerWidget::sltShowCloudProfileHelp);
-}
-
-void UICloudProfileManagerWidget::prepareWidgets()
-{
-    /* Create main-layout: */
-    new QVBoxLayout(this);
-    if (layout())
-    {
-        /* Configure layout: */
-        layout()->setContentsMargins(0, 0, 0, 0);
-#ifdef VBOX_WS_MAC
-        layout()->setSpacing(10);
-#else
-        layout()->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2);
-#endif
-
-        /* Prepare toolbar, if requested: */
-        if (m_fShowToolbar)
-            prepareToolBar();
-        /* Prepare tree-widget: */
-        prepareTreeWidget();
-        /* Prepare details-widget: */
-        prepareDetailsWidget();
-    }
-}
-
-void UICloudProfileManagerWidget::prepareToolBar()
-{
-    /* Create toolbar: */
-    m_pToolBar = new UIToolBar(parentWidget());
-    if (m_pToolBar)
-    {
-        /* Configure toolbar: */
-        const int iIconMetric = (int)(QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize));
-        m_pToolBar->setIconSize(QSize(iIconMetric, iIconMetric));
-        m_pToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
-
-        /* Add toolbar actions: */
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Add));
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Import));
-        m_pToolBar->addSeparator();
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Remove));
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details));
-        m_pToolBar->addSeparator();
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_TryPage));
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Help));
-
-#ifdef VBOX_WS_MAC
-        /* Check whether we are embedded into a stack: */
-        if (m_enmEmbedding == EmbedTo_Stack)
-        {
-            /* Add into layout: */
-            layout()->addWidget(m_pToolBar);
-        }
-#else
-        /* Add into layout: */
-        layout()->addWidget(m_pToolBar);
-#endif
-    }
-}
-
-void UICloudProfileManagerWidget::prepareTreeWidget()
-{
-    /* Create tree-widget: */
-    m_pTreeWidget = new QITreeWidget;
-    if (m_pTreeWidget)
-    {
-        /* Configure tree-widget: */
-        m_pTreeWidget->header()->hide();
-        m_pTreeWidget->setRootIsDecorated(false);
-        m_pTreeWidget->setAlternatingRowColors(true);
-        m_pTreeWidget->setContextMenuPolicy(Qt::CustomContextMenu);
-        m_pTreeWidget->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-        m_pTreeWidget->setColumnCount(Column_Max);
-        m_pTreeWidget->setSortingEnabled(true);
-        m_pTreeWidget->sortByColumn(Column_Name, Qt::AscendingOrder);
-        m_pTreeWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
-        connect(m_pTreeWidget, &QITreeWidget::currentItemChanged,
-                this, &UICloudProfileManagerWidget::sltHandleCurrentItemChange);
-        connect(m_pTreeWidget, &QITreeWidget::customContextMenuRequested,
-                this, &UICloudProfileManagerWidget::sltHandleContextMenuRequest);
-        connect(m_pTreeWidget, &QITreeWidget::itemDoubleClicked,
-                m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details), &QAction::setChecked);
-
-        /* Add into layout: */
-        layout()->addWidget(m_pTreeWidget);
-    }
-}
-
-void UICloudProfileManagerWidget::prepareDetailsWidget()
-{
-    /* Create details-widget: */
-    m_pDetailsWidget = new UICloudProfileDetailsWidget(m_enmEmbedding);
-    if (m_pDetailsWidget)
-    {
-        /* Configure details-widget: */
-        m_pDetailsWidget->setVisible(false);
-        m_pDetailsWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
-        connect(m_pDetailsWidget, &UICloudProfileDetailsWidget::sigDataChanged,
-                this, &UICloudProfileManagerWidget::sigCloudProfileDetailsDataChanged);
-        connect(m_pDetailsWidget, &UICloudProfileDetailsWidget::sigDataChangeRejected,
-                this, &UICloudProfileManagerWidget::sltResetCloudProfileDetailsChanges);
-        connect(m_pDetailsWidget, &UICloudProfileDetailsWidget::sigDataChangeAccepted,
-                this, &UICloudProfileManagerWidget::sltApplyCloudProfileDetailsChanges);
-
-        /* Add into layout: */
-        layout()->addWidget(m_pDetailsWidget);
-    }
+
+    /* Tree-widget connections: */
+    connect(m_pTreeWidget, &QITreeWidget::currentItemChanged,
+            this, &UICloudProfileManagerWidget::sltHandleCurrentItemChange);
+    connect(m_pTreeWidget, &QITreeWidget::customContextMenuRequested,
+            this, &UICloudProfileManagerWidget::sltHandleContextMenuRequest);
+    connect(m_pTreeWidget, &QITreeWidget::itemDoubleClicked,
+            m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details), &QAction::setChecked);
+
+    /* Details-widget connections: */
+    connect(m_pDetailsWidget, &UICloudProfileDetailsWidget::sigDataChanged,
+            this, &UICloudProfileManagerWidget::sigCloudProfileDetailsDataChanged);
+    connect(m_pDetailsWidget, &UICloudProfileDetailsWidget::sigDataChangeRejected,
+            this, &UICloudProfileManagerWidget::sltResetCloudProfileDetailsChanges);
+    connect(m_pDetailsWidget, &UICloudProfileDetailsWidget::sigDataChangeAccepted,
+            this, &UICloudProfileManagerWidget::sltApplyCloudProfileDetailsChanges);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/cloud/profilemanager/UICloudProfileManager.h

@@ -133 +133 @@
         /** Prepares details-widget. */
         void prepareDetailsWidget();
+        /** Prepares connections. */
+        void prepareConnections();
         /** Load settings: */
         void loadSettings();