Changeset 71255 in vbox

Timestamp:

Mar 7, 2018 12:02:39 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt bugref:6699 Implement rename for guest file view

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl

Files:

• UIGuestControlFileManager.cpp (modified) (1 diff)
• UIGuestControlFileTable.cpp (modified) (32 diffs)
• UIGuestControlFileTable.h (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl/UIGuestControlFileManager.cpp

@@ -447 +447 @@
 void UIGuestControlFileManager::sltGuestSessionStateChanged(const CGuestSessionStateChangedEvent &cEvent)
 {
-    if (cEvent.isOk() && m_comGuestSession.isOk())
+    if (cEvent.isOk() /*&& m_comGuestSession.isOk()*/)
     {
         CVirtualBoxErrorInfo cErrorInfo = cEvent.GetError();

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl/UIGuestControlFileTable.cpp

@@ -30 +30 @@
 # include "QILabel.h"
 # include "QILineEdit.h"
+# include "UIErrorString.h"
 # include "UIIconPool.h"
 # include "UIGuestControlFileTable.h"
@@ -59 +60 @@
 {
 public:
-    explicit UIFileTableItem(const QList<QVariant> &data, UIFileTableItem *parentItem = 0);
+    explicit UIFileTableItem(const QList<QVariant> &data, bool isDirectory, UIFileTableItem *parentItem);
     ~UIFileTableItem();
 
     void appendChild(UIFileTableItem *child);
 
-    UIFileTableItem *child(int row);
+    UIFileTableItem *child(int row) const;
+    /** Return a child (if possible) by path */
+    UIFileTableItem *child(const QString &path) const;
     int childCount() const;
     int columnCount() const;
     QVariant data(int column) const;
+    void setData(const QVariant &data, int index);
     int row() const;
     UIFileTableItem *parentItem();
@@ -73 +77 @@
     bool isDirectory() const;
     bool isOpened() const;
-
-    void setIsDirectory(bool flag);
     void setIsOpened(bool flag);
 
     const QString  &path() const;
     void setPath(const QString &path);
-
-    const QString  &name() const;
-    void setName(const QString &name);
+    /** Merge prefix and suffix by making sure they have a single '/' in between */
+    void setPath(const QString &prexix, const QString &suffix);
 
     /** True if this is directory and name is ".." */
@@ -88 +89 @@
 
 private:
-    QList<UIFileTableItem*> m_childItems;
+    QList<UIFileTableItem*>         m_childItems;
+    /** Used to find children by path */
+    QMap<QString, UIFileTableItem*> m_childMap;
     QList<QVariant>  m_itemData;
     UIFileTableItem *m_parentItem;
     bool             m_bIsDirectory;
     bool             m_bIsOpened;
+    /** Full absolute path of the item. Without the trailing '/' */
     QString          m_strPath;
-    QString          m_strName;
+    /** For directories base name is the name of the lowest level directory
+        in strPath. eg. for 'm_strPath = /opt/qt5.6/examples' 'm_strBaseName = examples'
+        for files it is the name of the file */
+    QString          m_strBaseName;
 };
 
 
-UIFileTableItem::UIFileTableItem(const QList<QVariant> &data, UIFileTableItem *parent)
+UIFileTableItem::UIFileTableItem(const QList<QVariant> &data, bool isDirectory, UIFileTableItem *parent)
     : m_itemData(data)
     , m_parentItem(parent)
-    , m_bIsDirectory(false)
+    , m_bIsDirectory(isDirectory)
     , m_bIsOpened(false)
 {
@@ -115 +122 @@
 void UIFileTableItem::appendChild(UIFileTableItem *item)
 {
+    if (!item)
+        return;
     m_childItems.append(item);
-}
-
-UIFileTableItem *UIFileTableItem::child(int row)
+    m_childMap.insert(item->path(), item);
+}
+
+UIFileTableItem *UIFileTableItem::child(int row) const
 {
     return m_childItems.value(row);
 }
 
+UIFileTableItem *UIFileTableItem::child(const QString &path) const
+{
+    if (!m_childMap.contains(path))
+        return 0;
+    return m_childMap.value(path);
+}
+
 int UIFileTableItem::childCount() const
 {
@@ -136 +153 @@
 {
     return m_itemData.value(column);
+}
+
+void UIFileTableItem::setData(const QVariant &data, int index)
+{
+    if (index >= m_itemData.length())
+        return;
+    m_itemData[index] = data;
 }
 
@@ -160 +184 @@
     qDeleteAll(m_childItems);
     m_childItems.clear();
+    m_childMap.clear();
 }
 
@@ -167 +192 @@
 }
 
-void UIFileTableItem::setIsDirectory(bool flag)
-{
-    m_bIsDirectory = flag;
-}
-
 void UIFileTableItem::setIsOpened(bool flag)
 {
@@ -184 +204 @@
 void UIFileTableItem::setPath(const QString &path)
 {
+    if (path.isNull() || path.isEmpty())
+        return;
     m_strPath = path;
-}
-
-const QString  &UIFileTableItem::name() const
-{
-    return m_strName;
-}
-
-void UIFileTableItem::setName(const QString &name)
-{
-    m_strName = name;
+    /* Make sure for we dont have any trailing slashes: */
+    if (m_strPath.length() > 1 && m_strPath.at(m_strPath.length() - 1) == QChar('/'))
+        m_strPath.chop(1);
+}
+
+void UIFileTableItem::setPath(const QString &prefix, const QString &suffix)
+{
+    if (prefix.isEmpty())
+        return;
+    QString newPath(prefix);
+    /* Make sure we have a trailing '/' in @p prefix: */
+    if (prefix.at(newPath.length() - 1) != QChar('/'))
+        newPath += "/";
+    newPath += suffix;
+    setPath(newPath);
 }
 
@@ -243 +270 @@
 }
 
+bool UIGuestControlFileModel::setData(const QModelIndex &index, const QVariant &value, int role)
+{
+    if (index.isValid() && role == Qt::EditRole)
+    {
+        UIFileTableItem *item = static_cast<UIFileTableItem*>(index.internalPointer());
+        if (!item || !m_pParent)
+            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("cannot rename %1").arg(item->path()));
+        }
+        return true;
+    }
+    return false;
+}
+
 QVariant UIGuestControlFileModel::data(const QModelIndex &index, int role) const
 {
@@ -251 +300 @@
         return QVariant();
 
-    if (role == Qt::DisplayRole)
+    if (role == Qt::DisplayRole || role == Qt::EditRole)
     {
         /* dont show anything but the name for up directories: */
@@ -279 +328 @@
     if (!index.isValid())
         return 0;
-
+    UIFileTableItem *item = static_cast<UIFileTableItem*>(index.internalPointer());
+    if (!item)
+        return QAbstractItemModel::flags(index);
+
+    if (!item->isUpDirectory() && index.column() == 0)
+        return QAbstractItemModel::flags(index)  | Qt::ItemIsEditable;
     return QAbstractItemModel::flags(index);
 }
@@ -294 +348 @@
     }
     return QVariant();
