Changeset 55279 in vbox for trunk/src/VBox

Timestamp:

Apr 15, 2015 11:34:52 AM (10 years ago)

Author:

vboxsync

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

99597

Message:

FE/Qt: 7676: Disk Encryption (DE) support: Reflecting encryption progress during settings save routine.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings

Files:

• UISettingsPage.h (modified) (1 diff)
• UISettingsSerializer.cpp (modified) (10 diffs)
• UISettingsSerializer.h (modified) (4 diffs)
• machine/UIMachineSettingsGeneral.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsPage.h

@@ -78 +78 @@
     Q_OBJECT;
 
+signals:
+
+    /** Notifies listeners about particular operation progress change.
+      * @param iOperations  holds the number of operations CProgress have,
+      * @param strOperation holds the description of the current CProgress operation,
+      * @param iOperation   holds the index of the current CProgress operation,
+      * @param iPercent     holds the percentage of the current CProgress operation. */
+    void sigOperationProgressChange(ulong iOperations, QString strOperation,
+                                    ulong iOperation, ulong iPercent);
+
 public:
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsSerializer.cpp

@@ -29 +29 @@
 # include "UISettingsPage.h"
 # include "UIIconPool.h"
+# include "QILabel.h"
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
@@ -144 +145 @@
             m_iIdOfHighPriorityPage = -1;
         /* Process this page if its enabled: */
+        connect(pPage, SIGNAL(sigOperationProgressChange(ulong, QString, ulong, ulong)),
+                this, SIGNAL(sigOperationProgressChange(ulong, QString, ulong, ulong)));
         if (pPage->isEnabled())
         {
@@ -152 +155 @@
         }
         /* Remember what page was processed: */
+        disconnect(pPage, SIGNAL(sigOperationProgressChange(ulong, QString, ulong, ulong)),
+                   this, SIGNAL(sigOperationProgressChange(ulong, QString, ulong, ulong)));
         pPage->setProcessed(true);
         /* Remove processed page from our map: */
@@ -174 +179 @@
 }
 
+QString UISettingsSerializerProgress::m_strProgressDescriptionTemplate = QString("<compact elipsis=\"middle\">%1 (%2/%3)</compact>");
+
 UISettingsSerializerProgress::UISettingsSerializerProgress(QWidget *pParent, UISettingsSerializer::SerializationDirection direction,
                                                            const QVariant &data, const UISettingsPageList &pages)
@@ -183 +190 @@
     , m_pLabelOperationProgress(0)
     , m_pBarOperationProgress(0)
+    , m_pLabelSubOperationProgress(0)
+    , m_pBarSubOperationProgress(0)
 {
     /* Prepare: */
@@ -222 +231 @@
         connect(m_pSerializer, SIGNAL(sigNotifyAboutPagesPostprocessed()),
                 this, SLOT(sltAdvanceProgressValue()));
+        connect(m_pSerializer, SIGNAL(sigOperationProgressChange(ulong, QString, ulong, ulong)),
+                this, SLOT(sltHandleOperationProgressChange(ulong, QString, ulong, ulong)));
     }
 
@@ -276 +287 @@
                     pLayoutProgress->addWidget(m_pBarOperationProgress);
                 }
+                /* Create sub-operation progress label: */
+                m_pLabelSubOperationProgress = new QILabel;
+                AssertPtrReturnVoid(m_pLabelSubOperationProgress);
+                {
+                    /* Configure label: */
+                    m_pLabelSubOperationProgress->hide();
+                    m_pLabelSubOperationProgress->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed));
+                    /* Add label into layout: */
+                    pLayoutProgress->addWidget(m_pLabelSubOperationProgress);
+                }
+                /* Create sub-operation progress bar: */
+                m_pBarSubOperationProgress = new QProgressBar;
+                AssertPtrReturnVoid(m_pBarSubOperationProgress);
+                {
+                    /* Configure progress bar: */
+                    m_pBarSubOperationProgress->hide();
+                    m_pBarSubOperationProgress->setMinimumWidth(300);
+                    m_pBarSubOperationProgress->setMaximum(100);
+                    m_pBarSubOperationProgress->setMinimum(0);
+                    m_pBarSubOperationProgress->setValue(0);
+                    /* Add bar into layout: */
+                    pLayoutProgress->addWidget(m_pBarSubOperationProgress);
+                }
                 /* Add stretch: */
                 pLayoutProgress->addStretch();
