Changeset 71274 in vbox

Timestamp:

Mar 8, 2018 2:09:07 PM (7 years ago)

Author:

vboxsync

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

121203

Message:

FE/Qt bugref:6699 Some debugging in guest file manager

Location:

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

Files:

• UIGuestControlFileManager.cpp (modified) (1 diff)
• UIGuestControlFileModel.cpp (modified) (1 diff)
• UIGuestControlFileTable.cpp (modified) (4 diffs)

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

@@ -421 +421 @@
         {
             m_pLogOutput->appendPlainText("Could not find Guest Additions");
+            postSessionClosed();
             return;
         }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestControlFileModel.cpp ¶

@@ -69 +69 @@
     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()))
+        if (index.column() == 0 && value.canConvert(QMetaType::QString))
         {
-            item->setData(value, index.column());
-            emit dataChanged(index, index);
+            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(item->path()).append(" could not be renamed"));
+            }
+            return true;
         }
-        else
-        {
-            if (m_pParent)
-                m_pParent->emitLogOutput(QString(item->path()).append(" could not be renamed"));
-        }
-        return true;
     }
     return false;

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

@@ -346 +346 @@
         m_pView->verticalHeader()->setDefaultSectionSize(m_pView->verticalHeader()->minimumSectionSize());
         /* Make the columns take all the avaible space: */
-        m_pView->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+        //m_pView->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
 
         connect(m_pView, &QTableView::doubleClicked,
@@ -934 +934 @@
 
     m_comGuestSession.FsObjRename(item->path(), newPath, aFlags);
-    if (m_comGuestSession.isOk())
+    if (!m_comGuestSession.isOk())
         return false;
+    item->setPath(newPath);
     return true;
 }
@@ -1000 +1001 @@
         const QFileInfo &fileInfo = entries.at(i);
         QList<QVariant> data;
-        data << fileInfo.baseName() << fileInfo.size() << fileInfo.lastModified();
+        data << fileInfo.fileName() << fileInfo.size() << fileInfo.lastModified();
         UIFileTableItem *item = new UIFileTableItem(data, fileInfo.isDir(), parent);
         item->setPath(fileInfo.absoluteFilePath());
         if (fileInfo.isDir())
         {
-            directories.insert(fileInfo.baseName(), item);
+            directories.insert(fileInfo.fileName(), item);
             item->setIsOpened(false);
         }
         else
         {
-            files.insert(fileInfo.baseName(), item);
+            files.insert(fileInfo.fileName(), item);
             item->setIsOpened(false);
         }
@@ -1065 +1066 @@
         return false;
     QString newPath = constructNewItemPath(item->path(), newBaseName);
-    QDir a;
-    return a.rename(item->path(), newPath);
+    QDir tempDir;
+    if (tempDir.rename(item->path(), newPath))
+    {
+        item->setPath(newPath);
+        return true;
+    }
+    return false;
 }