Changeset 85454 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 24, 2020 10:50:38 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9722: VirtualBox Manager: Hot-load last used public key on subsequent try to create cloud console connection; Path to key being stored in extra-data.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (2 diffs)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• manager/UIVirtualBoxManager.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp

@@ -118 +118 @@
 const char *UIExtraDataDefs::GUI_CloudConsoleManager_Restrictions = "GUI/CloudConsoleManager/Restrictions";
 const char *UIExtraDataDefs::GUI_CloudConsoleManager_Details_Expanded = "GUI/CloudConsoleManager/Details/Expanded";
+
+/* Cloud Console: */
+const char *UIExtraDataDefs::GUI_CloudConsole_PublicKey_Path = "GUI/CloudConsole/PublicKey/Path";
 
 #ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -230 +230 @@
         /** Holds whether Cloud Console Manager details expanded. */
         SHARED_LIBRARY_STUFF extern const char *GUI_CloudConsoleManager_Details_Expanded;
+    /** @} */
+
+    /** @name Cloud Console
+      * @{ */
+        /** Holds Cloud Console public key path. */
+        SHARED_LIBRARY_STUFF extern const char *GUI_CloudConsole_PublicKey_Path;
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -1933 +1933 @@
            << GUI_CloudConsoleManager_Restrictions
            << GUI_CloudConsoleManager_Details_Expanded
+           << GUI_CloudConsole_PublicKey_Path
            << GUI_HideDescriptionForWizards
            << GUI_HideFromManager << GUI_HideDetails
@@ -3063 +3064 @@
 }
 
+QString UIExtraDataManager::cloudConsolePublicKeyPath()
+{
+    return extraDataString(GUI_CloudConsole_PublicKey_Path);
+}
+
+void UIExtraDataManager::setCloudConsolePublicKeyPath(const QString &strPath)
+{
+    setExtraDataString(GUI_CloudConsole_PublicKey_Path, strPath);
+}
+
 WizardMode UIExtraDataManager::modeForWizardType(WizardType type)
 {

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

@@ -450 +450 @@
         /** Defines whether Cloud Console Manager details @a fExpanded. */
         void setCloudConsoleManagerDetailsExpanded(bool fExpanded);
+    /** @} */
+
+    /** @name Cloud Console
+      * @{ */
+        /** Returns Cloud Console public key path. */
+        QString cloudConsolePublicKeyPath();
+        /** Defines Cloud Console public key @a strPath. */
+        void setCloudConsolePublicKeyPath(const QString &strPath);
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -131 +131 @@
     void prepare();
 
+    /** Loads file contents. */
+    void loadFileContents(const QString &strPath, bool fIgnoreErrors = false);
+
     /** Holds the text-editor instance. */
     QTextEdit         *m_pTextEditor;
@@ -175 +178 @@
     if (!strFileName.isEmpty())
     {
-        QFile file(strFileName);
-        if (file.open(QIODevice::ReadOnly))
-            m_pTextEditor->setPlainText(file.readAll());
-        else
-            msgCenter().cannotOpenPublicKeyFile(strFileName);
+        gEDataManager->setCloudConsolePublicKeyPath(strFileName);
+        loadFileContents(strFileName);
     }
 }
@@ -219 +219 @@
     /* Apply language settings: */
     retranslateUi();
+
+    /* Load last remembered file contents: */
+    loadFileContents(gEDataManager->cloudConsolePublicKeyPath(), true /* ignore errors */);
+
+    /* Resize to suitable size: */
+    const int iMinimumHeightHint = minimumSizeHint().height();
+    resize(iMinimumHeightHint * 2, iMinimumHeightHint);
+}
+
+void UIAcquirePublicKeyDialog::loadFileContents(const QString &strPath, bool fIgnoreErrors /* = false */)
+{
+    if (strPath.isEmpty())
+        return;
+    QFile file(strPath);
+    if (file.open(QIODevice::ReadOnly))
+        m_pTextEditor->setPlainText(file.readAll());
+    else if (!fIgnoreErrors)
+        msgCenter().cannotOpenPublicKeyFile(strPath);
 }