Changeset 100123 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jun 8, 2023 1:45:18 PM (20 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9080. Removed one of the panels. It did not have enough stuff in it to deserve its existence.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/globals/UIActionPool.cpp (modified) (2 diffs)
• src/globals/UIActionPool.h (modified) (1 diff)
• src/medium/viso/UIVisoConfigurationPanel.cpp (modified) (7 diffs)
• src/medium/viso/UIVisoConfigurationPanel.h (modified) (5 diffs)
• src/medium/viso/UIVisoCreator.cpp (modified) (8 diffs)
• src/medium/viso/UIVisoCreator.h (modified) (3 diffs)
• src/medium/viso/UIVisoCreatorOptionsPanel.cpp (deleted)
• src/medium/viso/UIVisoCreatorOptionsPanel.h (deleted)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -871 +871 @@
         src/medium/viso/UIVisoCreator.h \
         src/medium/viso/UIVisoConfigurationPanel.h \
-        src/medium/viso/UIVisoCreatorOptionsPanel.h \
         src/medium/viso/UIVisoHostBrowser.h \
         src/notificationcenter/UINotificationCenter.h \
@@ -1454 +1453 @@
         src/medium/viso/UIVisoCreator.cpp \
         src/medium/viso/UIVisoConfigurationPanel.cpp \
-        src/medium/viso/UIVisoCreatorOptionsPanel.cpp \
         src/medium/viso/UIVisoHostBrowser.cpp \
         src/notificationcenter/UINotificationCenter.cpp \

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

@@ -2289 +2289 @@
     {
         setName(QApplication::translate("UIActionPool", "VISO Creator"));
-    }
-};
-
-/** Toggle action extension, used to toggle 'VISO Creator configuration' panel in file manager. */
-class UIActionMenuVISOCreatorToggleConfigPanel : public UIActionToggle
-{
-    Q_OBJECT;
-
-public:
-
-    /** Constructs action passing @a pParent to the base-class. */
-    UIActionMenuVISOCreatorToggleConfigPanel(UIActionPool *pParent)
-        : UIActionToggle(pParent)
-    {
-        setShortcutContext(Qt::WidgetWithChildrenShortcut);
-        setIcon(UIIconPool::iconSetFull(":/file_manager_options_32px.png",
-                                        ":/%file_manager_options_16px.png",
-                                        ":/file_manager_options_disabled_32px.png",
-                                        ":/file_manager_options_disabled_16px.png"));
-    }
-
-protected:
-
-    /** Returns shortcut extra-data ID. */
-    virtual QString shortcutExtraDataID() const RT_OVERRIDE
-    {
-        return QString("ToggleVISOCreatorConfigurationPanel");
-    }
-
-    /** Returns default shortcut. */
-    virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
-    {
-        return QKeySequence();
-    }
-
-    /** Handles translation event. */
-    virtual void retranslateUi() RT_OVERRIDE
-    {
-        setName(QApplication::translate("UIActionPool", "Configuration"));
-        setShortcutScope(QApplication::translate("UIActionPool", "VISO Creator"));
-        setStatusTip(QApplication::translate("UIActionPool", "Open panel for VISO Creator configuration"));
-        setToolTip(QApplication::translate("UIActionPool", "Open Configuration Panel")
-                   + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString())));
     }
 };
@@ -3229 +3186 @@
     /* Create VISO Creator actions: */
     m_pool[UIActionIndex_M_VISOCreator] = new UIActionMenuVISOCreator(this);
-    m_pool[UIActionIndex_M_VISOCreator_ToggleConfigPanel] = new UIActionMenuVISOCreatorToggleConfigPanel(this);
     m_pool[UIActionIndex_M_VISOCreator_ToggleOptionsPanel] = new UIActionMenuVISOCreatorToggleOptionsPanel(this);
     m_pool[UIActionIndex_M_VISOCreator_Add] = new UIActionMenuVISOCreatorAdd(this);

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h

@@ -151 +151 @@
     /* VISO Creator actions: */
     UIActionIndex_M_VISOCreator,
-    UIActionIndex_M_VISOCreator_ToggleConfigPanel,
     UIActionIndex_M_VISOCreator_ToggleOptionsPanel,
     UIActionIndex_M_VISOCreator_Add,

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

