Changeset 100812 in vbox

Timestamp:

Aug 6, 2023 12:02:52 PM (20 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

158706

Message:

FE/Qt: ​bugref:10496, bugref:9080. A first pass on VISO creator's settings dialog/panel.

Location:

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

Files:

• UIVisoCreator.cpp (modified) (26 diffs)
• UIVisoCreator.h (modified) (8 diffs)

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

@@ -29 +29 @@
 #include <QCheckBox>
 #include <QGridLayout>
-#include <QGraphicsBlurEffect>
 #include <QGroupBox>
 #include <QMenuBar>
@@ -35 +34 @@
 #include <QPushButton>
 #include <QStyle>
-#include <QStackedLayout>
 #include <QTextStream>
 
@@ -66 +64 @@
 *********************************************************************************************************************************/
 
-class SHARED_LIBRARY_STUFF UIVisoSettingWidget : public QIWithRetranslateUI<QGroupBox>
+class SHARED_LIBRARY_STUFF UIVisoSettingWidget : public QIWithRetranslateUI<QWidget>
 {
     Q_OBJECT;
@@ -72 +70 @@
 signals:
 
-    void sigClosed(bool fWithAccept);
+    void sigSettingsChanged();
 
 public:
@@ -82 +80 @@
 
 private slots:
-
-    void sltButtonBoxOk();
-    void sltButtonBoxCancel();
 
 private:
@@ -98 +93 @@
     QCheckBox    *m_pShowHiddenObjectsCheckBox;
     QILabel      *m_pShowHiddenObjectsLabel;
-    QIDialogButtonBox *m_pButtonBox;
 };
 
@@ -107 +101 @@
 
 UIVisoSettingWidget::UIVisoSettingWidget(QWidget *pParent)
-    :QIWithRetranslateUI<QGroupBox>(pParent)
+    :QIWithRetranslateUI<QWidget>(pParent)
     , m_pTabWidget(0)
     , m_pVisoNameLabel(0)
@@ -115 +109 @@
     , m_pShowHiddenObjectsCheckBox(0)
     , m_pShowHiddenObjectsLabel(0)
-    , m_pButtonBox(0)
 {
     prepareObjects();
@@ -159 +152 @@
     pVisoOptionsGridLayout->addWidget(m_pCustomOptionsLineEdit, iRow, 1, 1, 1, Qt::AlignTop);
 
-
     ++iRow;
     pVisoOptionsGridLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding), iRow, 0, 1, 2);
@@ -172 +164 @@
     iRow = 0;
     m_pShowHiddenObjectsCheckBox = new QCheckBox;
-    m_pShowHiddenObjectsLabel = new QILabel(QApplication::translate("UIVisoCreatorWidget", "Show Hidden Objects"));
+    m_pShowHiddenObjectsLabel = new QILabel(QApplication::translate("UIVisoCreatorWidget", "Show Hidden Objects:"));
     m_pShowHiddenObjectsLabel->setBuddy(m_pShowHiddenObjectsCheckBox);
     pDialogSettingsContainerLayout->addWidget(m_pShowHiddenObjectsLabel,    iRow, 0, 1, 1, Qt::AlignTop);
@@ -179 +171 @@
     ++iRow;
     pDialogSettingsContainerLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding), iRow, 0, 1, 2);
-
-    m_pButtonBox = new QIDialogButtonBox;
-    AssertReturnVoid(m_pButtonBox);
-    m_pButtonBox->setDoNotPickDefaultButton(true);
-    m_pButtonBox->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
-    m_pButtonBox->button(QDialogButtonBox::Cancel)->setShortcut(QKeySequence(Qt::Key_Escape));
-    pMainLayout->addWidget(m_pButtonBox);
-
     retranslateUi();
 }
@@ -202 +186 @@
         m_pCustomOptionsLineEdit->setToolTip(QApplication::translate("UIVisoCreatorWidget", "The list of suctom options delimited with ';'."));
     if (m_pShowHiddenObjectsLabel)
