Changeset 67969 in vbox

Timestamp:

Jul 14, 2017 1:12:28 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8400: Virtual Media Manager: Implementing possibility to change medium description.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)
• medium/UIMediumDetailsWidget.cpp (modified) (11 diffs)
• medium/UIMediumDetailsWidget.h (modified) (6 diffs)
• medium/UIMediumManager.cpp (modified) (2 diffs)

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

@@ -1233 +1233 @@
              .arg(strLocationOld, strLocationNew),
           formatErrorInfo(comProgress));
+}
+
+void UIMessageCenter::cannotChangeMediumDescription(const CMedium &comMedium, const QString &strLocation, QWidget *pParent /* = 0 */) const
+{
+    error(pParent, MessageType_Error,
+          tr("<p>Error changing the description of the disk image <b>%1</b>.</p>")
+             .arg(strLocation),
+          formatErrorInfo(comMedium));
 }
 

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

@@ -247 +247 @@
     void cannotMoveMediumStorage(const CMedium &comMedium, const QString &strLocationOld, const QString &strLocationNew, QWidget *pParent = 0) const;
     void cannotMoveMediumStorage(const CProgress &comProgress, const QString &strLocationOld, const QString &strLocationNew, QWidget *pParent = 0) const;
+    void cannotChangeMediumDescription(const CMedium &comMedium, const QString &strLocation, QWidget *pParent = 0) const;
     bool confirmMediumRelease(const UIMedium &medium, QWidget *pParent = 0) const;
     bool confirmMediumRemoval(const UIMedium &medium, QWidget *pParent = 0) const;

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumDetailsWidget.cpp

@@ -26 +26 @@
 # include <QSlider>
 # include <QStackedLayout>
+# include <QTextEdit>
 # include <QVBoxLayout>
 
@@ -55 +56 @@
     , m_pLabelLocation(0), m_pSelectorLocation(0), m_pErrorPaneLocation(0)
     , m_pLabelSize(0), m_pEditorSize(0), m_pErrorPaneSize(0)
+    , m_pLabelDescription(0), m_pEditorDescription(0), m_pErrorPaneDescription(0)
     , m_pButtonBox(0)
     , m_pLayoutDetails(0)
@@ -93 +95 @@
     m_pLabelLocation->setText(tr("&Location:"));
     m_pLabelSize->setText(tr("&Size:"));
+    m_pLabelDescription->setText(tr("&Description:"));
 
     /* Translate fields: */
@@ -100 +103 @@
     m_pSelectorLocation->setToolTip(tr("Holds the location of this medium."));
     m_pEditorSize->setToolTip(tr("Holds the size of this medium."));
+    m_pEditorDescription->setToolTip(tr("Holds the description of this medium."));
 
     /* Translate button-box: */
@@ -143 +147 @@
 }
 
+void UIMediumDetailsWidget::sltDescriptionTextChanged()
+{
+    m_newData.m_options.m_strDescription = m_pEditorDescription->toPlainText();
+    revalidate(m_pErrorPaneDescription);
+    updateButtonStates();
+}
+
 void UIMediumDetailsWidget::sltHandleButtonBoxClick(QAbstractButton *pButton)
 {
@@ -373 +384 @@
             }
 
+            /* Create description label: */
+            m_pLabelDescription = new QLabel;
+            AssertPtrReturnVoid(m_pLabelDescription);
+            {
+                /* Configure label: */
+                m_pLabelDescription->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+
+                /* Add into layout: */
+                pLayoutOptions->addWidget(m_pLabelDescription, 4, 0);
+            }
+
+            /* Create description layout: */
+            QGridLayout *pLayoutDescription = new QGridLayout;
+            AssertPtrReturnVoid(pLayoutDescription);
+            {
+                /* Configure layout: */
+                pLayoutDescription->setContentsMargins(0, 0, 0, 0);
+
+                /* Create description editor: */
+                m_pEditorDescription = new QTextEdit;
+                AssertPtrReturnVoid(m_pEditorDescription);
+                {
+                    /* Configure editor: */
+                    m_pLabelDescription->setBuddy(m_pEditorDescription);
+                    QFontMetrics fontMetrics = m_pEditorDescription->fontMetrics();
+                    QTextDocument *pTextDocument = m_pEditorDescription->document();
+                    const int iMinimumHeight = fontMetrics.lineSpacing() * 3
+                                             + pTextDocument->documentMargin() * 2
+                                             + m_pEditorDescription->frameWidth() * 2;
+                    m_pEditorDescription->setMaximumHeight(iMinimumHeight);
+                    connect(m_pEditorDescription, &QTextEdit::textChanged,
+                            this, &UIMediumDetailsWidget::sltDescriptionTextChanged);
+
+                    /* Add into layout: */
+                    pLayoutDescription->addWidget(m_pEditorDescription, 0, 0, 2, 1);
+                }
+
+                /* Create description error pane: */
+                m_pErrorPaneDescription = new QLabel;
+                AssertPtrReturnVoid(m_pErrorPaneDescription);
+                {
+                    /* Configure label: */
+                    m_pErrorPaneDescription->setAlignment(Qt::AlignCenter);
+                    m_pErrorPaneDescription->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+                    m_pErrorPaneDescription->setPixmap(UIIconPool::iconSet(":/status_error_16px.png")
+                                                       .pixmap(QSize(iIconMetric, iIconMetric)));
+
+                    /* Add into layout: */
+                    pLayoutDescription->addWidget(m_pErrorPaneDescription, 0, 1, Qt::AlignCenter);
+                }
+
+                /* Add into layout: */
+                pLayoutOptions->addLayout(pLayoutDescription, 4, 1, 2, 1);
+            }
+
             /* Create stretch: */
             QSpacerItem *pSpacer2 = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
