Changeset 100880 in vbox for trunk/src/VBox

Timestamp:

Aug 15, 2023 11:31:30 AM (19 months ago)

Author:

vboxsync

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

158800

Message:

FE/Qt: bugref:10496, bugref:6699. Removing the options panel from the file manager.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/guestctrl/UIFileManager.cpp (modified) (8 diffs)
• src/guestctrl/UIFileManager.h (modified) (5 diffs)
• src/guestctrl/UIFileManagerOptionsPanel.cpp (deleted)
• src/guestctrl/UIFileManagerOptionsPanel.h (deleted)
• src/guestctrl/UIFileManagerPanel.cpp (modified) (1 diff)

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

@@ -847 +847 @@
         src/guestctrl/UIFileManagerLogPanel.h \
         src/guestctrl/UIFileManagerOperationsPanel.h \
-        src/guestctrl/UIFileManagerOptionsPanel.h \
         src/guestctrl/UIFileManagerPanel.h \
         src/guestctrl/UIFileManagerTable.h \
@@ -1430 +1429 @@
         src/guestctrl/UIFileManagerPanel.cpp \
         src/guestctrl/UIFileManagerOperationsPanel.cpp \
-        src/guestctrl/UIFileManagerOptionsPanel.cpp \
         src/guestctrl/UIFileManagerTable.cpp \
         src/helpbrowser/UIHelpBrowserDialog.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.cpp

@@ -43 +43 @@
 #include "UIFileManager.h"
 #include "UIFileManagerPanel.h"
-#include "UIFileManagerOptionsPanel.h"
 #include "UIFileManagerLogPanel.h"
 #include "UIFileManagerOperationsPanel.h"
@@ -136 +135 @@
     , m_pActionPool(pActionPool)
     , m_fShowToolbar(fShowToolbar)
-    , m_pOptionsPanel(0)
     , m_pLogPanel(0)
     , m_pOperationsPanel(0)
@@ -237 +235 @@
     for (int i = 0; i < m_pFileTableSplitter->count(); ++i)
         m_pFileTableSplitter->setCollapsible(i, false);
-
-    /* Create options and session panels and insert them into pTopLayout: */
-    prepareOptionsAndSessionPanels(pTopLayout);
 
     /** Vertical splitter has 3 widgets. Log panel as bottom most one, operations panel on top of it,
@@ -319 +314 @@
                     this, &UIFileManager::sltCopyHostToGuest);
     }
-    if (m_pOptionsPanel)
-    {
-        connect(m_pOptionsPanel, &UIFileManagerOptionsPanel::sigHidePanel,
-                this, &UIFileManager::sltHandleHidePanel);
-        connect(m_pOptionsPanel, &UIFileManagerOptionsPanel::sigShowPanel,
-                this, &UIFileManager::sltHandleShowPanel);
-        connect(m_pOptionsPanel, &UIFileManagerOptionsPanel::sigOptionsChanged,
-                this, &UIFileManager::sltHandleOptionsUpdated);
-    }
     if (m_pLogPanel)
     {
@@ -347 +333 @@
         connect(m_pHostFileTable, &UIFileManagerHostTable::sigLogOutput,
                 this, &UIFileManager::sltReceieveLogOutput);
-        connect(m_pHostFileTable, &UIFileManagerHostTable::sigDeleteConfirmationOptionChanged,
-                this, &UIFileManager::sltHandleOptionsUpdated);
         connect(m_pHostFileTable, &UIFileManagerGuestTable::sigSelectionChanged,
                 this, &UIFileManager::sltFileTableSelectionChanged);
@@ -445 +429 @@
 }
 
-void UIFileManager::sltHandleOptionsUpdated()
-{
-    if (m_pOptionsPanel)
-        m_pOptionsPanel->update();
-
-    for (int i = 0; i < m_pGuestTablesContainer->count(); ++i)
-    {
-        UIFileManagerGuestTable *pTable = qobject_cast<UIFileManagerGuestTable*>(m_pGuestTablesContainer->widget(i));
-        if (pTable)
-            pTable->optionsUpdated();
-    }
-    if (m_pHostFileTable)
-        m_pHostFileTable->optionsUpdated();
-    saveOptions();
-}
-
 void UIFileManager::sltHandleHidePanel(UIDialogPanel *pPanel)
 {
@@ -574 +542 @@
         if (pGuestFileTable)
             pGuestFileTable->copyHostToGuest(m_pHostFileTable->selectedItemPathList());
-    }
-}
-
-void UIFileManager::prepareOptionsAndSessionPanels(QVBoxLayout *pLayout)
-{
-    if (!pLayout)
-        return;
-
-    m_pOptionsPanel = new UIFileManagerOptionsPanel(0 /*parent */, UIFileManagerOptions::instance());
-    if (m_pOptionsPanel)
-    {
-        m_pOptionsPanel->hide();
-        m_panelActionMap.insert(m_pOptionsPanel, m_pActionPool->action(UIActionIndex_M_FileManager_T_Options));
-        pLayout->addWidget(m_pOptionsPanel);
     }
 }
@@ -849 +803 @@
             connect(pGuestFileTable, &UIFileManagerGuestTable::sigNewFileOperation,
                     this, &UIFileManager::sltReceieveNewFileOperation);
-            connect(pGuestFileTable, &UIFileManagerGuestTable::sigDeleteConfirmationOptionChanged,
-                    this, &UIFileManager::sltHandleOptionsUpdated);
             connect(pGuestFileTable, &UIFileManagerGuestTable::sigStateChanged,
                     this, &UIFileManager::sltGuestFileTableStateChanged);

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.h

@@ -56 +56 @@
 class UIFileManagerPanel;
 class UIFileManagerOperationsPanel;
-class UIFileManagerOptionsPanel;
 class UIFileManagerGuestTable;
 class UIFileManagerHostTable;
@@ -123 +122 @@
     void sltReceieveNewFileOperation(const CProgress &comProgress, const QString &strTableName);
     void sltFileOperationComplete(QUuid progressId);
-    /** Performs whatever necessary when some signal about option change has been receieved. */
-    void sltHandleOptionsUpdated();
     void sltHandleHidePanel(UIDialogPanel *pPanel);
     void sltHandleShowPanel(UIDialogPanel *pPanel);
@@ -138 +135 @@
     void prepareVerticalToolBar(QHBoxLayout *layout);
     void prepareToolBar();
-    /** Creates options and sessions panels and adds them to @p pLayout.  */
-    void prepareOptionsAndSessionPanels(QVBoxLayout *pLayout);
     void prepareOperationsAndLogPanels(QSplitter *pSplitter);
 
@@ -185 +180 @@
     QMap<UIDialogPanel*, QAction*> m_panelActionMap;
     QList<UIDialogPanel*>          m_visiblePanelsList;
-    UIFileManagerOptionsPanel     *m_pOptionsPanel;
     UIFileManagerLogPanel         *m_pLogPanel;
     UIFileManagerOperationsPanel  *m_pOperationsPanel;
@@ -193 +187 @@
     QVector<QUuid> m_machineIds;
 
-    friend class UIFileManagerOptionsPanel;
     friend class UIFileManagerDialog;
 };

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerPanel.cpp

@@ -36 +36 @@
 #include "UIFileManagerPanel.h"
 
+/* Other VBox includes: */
+#include <iprt/assert.h>
 
 UIFileManagerPanel::UIFileManagerPanel(QWidget *pParent /* = 0 */)