Changeset 97481 in vbox

Timestamp:

Nov 9, 2022 2:13:50 PM (2 years ago)

Author:

vboxsync

Message:

Guest Control/Main: A bit nicer progress object descriptions, which now also include information about how many (other) objects are copied to where. bugref:10286

File:

• trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp

@@ -1583 +1583 @@
         Assert(mVecLists[0]->mVecEntries.size());
 
-        Utf8Str strFirstOp = mDest + mVecLists[0]->mVecEntries[0]->strPath;
+        Utf8Str const &strFirstOp = mVecLists[0]->mVecEntries[0]->strPath;
+
+        /* Now that we know how many objects we're handling, tweak the progress description so that it
+         * reflects more accurately what the progress is actually doing. */
+        if (cOperations > 1)
+        {
+            mDesc.printf(tr("Copying \"%s\" [and %zu %s] from guest to \"%s\" on the host ..."),
+                         strFirstOp.c_str(), cOperations - 1, cOperations > 2 ? tr("others") : tr("other"), mDest.c_str());
+        }
+        else
+            mDesc.printf(tr("Copying \"%s\" from guest to \"%s\" on the host ..."), strFirstOp.c_str(), mDest.c_str());
+
         hrc = pProgress->init(static_cast<IGuestSession*>(mSession), Bstr(mDesc).raw(),
                               TRUE /* aCancelable */, cOperations + 1 /* Number of operations */, Bstr(strFirstOp).raw());
@@ -2025 +2036 @@
         Assert(mVecLists[0]->mVecEntries.size());
 
+        Utf8Str const &strFirstOp = mVecLists[0]->mVecEntries[0]->strPath;
+
+        /* Now that we know how many objects we're handling, tweak the progress description so that it
+         * reflects more accurately what the progress is actually doing. */
+        if (cOperations > 1)
+        {
+            mDesc.printf(tr("Copying \"%s\" [and %zu %s] from host to \"%s\" on the guest ..."),
+                         strFirstOp.c_str(), cOperations - 1, cOperations > 2 ? tr("others") : tr("other"), mDest.c_str());
+        }
+        else
+            mDesc.printf(tr("Copying \"%s\" from host to \"%s\" on the guest ..."), strFirstOp.c_str(), mDest.c_str());
+
         hrc = pProgress->init(static_cast<IGuestSession*>(mSession), Bstr(mDesc).raw(),
                               TRUE /* aCancelable */, cOperations + 1 /* Number of operations */,
-                              Bstr(mDesc).raw());
+                              Bstr(strFirstOp).raw());
     }
     else /* If no operations have been defined, go with an "empty" progress object when will be used for error handling. */