Changeset 62080 in vbox for trunk

Timestamp:

Jul 6, 2016 5:33:31 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8399: Medium Type Change dialog cleanup/rework (part 03): Moving.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• UIMediumTypeChangeDialog.cpp (modified) (2 diffs)
• UIMediumTypeChangeDialog.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/UIMediumTypeChangeDialog.cpp

@@ -40 +40 @@
 UIMediumTypeChangeDialog::UIMediumTypeChangeDialog(QWidget *pParent, const QString &strMediumID)
     : QIWithRetranslateUI<QIDialog>(pParent)
-{
-#ifdef VBOX_WS_MAC
-    // TODO: Is that necessary?
-    setWindowFlags(Qt::Sheet);
-#else /* !VBOX_WS_MAC */
-    /* Enable size-grip: */
-    setSizeGripEnabled(true);
-#endif /* !VBOX_WS_MAC */
-
-    /* Search for corresponding medium: */
-    m_medium = vboxGlobal().medium(strMediumID).medium();
-    m_enmMediumTypeOld = m_medium.GetType();
-    m_enmMediumTypeNew = m_enmMediumTypeOld;
-
-    /* Create main layout: */
-    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
-
-    /* Create label: */
-    m_pLabel = new QILabel(this);
-    /* Configure label: */
-    m_pLabel->setWordWrap(true);
-    m_pLabel->useSizeHintForWidth(450);
-    m_pLabel->updateGeometry();
-    /* Add label into main layout: */
-    pMainLayout->addWidget(m_pLabel);
-
-    /* Create group-box: */
-    m_pGroupBox = new QGroupBox(this);
-    /* Add group-box into main layout: */
-    pMainLayout->addWidget(m_pGroupBox);
-
-    /* Create button-box: */
-    m_pButtonBox = new QIDialogButtonBox(this);
-    /* Configure button-box: */
-    m_pButtonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-    m_pButtonBox->button(QDialogButtonBox::Ok)->setDefault(true);
-    connect(m_pButtonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked()), this, SLOT(sltAccept()));
-    connect(m_pButtonBox->button(QDialogButtonBox::Cancel), SIGNAL(clicked()), this, SLOT(sltReject()));
-    /* Add button-box into main layout: */
-    pMainLayout->addWidget(m_pButtonBox);
-
-    /* Add a stretch to main layout: */
-    pMainLayout->addStretch();
-
-    /* Prepare radio-buttons: */
-    prepareMediumTypeButtons();
-
-    /* Retranslate: */
-    retranslateUi();
-
-    /* Resize to minimum size: */
-    resize(minimumSizeHint());
+    , m_strMediumID(strMediumID)
+{
+    /* Prepare: */
+    prepare();
 }
 
@@ -158 +110 @@
      * for now only the previous type is restricted, others are free to choose: */
     m_pButtonBox->button(QDialogButtonBox::Ok)->setEnabled(m_enmMediumTypeOld != m_enmMediumTypeNew);
+}
+
+void UIMediumTypeChangeDialog::prepare()
+{
+#ifdef VBOX_WS_MAC
+    // TODO: Is that necessary?
+    setWindowFlags(Qt::Sheet);
+#else /* !VBOX_WS_MAC */
+    /* Enable size-grip: */
+    setSizeGripEnabled(true);
+#endif /* !VBOX_WS_MAC */
+
+    /* Search for corresponding medium: */
+    m_medium = vboxGlobal().medium(m_strMediumID).medium();
+    m_enmMediumTypeOld = m_medium.GetType();
+    m_enmMediumTypeNew = m_enmMediumTypeOld;
+
+    /* Create main layout: */
+    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
+
+    /* Create label: */
+    m_pLabel = new QILabel(this);
+    /* Configure label: */
+    m_pLabel->setWordWrap(true);
+    m_pLabel->useSizeHintForWidth(450);
+    m_pLabel->updateGeometry();
+    /* Add label into main layout: */
+    pMainLayout->addWidget(m_pLabel);
+
+    /* Create group-box: */
+    m_pGroupBox = new QGroupBox(this);
+    /* Add group-box into main layout: */
+    pMainLayout->addWidget(m_pGroupBox);
+
+    /* Create button-box: */
+    m_pButtonBox = new QIDialogButtonBox(this);
+    /* Configure button-box: */
+    m_pButtonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+    m_pButtonBox->button(QDialogButtonBox::Ok)->setDefault(true);
+    connect(m_pButtonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked()), this, SLOT(sltAccept()));
+    connect(m_pButtonBox->button(QDialogButtonBox::Cancel), SIGNAL(clicked()), this, SLOT(sltReject()));
+    /* Add button-box into main layout: */
+    pMainLayout->addWidget(m_pButtonBox);
+
+    /* Add a stretch to main layout: */
+    pMainLayout->addStretch();
+
+    /* Prepare radio-buttons: */
+    prepareMediumTypeButtons();
+
+    /* Retranslate: */
+    retranslateUi();
+
+    /* Resize to minimum size: */
+    resize(minimumSizeHint());
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/UIMediumTypeChangeDialog.h

@@ -64 +64 @@
 private:
 
+    /** Prepares all. */
+    void prepare();
     /** Prepares medium-type radio-buttons. */
     void prepareMediumTypeButtons();
     /** Prepares radio-button for the passed @a mediumType. */
     void prepareMediumTypeButton(KMediumType mediumType);
+
+    /** Holds the medium ID reference. */
+    const QString &m_strMediumID;
+    /** Holds the medium instance to be modified. */
+    CMedium m_medium;
+    /** Holds the old medium type. */
+    KMediumType m_enmMediumTypeOld;
+    /** Holds the new medium type. */
+    KMediumType m_enmMediumTypeNew;
 
     /** Holds the description label instance. */
@@ -77 +88 @@
     /** Holds the button-box instance. */
     QIDialogButtonBox *m_pButtonBox;
-
-    /** Holds the medium instance to be modified. */
-    CMedium m_medium;
-    /** Holds the old medium type. */
-    KMediumType m_enmMediumTypeOld;
-    /** Holds the new medium type. */
-    KMediumType m_enmMediumTypeNew;
 };