@@ -27 +27 @@
 
 /* Qt includes: */
+#include <QCheckBox>
 #include <QComboBox>
 #include <QGridLayout>
@@ -43 +44 @@
     , m_pVisoNameLineEdit(0)
     , m_pCustomOptionsLineEdit(0)
+    , m_pShowHiddenObjectsCheckBox(0)
+    , m_pShowHiddenObjectsLabel(0)
 {
     prepareObjects();
@@ -69 +72 @@
     m_pCustomOptionsLineEdit->clear();
     m_pCustomOptionsLineEdit->setText(visoCustomOptions.join(";"));
+}
+
+void UIVisoConfigurationPanel::setShowHiddenbjects(bool fShow)
+{
+    if (m_pShowHiddenObjectsCheckBox)
+        m_pShowHiddenObjectsCheckBox->setChecked(fShow);
 }
 
@@ -99 +108 @@
         mainLayout()->addWidget(m_pCustomOptionsLineEdit, Qt::AlignLeft);
     }
+
+
+    m_pShowHiddenObjectsCheckBox = new QCheckBox;
+    m_pShowHiddenObjectsLabel = new QILabel(QApplication::translate("UIVisoCreatorWidget", "Show Hidden Objects"));
+    m_pShowHiddenObjectsLabel->setBuddy(m_pShowHiddenObjectsCheckBox);
+    mainLayout()->addWidget(m_pShowHiddenObjectsCheckBox, 0, Qt::AlignLeft);
+    mainLayout()->addWidget(m_pShowHiddenObjectsLabel, 0, Qt::AlignLeft);
+    mainLayout()->addStretch(6);
+
+
     retranslateUi();
 }
@@ -108 +127 @@
     if (m_pCustomOptionsLabel)
         connect(m_pCustomOptionsLineEdit, &QILineEdit::editingFinished, this, &UIVisoConfigurationPanel::sltCustomOptionsEdited);
+    if (m_pShowHiddenObjectsCheckBox)
+        connect(m_pShowHiddenObjectsCheckBox, &QCheckBox::stateChanged,
+                this, &UIVisoConfigurationPanel::sltShowHiddenObjectsChange);
 }
 
@@ -121 +143 @@
     if (m_pCustomOptionsLineEdit)
         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"));
+    if (m_pShowHiddenObjectsCheckBox)
+        m_pShowHiddenObjectsCheckBox->setToolTip(QApplication::translate("UIVisoCreatorWidget", "When checked, "
+                                                                         "multiple hidden objects are shown in the file browser"));
 }
 
@@ -137 +164 @@
         emit sigVisoNameChanged(m_pVisoNameLineEdit->text());
 }
+
+void UIVisoConfigurationPanel::sltShowHiddenObjectsChange(int iState)
+{
+    if (iState == static_cast<int>(Qt::Checked))
+        sigShowHiddenObjects(true);
+    else
+        sigShowHiddenObjects(false);
+}

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

@@ -36 +36 @@
 
 /* Forward declarations: */
+class QCheckBox;
 class QComboBox;
 class QILabel;
@@ -49 +50 @@
     void sigVisoNameChanged(const QString &strVisoName);
     void sigCustomVisoOptionsChanged(const QStringList &customVisoOptions);
+    void sigShowHiddenObjects(bool fShow);
 
 public:
+
     UIVisoConfigurationPanel(QWidget *pParent = 0);
     ~UIVisoConfigurationPanel();
@@ -56 +59 @@
     void setVisoName(const QString& strVisoName);
     void setVisoCustomOptions(const QStringList& visoCustomOptions);
+    void setShowHiddenbjects(bool fShow);
 
 protected:
@@ -65 +69 @@
     void sltVisoNameChanged();
     void sltCustomOptionsEdited();
+    void sltShowHiddenObjectsChange(int iState);
 
 private:
@@ -75 +80 @@
     QILineEdit   *m_pVisoNameLineEdit;
     QILineEdit   *m_pCustomOptionsLineEdit;
+    QCheckBox    *m_pShowHiddenObjectsCheckBox;
+    QILabel      *m_pShowHiddenObjectsLabel;
 };
 

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

