Changeset 100094 in vbox

Timestamp:

Jun 7, 2023 1:30:53 PM (18 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9080. Some more refactoring.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (2 diffs)
• medium/viso/UIVisoCreator.cpp (modified) (9 diffs)
• medium/viso/UIVisoCreator.h (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

@@ -1675 +1675 @@
             break;
         case UIMediumDeviceType_DVD:
-            uMediumId = UIVisoCreatorWidget::createViso(pActionPool, pParent, strDefaultFolder, strMachineName);
+            uMediumId = UIVisoCreatorDialog::createViso(pActionPool, pParent, strDefaultFolder, strMachineName);
             break;
         case UIMediumDeviceType_Floppy:
@@ -1908 +1908 @@
                 }
                 else if(target.type == UIMediumTarget::UIMediumTargetType_CreateAdHocVISO)
-                    uMediumID = UIVisoCreatorWidget::createViso(pActionPool, windowManager().mainWindowShown(),
+                    uMediumID = UIVisoCreatorDialog::createViso(pActionPool, windowManager().mainWindowShown(),
                                                                 strMachineFolder, comConstMachine.GetName());
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp

@@ -28 +28 @@
 /* Qt includes: */
 #include <QGridLayout>
+#include <QLabel>
 #include <QMenuBar>
 #include <QPushButton>
 #include <QStyle>
+#include <QStatusBar>
 #include <QTextStream>
 
@@ -62 +64 @@
 
 UIVisoCreatorWidget::UIVisoCreatorWidget(UIActionPool *pActionPool, QWidget *pParent,
-                                         bool fShowToolBar,const QString& strMachineName /* = QString() */)
+                                         bool fShowToolBar, const QString& strMachineName /* = QString() */)
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_pActionConfiguration(0)
@@ -78 +80 @@
     , m_pVerticalToolBar(0)
     , m_pMainMenu(0)
-    , m_strMachineName(strMachineName)
     , m_pCreatorOptionsPanel(0)
     , m_pConfigurationPanel(0)
@@ -528 +529 @@
 
 /* static */
-QUuid UIVisoCreatorWidget::createViso(UIActionPool *pActionPool, QWidget *pParent,
+QUuid UIVisoCreatorDialog::createViso(UIActionPool *pActionPool, QWidget *pParent,
                                       const QString &strDefaultFolder /* = QString() */,
                                       const QString &strMachineName /* = QString() */)
@@ -585 +586 @@
 UIVisoCreatorDialog::UIVisoCreatorDialog(UIActionPool *pActionPool, QWidget *pParent, const QString& strMachineName /* = QString() */)
     : QIWithRetranslateUI<QIWithRestorableGeometry<QIMainDialog> >(pParent)
-    , m_strMachineName(strMachineName)
     , m_pVisoCreatorWidget(0)
     , m_pButtonBox(0)
+    , m_pStatusBar(0)
+    , m_pStatusLabel(0)
     , m_pActionPool(pActionPool)
     , m_iGeometrySaveTimerId(-1)
@@ -594 +596 @@
        we manage escape key here with special casing: */
     setRejectByEscape(false);
-    prepareWidgets();
+    prepareWidgets(strMachineName);
     prepareConnections();
     loadSettings();
@@ -633 +635 @@
 }
 
-void UIVisoCreatorDialog::prepareWidgets()
+void UIVisoCreatorDialog::prepareWidgets(const QString &strMachineName)
 {
     QWidget *pCentralWidget = new QWidget;
@@ -641 +643 @@
 
 
-    m_pVisoCreatorWidget = new UIVisoCreatorWidget(m_pActionPool, this, true /* show toolbar */, m_strMachineName);
+    m_pVisoCreatorWidget = new UIVisoCreatorWidget(m_pActionPool, this, true /* show toolbar */, strMachineName);
     if (m_pVisoCreatorWidget)
     {
@@ -665 +667 @@
 
         uiCommon().setHelpKeyword(m_pButtonBox->button(QIDialogButtonBox::Help), "create-optical-disk-image");
+    }
+
+    m_pStatusLabel = new QLabel;
+    m_pStatusBar = new QStatusBar(this);
+    if (m_pButtonBox && m_pStatusLabel)
+    {
+        pMainLayout->addWidget(m_pStatusBar);
+        m_pStatusBar->addPermanentWidget(m_pStatusLabel);
     }
     retranslateUi();

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.h

@@ -43 +43 @@
 
 /* Forward declarations: */
+class QGridLayout;
+class QLabel;
 class QMenu;
-class QGridLayout;
+class QStatusBar;
 class QIDialogButtonBox;
-class UIDialogPanel;
 class QIToolBar;
 class UIActionPool;
+class UIDialogPanel;
 class UIVisoHostBrowser;
 class UIVisoContentBrowser;
@@ -65 +67 @@
     void sigSetCancelButtonShortCut(QKeySequence keySequence);
     void sigVisoNameChanged(const QString &strVisoName);
+    void sigVisoFilePathChanged(const QString &strPath);
 
 public:
@@ -79 +82 @@
     void    setCurrentPath(const QString &strPath);
     QMenu *menu() const;
-
-    /** Creates a VISO by using the VISO creator dialog.
-      * @param  pParent           Passes the dialog parent.
-      * @param  strDefaultFolder  Passes the folder to save the VISO file.
-      * @param  strMachineName    Passes the name of the machine,
-      * returns the UUID of the created medium or a null QUuid. */
-    static QUuid createViso(UIActionPool *pActionPool, QWidget *pParent,
-                            const QString &strDefaultFolder = QString(),
-                            const QString &strMachineName  = QString());
 
 #ifdef VBOX_WS_MAC
@@ -176 +170 @@
     BrowserOptions        m_browserOptions;
     QMenu                *m_pMainMenu;
-    QString               m_strMachineName;
     UIVisoCreatorOptionsPanel *m_pCreatorOptionsPanel;
     UIVisoConfigurationPanel  *m_pConfigurationPanel;
@@ -200 +193 @@
     void    setCurrentPath(const QString &strPath);
 
+    /** Creates a VISO by using the VISO creator dialog.
+      * @param  pParent           Passes the dialog parent.
+      * @param  strDefaultFolder  Passes the folder to save the VISO file.
+      * @param  strMachineName    Passes the name of the machine,
+      * returns the UUID of the created medium or a null QUuid. */
+    static QUuid createViso(UIActionPool *pActionPool, QWidget *pParent,
+                            const QString &strDefaultFolder = QString(),
+                            const QString &strMachineName  = QString());
+
 protected:
 
@@ -210 +212 @@
 
 private:
-    void prepareWidgets();
+    void prepareWidgets(const QString &strMachineName);
     void prepareConnections();
     virtual void retranslateUi() final override;
@@ -217 +219 @@
     void updateWindowTitle();
 
-    QString m_strMachineName;
     UIVisoCreatorWidget *m_pVisoCreatorWidget;
-    QIDialogButtonBox    *m_pButtonBox;
+    QIDialogButtonBox   *m_pButtonBox;
+    QStatusBar          *m_pStatusBar;
+    QLabel              *m_pStatusLabel;
     QPointer<UIActionPool> m_pActionPool;
     int                   m_iGeometrySaveTimerId;