Changeset 76312 in vbox for trunk/src/VBox

Timestamp:

Dec 20, 2018 1:02:13 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699. More refactoring on file system model classes to achieve decoupling

Location:

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

Files:

• UICustomFileSystemModel.cpp (modified) (3 diffs)
• UICustomFileSystemModel.h (modified) (4 diffs)
• UIFileManagerTable.cpp (modified) (3 diffs)
• UIFileManagerTable.h (modified) (2 diffs)

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

@@ -28 +28 @@
 # include "UICustomFileSystemModel.h"
 # include "UIFileManagerTable.h"
-# include "UIFileManager.h"
 # include "VBoxGlobal.h"
 
@@ -284 +283 @@
 UICustomFileSystemModel::UICustomFileSystemModel(QObject *parent)
     : QAbstractItemModel(parent)
-    , m_pParent(qobject_cast<UIFileManagerTable*>(parent))
     , m_fShowHumanReadableSizes(false)
 {
@@ -324 +322 @@
         if (index.column() == 0 && value.canConvert(QMetaType::QString))
         {
-            UIFileTableItem *item = static_cast<UIFileTableItem*>(index.internalPointer());
-            if (!item || !m_pParent)
+            UIFileTableItem *pItem = static_cast<UIFileTableItem*>(index.internalPointer());
+            if (!pItem)
                 return false;
-            if (m_pParent->renameItem(item, value.toString()))
-            {
-                item->setData(value, index.column());
-                emit dataChanged(index, index);
-            }
-            else
-            {
-                if (m_pParent)
-                    m_pParent->emitLogOutput(QString(item->path()).append(" could not be renamed"), FileManagerLogType_Error);
-            }
+            QString strOldName = pItem->name();
+            pItem->setData(value, index.column());
+            emit dataChanged(index, index);
+            emit sigItemRenamed(pItem, strOldName, value.toString());
             return true;
         }

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

@@ -25 +25 @@
 /* COM includes: */
 #include "COMEnums.h"
-
-/* Forward declarations: */
-class UIFileManagerTable;
 
 enum UICustomFileSystemModelColumn
@@ -126 +123 @@
 
     UICustomFileSystemProxyModel(QObject *parent = 0);
-
     void setListDirectoriesOnTop(bool fListDirectoriesOnTop);
     bool listDirectoriesOnTop() const;
@@ -141 +137 @@
 /** UICustomFileSystemModel serves as the model for a file structure.
  *  it supports a tree level hierarchy which can be displayed with
- *  QTableView and/or QTreeView. .*/
+ *  QTableView and/or QTreeView.*/
 class UICustomFileSystemModel : public QAbstractItemModel
 {
 
     Q_OBJECT;
+
+signals:
+
+    void sigItemRenamed(UIFileTableItem *pItem, QString strOldName, QString strNewName);
 
 public:
@@ -181 +181 @@
     UIFileTableItem    *m_pRootItem;
     void setupModelData(const QStringList &lines, UIFileTableItem *parent);
-    UIFileManagerTable *m_pParent;
     bool                m_fShowHumanReadableSizes;
-
 };
 

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

@@ -583 +583 @@
     if (!m_pModel)
         return;
+    connect(m_pModel, &UICustomFileSystemModel::sigItemRenamed,
+            this, &UIFileManagerTable::sltHandleItemRenameAttempt);
 
     m_pProxyModel = new UICustomFileSystemProxyModel(this);
@@ -917 +919 @@
 void UIFileManagerTable::sltRename()
 {
-    if (!m_pView)
+    if (!m_pView || !m_pModel)
         return;
     QItemSelectionModel *selectionModel =  m_pView->selectionModel();
@@ -1017 +1019 @@
     performSelectionSearch(strText);
 }
+
+void UIFileManagerTable::sltHandleItemRenameAttempt(UIFileTableItem *pItem, QString strOldName, QString strNewName)
+{
+    if (!pItem)
+        return;
+    /* Attempt to chage item name in the file system: */
+    if (!renameItem(pItem, strNewName))
+    {
+        /* Restore the previous name. relist the view: */
+        pItem->setData(strOldName, static_cast<int>(UICustomFileSystemModelColumn_Name));
+        relist();
+        sigLogOutput(QString(pItem->path()).append(" could not be renamed"), FileManagerLogType_Error);
+    }
+}
+
 
 void UIFileManagerTable::sltCreateFileViewContextMenu(const QPoint &point)

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

@@ -190 +190 @@
     void sltRefresh();
     void sltDelete();
+    /** Calls the edit on the data item over m_pView. This causes setData(..) call on the model. After setting
+     *  user entered text as the name of the item m_pModel signals. This signal is handled by sltHandleItemRenameAttempt which
+     *  tries to rename the corresponding file object by calling renameItem(...). If this rename fails the old name of the
+     *  model item is restored and view is refreshed by sltHandleItemRenameAttempt. */
     void sltRename();
     void sltCopy();
@@ -280 +284 @@
     void sltLocationComboCurrentChange(const QString &strLocation);
     void sltSearchTextChanged(const QString &strText);
+    /** m_pModel signals when an tree item is renamed. we try to apply this rename to the file system.
+     *  if the file system rename fails we restore the old name of the item. See the comment of
+     *  sltRename() for more details. */
+    void sltHandleItemRenameAttempt(UIFileTableItem *pItem, QString strOldName, QString strNewName);
 
 private: