Changeset 75633 in vbox

Timestamp:

Nov 21, 2018 10:03:40 AM (6 years ago)

Author:

vboxsync

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

126811

Message:

FE/Qt: bugref:6699. Implement a 'delete confirmation' dialog

Location:

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

Files:

• UIGuestControlFileTable.cpp (modified) (8 diffs)
• UIGuestControlFileTable.h (modified) (2 diffs)

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

@@ -23 +23 @@
 # include <QAction>
 # include <QComboBox>
+# include <QCheckBox>
 # include <QDateTime>
 # include <QDir>
@@ -44 +45 @@
 # include "UIIconPool.h"
 # include "UIGuestControlFileTable.h"
+# include "UIGuestControlFileManager.h"
 # include "UIGuestControlFileModel.h"
 # include "UIToolBar.h"
@@ -99 +101 @@
 
 protected:
-        virtual void drawFocus ( QPainter * /*painter*/, const QStyleOptionViewItem & /*option*/, const QRect & /*rect*/ ) const {}
+
+    virtual void drawFocus ( QPainter * /*painter*/, const QStyleOptionViewItem & /*option*/, const QRect & /*rect*/ ) const {}
+
 };
 
 
 /*********************************************************************************************************************************
-*   UIFileStringInputDialog definition.                                                                                          *
+*   UStringInputDialog definition.                                                                                          *
 *********************************************************************************************************************************/
 
@@ -121 +125 @@
 
     QILineEdit      *m_pLineEdit;
+
+};
+
+
+/*********************************************************************************************************************************
+*   UIFileDeleteConfirmationDialog definition.                                                                                   *
+*********************************************************************************************************************************/
+
+/** A QIDialog child including a line edit whose text exposed when the dialog is accepted */
+class UIFileDeleteConfirmationDialog : public QIDialog
+{
+
+    Q_OBJECT;
+
+public:
+
+    UIFileDeleteConfirmationDialog(QWidget *pParent = 0, Qt::WindowFlags flags = 0);
+    /** Returns whether m_pAskNextTimeCheckBox is checked or not. */
+    bool askDeleteConfirmationNextTime() const;
+
+private:
+
+    QCheckBox *m_pAskNextTimeCheckBox;
+    QLabel    *m_pQuestionLabel;
 
 };
@@ -341 +369 @@
         new QIDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this);
     layout->addWidget(pButtonBox);
-        // {
-        //     /* Configure button-box: */
     connect(pButtonBox, &QIDialogButtonBox::accepted, this, &UIStringInputDialog::accept);
     connect(pButtonBox, &QIDialogButtonBox::rejected, this, &UIStringInputDialog::reject);
-
 }
 
@@ -598 +623 @@
 {
     return m_isDriveItem;
+}
+
+/*********************************************************************************************************************************
++*   UIFileDeleteConfirmationDialog implementation.                                                                                *
++*********************************************************************************************************************************/
+
+UIFileDeleteConfirmationDialog::UIFileDeleteConfirmationDialog(QWidget *pParent /* = 0 */, Qt::WindowFlags flags /* = 0 */)
+    :QIDialog(pParent, flags)
+    , m_pAskNextTimeCheckBox(0)
+    , m_pQuestionLabel(0)
+{
+    QVBoxLayout *pLayout = new QVBoxLayout(this);
+
+    m_pQuestionLabel = new QLabel;
+    if (m_pQuestionLabel)
+    {
+        pLayout->addWidget(m_pQuestionLabel);
+        m_pQuestionLabel->setText(UIGuestControlFileManager::tr("Delete the selected file(s) and/or folder(s)"));
+    }
+
+    QIDialogButtonBox *pButtonBox =
+        new QIDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this);
+    if (pButtonBox)
+    {
+        pLayout->addWidget(pButtonBox, 0, Qt::AlignCenter);
+        connect(pButtonBox, &QIDialogButtonBox::accepted, this, &UIStringInputDialog::accept);
+        connect(pButtonBox, &QIDialogButtonBox::rejected, this, &UIStringInputDialog::reject);
+    }
+
+    QCheckBox *m_pAskNextTimeCheckBox = new QCheckBox;
+
+    if (m_pAskNextTimeCheckBox)
+    {
+        pLayout->addWidget(m_pAskNextTimeCheckBox);
+        m_pAskNextTimeCheckBox->setText(UIGuestControlFileManager::tr("Ask for this confirmation next time"));
+    }
+}
+
+bool UIFileDeleteConfirmationDialog::askDeleteConfirmationNextTime() const
+{
+    if (!m_pAskNextTimeCheckBox)
+        return true;
+    return m_pAskNextTimeCheckBox->isChecked();
 }
 
@@ -974 +1042 @@
 void UIGuestControlFileTable::sltDelete()
 {
+    if (!checkIfDeleteOK())
+        return;
+
+    if (!m_pView || !m_pModel)
+        return;
+
     if (!m_pView || !m_pModel)
         return;
@@ -1419 +1493 @@
 }
 
+bool UIGuestControlFileTable::checkIfDeleteOK()
+{
+    UIGuestControlFileManagerSettings *pFileManagerSettings = UIGuestControlFileManagerSettings::instance();
+    if (!pFileManagerSettings)
+        return true;
+    if (!pFileManagerSettings->bAskDeleteConfirmation)
+        return true;
+    UIFileDeleteConfirmationDialog *pDialog =
+        new UIFileDeleteConfirmationDialog(this);
+
+
+    bool fContinueWithDelete = (pDialog->execute() == QDialog::Accepted);
+
+    bool bAskNextTime = pDialog->askDeleteConfirmationNextTime();
+
+    /* Update the file manager settings only if it is necessary: */
+    if (pFileManagerSettings->bAskDeleteConfirmation != bAskNextTime)
+    {
+        pFileManagerSettings->bAskDeleteConfirmation = bAskNextTime;
+        /* Notify file manager settings panel so that the check box there is updated: */
+        emit sigDeleteConfirmationSettingChanged();
+    }
+
+    delete pDialog;
+
+    return fContinueWithDelete;
+
+}
+
 #include "UIGuestControlFileTable.moc"

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

@@ -246 +246 @@
 
     void sigLogOutput(QString strLog, FileManagerLogType eLogType);
+    void sigDeleteConfirmationSettingChanged();
 
 public:
@@ -363 +364 @@
     /** Clears the m_pSearchLineEdit and hides it. */
     void            disableSelectionSearch();
+    /** Checks if delete confirmation dialog is shown and users choice. Returns true
+     *  if deletion can continue */
+    bool            checkIfDeleteOK();
+
     UIGuestControlFileModel      *m_pModel;
     UIGuestControlFileView       *m_pView;