@@ -317 +351 @@
 void UISettingsSerializerProgress::sltAdvanceProgressValue()
 {
-    /* Advance the serialize progress bar: */
+    /* Advance the operation progress bar: */
     AssertPtrReturnVoid(m_pBarOperationProgress);
     m_pBarOperationProgress->setValue(m_pBarOperationProgress->value() + 1);
@@ -324 +358 @@
 void UISettingsSerializerProgress::sltProgressValueChanged(int iValue)
 {
+    /* Hide the progress-dialog upon reaching the 100% progress: */
     AssertPtrReturnVoid(m_pBarOperationProgress);
     if (iValue == m_pBarOperationProgress->maximum())
@@ -329 +364 @@
 }
 
+void UISettingsSerializerProgress::sltHandleOperationProgressChange(ulong iOperations, QString strOperation,
+                                                                    ulong iOperation, ulong iPercent)
+{
+    /* Update the sub-operation progress label and bar: */
+    AssertPtrReturnVoid(m_pLabelSubOperationProgress);
+    AssertPtrReturnVoid(m_pBarSubOperationProgress);
+    m_pLabelSubOperationProgress->show();
+    m_pBarSubOperationProgress->show();
+    m_pLabelSubOperationProgress->setText(m_strProgressDescriptionTemplate.arg(strOperation).arg(iOperation).arg(iOperations));
+    m_pBarSubOperationProgress->setValue(iPercent);
+}
+

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsSerializer.h

@@ -33 +33 @@
 class UISettingsPage;
 class QProgressBar;
+class QILabel;
 class QLabel;
 
@@ -62 +63 @@
     /** Notifies listeners about process has been finished. */
     void sigNotifyAboutProcessFinished();
+
+    /** Notifies listeners about particular operation progress change.
+      * @param iOperations  holds the number of operations CProgress have,
+      * @param strOperation holds the description of the current CProgress operation,
+      * @param iOperation   holds the index of the current CProgress operation,
+      * @param iPercent     holds the percentage of the current CProgress operation. */
+    void sigOperationProgressChange(ulong iOperations, QString strOperation,
+                                    ulong iOperation, ulong iPercent);
 
 public:
@@ -179 +188 @@
     void sltProgressValueChanged(int iValue);
 
+    /** Handles particular operation progress change.
+      * @param iOperations  holds the number of operations CProgress have,
+      * @param strOperation holds the description of the current CProgress operation,
+      * @param iOperation   holds the index of the current CProgress operation,
+      * @param iPercent     holds the percentage of the current CProgress operation. */
+    void sltHandleOperationProgressChange(ulong iOperations, QString strOperation,
+                                          ulong iOperation, ulong iPercent);
+
 private:
 
@@ -196 +213 @@
     /** Holds the operation progress bar. */
     QProgressBar *m_pBarOperationProgress;
+
+    /** Holds the sub-operation progress label. */
+    QILabel *m_pLabelSubOperationProgress;
+    /** Holds the sub-operation progress bar. */
+    QProgressBar *m_pBarSubOperationProgress;
+
+    /** Holds the template for the sub-operation progress label. */
+    static QString m_strProgressDescriptionTemplate;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp

@@ -25 +25 @@
 # include "QIWidgetValidator.h"
 # include "UIMachineSettingsGeneral.h"
- #include "UIModalWindowManager.h"
+# include "UIModalWindowManager.h"
+# include "UIProgressDialog.h"
 # include "UIMessageCenter.h"
 # include "UIConverter.h"
@@ -336 +337 @@
 
                         /* Update encryption: */
-                        CProgress progress = medium.ChangeEncryption(strOldPassword,
-                                                                     strNewCipher,
-                                                                     strNewPassword,
-                                                                     strNewPasswordId);
+                        CProgress cprogress = medium.ChangeEncryption(strOldPassword,
+                                                                      strNewCipher,
+                                                                      strNewPassword,
+                                                                      strNewPasswordId);
 //                        if (!medium.isOk())
 //                            printf("  Medium API Error, rc = %s\n", msgCenter().formatRC(medium.lastRC()).toAscii().constData());
-                        progress.WaitForCompletion(-1);
+                        UIProgress uiprogress(cprogress);
+                        connect(&uiprogress, SIGNAL(sigProgressChange(ulong, QString, ulong, ulong)),
+                                this, SIGNAL(sigOperationProgressChange(ulong, QString, ulong, ulong)),
+                                Qt::QueuedConnection);
+                        uiprogress.run(350);
 //                        if (!progress.isOk())
 //                            printf("  Progress API Error, rc = %s\n", msgCenter().formatRC(progress.lastRC()).toAscii().constData());