Changeset 100169 in vbox

Timestamp:

Jun 13, 2023 3:14:29 PM (22 months ago)

Author:

vboxsync

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

157869

Message:

FE/Qt: bugref:9080. More work on the settings dialog.

Location:

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

Files:

• UIVisoContentBrowser.cpp (modified) (5 diffs)
• UIVisoCreator.cpp (modified) (10 diffs)
• UIVisoCreator.h (modified) (3 diffs)
• UIVisoHostBrowser.cpp (modified) (3 diffs)

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

@@ -29 +29 @@
 /* Qt includes: */
 #include <QDir>
+#include <QItemDelegate>
 #include <QFileInfo>
 #include <QGridLayout>
@@ -41 +42 @@
 #include "UIVisoContentBrowser.h"
 
+
+/*********************************************************************************************************************************
+*   UIContentBrowserDelegate definition.                                                                                         *
+*********************************************************************************************************************************/
+/** A QItemDelegate child class to disable dashed lines drawn around selected cells in QTableViews */
+class UIContentBrowserDelegate : public QItemDelegate
+{
+
+    Q_OBJECT;
+
+public:
+
+    UIContentBrowserDelegate(QObject *pParent)
+        : QItemDelegate(pParent){}
+
+protected:
+
+    virtual void drawFocus ( QPainter * /*painter*/, const QStyleOptionViewItem & /*option*/, const QRect & /*rect*/ ) const {}
+};
+
+
 /*********************************************************************************************************************************
 *   UIVisoContentTableView definition.                                                                                      *
@@ -94 +116 @@
 {
     event->acceptProposedAction();
-
 }
 
@@ -420 +441 @@
         m_pTableView->setAlternatingRowColors(true);
         m_pTableView->setTabKeyNavigation(false);
+        m_pTableView->setItemDelegate(new UIContentBrowserDelegate(this));
         QHeaderView *pVerticalHeader = m_pTableView->verticalHeader();
         if (pVerticalHeader)
@@ -716 +738 @@
     if (selectedItems.empty())
         return;
-    /* This is not complete. we have to modify the entries in the m_entryMap as well: */
     renameFileObject(selectedItems.at(0));
 }

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

@@ -80 +80 @@
     UIVisoSettingWidget(QWidget *pParent);
     virtual void retranslateUi();
+    void setSettings(const UIVisoCreatorWidget::Settings &settings);
+    UIVisoCreatorWidget::Settings settings() const;
 
 private slots:
@@ -209 +211 @@
 {
     emit sigClosed(false);
+}
+
+
+void UIVisoSettingWidget::setSettings(const UIVisoCreatorWidget::Settings &settings)
+{
+    if (m_pVisoNameLineEdit)
+        m_pVisoNameLineEdit->setText(settings.m_strVisoName);
+    if (m_pCustomOptionsLineEdit)
+        m_pCustomOptionsLineEdit->setText(settings.m_customOptions.join(";"));
+    if (m_pShowHiddenObjectsCheckBox)
+        m_pShowHiddenObjectsCheckBox->setChecked(settings.m_fShowHiddenObjects);
+}
+
+UIVisoCreatorWidget::Settings UIVisoSettingWidget::settings() const
+{
+    UIVisoCreatorWidget::Settings settings;
+    if (m_pVisoNameLineEdit)
+        settings.m_strVisoName = m_pVisoNameLineEdit->text();
+    if (m_pCustomOptionsLineEdit)
+        settings.m_customOptions = m_pCustomOptionsLineEdit->text().split(";");
+    if (m_pShowHiddenObjectsCheckBox)
+        settings.m_fShowHiddenObjects = m_pShowHiddenObjectsCheckBox->isChecked();
+    return settings;
 }
 
@@ -333 +358 @@
         m_pActionSettings->setChecked(false);
     /* Update settings:*/
-    if (fAccepted)
-    {
+    if (fAccepted && m_pSettingsWidget)
+    {
+        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);
+        }
+        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;
     }
 }
@@ -447 +482 @@
     m_pOverlayWidget->setGraphicsEffect(m_pOverlayBlurEffect);
     m_pOverlayBlurEffect->setEnabled(false);
