Changeset 91278 in vbox

Timestamp:

Sep 16, 2021 12:11:05 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996. Some more refactoring on disk editor classes

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors

Files:

• UIWizardDiskEditors.cpp (modified) (3 diffs)
• UIWizardDiskEditors.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardDiskEditors.cpp

@@ -50 +50 @@
 *********************************************************************************************************************************/
 
-UIDiskEditorGroupBox::UIDiskEditorGroupBox(bool fExpertMode, QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QGroupBox>(pParent)
-    , m_fExpertMode(fExpertMode)
-{
-    if (!m_fExpertMode)
-        setFlat(true);
-}
-
 /* static */
 QString UIDiskEditorGroupBox::appendExtension(const QString &strName, const QString &strExtension)
@@ -302 +294 @@
 
 UIMediumSizeAndPathGroupBox::UIMediumSizeAndPathGroupBox(bool fExpertMode, QWidget *pParent, qulonglong uMinimumMediumSize)
-    : UIDiskEditorGroupBox(fExpertMode, pParent)
+    : QIWithRetranslateUI<QGroupBox>(pParent)
     , m_pLocationEditor(0)
     , m_pLocationOpenButton(0)
@@ -308 +300 @@
     , m_pLocationLabel(0)
     , m_pSizeLabel(0)
+    , m_fExpertMode(fExpertMode)
 {
     prepare(uMinimumMediumSize);

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardDiskEditors.h

@@ -52 +52 @@
 #include "CMediumFormat.h"
 
-/** Base class for disk related group boxes. */
-class SHARED_LIBRARY_STUFF UIDiskEditorGroupBox : public QIWithRetranslateUI<QGroupBox>
-{
-    Q_OBJECT;
-
-public:
-
-    UIDiskEditorGroupBox(bool fExpertMode, QWidget *pParent = 0);
-
-    static QString appendExtension(const QString &strName, const QString &strExtension);
-    static QString constructMediumFilePath(const QString &strFileName, const QString &strPath);
-    static bool checkFATSizeLimitation(const qulonglong uVariant, const QString &strMediumPath, const qulonglong uSize);
-    static QString openFileDialogForDiskFile(const QString &strInitialPath, const CMediumFormat &comMediumFormat,
+/** A set of static utility functions used by several wizard in the context of virtual media. */
+namespace SHARED_LIBRARY_STUFF UIDiskEditorGroupBox
+{
+    QString appendExtension(const QString &strName, const QString &strExtension);
+    QString constructMediumFilePath(const QString &strFileName, const QString &strPath);
+    bool checkFATSizeLimitation(const qulonglong uVariant, const QString &strMediumPath, const qulonglong uSize);
+    QString openFileDialogForDiskFile(const QString &strInitialPath, const CMediumFormat &comMediumFormat,
                                              KDeviceType enmDeviceType, QWidget *pParent);
     /** Attempts to find a file extention for the device type @p enmDeviceType within the extensions
       * returned by CMediumFormat::DescribeFileExtensions(..). */
-    static QString defaultExtension(const CMediumFormat &mediumFormatRef, KDeviceType enmDeviceType);
-
-protected:
-
-    bool m_fExpertMode;
-};
-
+    QString defaultExtension(const CMediumFormat &mediumFormatRef, KDeviceType enmDeviceType);
+};
 
 class SHARED_LIBRARY_STUFF UIDiskVariantWidget : public QIWithRetranslateUI<QWidget>
@@ -114 +103 @@
 
 
-class SHARED_LIBRARY_STUFF UIMediumSizeAndPathGroupBox : public UIDiskEditorGroupBox
+class SHARED_LIBRARY_STUFF UIMediumSizeAndPathGroupBox : public QIWithRetranslateUI<QGroupBox>
 {
     Q_OBJECT;
@@ -153 +142 @@
     QIRichTextLabel *m_pLocationLabel;
     QIRichTextLabel *m_pSizeLabel;
+    bool m_fExpertMode;
 };