@@ -48 +48 @@
 #include "UIVisoCreator.h"
 #include "UIVisoConfigurationPanel.h"
-#include "UIVisoCreatorOptionsPanel.h"
 #include "UIVisoContentBrowser.h"
 #ifdef VBOX_WS_MAC
@@ -66 +65 @@
                                          bool fShowToolBar, const QString& strMachineName /* = QString() */)
     : QIWithRetranslateUI<QWidget>(pParent)
-    , m_pActionConfiguration(0)
     , m_pActionOptions(0)
     , m_pAddAction(0)
@@ -308 +306 @@
     }
 
-    m_pCreatorOptionsPanel = new UIVisoCreatorOptionsPanel;
+    m_pCreatorOptionsPanel = new UIVisoConfigurationPanel;
     if (m_pCreatorOptionsPanel)
     {
@@ -339 +337 @@
     }
 
-    if (m_pActionConfiguration)
-        connect(m_pActionConfiguration, &QAction::triggered, this, &UIVisoCreatorWidget::sltPanelActionToggled);
     if (m_pActionOptions)
         connect(m_pActionOptions, &QAction::triggered, this, &UIVisoCreatorWidget::sltPanelActionToggled);
@@ -352 +348 @@
         connect(m_pConfigurationPanel, &UIVisoConfigurationPanel::sigHidePanel,
                 this, &UIVisoCreatorWidget::sltHandleHidePanel);
-        m_panelActionMap.insert(m_pConfigurationPanel, m_pActionConfiguration);
     }
 
     if (m_pCreatorOptionsPanel)
     {
-        connect(m_pCreatorOptionsPanel, &UIVisoCreatorOptionsPanel::sigShowHiddenObjects,
+        connect(m_pCreatorOptionsPanel, &UIVisoConfigurationPanel::sigShowHiddenObjects,
                 this, &UIVisoCreatorWidget::sltHandleShowHiddenObjectsChange);
-        connect(m_pCreatorOptionsPanel, &UIVisoCreatorOptionsPanel::sigHidePanel,
+        connect(m_pCreatorOptionsPanel, &UIVisoConfigurationPanel::sigHidePanel,
                 this, &UIVisoCreatorWidget::sltHandleHidePanel);
         m_panelActionMap.insert(m_pCreatorOptionsPanel, m_pActionOptions);
@@ -390 +385 @@
         return;
 
-    m_pActionConfiguration = m_pActionPool->action(UIActionIndex_M_VISOCreator_ToggleConfigPanel);
     m_pActionOptions = m_pActionPool->action(UIActionIndex_M_VISOCreator_ToggleOptionsPanel);
 
-    m_pOpenAction = m_pActionPool->action(UIActionIndex_M_VISOCreator_Open);
     m_pAddAction = m_pActionPool->action(UIActionIndex_M_VISOCreator_Add);
     if (m_pAddAction && m_pHostBrowser)
@@ -412 +405 @@
     if (m_pToolBar)
     {
-        if (m_pActionConfiguration)
-            m_pToolBar->addAction(m_pActionConfiguration);
         if (m_pActionOptions)
             m_pToolBar->addAction(m_pActionOptions);
@@ -419 +410 @@
     if (m_pMainMenu)
     {
-        m_pMainMenu->addAction(m_pActionConfiguration);
         m_pMainMenu->addAction(m_pActionOptions);
         m_pMainMenu->addSeparator();

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

@@ -53 +53 @@
 class UIVisoHostBrowser;
 class UIVisoContentBrowser;
-class UIVisoCreatorOptionsPanel;
 class UIVisoConfigurationPanel;
 
@@ -147 +146 @@
     /** @name Main toolbar (and main menu) actions
       * @{ */
-        QAction         *m_pActionConfiguration;
         QAction         *m_pActionOptions;
     /** @} */
@@ -170 +168 @@
     BrowserOptions        m_browserOptions;
     QMenu                *m_pMainMenu;
-    UIVisoCreatorOptionsPanel *m_pCreatorOptionsPanel;
+    UIVisoConfigurationPanel  *m_pCreatorOptionsPanel;
     UIVisoConfigurationPanel  *m_pConfigurationPanel;
     QMap<UIDialogPanel*, QAction*> m_panelActionMap;