-        m_pShowHiddenObjectsLabel->setText(QApplication::translate("UIVisoCreatorWidget", "Show Hidden Objects"));
+        m_pShowHiddenObjectsLabel->setText(QApplication::translate("UIVisoCreatorWidget", "Show Hidden Objects:"));
     if (m_pShowHiddenObjectsCheckBox)
         m_pShowHiddenObjectsCheckBox->setToolTip(QApplication::translate("UIVisoCreatorWidget", "When checked, "
@@ -210 +194 @@
 void UIVisoSettingWidget::prepareConnections()
 {
-    if (m_pButtonBox)
-    {
-        connect(m_pButtonBox, &QIDialogButtonBox::rejected, this, &UIVisoSettingWidget::sltButtonBoxCancel);
-        connect(m_pButtonBox, &QIDialogButtonBox::accepted, this, &UIVisoSettingWidget::sltButtonBoxOk);
-    }
-}
-
-void UIVisoSettingWidget::sltButtonBoxOk()
-{
-    emit sigClosed(true);
-}
-
-void UIVisoSettingWidget::sltButtonBoxCancel()
-{
-    emit sigClosed(false);
+    if (m_pVisoNameLineEdit)
+        connect(m_pVisoNameLineEdit, &QILineEdit::textChanged, this, &UIVisoSettingWidget::sigSettingsChanged);
+    if (m_pCustomOptionsLineEdit)
+        connect(m_pCustomOptionsLineEdit, &QILineEdit::textChanged, this, &UIVisoSettingWidget::sigSettingsChanged);
+    if (m_pShowHiddenObjectsCheckBox)
+        connect(m_pShowHiddenObjectsCheckBox, &QCheckBox::toggled, this, &UIVisoSettingWidget::sigSettingsChanged);
 }
 
@@ -271 +246 @@
     , m_pActionPool(pActionPool)
     , m_fShowToolBar(fShowToolBar)
-    , m_fShowSettingsDialog(false)
     , m_pSettingsWidget(0)
     , m_pBrowserContainerWidget(0)
-    , m_pStackedLayout(0)
     , m_strVisoFilePath(strVisoFilePath)
-{
-    m_visoOptions.m_strVisoName = !strMachineName.isEmpty() ? strMachineName : "ad-hoc";
+    , m_fShowSettingsDialog(false)
+{
+    m_settings.m_strVisoName = !strMachineName.isEmpty() ? strMachineName : "ad-hoc";
     prepareWidgets();
     populateMenuMainToolbar();
     prepareConnections();
     retranslateUi();
+    if (m_pActionSettings)
+        sltSettingsActionToggled(m_pActionSettings->isChecked());
 }
 
@@ -300 +276 @@
 const QString &UIVisoCreatorWidget::visoName() const
 {
-    return m_visoOptions.m_strVisoName;
+    return m_settings.m_strVisoName;
 }
 
 void UIVisoCreatorWidget::setVisoName(const QString& strName)
 {
-    if (m_visoOptions.m_strVisoName == strName)
+    if (m_settings.m_strVisoName == strName)
         return;
-    m_visoOptions.m_strVisoName = strName;
-    emit sigVisoNameChanged(m_visoOptions.m_strVisoName);
+    m_settings.m_strVisoName = strName;
+    emit sigVisoNameChanged(m_settings.m_strVisoName);
 }
 
@@ -321 +297 @@
 const QStringList &UIVisoCreatorWidget::customOptions() const
 {
-    return m_visoOptions.m_customOptions;
+    return m_settings.m_customOptions;
 }
 
@@ -345 +321 @@
 void UIVisoCreatorWidget::retranslateUi()
 {
-    if (m_pSettingsWidget)
-        m_pSettingsWidget->setTitle(tr("Settings"));
-}
-
-void UIVisoCreatorWidget::resizeEvent(QResizeEvent *pEvent)
-{
-    Q_UNUSED(pEvent);
-    if (m_pOverlayWidget && m_fShowSettingsDialog)
-    {
-#ifndef VBOX_IS_QT6_OR_LATER
-        const QPixmap *pLabelPixmap = m_pOverlayWidget->pixmap();
-        if (pLabelPixmap)
-        {
-            QPixmap newPixmap = pLabelPixmap->scaled(m_pOverlayWidget->size(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-            if (!newPixmap.isNull())
-                m_pOverlayWidget->setPixmap(newPixmap);
-        }
-#else
-        QPixmap labelPixmap = m_pOverlayWidget->pixmap();
-        QPixmap newPixmap = labelPixmap.scaled(m_pOverlayWidget->size(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-        if (!newPixmap.isNull())
-            m_pOverlayWidget->setPixmap(newPixmap);
-#endif
-    }
 }
 
@@ -379 +331 @@
 void UIVisoCreatorWidget::sltSettingsActionToggled(bool fChecked)
 {
-    if (m_fShowSettingsDialog == fChecked)
-        return;
     toggleSettingsWidget(fChecked);
-}
-
-void UIVisoCreatorWidget::sltSettingsDialogClosed(bool fAccepted)
-{
-    toggleSettingsWidget(false);
-    if (m_pActionSettings)
-        m_pActionSettings->setChecked(false);
-    /* Update settings:*/
-    if (fAccepted && m_pSettingsWidget)
-    {
-        Settings newSettings = m_pSettingsWidget->settings();
-        setVisoName(newSettings.m_strVisoName);
-        if (m_visoOptions.m_customOptions != newSettings.m_customOptions)
-            m_visoOptions.m_customOptions = newSettings.m_customOptions;
-        if (m_visoOptions.m_fShowHiddenObjects != newSettings.m_fShowHiddenObjects)
-            m_visoOptions.m_fShowHiddenObjects = newSettings.m_fShowHiddenObjects;
-    }
-}
-
-void UIVisoCreatorWidget::sltBrowserTreeViewVisibilityChanged(bool fVisible)
-{
-    Q_UNUSED(fVisible);
 }
 
@@ -473 +401 @@
     if (m_pRemoveISOAction)
         m_pRemoveISOAction->setEnabled(fImported);
+}
+
+void UIVisoCreatorWidget::sltSettingsChanged()
+{
+    AssertReturnVoid(m_pSettingsWidget);
+    const Settings &settings = m_pSettingsWidget->settings();
+    setVisoName(settings.m_strVisoName);
+    if (m_settings.m_customOptions != settings.m_customOptions)
+        m_settings.m_customOptions = settings.m_customOptions;
+    if (m_settings.m_fShowHiddenObjects != settings.m_fShowHiddenObjects)
+        m_settings.m_fShowHiddenObjects = settings.m_fShowHiddenObjects;
 }
 
@@ -506 +445 @@
         m_pToolBar->setIconSize(QSize(iIconMetric, iIconMetric));
         m_pToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
-        m_pMainLayout->addWidget(m_pToolBar);
-    }
-
-    m_pStackedLayout = new QStackedLayout;
-    AssertPtrReturnVoid(m_pStackedLayout);
-    m_pMainLayout->addLayout(m_pStackedLayout);
+    }
 
     m_pBrowserContainerWidget = new QWidget;
@@ -532 +466 @@
     pContainerLayout->addWidget(m_pVISOContentBrowser, 0, 5, 1, 4);
 
-    m_pOverlayWidget = new QLabel(this);
-    AssertPtrReturnVoid(m_pOverlayWidget);
-    m_pOverlayBlurEffect = new QGraphicsBlurEffect(this);
-    AssertPtrReturnVoid(m_pOverlayBlurEffect);
-    m_pOverlayWidget->setGraphicsEffect(m_pOverlayBlurEffect);
-    m_pOverlayBlurEffect->setEnabled(false);
-    m_pOverlayBlurEffect->setBlurRadius(4);
-
     m_pSettingsWidget = new UIVisoSettingWidget(this);
+
     AssertPtrReturnVoid(m_pSettingsWidget);
-    m_pSettingsWidget->setMinimumWidth(300);
-    m_pSettingsWidget->setMinimumHeight(300);
-    m_pStackedLayout->addWidget(m_pOverlayWidget);
-    m_pStackedLayout->addWidget(m_pBrowserContainerWidget);
-
-    m_pStackedLayout->setCurrentWidget(m_pBrowserContainerWidget);
+
+    if (m_pToolBar)
+        m_pMainLayout->addWidget(m_pToolBar);
+    m_pMainLayout->addWidget(m_pBrowserContainerWidget);
+    m_pMainLayout->addWidget(m_pSettingsWidget);
+    m_pBrowserContainerWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
+    m_pSettingsWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
     m_pSettingsWidget->hide();
 }
@@ -574 +502 @@
     if (m_pSettingsWidget)
     {
-        connect(m_pSettingsWidget, &UIVisoSettingWidget::sigClosed,
-                this, &UIVisoCreatorWidget::sltSettingsDialogClosed);
+        connect(m_pSettingsWidget, &UIVisoSettingWidget::sigSettingsChanged,
+                this, &UIVisoCreatorWidget::sltSettingsChanged);
     }
 
@@ -672 +600 @@
 void UIVisoCreatorWidget::toggleSettingsWidget(bool fShown)
 {
+    AssertReturnVoid(m_pSettingsWidget);
+    m_pSettingsWidget->setVisible(fShown);
     m_fShowSettingsDialog = fShown;
+
+    if (fShown)
+        m_pSettingsWidget->setSettings(m_settings);
+
     emit sigSettingDialogToggle(fShown);
-
-    if (m_pSettingsWidget && m_pSettingsWidget->isVisible() != m_fShowSettingsDialog /*&& m_pOverlayWidget*/ && m_pOverlayBlurEffect)
-    {
-        QPixmap shot = m_pBrowserContainerWidget->grab();
-        m_pOverlayWidget->setPixmap(shot);
-
-        if (m_fShowSettingsDialog)
-            m_pStackedLayout->setCurrentWidget(m_pOverlayWidget);
-        else
-            m_pStackedLayout->setCurrentWidget(m_pBrowserContainerWidget);
-
-        m_pSettingsWidget->setVisible(m_fShowSettingsDialog);
-
-        m_pOverlayBlurEffect->setEnabled(m_fShowSettingsDialog);
-        m_pSettingsWidget->raise();
-        if (m_fShowSettingsDialog)
-        {
-            int x = 0.5 * (m_pBrowserContainerWidget->width() - m_pSettingsWidget->width());
-            int y = 0.5 * (m_pBrowserContainerWidget->height() - m_pSettingsWidget->height());
-            m_pSettingsWidget->move(m_pBrowserContainerWidget->x() + x, m_pBrowserContainerWidget->y() + y);
-        }
-        if (m_pMainMenu)
-            m_pMainMenu->setEnabled(!m_fShowSettingsDialog);
-        if (m_fShowSettingsDialog)
-            m_pSettingsWidget->setSettings(m_visoOptions);
-    }
 }
 
@@ -809 +717 @@
         connect(m_pVisoCreatorWidget, &UIVisoCreatorWidget::sigVisoFilePathChanged,
                 this, &UIVisoCreatorDialog::sltVisoFilePathChanged);
-        connect(m_pVisoCreatorWidget, &UIVisoCreatorWidget::sigSettingDialogToggle,
-                this, &UIVisoCreatorDialog::sltSettingDialogToggle);
         connect(m_pVisoCreatorWidget, &UIVisoCreatorWidget::sigSave,
                 this, &UIVisoCreatorDialog::sltSave);
@@ -886 +792 @@
     Q_UNUSED(strPath);
     updateWindowTitle();
-}
-
-void UIVisoCreatorDialog::sltSettingDialogToggle(bool fIsShown)
-{
-    if (m_pButtonBox)
-        m_pButtonBox->setEnabled(!fIsShown);
 }
 
@@ -984 +884 @@
             stream << "\n";
             stream << customOptions().join("\n");
+            printf("%s\n", qPrintable(customOptions().join("\n")));
         }
         file.close();

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

@@ -44 +44 @@
 /* Forward declarations: */
 class QGridLayout;
-class QGraphicsBlurEffect;
 class QLabel;
-class QStackedLayout;
 class QVBoxLayout;
 class QILabel;
@@ -108 +106 @@
 
     virtual void retranslateUi() final override;
-    virtual void resizeEvent(QResizeEvent *pEvent) final override;
 
 private slots:
@@ -114 +111 @@
     void sltAddObjectsToViso(QStringList pathList);
     void sltSettingsActionToggled(bool fChecked);
-    void sltSettingsDialogClosed(bool fAccepted);
-    void sltBrowserTreeViewVisibilityChanged(bool fVisible);
     void sltHostBrowserTableSelectionChanged(QStringList pathList);
     void sltContentBrowserTableSelectionChanged(bool fIsSelectionEmpty);
@@ -123 +118 @@
     void sltISORemoveAction();
     void sltISOContentImportedOrRemoved(bool fImported);
+    void sltSettingsChanged();
 
 private:
@@ -129 +125 @@
     void prepareConnections();
     void prepareActions();
+    void setVisoName(const QString& strName);
+
     /** Creates and configures the vertical toolbar. Should be called after prepareActions() */
     void prepareVerticalToolBar();
@@ -137 +135 @@
     void toggleSettingsWidget(bool fShown);
     QStringList findISOFiles(const QStringList &pathList) const;
-    void setVisoName(const QString& strName);
     void setVisoFilePath(const QString& strPath);
 
@@ -160 +157 @@
     QIToolBar             *m_pToolBar;
     QIToolBar             *m_pVerticalToolBar;
-    Settings            m_visoOptions;
+    Settings               m_settings;
     QMenu                 *m_pMainMenu;
     QPointer<UIActionPool> m_pActionPool;
     bool                   m_fShowToolBar;
-    bool                   m_fShowSettingsDialog;
     UIVisoSettingWidget   *m_pSettingsWidget;
     QWidget               *m_pBrowserContainerWidget;
-    QLabel                *m_pOverlayWidget;
-    QGraphicsBlurEffect   *m_pOverlayBlurEffect;
-    QStackedLayout        *m_pStackedLayout;
     QString                m_strVisoFilePath;
+    bool                   m_fShowSettingsDialog;
 };
 
@@ -207 +201 @@
     void sltVisoNameChanged(const QString &strName);
     void sltVisoFilePathChanged(const QString &strPath);
-    void sltSettingDialogToggle(bool fIsShown);
     void sltSave();