Changeset 88204 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Mar 19, 2021 1:42:23 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

143368

Message:

FE/Qt: bugref:9686. Saving some options to extradata

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• activity/overview/UIVMActivityOverviewWidget.cpp (modified) (5 diffs)
• activity/overview/UIVMActivityOverviewWidget.h (modified) (1 diff)
• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• extradata/UIExtraDataManager.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/activity/overview/UIVMActivityOverviewWidget.cpp

@@ -1439 +1439 @@
     m_iSortIndicatorWidth += 2 * iIndicatorMargin;
 
-    loadHiddenColumnList();
     prepareWidgets();
     loadSettings();
@@ -1563 +1562 @@
 void UIVMActivityOverviewWidget::loadSettings()
 {
-}
-
-void UIVMActivityOverviewWidget::loadHiddenColumnList()
-{
+    /* Load the list of hidden columns: */
     QStringList hiddenColumnList = gEDataManager->VMActivityOverviewHiddenColumnList();
     for (int i = (int)VMActivityOverviewColumn_Name; i < (int)VMActivityOverviewColumn_Max; ++i)
@@ -1572 +1568 @@
     foreach(const QString& strColumn, hiddenColumnList)
         setColumnVisible((int)gpConverter->fromInternalString<VMActivityOverviewColumn>(strColumn), false);
+    /* Load other options: */
+    sltNotRunningVMVisibility(gEDataManager->activityOverviewShowAllMachines());
 }
 
 void UIVMActivityOverviewWidget::saveSettings()
 {
+    /* Save the list of hidden columns: */
     QStringList hiddenColumnList;
     for (int i = 0; i < m_columnVisible.size(); ++i)
@@ -1583 +1582 @@
     }
     gEDataManager->setVMActivityOverviewHiddenColumnList(hiddenColumnList);
+    gEDataManager->setActivityOverviewShowAllMachines(m_fShowNotRunningVMs);
 }
 
@@ -1622 +1622 @@
     if (m_pVMActivityMonitorAction)
         menu.addAction(m_pVMActivityMonitorAction);
+    menu.addSeparator();
     QAction *pHideNotRunningAction =
         menu.addAction(UIVMActivityOverviewWidget::tr("List all virtual machines"));

trunk/src/VBox/Frontends/VirtualBox/src/activity/overview/UIVMActivityOverviewWidget.h

@@ -104 +104 @@
         void updateColumnsMenu();
         void loadSettings();
-        void loadHiddenColumnList();
         void saveSettings();
     /** @} */

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

@@ -245 +245 @@
 /* VM Activity Overview: */
 const char *UIExtraDataDefs::GUI_VMResourceManager_HiddenColumns = "GUI/VMResourceManagerHiddenColumns";
+const char *UIExtraDataDefs::GUI_VMResourceManager_ShowAllMachines = "GUI/VMResourceManagerShowAllMachines";
 
 /* Obsolete keys: */

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

@@ -446 +446 @@
       * @{ */
         SHARED_LIBRARY_STUFF extern const char *GUI_VMResourceManager_HiddenColumns;
+        SHARED_LIBRARY_STUFF extern const char *GUI_VMResourceManager_ShowAllMachines;
     /** @} */
 

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

@@ -4654 +4654 @@
 }
 
+bool UIExtraDataManager::activityOverviewShowAllMachines()
+{
+    return isFeatureAllowed(GUI_VMResourceManager_ShowAllMachines);
+}
+
+void UIExtraDataManager::setActivityOverviewShowAllMachines(bool fShow)
+{
+    setExtraDataString(GUI_VMResourceManager_ShowAllMachines, toFeatureAllowed(fShow));
+}
+
 void UIExtraDataManager::sltExtraDataChange(const QUuid &uMachineID, const QString &strKey, const QString &strValue)
 {

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

@@ -800 +800 @@
         void setVMActivityOverviewHiddenColumnList(const QStringList &hiddenColumnList);
         QStringList VMActivityOverviewHiddenColumnList();
+        bool activityOverviewShowAllMachines();
+        void setActivityOverviewShowAllMachines(bool fShow);
     /** @} */