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

Timestamp:

Jan 5, 2024 3:27:12 PM (13 months ago)

Author:

vboxsync

Message:

FE/Qt: UIVirtualBoxManager: Store whether log-viewer opened detached or embedded way to 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

@@ -108 +108 @@
 const char *UIExtraDataDefs::GUI_Toolbar_GlobalTools_Order = "GUI/Toolbar/GlobalTools/Order";
 const char *UIExtraDataDefs::GUI_Tools_LastItemsSelected = "GUI/Tools/LastItemsSelected";
+const char *UIExtraDataDefs::GUI_Tools_Detached = "GUI/Tools/Detached";
 const char *UIExtraDataDefs::GUI_Statusbar = "GUI/Statusbar";
 const char *UIExtraDataDefs::GUI_GroupDefinitions = "GUI/GroupDefinitions";

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

@@ -194 +194 @@
         /** Holds the last selected tool set of VirtualBox Manager. */
         SHARED_LIBRARY_STUFF extern const char *GUI_Tools_LastItemsSelected;
+        /** Holds the list of detached tools of VirtualBox Manager. */
+        SHARED_LIBRARY_STUFF extern const char *GUI_Tools_Detached;
         /** Holds whether selector-window status-bar visible. */
         SHARED_LIBRARY_STUFF extern const char *GUI_Statusbar;

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

@@ -1937 +1937 @@
            << GUI_Toolbar << GUI_Toolbar_Text
            << GUI_Toolbar_MachineTools_Order << GUI_Toolbar_GlobalTools_Order
-           << GUI_Tools_LastItemsSelected
+           << GUI_Tools_LastItemsSelected << GUI_Tools_Detached
            << GUI_Statusbar
            << GUI_GroupDefinitions << GUI_LastItemSelected
@@ -2917 +2917 @@
 }
 
+QList<UIToolType> UIExtraDataManager::detachedTools()
+{
+    /* Parse loaded data: */
+    QList<UIToolType> result;
+    foreach (const QString &strValue, extraDataStringList(GUI_Tools_Detached))
+    {
+        const UIToolType enmType = gpConverter->fromInternalString<UIToolType>(strValue);
+        if (enmType != UIToolType_Invalid)
+            result << enmType;
+    }
+
+    /* Return result: */
+    return result;
+}
+
+void UIExtraDataManager::setDetachedTools(const QList<UIToolType> &tools)
+{
+    /* Serialize passed values: */
+    QStringList data;
+    foreach (const UIToolType &enmType, tools)
+        data << gpConverter->toInternalString(enmType);
+
+    /* Re-cache corresponding extra-data: */
+    setExtraDataStringList(GUI_Tools_Detached, data);
+}
+
 bool UIExtraDataManager::selectorWindowStatusBarVisible()
 {

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

@@ -406 +406 @@
         /** Defines last selected tool @a set of VirtualBox Manager. */
         void setToolsPaneLastItemsChosen(const QList<UIToolType> &set);
+        /** Returns the list of detached tools of VirtualBox Manager. */
+        QList<UIToolType> detachedTools();
+        /** Defines the list of detached @a tools of VirtualBox Manager. */
+        void setDetachedTools(const QList<UIToolType> &tools);
 
         /** Returns whether selector-window status-bar visible. */

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

@@ -965 +965 @@
 void UIVirtualBoxManager::sltDetachLogViewer()
 {
+    /* Add tool to detached: */
+    QList<UIToolType> tools = gEDataManager->detachedTools();
+    if (!tools.contains(UIToolType_Logs))
+    {
+        tools << UIToolType_Logs;
+        gEDataManager->setDetachedTools(tools);
+    }
+
+    /* Detach Log Viewer: */
     sltOpenManagerWindow(UIToolType_Logs);
 }
@@ -1069 +1078 @@
     /* Make sure type is valid: */
     AssertReturnVoid(enmType != UIToolType_Invalid);
+
+    /* Remove tool from detached: */
+    QList<UIToolType> tools = gEDataManager->detachedTools();
+    if (tools.contains(UIToolType_Logs))
+    {
+        tools.removeAll(UIToolType_Logs);
+        gEDataManager->setDetachedTools(tools);
+    }
 
     /* Open known tool finally: */
@@ -2256 +2273 @@
     AssertReturnVoid(enmType != UIToolType_Invalid);
 
+    /* Check if this tool should be opened detached way: */
+    if (gEDataManager->detachedTools().contains(enmType))
+        return sltOpenManagerWindow(enmType);
+
     /* Open the tool finally: */
     m_pWidget->setToolsTypeMachine(enmType);