+}
+
+QModelIndex UIGuestControlFileModel::index(UIFileTableItem* item)
+{
+    if (!item)
+        return QModelIndex();
+    return createIndex(item->row(), 0, item);
 }
 
@@ -382 +443 @@
     , m_pTree(0)
     , m_pLocationLabel(0)
+    , m_pGoHome(0)
     , m_pMainLayout(0)
     , m_pCurrentLocationEdit(0)
     , m_pToolBar(0)
     , m_pGoUp(0)
-    , m_pGoHome(0)
     , m_pRefresh(0)
     , m_pDelete(0)
@@ -417 +478 @@
 }
 
+void UIGuestControlFileTable::emitLogOutput(const QString& strOutput)
+{
+    emit sigLogOutput(strOutput);
+}
+
 void UIGuestControlFileTable::prepareObjects()
 {
@@ -460 +526 @@
         m_pView->setModel(m_pModel);
         m_pView->setItemDelegate(new UIFileDelegate);
+        m_pView->setEditTriggers(QAbstractItemView::NoEditTriggers);
         /* Minimize the row height: */
         m_pView->verticalHeader()->setDefaultSectionSize(m_pView->verticalHeader()->minimumSectionSize());
@@ -565 +632 @@
     QList<QVariant> headData;
     headData << "Name" << "Size";
-    m_pRootItem = new UIFileTableItem(headData);
+    m_pRootItem = new UIFileTableItem(headData, true, 0);
 
     QList<QVariant> startDirData;
     startDirData << "/" << 4096;
-    UIFileTableItem* startItem = new UIFileTableItem(startDirData, m_pRootItem);
+    UIFileTableItem* startItem = new UIFileTableItem(startDirData, true, m_pRootItem);
     startItem->setPath("/");
-    startItem->setName("/");
     m_pRootItem->appendChild(startItem);
 
-    startItem->setIsDirectory(true);
     startItem->setIsOpened(false);
     /* Read the root directory and get the list: */
@@ -594 +659 @@
             QList<QVariant> data;
             data << ".." << 4096;
-            UIFileTableItem *item = new UIFileTableItem(data, parent);
-            item->setIsDirectory(true);
+            UIFileTableItem *item = new UIFileTableItem(data, isDirectoryMap, parent);
             item->setIsOpened(false);
             map.insert("..", item);
@@ -628 +692 @@
         return;
     if (currentRoot != m_pModel->rootIndex())
-        m_pView->setRootIndex(currentRoot.parent());
+        changeLocation(currentRoot.parent());
 }
 
 void UIGuestControlFileTable::sltGoHome()
 {
+    goToHomeDirectory();
 }
 
