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

Timestamp:

May 28, 2019 1:47:30 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9434: Import Appliance wizard: Form Editor widget: Adding data/editor for IRangedIntegerFormValue interface.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (2 diffs)
• globals/UIMessageCenter.h (modified) (1 diff)
• wizards/importappliance/UIFormEditorWidget.cpp (modified) (12 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -59 +59 @@
 #include "CCloudProvider.h"
 #include "CCloudProviderManager.h"
-#include "CNATNetwork.h"
 #include "CDHCPServer.h"
 #include "CNATEngine.h"
+#include "CNATNetwork.h"
+#include "CRangedIntegerFormValue.h"
 #include "CSerialPort.h"
 #include "CSharedFolder.h"
@@ -1750 +1751 @@
 }
 
+void UIMessageCenter::cannotAssignFormValue(const CRangedIntegerFormValue &comValue, QWidget *pParent /* = 0 */) const
+{
+    error(pParent, MessageType_Error,
+          tr("Failed to assign form value."),
+          UIErrorString::formatErrorInfo(comValue));
+}
+
 void UIMessageCenter::cannotAssignFormValue(const CProgress &comProgress, QWidget *pParent /* = 0 */) const
 {

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h

@@ -384 +384 @@
     void cannotAssignFormValue(const CStringFormValue &comValue, QWidget *pParent = 0) const;
     void cannotAssignFormValue(const CChoiceFormValue &comValue, QWidget *pParent = 0) const;
+    void cannotAssignFormValue(const CRangedIntegerFormValue &comValue, QWidget *pParent = 0) const;
     void cannotAssignFormValue(const CProgress &comProgress, QWidget *pParent = 0) const;
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIFormEditorWidget.cpp

@@ -22 +22 @@
 #include <QItemEditorFactory>
 #include <QSortFilterProxyModel>
+#include <QSpinBox>
 #include <QStyledItemDelegate>
 #include <QVBoxLayout>
@@ -34 +35 @@
 #include "CChoiceFormValue.h"
 #include "CFormValue.h"
+#include "CRangedIntegerFormValue.h"
 #include "CStringFormValue.h"
 #include "CVirtualSystemDescriptionForm.h"
@@ -93 +95 @@
 
 
+/** Class used to hold ranged-integer data. */
+class RangedIntegerData
+{
+public:
+
+    /** Constructs null ranged-integer data. */
+    RangedIntegerData() {}
+    /** Constructs ranged-integer data on the basis of passed @a iMinimum, @a iMaximum and @a iInteger. */
+    RangedIntegerData(int iMinimum, int iMaximum, int iInteger)
+        : m_iMinimum(iMinimum), m_iMaximum(iMaximum), m_iInteger(iInteger) {}
+    /** Constructs ranged-integer data on the basis of @a another ranged-integer data. */
+    RangedIntegerData(const RangedIntegerData &another)
+        : m_iMinimum(another.minimum()), m_iMaximum(another.maximum()), m_iInteger(another.integer()) {}
+
+    /** Assigns values of @a another ranged-integer to this one. */
+    RangedIntegerData &operator=(const RangedIntegerData &another)
+    {
+        m_iMinimum = another.minimum();
+        m_iMaximum = another.maximum();
+        m_iInteger = another.integer();
+        return *this;
+    }
+
+    /** Returns minimum value. */
+    int minimum() const { return m_iMinimum; }
+    /** Returns maximum value. */
+    int maximum() const { return m_iMaximum; }
+    /** Returns current value. */
+    int integer() const { return m_iInteger; }
+
+private:
+
+    /** Holds minimum value. */
+    int  m_iMinimum;
+    /** Holds maximum value. */
+    int  m_iMaximum;
+    /** Holds current value. */
+    int  m_iInteger;
+};
+Q_DECLARE_METATYPE(RangedIntegerData);
+
+
 /** QComboBox extension used as ChoiceData editor. */
 class ChoiceEditor : public QComboBox
@@ -125 +169 @@
 
 
+/** QSpinBox extension used as RangedIntegerData editor. */
+class RangedIntegerEditor : public QSpinBox
+{
+    Q_OBJECT;
+    Q_PROPERTY(RangedIntegerData rangedInteger READ rangedInteger WRITE setRangedInteger USER true);
+
+public:
+
+    /** Constructs RangedIntegerData editor passing @a pParent to the base-class. */
+    RangedIntegerEditor(QWidget *pParent = 0)
+        : QSpinBox(pParent) {}
+
+private:
+
+    /** Defines @a rangedInteger. */
+    void setRangedInteger(const RangedIntegerData &rangedInteger)
+    {
+        setMinimum(rangedInteger.minimum());
+        setMaximum(rangedInteger.maximum());
+        setValue(rangedInteger.integer());
+    }
+
+    /** Returns ranged-integer. */
+    RangedIntegerData rangedInteger() const
+    {
+        return RangedIntegerData(minimum(), maximum(), value());
+    }
+};
+
+
 /** QITableViewCell extension used as Form Editor table-view cell. */
 class UIFormEditorCell : public QITableViewCell
@@ -186 +260 @@
     void setChoice(const ChoiceData &choice);
 
+    /** Returns value cast to ranged-integer. */
+    RangedIntegerData toRangedInteger() const;
+    /** Defines @a rangedInteger value. */
+    void setRangedInteger(const RangedIntegerData &rangedInteger);
+
     /** Updates value cells. */
     void updateValueCells();
@@ -216 +295 @@
 
     /** Holds cached bool value. */
-    bool        m_fBool;
+    bool               m_fBool;
     /** Holds cached string value. */
-    QString     m_strString;
+    QString            m_strString;
     /** Holds cached choice value. */
-    ChoiceData  m_choice;
+    ChoiceData         m_choice;
+    /** Holds cached ranged-integer value. */
+    RangedIntegerData  m_rangedInteger;
 
     /** Holds the cell instances. */
@@ -338 +419 @@
     , m_strString(QString())
     , m_choice(ChoiceData())
+    , m_rangedInteger(RangedIntegerData())
 {
     prepare();
@@ -453 +535 @@
 }
 
+RangedIntegerData UIFormEditorRow::toRangedInteger() const
+{
+    AssertReturn(valueType() == KFormValueType_RangedInteger, RangedIntegerData());
+    return m_rangedInteger;
+}
+
+void UIFormEditorRow::setRangedInteger(const RangedIntegerData &rangedInteger)
+{
+    AssertReturnVoid(valueType() == KFormValueType_RangedInteger);
+    CRangedIntegerFormValue comValue(m_comValue);
+    CProgress comProgress = comValue.SetInteger(rangedInteger.integer());
+
+    /* Show error message if necessary: */
+    if (!comValue.isOk())
+        msgCenter().cannotAssignFormValue(comValue);
+    else
+    {
+        /* Show "Acquire export form" progress: */
+        msgCenter().showModalProgressDialog(comProgress, UIFormEditorWidget::tr("Assign value..."),
+                                            ":/progress_reading_appliance_90px.png");
+
+        /* Show error message if necessary: */
+        if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
+            msgCenter().cannotAssignFormValue(comProgress);
+        else
+            updateValueCells();
+    }
+}
+
 void UIFormEditorRow::updateValueCells()
 {
@@ -483 +594 @@
             m_choice = ChoiceData(values, iSelectedIndex);
             m_cells[UIFormEditorDataType_Value]->setText(m_choice.selectedValue());
+            /// @todo check for errors
+            break;
+        }
+        case KFormValueType_RangedInteger:
+        {
+            CRangedIntegerFormValue comValue(m_comValue);
+            const int iMinimum = comValue.GetMinimum();
+            const int iMaximum = comValue.GetMaximum();
+            const int iInteger = comValue.GetInteger();
+            m_rangedInteger = RangedIntegerData(iMinimum, iMaximum, iInteger);
+            m_cells[UIFormEditorDataType_Value]->setText(QString::number(m_rangedInteger.integer()));
             /// @todo check for errors
             break;
@@ -687 +809 @@
                             updateGeneration();
                             return true;
+                        case KFormValueType_RangedInteger:
+                            m_dataList[index.row()]->setRangedInteger(value.value<RangedIntegerData>());
+                            emit dataChanged(index, index);
+                            updateGeneration();
+                            return true;
                         default:
                             return false;
@@ -754 +881 @@
                         case KFormValueType_Choice:
                             return QVariant::fromValue(m_dataList[index.row()]->toChoice());
+                        case KFormValueType_RangedInteger:
+                            return QVariant::fromValue(m_dataList[index.row()]->toRangedInteger());
                         default:
                             return QVariant();
@@ -943 +1072 @@
                         pNewItemEditorFactory->registerEditor((QVariant::Type)iChoiceId, pChoiceEditorItemCreator);
 
+                        /* Register RangedIntegerEditor as the RangedIntegerData editor: */
+                        int iRangedIntegerId = qRegisterMetaType<RangedIntegerData>();
+                        QStandardItemEditorCreator<RangedIntegerEditor> *pRangedIntegerEditorItemCreator = new QStandardItemEditorCreator<RangedIntegerEditor>();
+                        pNewItemEditorFactory->registerEditor((QVariant::Type)iRangedIntegerId, pRangedIntegerEditorItemCreator);
+
                         /* Set newly created item editor factory for table delegate: */
                         pStyledItemDelegate->setItemEditorFactory(pNewItemEditorFactory);