Changeset 97802 in vbox

Timestamp:

Dec 14, 2022 2:58:10 PM (2 years ago)

Author:

vboxsync

Message:

DnD/Main: Made the progress object description a bit more flexible, to also know which operation currently is going on.

Location:

trunk/src/VBox/Main

Files:

• include/GuestDnDPrivate.h (modified) (1 diff)
• src-client/GuestDnDPrivate.cpp (modified) (2 diffs)
• src-client/GuestDnDSourceImpl.cpp (modified) (1 diff)
• src-client/GuestDnDTargetImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/include/GuestDnDPrivate.h

@@ -855 +855 @@
     bool isProgressRunning(void) const;
     int setProgress(unsigned uPercentage, uint32_t uState, int rcOp = VINF_SUCCESS, const Utf8Str &strMsg = "");
-    HRESULT resetProgress(const ComObjPtr<Guest>& pParent);
+    HRESULT resetProgress(const ComObjPtr<Guest>& pParent, const Utf8Str &strDesc);
     HRESULT queryProgressTo(IProgress **ppProgress);
     /** @} */

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

@@ -418 +418 @@
  * @returns HRESULT
  * @param   pParent             Parent to set for the progress object.
- */
-HRESULT GuestDnDState::resetProgress(const ComObjPtr<Guest>& pParent)
-{
+ * @param   strDesc             Description of the progress.
+ */
+HRESULT GuestDnDState::resetProgress(const ComObjPtr<Guest>& pParent, const Utf8Str &strDesc)
+{
+    AssertReturn(strDesc.isNotEmpty(), E_INVALIDARG);
+
     m_pProgress.setNull();
 
@@ -427 +430 @@
     {
         hr = m_pProgress->init(static_cast<IGuest *>(pParent),
-                               Bstr(tr("Dropping data")).raw(),
+                               Bstr(strDesc).raw(),
                                TRUE /* aCancelable */);
     }

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

@@ -393 +393 @@
     GuestDnDState *pState = GuestDnDInst()->getState();
     AssertPtr(pState);
-    HRESULT hr = pState->resetProgress(m_pGuest);
+    HRESULT hr = pState->resetProgress(m_pGuest, tr("Dropping data to host"));
     if (FAILED(hr))
         return hr;

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

@@ -719 +719 @@
     GuestDnDState *pState = GuestDnDInst()->getState();
     AssertPtr(pState);
-    HRESULT hr = pState->resetProgress(m_pGuest);
+    HRESULT hr = pState->resetProgress(m_pGuest, tr("Dropping data to guest"));
     if (FAILED(hr))
         return hr;