@@ -645 +710 @@
     if (!item)
         return;
+
     /* check if we need to go up: */
     if (item->isUpDirectory())
@@ -658 +724 @@
     if (!item->isOpened())
        readDirectory(item->path(),item);
-
     changeLocation(itemIndex);
 }
 
+void UIGuestControlFileTable::goIntoDirectory(const QVector<QString> &pathTrail)
+{
+    UIFileTableItem *parent = getStartDirectoryItem();
+
+    for(int i = 0; i < pathTrail.size(); ++i)
+    {
+        if (!parent)
+            return;
+        /* Make sure parent is already opened: */
+        if (!parent->isOpened())
+            readDirectory(parent->path(), parent, parent == getStartDirectoryItem());
+        /* search the current path item among the parent's children: */
+        UIFileTableItem *item = parent->child(pathTrail.at(i));
+        if (!item)
+            return;
+        parent = item;
+    }
+    if (!parent)
+        return;
+    if (!parent->isOpened())
+        readDirectory(parent->path(), parent, parent == getStartDirectoryItem());
+    goIntoDirectory(parent);
+}
+
+void UIGuestControlFileTable::goIntoDirectory(UIFileTableItem *item)
+{
+    if (!item || !m_pModel)
+        return;
+    goIntoDirectory(m_pModel->index(item));
+}
+
+UIFileTableItem* UIGuestControlFileTable::indexData(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return 0;
+    return static_cast<UIFileTableItem*>(index.internalPointer());
+}
+
 void UIGuestControlFileTable::refresh()
 {
@@ -667 +770 @@
         return;
     QModelIndex currentIndex = m_pView->rootIndex();
-    if (!currentIndex.isValid())
-        return;
-    UIFileTableItem *treeItem =
-        static_cast<UIFileTableItem*>(currentIndex.internalPointer());
+
+    UIFileTableItem *treeItem = indexData(currentIndex);
     if (!treeItem)
         return;
@@ -700 +801 @@
 void UIGuestControlFileTable::sltRename()
 {
+    if (!m_pView)
+        return;
+    QItemSelectionModel *selectionModel =  m_pView->selectionModel();
+    if (!selectionModel)
+        return;
+
+    QModelIndexList selectedItemIndices = selectionModel->selectedRows();
+    if (selectedItemIndices.size() == 0)
+        return;
+    UIFileTableItem *item = indexData(selectedItemIndices.at(0));
+    if (!item || item->isUpDirectory())
+        return;
+    m_pView->edit(selectedItemIndices.at(0));
+
 }
 
 void UIGuestControlFileTable::deleteByIndex(const QModelIndex &itemIndex)
 {
-    if (!itemIndex.isValid())
-        return;
-    UIFileTableItem *treeItem = static_cast<UIFileTableItem*>(itemIndex.internalPointer());
+    UIFileTableItem *treeItem = indexData(itemIndex);
     if (!treeItem)
         return;
@@ -723 +836 @@
     if (m_pGoHome)
     {
-        m_pGoHome->setText(UIVMInformationDialog::tr("Goto home folder"));
-        m_pGoHome->setToolTip(UIVMInformationDialog::tr("Goto home folder"));
-        m_pGoHome->setStatusTip(UIVMInformationDialog::tr("Goto home folder"));
+        m_pGoHome->setText(UIVMInformationDialog::tr("Go to home folder"));
+        m_pGoHome->setToolTip(UIVMInformationDialog::tr("Go to home folder"));
+        m_pGoHome->setStatusTip(UIVMInformationDialog::tr("Go to home folder"));
     }
 
@@ -805 +918 @@
 }
 
-
+UIFileTableItem *UIGuestControlFileTable::getStartDirectoryItem()
+{
+    if (!m_pRootItem)
+        return 0;
+    if (m_pRootItem->childCount() <= 0)
+        return 0;
+    return m_pRootItem->child(0);
+}
+
+QString UIGuestControlFileTable::constructNewItemPath(const QString &previousPath, const QString &newBaseName)
+{
+    if (newBaseName.isEmpty() || previousPath.length() <= 1)
+        return QString();
+
+    QStringList pathList = previousPath.split('/', QString::SkipEmptyParts);
+    QString newPath("/");
+    for(int i = 0; i < pathList.size() - 1; ++i)
+    {
+        newPath += (pathList.at(i) + "/");
+    }
+    newPath += newBaseName;
+    return newPath;
+}
 /*********************************************************************************************************************************
 *   UIGuestFileTable implementation.                                                                                             *
@@ -813 +948 @@
     :UIGuestControlFileTable(pParent)
 {
+    configureObjects();
     retranslateUi();
 }
@@ -859 +995 @@
             QList<QVariant> data;
             data << fsInfo.GetName() << static_cast<qulonglong>(fsInfo.GetObjectSize());
-            UIFileTableItem *item = new UIFileTableItem(data, parent);
-            item->setPath(QString("%1%3%2").arg(strPath).arg("/").arg(fsInfo.GetName()));
-            if (fsInfo.GetType() == KFsObjType_Directory)
+            bool isDirectory = (fsInfo.GetType() == KFsObjType_Directory);
+            UIFileTableItem *item = new UIFileTableItem(data, isDirectory, parent);
+
+            item->setPath(strPath, fsInfo.GetName());
+            if (isDirectory)
             {
                 directories.insert(fsInfo.GetName(), item);
-                item->setIsDirectory(true);
                 item->setIsOpened(false);
             }
@@ -870 +1007 @@
             {
                 files.insert(fsInfo.GetName(), item);
-                item->setIsDirectory(false);
                 item->setIsOpened(false);
             }
@@ -896 +1032 @@
     }
     else
-    {
-        /** @todo this is not working: */
         m_comGuestSession.FsObjRemove(item->path());
-    }
-}
-
+}
+
+void UIGuestFileTable::goToHomeDirectory()
+{
+    /* TODO: not implemented in guest control yet: */
+}
+
+bool UIGuestFileTable::renameItem(UIFileTableItem *item, QString newBaseName)
+{
+
+    if (!item || item->isUpDirectory() || newBaseName.isEmpty() || !m_comGuestSession.isOk())
+        return false;
+    QString newPath = constructNewItemPath(item->path(), newBaseName);
+    QVector<KFsObjRenameFlag> aFlags(KFsObjRenameFlag_Replace);
+
+    m_comGuestSession.FsObjRename(item->path(), newPath, aFlags);
+    if (m_comGuestSession.isOk())
+        return false;
+    return true;
+}
+
+void UIGuestFileTable::configureObjects()
+{
+    if (m_pGoHome)
+        m_pGoHome->setEnabled(false);
+}
 
 /*********************************************************************************************************************************
@@ -940 +1097 @@
         QList<QVariant> data;
         data << fileInfo.baseName() << fileInfo.size();
-        UIFileTableItem *item = new UIFileTableItem(data, parent);
+        UIFileTableItem *item = new UIFileTableItem(data, fileInfo.isDir(), parent);
         item->setPath(fileInfo.absoluteFilePath());
         if (fileInfo.isDir())
         {
             directories.insert(fileInfo.baseName(), item);
-            item->setIsDirectory(true);
             item->setIsOpened(false);
         }
@@ -951 +1107 @@
         {
             files.insert(fileInfo.baseName(), item);
-            item->setIsDirectory(false);
             item->setIsOpened(false);
         }
@@ -981 +1136 @@
 }
 
+void UIHostFileTable::goToHomeDirectory()
+{
+    if(!m_pRootItem || m_pRootItem->childCount() <= 0)
+        return;
+    UIFileTableItem *startDirItem = m_pRootItem->child(0);
+    if (!startDirItem)
+        return;
+
+    // UIFileTableItem *rootDirectoryItem
+    QDir homeDirectory(QDir::homePath());
+    QVector<QString> pathTrail;//(QDir::rootPath());
+    do{
+
+        pathTrail.push_front(homeDirectory.absolutePath());
+        homeDirectory.cdUp();
+    }while(!homeDirectory.isRoot());
+
+    goIntoDirectory(pathTrail);
+}
+
+bool UIHostFileTable::renameItem(UIFileTableItem *item, QString newPath)
+{
+    Q_UNUSED(item);
+    return true;
+}
 #include "UIGuestControlFileTable.moc"

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl/UIGuestControlFileTable.h

@@ -57 +57 @@
 
     QVariant data(const QModelIndex &index, int role) const /* override */;
