Changeset 92587 in vbox for trunk/src/VBox

Timestamp:

Nov 24, 2021 7:47:55 PM (3 years ago)

Author:

vboxsync

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

148471

Message:

FE/Qt: bugref:6699 Small fixes in file manager code.

Location:

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

Files:

• UIFileManagerGuestTable.cpp (modified) (5 diffs)
• UIFileManagerHostTable.cpp (modified) (4 diffs)
• UIFileManagerTable.cpp (modified) (4 diffs)

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

@@ -168 +168 @@
 {
     if (m_pLocationLabel)
-        m_pLocationLabel->setText(UIFileManager::tr("Guest File System"));
+        m_pLocationLabel->setText(UIFileManager::tr("Guest File System:"));
     UIFileManagerTable::retranslateUi();
 }
@@ -263 +263 @@
             m_comGuestSession.DirectoryRemoveRecursive(strPath, aFlags);
         }
-
     }
 }
@@ -302 +301 @@
         return false;
     }
-
     item->setPath(newPath);
     return true;
@@ -588 +586 @@
     if (selectedObjects.size() == 0)
         return;
-    //UIGuestDirectoryDiskUsageComputer *directoryThread = 0;
-
-    /* if the selection include a directory or it is a multiple selection the create a worker thread
-       to compute total size of the selection (recusively) */
-    // bool createWorkerThread = (selectedObjects.size() > 1);
-    // if (!createWorkerThread &&
-    //     fileType(m_comGuestSession.FsObjQueryInfo(selectedObjects[0], true)) == KFsObjType_Directory)
-    //     createWorkerThread = true;
-    // if (createWorkerThread)
-    // {
-    //     directoryThread = new UIGuestDirectoryDiskUsageComputer(this, selectedObjects, m_comGuestSession);
-    //     if (directoryThread)
-    //     {
-    //         connect(directoryThread, &UIGuestDirectoryDiskUsageComputer::sigResultUpdated,
-    //                 this, &UIFileManagerGuestTable::sltReceiveDirectoryStatistics/*, Qt::DirectConnection*/);
-    //         directoryThread->start();
-    //     }
-    // }
 
     m_pPropertiesDialog->setWindowTitle(UIFileManager::tr("Properties"));
@@ -611 +591 @@
     m_pPropertiesDialog->execute();
 
-    // if (directoryThread)
-    // {
-    //     if (directoryThread->isRunning())
-    //         directoryThread->stopRecursion();
-    //     disconnect(directoryThread, &UIGuestDirectoryDiskUsageComputer::sigResultUpdated,
-    //                this, &UIFileManagerGuestTable::sltReceiveDirectoryStatistics/*, Qt::DirectConnection*/);
-    // }
-
-
     delete m_pPropertiesDialog;
     m_pPropertiesDialog = 0;
-
 }
 

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

@@ -167 +167 @@
         item->setIsOpened(false);
     }
-
 }
 
@@ -173 +172 @@
 {
     if (m_pLocationLabel)
-        m_pLocationLabel->setText(UIFileManager::tr("Host File System"));
+        m_pLocationLabel->setText(UIFileManager::tr("Host File System:"));
     UIFileManagerTable::retranslateUi();
 }
@@ -207 +206 @@
         m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_Cut)->setVisible(false);
         m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_Paste)->setVisible(false);
-
-    }
-
+    }
     setSelectionDependentActionsEnabled(false);
 }
@@ -267 +264 @@
     bool deleteSuccess = itemToDelete.removeRecursively();
 
-     if (!deleteSuccess)
-         emit sigLogOutput(QString(item->path()).append(" could not be deleted"), FileManagerLogType_Error);
+    if (!deleteSuccess)
+        emit sigLogOutput(QString(item->path()).append(" could not be deleted"), FileManagerLogType_Error);
 }
 

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

@@ -386 +386 @@
     , m_pathSeparator('/')
 {
-    float fFontMult = 1.2f;
+    float fFontMult = 1.f;
     QFont mFont = font();
     if (mFont.pixelSize() == -1)
@@ -437 +437 @@
         QString strFolder = UIPathOperations::removeTrailingDelimiters(folderList.at(i)).replace('/', m_pathSeparator);
         QString strWord = QString("<a href=\"%1\" style=\"color:black;text-decoration:none;\">%2</a>").arg(strPathUpto[i]).arg(strFolder);
+
         if (i < folderList.size() - 1)
         {
@@ -446 +447 @@
         if (iWidth < width())
             strLabelText.prepend(strWord);
-
     }
     setText(strLabelText);
@@ -851 +851 @@
     setSelectionDependentActionsEnabled(false);
 
-    /** @todo check if we really need this and if not remove it */
-    //m_pModel->signalUpdate();
+    m_pView->scrollToTop();
 }