Changeset 71258 in vbox for trunk

Timestamp:

Mar 7, 2018 1:53:41 PM (7 years ago)

Author:

vboxsync

Message:

FE/QT: bugref:6699 Some improvements on guest control file views

Location:

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

Files:

• UIVMInformationDialog.cpp (modified) (1 diff)
• guestctrl/UIGuestControlFileManager.cpp (modified) (1 diff)
• guestctrl/UIGuestControlFileTable.cpp (modified) (10 diffs)
• guestctrl/UIGuestControlFileTable.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.cpp

@@ -119 +119 @@
     m_pTabWidget->setTabText(0, tr("Configuration &Details"));
     m_pTabWidget->setTabText(1, tr("&Runtime Information"));
-    m_pTabWidget->setTabText(2, tr("&Guest Session"));
+    m_pTabWidget->setTabText(2, tr("&Guest Session Manager"));
     m_pTabWidget->setTabText(3, tr("&Guest File Manager"));
 }

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

@@ -343 +343 @@
 
                 m_pCopyGuestToHost = new QAction(this);
-                m_pCopyGuestToHost->setIcon(UIIconPool::iconSet(QString(":/arrow_right_10px_x2.png")));
+                if(m_pCopyGuestToHost)
+                {
+                    m_pCopyGuestToHost->setIcon(UIIconPool::iconSet(QString(":/arrow_right_10px_x2.png")));
+                    m_pCopyGuestToHost->setEnabled(false);
+                }
+
                 m_pCopyHostToGuest = new QAction(this);
-                m_pCopyHostToGuest->setIcon(UIIconPool::iconSet(QString(":/arrow_left_10px_x2.png")));
-
-
+                if (m_pCopyHostToGuest)
+                {
+                    m_pCopyHostToGuest->setIcon(UIIconPool::iconSet(QString(":/arrow_left_10px_x2.png")));
+                    m_pCopyHostToGuest->setEnabled(false);
+                }
                 m_pToolBar->addWidget(topSpacerWidget);
                 m_pToolBar->addAction(m_pCopyGuestToHost);

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

@@ -22 +22 @@
 /* Qt includes: */
 # include <QAction>
+# include <QDateTime>
 # include <QDir>
 # include <QHeaderView>
@@ -285 +286 @@
         {
             if (m_pParent)
-                m_pParent->emitLogOutput(QString("cannot rename %1").arg(item->path()));
+                m_pParent->emitLogOutput(QString(item->path()).append(" could not be renamed"));
         }
         return true;
@@ -586 +587 @@
 
     m_pNewFolder = new QAction(this);
-    m_pNewFolder->setIcon(UIIconPool::iconSet(QString(":/sf_32px.png")));
-    m_pToolBar->addAction(m_pNewFolder);
+    if (m_pNewFolder)
+    {
+        m_pNewFolder->setIcon(UIIconPool::iconSet(QString(":/sf_32px.png")));
+        m_pToolBar->addAction(m_pNewFolder);
+        m_pNewFolder->setEnabled(false);
+    }
 
     m_pCopy = new QAction(this);
-    m_pCopy->setIcon(UIIconPool::iconSet(QString(":/fd_copy_22px.png")));
-    m_pToolBar->addAction(m_pCopy);
+    if (m_pCopy)
+    {
+        m_pCopy->setIcon(UIIconPool::iconSet(QString(":/fd_copy_22px.png")));
+        m_pToolBar->addAction(m_pCopy);
+        m_pCopy->setEnabled(false);
+    }
 
     m_pCut = new QAction(this);
-    m_pCut->setIcon(UIIconPool::iconSet(QString(":/fd_move_22px.png")));
-    m_pToolBar->addAction(m_pCut);
-
+    if (m_pCut)
+    {
+        m_pCut->setIcon(UIIconPool::iconSet(QString(":/fd_move_22px.png")));
+        m_pToolBar->addAction(m_pCut);
+        m_pCut->setEnabled(false);
+    }
 
     m_pPaste = new QAction(this);
-    m_pPaste->setIcon(UIIconPool::iconSet(QString(":/shared_clipboard_16px.png")));
-    m_pToolBar->addAction(m_pPaste);
+    if (m_pPaste)
+    {
+        m_pPaste->setIcon(UIIconPool::iconSet(QString(":/shared_clipboard_16px.png")));
+        m_pToolBar->addAction(m_pPaste);
+        m_pPaste->setEnabled(false);
+    }
 }
 
