Changeset 100500 in vbox for trunk/src/VBox

Timestamp:

Jul 11, 2023 9:36:58 AM (17 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9080. Implementing saveas slot.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso

Files:

• UIVisoCreator.cpp (modified) (13 diffs)
• UIVisoCreator.h (modified) (3 diffs)

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

@@ -255 +255 @@
 
 UIVisoCreatorWidget::UIVisoCreatorWidget(UIActionPool *pActionPool, QWidget *pParent,
-                                         bool fShowToolBar, const QString& strVisoSavePath, const QString& strMachineName)
+                                         bool fShowToolBar, const QString& strVisoFilePath, const QString& strMachineName)
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_pActionSettings(0)
@@ -275 +275 @@
     , m_pBrowserContainerWidget(0)
     , m_pStackedLayout(0)
-    , m_strVisoSavePath(strVisoSavePath)
+    , m_strVisoFilePath(strVisoFilePath)
 {
     m_visoOptions.m_strVisoName = !strMachineName.isEmpty() ? strMachineName : "ad-hoc";
@@ -301 +301 @@
 {
     return m_visoOptions.m_strVisoName;
+}
+
+void UIVisoCreatorWidget::setVisoName(const QString& strName)
+{
+    if (m_visoOptions.m_strVisoName == strName)
+        return;
+    m_visoOptions.m_strVisoName = strName;
+    emit sigVisoNameChanged(m_visoOptions.m_strVisoName);
+}
+
+void UIVisoCreatorWidget::setVisoFilePath(const QString& strPath)
+{
+    if (m_strVisoFilePath == strPath)
+        return;
+    m_strVisoFilePath = strPath;
+    emit sigVisoFilePathChanged(m_strVisoFilePath);
 }
 
@@ -377 +393 @@
     {
         Settings newSettings = m_pSettingsWidget->settings();
-        if (m_visoOptions.m_strVisoName != newSettings.m_strVisoName)
-        {
-            m_visoOptions.m_strVisoName = newSettings.m_strVisoName;
-            emit sigVisoNameChanged(m_visoOptions.m_strVisoName);
-        }
+        setVisoName(newSettings.m_strVisoName);
         if (m_visoOptions.m_customOptions != newSettings.m_customOptions)
             m_visoOptions.m_customOptions = newSettings.m_customOptions;
@@ -420 +432 @@
 void UIVisoCreatorWidget::sltSaveAsAction()
 {
-    // QString strSaveFileName = getSaveFileName(visoFileFullPath(), "VISO files (*.viso)", this,
-    //                                           UIVisoCreatorWidget::tr("Select a file to save Viso content to"));
+    QString strSaveFileName = QIFileDialog::getSaveFileName(visoFileFullPath(), "VISO files (*.viso)", this,
+                                                            UIVisoCreatorWidget::tr("Select a file to save Viso content to"));
+    if (visoFileFullPath() != strSaveFileName)
+    {
+        QFileInfo fileInfo(strSaveFileName);
+        setVisoFilePath(fileInfo.absolutePath());
+        setVisoName(fileInfo.fileName());
+    }
 }
 
@@ -695 +713 @@
 QString UIVisoCreatorWidget::visoFileFullPath() const
 {
-    return QString("%1/%2%3").arg(m_strVisoSavePath).arg(visoName()).arg(".viso");
+    return QString("%1/%2%3").arg(m_strVisoFilePath).arg(visoName()).arg(".viso");
 }
 
@@ -703 +721 @@
 *********************************************************************************************************************************/
 UIVisoCreatorDialog::UIVisoCreatorDialog(UIActionPool *pActionPool, QWidget *pParent,
-                                         const QString& strVisoSavePath, const QString& strMachineName /* = QString() */)
+                                         const QString& strVisoFilePath, const QString& strMachineName /* = QString() */)
     : QIWithRetranslateUI<QIWithRestorableGeometry<QIMainDialog> >(pParent)
     , m_pVisoCreatorWidget(0)
@@ -713 +731 @@
        we manage escape key here with special casing: */
     setRejectByEscape(false);
-    prepareWidgets(strVisoSavePath, strMachineName);
-    prepareConnections();
+    prepareWidgets(strVisoFilePath, strMachineName);
     loadSettings();
 }
