Changeset 75643 in vbox

Timestamp:

Nov 21, 2018 2:27:42 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699. Make use of the delete confirmation dialog

Location:

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl

Files:

• UIGuestControlFileManager.cpp (modified) (3 diffs)
• UIGuestControlFileManager.h (modified) (1 diff)
• UIGuestControlFileManagerSettingsPanel.cpp (modified) (1 diff)
• UIGuestControlFileManagerSettingsPanel.h (modified) (2 diffs)
• UIGuestControlFileTable.cpp (modified) (2 diffs)
• UIGuestControlFileTable.h (modified) (1 diff)

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

@@ -243 +243 @@
             connect(m_pHostFileTable, &UIHostFileTable::sigLogOutput,
                     this, &UIGuestControlFileManager::sltReceieveLogOutput);
+            connect(m_pHostFileTable, &UIHostFileTable::sigDeleteConfirmationOptionChanged,
+                    this, &UIGuestControlFileManager::sltHandleOptionsUpdated);
             pFileTableContainerLayout->addWidget(m_pHostFileTable);
         }
@@ -254 +256 @@
             connect(m_pGuestFileTable, &UIGuestFileTable::sigCacheHostFileObjectsForDeletion,
                     this, &UIGuestControlFileManager::sltCacheHostFileObjectsForDeletion);
-
+            connect(m_pGuestFileTable, &UIGuestFileTable::sigDeleteConfirmationOptionChanged,
+                    this, &UIGuestControlFileManager::sltHandleOptionsUpdated);
             pFileTableContainerLayout->addWidget(m_pGuestFileTable);
         }
@@ -548 +551 @@
 }
 
+void UIGuestControlFileManager::sltHandleOptionsUpdated()
+{
+    if (m_pSettingsPanel)
+    {
+        m_pSettingsPanel->update();
+    }
+}
+
 void UIGuestControlFileManager::copyMoveToHost(bool fIsMove)
 {

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

@@ -117 +117 @@
     void sltFileOperationComplete(QUuid progressId);
     void sltCacheHostFileObjectsForDeletion(const QUuid &moveProgessId, const QStringList &hostPathList);
+    /** Performs whatever necessary when some signal about option change has been receieved. */
+    void sltHandleOptionsUpdated();
 
 private:

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

@@ -51 +51 @@
 {
     return "SettingsPanel";
+}
+
+void UIGuestControlFileManagerSettingsPanel::update()
+{
+    if (!m_pFileManagerSettings)
+        return;
+
+    if (m_pListDirectoriesOnTopCheckBox)
+    {
+        m_pListDirectoriesOnTopCheckBox->blockSignals(true);
+        m_pListDirectoriesOnTopCheckBox->setChecked(m_pFileManagerSettings->bListDirectoriesOnTop);
+        m_pListDirectoriesOnTopCheckBox->blockSignals(false);
+    }
+
+    if (m_pDeleteConfirmationCheckBox)
+    {
+        m_pDeleteConfirmationCheckBox->blockSignals(true);
+        m_pDeleteConfirmationCheckBox->setChecked(m_pFileManagerSettings->bAskDeleteConfirmation);
+        m_pDeleteConfirmationCheckBox->blockSignals(false);
+    }
+
+    if (m_pHumanReabableSizesCheckBox)
+    {
+        m_pHumanReabableSizesCheckBox->blockSignals(true);
+        m_pHumanReabableSizesCheckBox->setChecked(m_pFileManagerSettings->bShowHumanReadableSizes);
+        m_pHumanReabableSizesCheckBox->blockSignals(false);
+    }
 }
 

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

@@ -39 +39 @@
                                            QWidget *pParent, UIGuestControlFileManagerSettings *pFileManagerSettings);
     virtual QString panelName() const /* override */;
+    /** Reads the file manager options and updates te widget accordingly. This functions is typically called
+     *  when file manager options have been change by other means and this panel needs to adapt. */
+    void update();
 
 signals:
@@ -60 +63 @@
 private:
 
-    QCheckBox                         *m_pListDirectoriesOnTopCheckBox;
-    QCheckBox                         *m_pDeleteConfirmationCheckBox;
-    QCheckBox                         *m_pHumanReabableSizesCheckBox;
+    QCheckBox          *m_pListDirectoriesOnTopCheckBox;
+    QCheckBox          *m_pDeleteConfirmationCheckBox;
+    QCheckBox          *m_pHumanReabableSizesCheckBox;
 
     UIGuestControlFileManagerSettings *m_pFileManagerSettings;

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

@@ -652 +652 @@
     }
 
-    QCheckBox *m_pAskNextTimeCheckBox = new QCheckBox;
+    m_pAskNextTimeCheckBox = new QCheckBox;
 
     if (m_pAskNextTimeCheckBox)
     {
+        UIGuestControlFileManagerSettings *pFileManagerSettings = UIGuestControlFileManagerSettings::instance();
+        if (pFileManagerSettings)
+            m_pAskNextTimeCheckBox->setChecked(pFileManagerSettings->bAskDeleteConfirmation);
+
         pLayout->addWidget(m_pAskNextTimeCheckBox);
         m_pAskNextTimeCheckBox->setText(UIGuestControlFileManager::tr("Ask for this confirmation next time"));
@@ -1513 +1517 @@
         pFileManagerSettings->bAskDeleteConfirmation = bAskNextTime;
         /* Notify file manager settings panel so that the check box there is updated: */
-        emit sigDeleteConfirmationSettingChanged();
+        emit sigDeleteConfirmationOptionChanged();
     }
 

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

@@ -246 +246 @@
 
     void sigLogOutput(QString strLog, FileManagerLogType eLogType);
-    void sigDeleteConfirmationSettingChanged();
+    void sigDeleteConfirmationOptionChanged();
 
 public: