Changeset 87859 in vbox

Timestamp:

Feb 24, 2021 1:01:12 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9950. Further refactoring

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd

Files:

• UIWizardNewVD.cpp (modified) (2 diffs)
• UIWizardNewVDPageBasic1.cpp (modified) (3 diffs)
• UIWizardNewVDPageBasic1.h (modified) (1 diff)
• UIWizardNewVDPageBasic2.cpp (modified) (4 diffs)
• UIWizardNewVDPageBasic2.h (modified) (1 diff)
• UIWizardNewVDPageBasic3.cpp (modified) (7 diffs)
• UIWizardNewVDPageBasic3.h (modified) (1 diff)
• UIWizardNewVDPageExpert.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.cpp

@@ -18 +18 @@
 /* Qt includes: */
 #include <QVariant>
-
+#include <QPushButton>
 /* GUI includes: */
 #include "UICommon.h"
@@ -49 +49 @@
     assignBackground(":/wizard_new_harddisk_bg.png");
 #endif /* VBOX_WS_MAC */
+    QPushButton *pButton = new QPushButton("boooo");
+    setSideWidget(pButton);
+
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic1.cpp

@@ -145 +145 @@
 }
 
+void UIWizardNewVDPage1::retranslateWidgets()
+{
+    QList<QAbstractButton*> buttons = m_pFormatButtonGroup->buttons();
+    for (int i = 0; i < buttons.size(); ++i)
+    {
+        QAbstractButton *pButton = buttons[i];
+        UIMediumFormat enmFormat = gpConverter->fromInternalString<UIMediumFormat>(m_formatNames[m_pFormatButtonGroup->id(pButton)]);
+        pButton->setText(gpConverter->toString(enmFormat));
+    }
+}
+
 UIWizardNewVDPageBasic1::UIWizardNewVDPageBasic1()
 {
@@ -169 +180 @@
 void UIWizardNewVDPageBasic1::retranslateUi()
 {
+    retranslateWidgets();
     /* Translate page: */
-    setTitle(UIWizardNewVD::tr("Hard disk file type"));
+    setTitle(UIWizardNewVD::tr("Virtual Hard disk file type"));
 
     /* Translate widgets: */
@@ -176 +188 @@
                                         "for the new virtual hard disk. If you do not need to use it "
                                         "with other virtualization software you can leave this setting unchanged."));
-    QList<QAbstractButton*> buttons = m_pFormatButtonGroup->buttons();
-    for (int i = 0; i < buttons.size(); ++i)
-    {
-        QAbstractButton *pButton = buttons[i];
-        UIMediumFormat enmFormat = gpConverter->fromInternalString<UIMediumFormat>(m_formatNames[m_pFormatButtonGroup->id(pButton)]);
-        pButton->setText(gpConverter->toString(enmFormat));
-    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic1.h

@@ -52 +52 @@
     CMediumFormat mediumFormat() const;
     void setMediumFormat(const CMediumFormat &mediumFormat);
+    void retranslateWidgets();
 
     /* Variables: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic2.cpp

@@ -72 +72 @@
 }
 
+void UIWizardNewVDPage2::retranslateWidgets()
+{
+    m_pDynamicalButton->setText(UIWizardNewVD::tr("&Dynamically allocated"));
+    m_pFixedButton->setText(UIWizardNewVD::tr("&Fixed size"));
+    m_pSplitBox->setText(UIWizardNewVD::tr("&Split into files of less than 2GB"));
+}
+
 UIWizardNewVDPageBasic2::UIWizardNewVDPageBasic2()
 {
@@ -119 +126 @@
 void UIWizardNewVDPageBasic2::retranslateUi()
 {
+    retranslateWidgets();
     /* Translate page: */
     setTitle(UIWizardNewVD::tr("Storage on physical hard disk"));
@@ -134 +142 @@
                                              "virtual machine on removable USB devices or old systems, some of which cannot "
                                              "handle very large files."));
-    m_pDynamicalButton->setText(UIWizardNewVD::tr("&Dynamically allocated"));
-    m_pFixedButton->setText(UIWizardNewVD::tr("&Fixed size"));
-    m_pSplitBox->setText(UIWizardNewVD::tr("&Split into files of less than 2GB"));
 }
 
@@ -168 +173 @@
     return mediumVariant() != (qulonglong)KMediumVariant_Max;
 }
-

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic2.h

@@ -43 +43 @@
     qulonglong mediumVariant() const;
     void setMediumVariant(qulonglong uMediumVariant);