+    bool setData(const QModelIndex &index, const QVariant &value, int role);
+
     Qt::ItemFlags flags(const QModelIndex &index) const /* override */;
     QVariant headerData(int section, Qt::Orientation orientation,
     int role = Qt::DisplayRole) const /* override */;
     QModelIndex index(int row, int column,
-    const QModelIndex &parent = QModelIndex()) const /* override */;
+                      const QModelIndex &parent = QModelIndex()) const /* override */;
+    QModelIndex index(UIFileTableItem* item);
     QModelIndex parent(const QModelIndex &index) const /* override */;
     int rowCount(const QModelIndex &parent = QModelIndex()) const /* override */;
@@ -97 +100 @@
     /** Delete all the tree nodes */
     void reset();
+    void emitLogOutput(const QString& strOutput);
 
 protected:
@@ -109 +113 @@
     virtual void refresh();
     virtual void deleteByItem(UIFileTableItem *item) = 0;
+    virtual void goToHomeDirectory() = 0;
+    virtual bool renameItem(UIFileTableItem *item, QString newPath) = 0;
+    void             goIntoDirectory(const QModelIndex &itemIndex);
+    /** Follow the path trail, open directories as we go and descend */
+    void             goIntoDirectory(const QVector<QString> &pathTrail);
+    /** Go into directory pointed by the @p item */
+    void             goIntoDirectory(UIFileTableItem *item);
+    UIFileTableItem* indexData(const QModelIndex &index) const;
     void keyPressEvent(QKeyEvent * pEvent);