-    m_pOverlayBlurEffect->setBlurRadius(6);
+    m_pOverlayBlurEffect->setBlurRadius(4);
 
     m_pSettingsWidget = new UIVisoSettingWidget(this);
-    m_pSettingsWidget->setFixedWidth(300);
-    m_pSettingsWidget->setFixedHeight(300);
     AssertPtrReturnVoid(m_pSettingsWidget);
-
+    m_pSettingsWidget->setMinimumWidth(300);
+    m_pSettingsWidget->setMinimumHeight(300);
     m_pStackedLayout->addWidget(m_pOverlayWidget);
     m_pStackedLayout->addWidget(m_pBrowserContainerWidget);
@@ -563 +597 @@
         /* Add to dummy QWidget to toolbar to center the action icons vertically: */
         QWidget *topSpacerWidget = new QWidget(this);
+        AssertPtrReturnVoid(topSpacerWidget);
         topSpacerWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
         topSpacerWidget->setVisible(true);
         QWidget *bottomSpacerWidget = new QWidget(this);
+        AssertPtrReturnVoid(bottomSpacerWidget);
         bottomSpacerWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
         bottomSpacerWidget->setVisible(true);
@@ -612 +648 @@
         if (m_pMainMenu)
             m_pMainMenu->setEnabled(!m_fShowSettingsDialog);
+        if (m_fShowSettingsDialog)
+            m_pSettingsWidget->setSettings(m_visoOptions);
     }
 }