+    void retranslateWidgets();
 
     /* Widgets: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic3.cpp

@@ -52 +52 @@
     , m_uMediumSizeMin(_4M)
     , m_uMediumSizeMax(uiCommon().virtualBox().GetSystemProperties().GetInfoVDSize())
+    , m_pLocationEditor(0)
+    , m_pLocationOpenButton(0)
+    , m_pEditorSize(0)
+
 {
 }
@@ -102 +106 @@
         if (QFileInfo(strChosenFilePath).suffix().isEmpty())
             strChosenFilePath += QString(".%1").arg(m_strDefaultExtension);
-        m_pLocationEditor->setText(QDir::toNativeSeparators(strChosenFilePath));
-        m_pLocationEditor->selectAll();
-        m_pLocationEditor->setFocus();
+        if (m_pLocationEditor)
+        {
+            m_pLocationEditor->setText(QDir::toNativeSeparators(strChosenFilePath));
+            m_pLocationEditor->selectAll();
+            m_pLocationEditor->setFocus();
+        }
     }
 }
@@ -200 +207 @@
 QString UIWizardNewVDPage3::mediumPath() const
 {
+    if (!m_pLocationEditor)
+        return QString();
     return absoluteFilePath(toFileName(m_pLocationEditor->text(), m_strDefaultExtension), m_strDefaultPath);
 }
@@ -205 +214 @@
 qulonglong UIWizardNewVDPage3::mediumSize() const
 {
-    return m_pEditorSize->mediumSize();
+    return m_pEditorSize ? m_pEditorSize->mediumSize() : 0;
 }
 
 void UIWizardNewVDPage3::setMediumSize(qulonglong uMediumSize)
 {
-    m_pEditorSize->setMediumSize(uMediumSize);
+    if (m_pEditorSize)
+        m_pEditorSize->setMediumSize(uMediumSize);
+}
+
+void UIWizardNewVDPage3::retranslateWidgets()
+{
+    if (m_pLocationOpenButton)
+        m_pLocationOpenButton->setToolTip(UIWizardNewVD::tr("Choose a location for new virtual hard disk file..."));
 }
 
@@ -259 +275 @@
 void UIWizardNewVDPageBasic3::retranslateUi()
 {
+    retranslateWidgets();
     /* Translate page: */
     setTitle(UIWizardNewVD::tr("File location and size"));
@@ -265 +282 @@
     m_pLocationLabel->setText(UIWizardNewVD::tr("Please type the name of the new virtual hard disk file into the box below or "
                                                 "click on the folder icon to select a different folder to create the file in."));
-    m_pLocationOpenButton->setToolTip(UIWizardNewVD::tr("Choose a location for new virtual hard disk file..."));
-    m_pSizeLabel->setText(UIWizardNewVD::tr("Select the size of the virtual hard disk in megabytes. "
-                                            "This size is the limit on the amount of file data "
-                                            "that a virtual machine will be able to store on the hard disk."));
+    if (m_pSizeLabel)
+        m_pSizeLabel->setText(UIWizardNewVD::tr("Select the size of the virtual hard disk in megabytes. "
+                                                "This size is the limit on the amount of file data "
+                                                "that a virtual machine will be able to store on the hard disk."));
 }
 
@@ -279 +296 @@
     m_strDefaultExtension = defaultExtension(field("mediumFormat").value<CMediumFormat>());
     /* Set default name as text for location editor: */
-    m_pLocationEditor->setText(absoluteFilePath(m_strDefaultName, m_strDefaultPath, m_strDefaultExtension));
+    if (m_pLocationEditor)
+        m_pLocationEditor->setText(absoluteFilePath(m_strDefaultName, m_strDefaultPath, m_strDefaultExtension));
 }
 
 bool UIWizardNewVDPageBasic3::isComplete() const
 {
+    if (!m_pLocationEditor)
+        return false;
     /* Make sure current name is not empty and current size feats the bounds: */
     return !m_pLocationEditor->text().trimmed().isEmpty() &&

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic3.h

@@ -65 +65 @@
     qulonglong mediumSize() const;
     void setMediumSize(qulonglong uMediumSize);
+    void retranslateWidgets();
 
     /* Variables: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageExpert.cpp

@@ -197 +197 @@
 void UIWizardNewVDPageExpert::retranslateUi()
 {
+    UIWizardNewVDPage1::retranslateWidgets();
+    UIWizardNewVDPage2::retranslateWidgets();
+    UIWizardNewVDPage3::retranslateWidgets();
     /* Translate widgets: */
     if (m_pLocationGroupBox)
         m_pLocationGroupBox->setTitle(UIWizardNewVD::tr("File &location"));
-    if (m_pLocationOpenButton)
-        m_pLocationOpenButton->setToolTip(UIWizardNewVD::tr("Choose a location for new virtual hard disk file..."));
     if (m_pSizeGroupBox)
         m_pSizeGroupBox->setTitle(UIWizardNewVD::tr("File &size"));