@@ -378 +444 @@
             {
                 /* Add into layout: */
-                pLayoutOptions->addItem(pSpacer2, 4, 0, 1, 2);
+                pLayoutOptions->addItem(pSpacer2, 6, 0, 1, 2);
             }
 
@@ -392 +458 @@
 
                 /* Add into layout: */
-                pLayoutOptions->addWidget(m_pButtonBox, 5, 0, 1, 2);
+                pLayoutOptions->addWidget(m_pButtonBox, 7, 0, 1, 2);
             }
         }
@@ -531 +597 @@
     m_pEditorSize->setEnabled(fEnableResize);
     m_pEditorSize->setMediumSize(m_newData.m_options.m_uLogicalSize);
+
+    /* Load description: */
+    m_pLabelDescription->setEnabled(m_newData.m_fValid);
+    m_pEditorDescription->setEnabled(m_newData.m_fValid);
+    m_pEditorDescription->setPlainText(m_newData.m_options.m_strDescription);
 }
 
@@ -570 +641 @@
         const bool fError = false;
         m_pErrorPaneSize->setVisible(fError);
+    }
+    if (!pWidget || pWidget == m_pErrorPaneDescription)
+    {
+        /* Always valid for now: */
+        const bool fError = false;
+        m_pErrorPaneDescription->setVisible(fError);
     }
 
@@ -588 +665 @@
 //        m_pErrorPaneSize->setToolTip(tr("Cannot change medium size from <b>%1</b> to <b>%2</b>.")
 //                                         .arg(m_oldData.m_options.m_uLogicalSize).arg(m_newData.m_options.m_uLogicalSize));
+//    if (!pWidget || pWidget == m_pErrorPaneDescription)
+//        m_pErrorPaneDescription->setToolTip(tr("Cannot change medium description from <b>%1</b> to <b>%2</b>.")
+//                                               .arg(m_oldData.m_options.m_strDescription).arg(m_newData.m_options.m_strDescription));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumDetailsWidget.h

@@ -35 +35 @@
 class QLabel;
 class QStackedLayout;
+class QTextEdit;
 class QWidget;
 class QILabel;
@@ -50 +51 @@
         , m_strLocation(QString())
         , m_uLogicalSize(0)
+        , m_strDescription(QString())
     {}
 
@@ -59 +61 @@
                && (m_strLocation == other.m_strLocation)
                && (m_uLogicalSize == other.m_uLogicalSize)
+               && (m_strDescription == other.m_strDescription)
                ;
     }
@@ -73 +76 @@
     /** Holds the logical size. */
     qulonglong m_uLogicalSize;
+    /** Holds the description. */
+    QString m_strDescription;
 };
 
@@ -202 +207 @@
         /** Handles size editor change. */
         void sltSizeValueChanged(qulonglong uSize);
+        /** Handles description text change. */
+        void sltDescriptionTextChanged();
 
         /** Handles button-box button click. */
@@ -290 +297 @@
         QLabel             *m_pErrorPaneSize;
 
+        /** Holds the description label. */
+        QLabel    *m_pLabelDescription;
+        /** Holds the description editor. */
+        QTextEdit *m_pEditorDescription;
+        /** Holds the description error pane. */
+        QLabel    *m_pErrorPaneDescription;
+
         /** Holds the button-box instance. */
         QIDialogButtonBox *m_pButtonBox;

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

@@ -388 +388 @@
     m_options.m_strLocation = m_guiMedium.location();
     m_options.m_uLogicalSize = m_guiMedium.logicalSizeInBytes();
+    m_options.m_strDescription = m_guiMedium.description();
     /* Gather medium details data: */
     m_details.m_aFields.clear();
@@ -990 +991 @@
                                                         this);
         }
+    }
+
+    /* Try to assign new medium description: */
+    if (   comMedium.isOk()
+        && newData.m_options.m_strDescription != oldData.m_options.m_strDescription)
+    {
+        comMedium.SetDescription(newData.m_options.m_strDescription);
+
+        /* Show error message if necessary: */
+        if (!comMedium.isOk())
+            msgCenter().cannotChangeMediumDescription(comMedium,
+                                                      oldData.m_options.m_strLocation,
+                                                      this);
     }