Changeset 76296 in vbox for trunk/src/VBox

Timestamp:

Dec 19, 2018 4:17:39 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699. Refactoring some classes to improve decoupling. I will need those in viso creator dialog.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl

Files:

• UIFileManager.cpp (modified) (3 diffs)
• UIFileManager.h (modified) (1 diff)
• UIFileManagerModel.cpp (modified) (6 diffs)
• UIFileManagerModel.h (modified) (3 diffs)
• UIFileManagerTable.cpp (modified) (2 diffs)
• UIFileManagerTable.h (modified) (2 diffs)

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

@@ -281 +281 @@
         m_panelActionMap.insert(m_pOptionsPanel, m_pActionPool->action(UIActionIndex_M_FileManager_T_Options));
         connect(m_pOptionsPanel, &UIFileManagerOptionsPanel::sigOptionsChanged,
-                this, &UIFileManager::sltListDirectoriesBeforeChanged);
+                this, &UIFileManager::sltHandleOptionsUpdated);
         pTopLayout->addWidget(m_pOptionsPanel);
     }
@@ -519 +519 @@
 }
 
-void UIFileManager::sltListDirectoriesBeforeChanged()
-{
-    if (m_pGuestFileTable)
-        m_pGuestFileTable->relist();
-    if (m_pHostFileTable)
-        m_pHostFileTable->relist();
-}
-
 void UIFileManager::sltReceieveNewFileOperation(const CProgress &comProgress)
 {
@@ -549 +541 @@
         m_pOptionsPanel->update();
     }
+
+    if (m_pGuestFileTable)
+        m_pGuestFileTable->optionsUpdated();
+    if (m_pHostFileTable)
+        m_pHostFileTable->optionsUpdated();
 }
 

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

@@ -116 +116 @@
     void sltCopyHostToGuest();
     void sltPanelActionToggled(bool fChecked);
-    void sltListDirectoriesBeforeChanged();
     void sltReceieveNewFileOperation(const CProgress &comProgress);
     void sltFileOperationComplete(QUuid progressId);

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

@@ -29 +29 @@
 # include "UIFileManagerTable.h"
 # include "UIFileManager.h"
-
+# include "VBoxGlobal.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -37 +37 @@
 UIGuestControlFileProxyModel::UIGuestControlFileProxyModel(QObject *parent /* = 0 */)
     :QSortFilterProxyModel(parent)
-{
+    , m_fListDirectoriesOnTop(false)
+{
+}
+
+void UIGuestControlFileProxyModel::setListDirectoriesOnTop(bool fListDirectoriesOnTop)
+{
+    m_fListDirectoriesOnTop = fListDirectoriesOnTop;
+}
+
+bool UIGuestControlFileProxyModel::listDirectoriesOnTop() const
+{
+    return m_fListDirectoriesOnTop;
 }
 
@@ -45 +56 @@
     UIFileTableItem *pRightItem = static_cast<UIFileTableItem*>(right.internalPointer());
 
-    UIFileManagerOptions *pOptions = UIFileManagerOptions::instance();
-
     if (pLeftItem && pRightItem)
     {
         /* List the directories before the files if options say so: */
-        if (pOptions && pOptions->bListDirectoriesOnTop)
+        if (m_fListDirectoriesOnTop)
         {
             if ((pLeftItem->isDirectory() || pLeftItem->isSymLinkToADirectory()) && !pRightItem->isDirectory())
@@ -87 +96 @@
     : QAbstractItemModel(parent)
     , m_pParent(qobject_cast<UIFileManagerTable*>(parent))
+    , m_fShowHumanReadableSizes(false)
 {
 }
@@ -161 +171 @@
         if (index.column() == UIFileManagerModelColumn_Size)
         {
-            UIFileManagerOptions* pOptions =
-                UIFileManagerOptions::instance();
-            if (pOptions && pOptions->bShowHumanReadableSizes)
+            if (m_fShowHumanReadableSizes)
             {
                 qulonglong size = item->data(index.column()).toULongLong();
-                return UIFileManagerTable::humanReadableSize(size);
+                return vboxGlobal().formatSize(size);
             }
             else
@@ -305 +313 @@
     endResetModel();
 }
+
+void UIFileManagerModel::setShowHumanReadableSizes(bool fShowHumanReadableSizes)
+{
+    m_fShowHumanReadableSizes = fShowHumanReadableSizes;
+}
+
+bool UIFileManagerModel::showHumanReadableSizes() const
+{
+    return m_fShowHumanReadableSizes;
+}

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

@@ -51 +51 @@
     UIGuestControlFileProxyModel(QObject *parent = 0);
 
+    void setListDirectoriesOnTop(bool fListDirectoriesOnTop);
+    bool listDirectoriesOnTop() const;
+
 protected:
 
     bool lessThan(const QModelIndex &left, const QModelIndex &right) const /* override */;
+
+private:
+
+    bool m_fListDirectoriesOnTop;
 };
 
@@ -87 +94 @@
     void           beginReset();
     void           endReset();
+    void           setShowHumanReadableSizes(bool fShowHumanReadableSizes);
+    bool           showHumanReadableSizes() const;
+
     static const char* strUpDirectoryString;
 
@@ -95 +105 @@
     UIFileManagerTable *m_pParent;
     UIFileTableItem    *m_pRootItem;
+    bool                m_fShowHumanReadableSizes;
+
 };
 

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

@@ -822 +822 @@
                 this, &UIFileManagerTable::sltSearchTextChanged);
     }
+    optionsUpdated();
 }
 
@@ -1481 +1482 @@
 }
 
+void UIFileManagerTable::optionsUpdated()
+{
+    UIFileManagerOptions *pOptions = UIFileManagerOptions::instance();
+    if (pOptions)
+    {
+        if (m_pProxyModel)
+            m_pProxyModel->setListDirectoriesOnTop(pOptions->bListDirectoriesOnTop);
+        if (m_pModel)
+            m_pModel->setShowHumanReadableSizes(pOptions->bShowHumanReadableSizes);
+    }
+    relist();
+}
+
+
 void UIFileManagerTable::sltReceiveDirectoryStatistics(UIDirectoryStatistics statistics)
 {

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

@@ -263 +263 @@
     QStringList selectedItemPathList();
     virtual void refresh();
-    void         relist();
     static const unsigned    m_iKiloByte;
     static QString humanReadableSize(ULONG64 size);
+    /** Peroforms whatever is necessary after a UIFileManagerOptions change. */
+    void optionsUpdated();
 
 public slots:
@@ -370 +371 @@
 private:
 
+    void             relist();
     void             prepareObjects();
     /** @p itemIndex is assumed to be 'model' index not 'proxy model' index */