@@ -759 +776 @@
 }
 
-void UIVisoCreatorDialog::prepareWidgets(const QString& strVisoSavePath, const QString &strMachineName)
+void UIVisoCreatorDialog::prepareWidgets(const QString& strVisoFilePath, const QString &strMachineName)
 {
     QWidget *pCentralWidget = new QWidget;
@@ -769 +786 @@
 
 
-    m_pVisoCreatorWidget = new UIVisoCreatorWidget(m_pActionPool, this, true /* show toolbar */, strVisoSavePath, strMachineName);
+    m_pVisoCreatorWidget = new UIVisoCreatorWidget(m_pActionPool, this, true /* show toolbar */, strVisoFilePath, strMachineName);
     AssertPtrReturnVoid(m_pVisoCreatorWidget);
     if (m_pVisoCreatorWidget->menu())
@@ -779 +796 @@
         connect(m_pVisoCreatorWidget, &UIVisoCreatorWidget::sigVisoNameChanged,
                 this, &UIVisoCreatorDialog::sltVisoNameChanged);
+        connect(m_pVisoCreatorWidget, &UIVisoCreatorWidget::sigVisoFilePathChanged,
+                this, &UIVisoCreatorDialog::sltVisoFilePathChanged);
         connect(m_pVisoCreatorWidget, &UIVisoCreatorWidget::sigSettingDialogToggle,
                 this, &UIVisoCreatorDialog::sltSettingDialogToggle);
@@ -795 +814 @@
     m_pButtonBox->button(QDialogButtonBox::Help)->setShortcut(QKeySequence::HelpContents);
 
+    connect(m_pButtonBox, &QIDialogButtonBox::rejected, this, &UIVisoCreatorDialog::close);
+    connect(m_pButtonBox, &QIDialogButtonBox::accepted, this, &UIVisoCreatorDialog::accept);
+
+
     uiCommon().setHelpKeyword(m_pButtonBox->button(QIDialogButtonBox::Help), "create-optical-disk-image");
 
     retranslateUi();
-}
-
-void UIVisoCreatorDialog::prepareConnections()
-{
-    if (m_pButtonBox)
-    {
-        connect(m_pButtonBox, &QIDialogButtonBox::rejected, this, &UIVisoCreatorDialog::close);
-        connect(m_pButtonBox, &QIDialogButtonBox::accepted, this, &UIVisoCreatorDialog::accept);
-    }
 }
 
@@ -852 +866 @@
 {
     Q_UNUSED(strName);
+    updateWindowTitle();
+}
+
+void UIVisoCreatorDialog::sltVisoFilePathChanged(const QString &strPath)
+{
+    Q_UNUSED(strPath);
     updateWindowTitle();
 }

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

@@ -136 +136 @@
     void toggleSettingsWidget(bool fShown);
     QStringList findISOFiles(const QStringList &pathList) const;
+    void setVisoName(const QString& strName);
+    void setVisoFilePath(const QString& strPath);
+
     /** @name Main toolbar (and main menu) actions
       * @{ */
@@ -166 +169 @@
     QGraphicsBlurEffect   *m_pOverlayBlurEffect;
     QStackedLayout        *m_pStackedLayout;
-    QString                m_strVisoSavePath;
+    QString                m_strVisoFilePath;
 };
 
@@ -203 +206 @@
     void sltSetCancelButtonShortCut(QKeySequence keySequence);
     void sltVisoNameChanged(const QString &strName);
+    void sltVisoFilePathChanged(const QString &strPath);
     void sltSettingDialogToggle(bool fIsShown);
 
 private:
     void prepareWidgets(const QString& strVisoSavePath, const QString &strMachineName);
-    void prepareConnections();
     virtual void retranslateUi() final override;
     void loadSettings();