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

Timestamp:

Nov 21, 2018 1:55:19 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699. Save file manager options 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) (2 diffs)
• guestctrl/UIGuestControlFileManager.cpp (modified) (3 diffs)
• guestctrl/UIGuestControlFileManager.h (modified) (1 diff)

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

@@ -204 +204 @@
 const char *UIExtraDataDefs::GUI_GuestControl_ProcessControlDialogGeometry = "GUI/GuestControl/ProcessControlDialogGeometry";
 
+/* Guest Control file manager options: */
+const char *UIExtraDataDefs::GUI_GuestControl_FileManagerOptions = "GUI/GuestControl/FileManagerOptions";
+const char *UIExtraDataDefs::GUI_GuestControl_FileManagerListDirectoriesFirst = "ListDirectoriesFirst";
+const char *UIExtraDataDefs::GUI_GuestControl_FileManagerShowDeleteConfirmation = "ShowDeleteConfimation";
+const char *UIExtraDataDefs::GUI_GuestControl_FileManagerShowHumanReadableSizes = "ShowHumanReadableSizes";
+
 /* Virtual Machine: Close dialog: */
 const char *UIExtraDataDefs::GUI_DefaultCloseAction = "GUI/DefaultCloseAction";

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

@@ -365 +365 @@
     /** @} */
 
+    /** @name Guest Control file manager options
+      * @{ */
+        extern const char *GUI_GuestControl_FileManagerOptions;
+        extern const char *GUI_GuestControl_FileManagerListDirectoriesFirst;
+        extern const char *GUI_GuestControl_FileManagerShowDeleteConfirmation;
+        extern const char *GUI_GuestControl_FileManagerShowHumanReadableSizes;
+    /** @} */
+
     /** @name Virtual Machine: Close dialog
       * @{ */

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

@@ -2034 +2034 @@
            << GUI_GuestControl_ProcessControlSplitterHints
            << GUI_GuestControl_FileManagerDialogGeometry
+           << GUI_GuestControl_FileManagerOptions
            << GUI_GuestControl_ProcessControlDialogGeometry
            << GUI_DefaultCloseAction << GUI_RestrictedCloseActions
@@ -4245 +4246 @@
 }
 
+void UIExtraDataManager::setGuestControlFileManagerOptions(bool fListDirectoriesFirst,
+                                       bool fShowDeleteConfirmation, bool fShowHumanReadableSizes)
+{
+    /* Serialize passed values: */
+    QStringList data;
+
+    if (fListDirectoriesFirst)
+        data << GUI_GuestControl_FileManagerListDirectoriesFirst;
+    if (fShowDeleteConfirmation)
+        data << GUI_GuestControl_FileManagerShowDeleteConfirmation;
+    if (fShowHumanReadableSizes)
+        data << GUI_GuestControl_FileManagerShowHumanReadableSizes;
+
+    /* Re-cache corresponding extra-data: */
+    setExtraDataStringList(GUI_GuestControl_FileManagerOptions, data);
+}
+
+bool UIExtraDataManager::guestControlFileManagerListDirectoriesFirst()
+{
+    const QStringList data = extraDataStringList(GUI_GuestControl_FileManagerOptions);
+    for (int i = 0; i < data.size(); ++i)
+    {
+        if (data[i] == GUI_GuestControl_FileManagerListDirectoriesFirst)
+            return true;
+    }
+    return false;
+}
+
+bool UIExtraDataManager::guestControlFileManagerShowDeleteConfirmation()
+{
+    const QStringList data = extraDataStringList(GUI_GuestControl_FileManagerOptions);
+    for (int i = 0; i < data.size(); ++i)
+    {
+        if (data[i] == GUI_GuestControl_FileManagerShowDeleteConfirmation)
+            return true;
+    }
+    return false;
+}
+
+bool UIExtraDataManager::guestControlFileManagerShowHumanReadableSizes()
+{
+    const QStringList data = extraDataStringList(GUI_GuestControl_FileManagerOptions);
+    for (int i = 0; i < data.size(); ++i)
+    {
+        if (data[i] == GUI_GuestControl_FileManagerShowHumanReadableSizes)
+            return true;
+    }
+    return false;
+}
+
 QRect UIExtraDataManager::guestProcessControlDialogGeometry(QWidget *pWidget, const QRect &defaultGeometry)
 {

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

@@ -634 +634 @@
     /** @} */
 
-    /** @name Virtual Machine: Guest Control related dialogs
+    /** @name Guest Control related dialogs
       * @{ */
         void setGuestControlProcessControlSplitterHints(const QList<int> &hints);
@@ -646 +646 @@
         void setGuestControlFileManagerVisiblePanels(const QStringList &panelNameList);
         QStringList guestControlFileManagerVisiblePanels();
+    /** @} */
+
+    /** @name Guest Control file manager options
+      * @{ */
+        void setGuestControlFileManagerOptions(bool fListDirectoriesFirst,
+                                               bool fShowDeleteConfirmation, bool fshowHumanReadableSizes);
+        bool guestControlFileManagerListDirectoriesFirst();
+        bool guestControlFileManagerShowDeleteConfirmation();
+        bool guestControlFileManagerShowHumanReadableSizes();
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.cpp

@@ -147 +147 @@
     , m_pOperationsPanel(0)
 {
+    loadOptions();
     prepareGuestListener();
     prepareObjects();
@@ -703 +704 @@
         strNameList.append(pPanel->panelName());
     gEDataManager->setGuestControlFileManagerVisiblePanels(strNameList);
+
+    /* Save the options: */
+    UIGuestControlFileManagerSettings *pSettings = UIGuestControlFileManagerSettings::instance();
+    if (pSettings)
+    {
+        gEDataManager->setGuestControlFileManagerOptions(pSettings->bListDirectoriesOnTop,
+                                                         pSettings->bAskDeleteConfirmation,
+                                                         pSettings->bShowHumanReadableSizes);
+    }
 }
 
@@ -722 +732 @@
 }
 
+void UIGuestControlFileManager::loadOptions()
+{
+    /* Load options: */
+    UIGuestControlFileManagerSettings *pSettings = UIGuestControlFileManagerSettings::instance();
+    if (pSettings)
+    {
+        pSettings->bListDirectoriesOnTop = gEDataManager->guestControlFileManagerListDirectoriesFirst();
+        pSettings->bAskDeleteConfirmation = gEDataManager->guestControlFileManagerShowDeleteConfirmation();
+        pSettings->bShowHumanReadableSizes = gEDataManager->guestControlFileManagerShowHumanReadableSizes();
+    }
+}
+
 void UIGuestControlFileManager::hidePanel(UIGuestControlFileManagerPanel* panel)
 {

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.h

@@ -143 +143 @@
     /** @} */
 
+    /** Saves list of panels and file manager options to the extra data. */
     void saveSettings();
+    /** Loads settings from exra data except the file manager options. */
     void loadSettings();
+    /** Loads file manager options. This should be done before widget creation
+     *  since some widgets are initilized with these options */
+    void loadOptions();
     void hidePanel(UIGuestControlFileManagerPanel *panel);
     void showPanel(UIGuestControlFileManagerPanel *panel);
-    /** Make sure escape key is assigned to only a single widget. This is done by checking
+    /** Makes sure escape key is assigned to only a single widget. This is done by checking
         several things in the following order:
         - when there are no more panels visible assign it to the parent dialog