+
+    /** Replace the last part of the @p previusPath with newBaseName */
+    QString constructNewItemPath(const QString &previousPath, const QString &newBaseName);
+
     UIFileTableItem         *m_pRootItem;
 
@@ -119 +135 @@
     QTreeView               *m_pTree;
     QILabel                 *m_pLocationLabel;
-
+    QAction                  *m_pGoHome;
 protected slots:
 
@@ -131 +147 @@
 private:
 
-    void            prepareObjects();
-    void            prepareActions();
-    void            deleteByIndex(const QModelIndex &itemIndex);
-    void            goIntoDirectory(const QModelIndex &itemIndex);
-    QGridLayout    *m_pMainLayout;
-    QILineEdit     *m_pCurrentLocationEdit;
-    UIToolBar      *m_pToolBar;
-    QAction        *m_pGoUp;
-    QAction        *m_pGoHome;
-    QAction        *m_pRefresh;
-    QAction        *m_pDelete;
-    QAction        *m_pRename;
-    QAction        *m_pNewFolder;
-
-    QAction        *m_pCopy;
-    QAction        *m_pCut;
-    QAction        *m_pPaste;
+    void             prepareObjects();
+    void             prepareActions();
+    void             deleteByIndex(const QModelIndex &itemIndex);
+    /** Return the UIFileTableItem for path / which is a direct (and single) child of m_pRootItem */
+    UIFileTableItem *getStartDirectoryItem();
+
+    QGridLayout     *m_pMainLayout;
+    QILineEdit      *m_pCurrentLocationEdit;
+    UIToolBar       *m_pToolBar;
+    QAction         *m_pGoUp;
+
+    QAction         *m_pRefresh;
+    QAction         *m_pDelete;
+    QAction         *m_pRename;
+    QAction         *m_pNewFolder;
+
+    QAction         *m_pCopy;
+    QAction         *m_pCut;
+    QAction         *m_pPaste;
 
     friend class UIGuestControlFileModel;
@@ -168 +186 @@
     virtual void readDirectory(const QString& strPath, UIFileTableItem *parent, bool isStartDir = false) /* override */;
     virtual void deleteByItem(UIFileTableItem *item) /* override */;
+    virtual void goToHomeDirectory() /* override */;
+    virtual bool renameItem(UIFileTableItem *item, QString newPath);
 
 private:
 
+    void configureObjects();
     CGuestSession m_comGuestSession;
+
 };
 
@@ -189 +211 @@
     virtual void readDirectory(const QString& strPath, UIFileTableItem *parent, bool isStartDir = false) /* override */;
     virtual void deleteByItem(UIFileTableItem *item) /* override */;
+    virtual void goToHomeDirectory() /* override */;
+    virtual bool renameItem(UIFileTableItem *item, QString newPath);
 };