@@ -631 +647 @@
 
     QList<QVariant> headData;
-    headData << "Name" << "Size";
+    headData << "Name" << "Size" << "Change Time";
     m_pRootItem = new UIFileTableItem(headData, true, 0);
 
     QList<QVariant> startDirData;
-    startDirData << "/" << 4096;
+    startDirData << "/" << 4096 << QDateTime();
     UIFileTableItem* startItem = new UIFileTableItem(startDirData, true, m_pRootItem);
     startItem->setPath("/");
@@ -941 +957 @@
     return newPath;
 }
+
+
 /*********************************************************************************************************************************
 *   UIGuestFileTable implementation.                                                                                             *
@@ -994 +1012 @@
         {
             QList<QVariant> data;
-            data << fsInfo.GetName() << static_cast<qulonglong>(fsInfo.GetObjectSize());
+            QDateTime changeTime = QDateTime::fromMSecsSinceEpoch(fsInfo.GetChangeTime()/1000);
+            data << fsInfo.GetName() << static_cast<qulonglong>(fsInfo.GetObjectSize()) << changeTime;
             bool isDirectory = (fsInfo.GetType() == KFsObjType_Directory);
             UIFileTableItem *item = new UIFileTableItem(data, isDirectory, parent);
-
             item->setPath(strPath, fsInfo.GetName());
             if (isDirectory)
@@ -1033 +1051 @@
     else
         m_comGuestSession.FsObjRemove(item->path());
+    if (!m_comGuestSession.isOk())
+        emit sigLogOutput(QString(item->path()).append(" could not be deleted"));
+
 }
 
 void UIGuestFileTable::goToHomeDirectory()
 {
-    /* TODO: not implemented in guest control yet: */
+    /** @todo not implemented in guest control yet: */
 }
 
@@ -1060 +1081 @@
 }
 
+
 /*********************************************************************************************************************************
 *   UIHostFileTable implementation.                                                                                              *
@@ -1096 +1118 @@
         const QFileInfo &fileInfo = entries.at(i);
         QList<QVariant> data;
-        data << fileInfo.baseName() << fileInfo.size();
+        data << fileInfo.baseName() << fileInfo.size() << fileInfo.lastModified();
         UIFileTableItem *item = new UIFileTableItem(data, fileInfo.isDir(), parent);
         item->setPath(fileInfo.absoluteFilePath());
@@ -1156 +1178 @@
 }
 
-bool UIHostFileTable::renameItem(UIFileTableItem *item, QString newPath)
-{
-    Q_UNUSED(item);
-    return true;
-}
+bool UIHostFileTable::renameItem(UIFileTableItem *item, QString newBaseName)
+{
+    if (!item || item->isUpDirectory() || newBaseName.isEmpty())
+        return false;
+    QString newPath = constructNewItemPath(item->path(), newBaseName);
+    QDir a;
+    return a.rename(item->path(), newPath);
+}
+
+
 #include "UIGuestControlFileTable.moc"

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

@@ -114 +114 @@
     virtual void deleteByItem(UIFileTableItem *item) = 0;
     virtual void goToHomeDirectory() = 0;
-    virtual bool renameItem(UIFileTableItem *item, QString newPath) = 0;
+    virtual bool renameItem(UIFileTableItem *item, QString newBaseName) = 0;
     void             goIntoDirectory(const QModelIndex &itemIndex);
     /** Follow the path trail, open directories as we go and descend */
@@ -187 +187 @@
     virtual void deleteByItem(UIFileTableItem *item) /* override */;
     virtual void goToHomeDirectory() /* override */;
-    virtual bool renameItem(UIFileTableItem *item, QString newPath);
+    virtual bool renameItem(UIFileTableItem *item, QString newBaseName);
 
 private:
@@ -212 +212 @@
     virtual void deleteByItem(UIFileTableItem *item) /* override */;
     virtual void goToHomeDirectory() /* override */;
-    virtual bool renameItem(UIFileTableItem *item, QString newPath);
+    virtual bool renameItem(UIFileTableItem *item, QString newBaseName);
 };