Changeset 82290 in vbox

Timestamp:

Nov 29, 2019 6:31:38 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9611: UIMachineSettingsGeneral: Get rid of hardcoded shared clipboard mode list, instead acquire this list through CSystemProperties interface; Besides that, using more modern Qt approach to cache enum data directly without casting it to int.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine

Files:

• UIMachineSettingsGeneral.cpp (modified) (6 diffs)
• UIMachineSettingsGeneral.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp

@@ -241 +241 @@
     const UIDataSettingsMachineGeneral &oldGeneralData = m_pCache->base();
 
+    /* We are doing that *now* because these combos have
+     * dynamical content which depends on cashed value: */
+    repopulateComboClipboardMode();
+
     /* Load old 'Basic' data from the cache: */
     AssertPtrReturnVoid(m_pNameAndSystemEditor);
@@ -252 +256 @@
     mPsSnapshot->setPath(oldGeneralData.m_strSnapshotsFolder);
     mPsSnapshot->setHomeDir(oldGeneralData.m_strSnapshotsHomeDir);
-    mCbClipboard->setCurrentIndex(oldGeneralData.m_clipboardMode);
+    const int iClipboardModePosition = mCbClipboard->findData(oldGeneralData.m_clipboardMode);
+    mCbClipboard->setCurrentIndex(iClipboardModePosition == -1 ? 0 : iClipboardModePosition);
     mCbDragAndDrop->setCurrentIndex(oldGeneralData.m_dndMode);
 
@@ -289 +294 @@
     AssertPtrReturnVoid(mCbDragAndDrop);
     newGeneralData.m_strSnapshotsFolder = mPsSnapshot->path();
-    newGeneralData.m_clipboardMode = (KClipboardMode)mCbClipboard->currentIndex();
+    newGeneralData.m_clipboardMode = mCbClipboard->currentData().value<KClipboardMode>();
     newGeneralData.m_dndMode = (KDnDMode)mCbDragAndDrop->currentIndex();
 
@@ -466 +471 @@
                                  "virtual machine will be stored. Be aware that "
                                  "snapshots can take quite a lot of storage space."));
+
     /* Translate Shared Clipboard mode combo: */
     AssertPtrReturnVoid(mCbClipboard);
-    mCbClipboard->setItemText(0, gpConverter->toString(KClipboardMode_Disabled));
-    mCbClipboard->setItemText(1, gpConverter->toString(KClipboardMode_HostToGuest));
-    mCbClipboard->setItemText(2, gpConverter->toString(KClipboardMode_GuestToHost));
-    mCbClipboard->setItemText(3, gpConverter->toString(KClipboardMode_Bidirectional));
+    for (int iIndex = 0; iIndex < mCbClipboard->count(); ++iIndex)
+    {
+        const KClipboardMode enmType = mCbClipboard->currentData().value<KClipboardMode>();
+        mCbClipboard->setItemText(iIndex, gpConverter->toString(enmType));
+    }
+
     /* Translate Drag'n'drop mode combo: */
     AssertPtrReturnVoid(mCbDragAndDrop);
@@ -559 +567 @@
     /* Tab and it's layout created in the .ui file. */
     {
-        /* Shared Clipboard Mode combo-box created in the .ui file. */
-        AssertPtrReturnVoid(mCbClipboard);
-        {
-            /* Configure combo-box: */
-            mCbClipboard->addItem(""); /* KClipboardMode_Disabled */
-            mCbClipboard->addItem(""); /* KClipboardMode_HostToGuest */
-            mCbClipboard->addItem(""); /* KClipboardMode_GuestToHost */
-            mCbClipboard->addItem(""); /* KClipboardMode_Bidirectional */
-        }
-
         /* Drag&drop Mode combo-box created in the .ui file. */
         AssertPtrReturnVoid(mCbDragAndDrop);
@@ -656 +654 @@
     delete m_pCache;
     m_pCache = 0;
+}
+
+void UIMachineSettingsGeneral::repopulateComboClipboardMode()
+{
+    /* Shared Clipboard mode combo-box created in the .ui file. */
+    AssertPtrReturnVoid(mCbClipboard);
+    {
+        /* Clear combo first of all: */
+        mCbClipboard->clear();
+
+        /* Load currently supported Shared Clipboard modes: */
+        CSystemProperties comProperties = uiCommon().virtualBox().GetSystemProperties();
+        QVector<KClipboardMode> clipboardModes = comProperties.GetSupportedClipboardModes();
+        /* Take into account currently cached value: */
+        const KClipboardMode enmCachedValue = m_pCache->base().m_clipboardMode;
+        if (!clipboardModes.contains(enmCachedValue))
+            clipboardModes.prepend(enmCachedValue);
+
+        /* Populate combo finally: */
+        foreach (const KClipboardMode &enmMode, clipboardModes)
+            mCbClipboard->addItem(gpConverter->toString(enmMode), QVariant::fromValue(enmMode));
+    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.h

@@ -111 +111 @@
     void cleanup();
 
+    /** Repopulates Clipboard mode combo-box. */
+    void repopulateComboClipboardMode();
+
     /** Saves existing general data from the cache. */
     bool saveGeneralData();