@@ -618 +656 @@
 {
     m_pVerticalToolBar = new QIToolBar;
-    if (!m_pVerticalToolBar)
-        return;
+    AssertPtrReturnVoid(m_pVerticalToolBar);
 
     m_pVerticalToolBar->setOrientation(Qt::Vertical);
@@ -636 +673 @@
     UIVisoCreatorDialog *pVisoCreator = new UIVisoCreatorDialog(pActionPool, pDialogParent,
                                                                 strVisoSaveFolder, strMachineName);
-
-    if (!pVisoCreator)
-        return QUuid();
+    AssertPtrReturn(pVisoCreator, QUuid());
+
     windowManager().registerNewParent(pVisoCreator, pDialogParent);
     pVisoCreator->setCurrentPath(gEDataManager->visoCreatorRecentFolder());
@@ -737 +773 @@
 {
     QWidget *pCentralWidget = new QWidget;
+    AssertPtrReturnVoid(pCentralWidget);
     setCentralWidget(pCentralWidget);
     QVBoxLayout *pMainLayout = new QVBoxLayout;
+    AssertPtrReturnVoid(pMainLayout);
     pCentralWidget->setLayout(pMainLayout);
 
 
     m_pVisoCreatorWidget = new UIVisoCreatorWidget(m_pActionPool, this, true /* show toolbar */, strMachineName);
-    if (m_pVisoCreatorWidget && m_pVisoCreatorWidget->menu())
+    AssertPtrReturnVoid(m_pVisoCreatorWidget);
+    if (m_pVisoCreatorWidget->menu())
     {
         menuBar()->addMenu(m_pVisoCreatorWidget->menu());
@@ -756 +795 @@
 
     m_pButtonBox = new QIDialogButtonBox;
-    if (m_pButtonBox)
-    {
-        m_pButtonBox->setDoNotPickDefaultButton(true);
-        m_pButtonBox->setStandardButtons(QDialogButtonBox::Help | QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
-        m_pButtonBox->button(QDialogButtonBox::Cancel)->setShortcut(QKeySequence(Qt::Key_Escape));
-        pMainLayout->addWidget(m_pButtonBox);
-
-        // connect(m_pButtonBox->button(QIDialogButtonBox::Help), &QPushButton::pressed,
-        //         m_pButtonBox, &QIDialogButtonBox::sltHelpRequest);
-
-        m_pButtonBox->button(QDialogButtonBox::Help)->setShortcut(QKeySequence::HelpContents);
-
-        uiCommon().setHelpKeyword(m_pButtonBox->button(QIDialogButtonBox::Help), "create-optical-disk-image");
-    }
+    AssertPtrReturnVoid(m_pButtonBox);
+    m_pButtonBox->setDoNotPickDefaultButton(true);
+    m_pButtonBox->setStandardButtons(QDialogButtonBox::Help | QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
+    m_pButtonBox->button(QDialogButtonBox::Cancel)->setShortcut(QKeySequence(Qt::Key_Escape));
+    pMainLayout->addWidget(m_pButtonBox);
+
+    connect(m_pButtonBox->button(QIDialogButtonBox::Help), &QPushButton::pressed,
+            m_pButtonBox, &QIDialogButtonBox::sltHandleHelpRequest);
+
+    m_pButtonBox->button(QDialogButtonBox::Help)->setShortcut(QKeySequence::HelpContents);
+
+    uiCommon().setHelpKeyword(m_pButtonBox->button(QIDialogButtonBox::Help), "create-optical-disk-image");
 
     m_pStatusLabel = new QILabel;
     m_pStatusBar = new QStatusBar(this);
-    if (m_pButtonBox && m_pStatusLabel)
-    {
-        pMainLayout->addWidget(m_pStatusBar);
-        m_pStatusBar->addPermanentWidget(m_pStatusLabel);
-    }
+    AssertPtrReturnVoid(m_pButtonBox);
+    AssertPtrReturnVoid(m_pStatusLabel);
+
+    pMainLayout->addWidget(m_pStatusBar);
+    m_pStatusBar->addPermanentWidget(m_pStatusLabel);
+
     retranslateUi();
 }

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

@@ -74 +74 @@
 public:
 
+    struct Settings
+    {
+        Settings()
+            : m_strVisoName("ad-hoc-viso")
+            , m_fShowHiddenObjects(true){}
+        QString m_strVisoName;
+        /** Additions viso options to be inserted to the viso file as separate lines. */
+        QStringList m_customOptions;
+        /* If host file browser shows hidden file objects. */
+        bool m_fShowHiddenObjects;
+    };
+
     UIVisoCreatorWidget(UIActionPool *pActionPool, QWidget *pParent,
                         bool fShowToolBar, const QString& strMachineName = QString());
@@ -109 +121 @@
 private:
 
-    struct VisoOptions
-    {
-        VisoOptions()
-            :m_strVisoName("ad-hoc-viso"){}
-        QString m_strVisoName;
-        /** Additions viso options to be inserted to the viso file as separate lines. */
-        QStringList m_customOptions;
-    };
-
-    struct BrowserOptions
-    {
-        BrowserOptions()
-            :m_fShowHiddenObjects(true){}
-        bool m_fShowHiddenObjects;
-    };
-
     void prepareWidgets();
     void prepareConnections();
@@ -156 +152 @@
     QIToolBar             *m_pToolBar;
     QIToolBar             *m_pVerticalToolBar;
-    VisoOptions            m_visoOptions;
-    BrowserOptions         m_browserOptions;
+    Settings            m_visoOptions;
     QMenu                 *m_pMainMenu;
     QPointer<UIActionPool> m_pActionPool;

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

@@ -29 +29 @@
 #include <QGridLayout>
 #include <QHeaderView>
+#include <QItemDelegate>
 #include <QMimeData>
 #include <QTextEdit>
@@ -36 +37 @@
 /* GUI includes: */
 #include "UIVisoHostBrowser.h"
+
+
+/*********************************************************************************************************************************
+*   UIHostBrowserDelegate definition.                                                                                            *
+*********************************************************************************************************************************/
+/** A QItemDelegate child class to disable dashed lines drawn around selected cells in QTableViews */
+class UIHostBrowserDelegate : public QItemDelegate
+{
+
+    Q_OBJECT;
+
+public:
+
+    UIHostBrowserDelegate(QObject *pParent)
+        : QItemDelegate(pParent){}
+
+protected:
+
+    virtual void drawFocus ( QPainter * /*painter*/, const QStyleOptionViewItem & /*option*/, const QRect & /*rect*/ ) const {}
+};
 
 /*********************************************************************************************************************************
@@ -184 +205 @@
         m_pTableView->setAlternatingRowColors(true);
         m_pTableView->setTabKeyNavigation(false);
+        m_pTableView->setItemDelegate(new UIHostBrowserDelegate(this));
         QHeaderView *pVerticalHeader = m_pTableView->verticalHeader();
         if (pVerticalHeader)