Changeset 67965 in vbox

Timestamp:

Jul 14, 2017 1:01:13 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8400: Virtual Media Manager: A bit of fixes for medium details widget.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (2 diffs)
• globals/UIMessageCenter.h (modified) (2 diffs)
• medium/UIMediumDetailsWidget.cpp (modified) (3 diffs)
• medium/UIMediumDetailsWidget.h (modified) (2 diffs)
• medium/UIMediumManager.cpp (modified) (2 diffs)

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

@@ -1217 +1217 @@
              .arg(gpConverter->toString(oldMediumType)).arg(gpConverter->toString(newMediumType)),
           formatErrorInfo(medium));
+}
+
+void UIMessageCenter::cannotMoveMediumStorage(const CMedium &comMedium, const QString &strLocationOld, const QString &strLocationNew, QWidget *pParent /* = 0 */) const
+{
+    error(pParent, MessageType_Error,
+          tr("Failed to move the storage unit of the disk image <b>%1</b> to <b>%2</b>.")
+             .arg(strLocationOld, strLocationNew),
+          formatErrorInfo(comMedium));
+}
+
+void UIMessageCenter::cannotMoveMediumStorage(const CProgress &comProgress, const QString &strLocationOld, const QString &strLocationNew, QWidget *pParent /* = 0 */) const
+{
+    error(pParent, MessageType_Error,
+          tr("Failed to move the storage unit of the disk image <b>%1</b> to <b>%2</b>.")
+             .arg(strLocationOld, strLocationNew),
+          formatErrorInfo(comProgress));
 }
 
@@ -1325 +1341 @@
              .arg(strLocation),
           formatErrorInfo(progress));
-}
-
-void UIMessageCenter::cannotMoveHardDiskStorage(const CMedium &comMedium, const QString &strLocationOld, const QString &strLocationNew, QWidget *pParent /* = 0 */) const
-{
-    error(pParent, MessageType_Error,
-          tr("Failed to move the storage unit of the hard disk <b>%1</b> to <b>%2</b>.")
-             .arg(strLocationOld, strLocationNew),
-          formatErrorInfo(comMedium));
-}
-
-void UIMessageCenter::cannotMoveHardDiskStorage(const CProgress &comProgress, const QString &strLocationOld, const QString &strLocationNew, QWidget *pParent /* = 0 */) const
-{
-    error(pParent, MessageType_Error,
-          tr("Failed to move the storage unit of the hard disk <b>%1</b> to <b>%2</b>.")
-             .arg(strLocationOld, strLocationNew),
-          formatErrorInfo(comProgress));
 }
 

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

@@ -245 +245 @@
     /* API: Virtual Medium Manager warnings: */
     void cannotChangeMediumType(const CMedium &medium, KMediumType oldMediumType, KMediumType newMediumType, QWidget *pParent = 0) const;
+    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;
     bool confirmMediumRelease(const UIMedium &medium, QWidget *pParent = 0) const;
     bool confirmMediumRemoval(const UIMedium &medium, QWidget *pParent = 0) const;
@@ -250 +252 @@
     void cannotDeleteHardDiskStorage(const CMedium &medium, const QString &strLocation, QWidget *pParent = 0) const;
     void cannotDeleteHardDiskStorage(const CProgress &progress, const QString &strLocation, QWidget *pParent = 0) const;
-    void cannotMoveHardDiskStorage(const CMedium &comMedium, const QString &strLocationOld, const QString &strLocationNew, QWidget *pParent = 0) const;
-    void cannotMoveHardDiskStorage(const CProgress &comProgress, const QString &strLocationOld, const QString &strLocationNew, QWidget *pParent = 0) const;
     void cannotResizeHardDiskStorage(const CMedium &comMedium, const QString &strLocation, const QString &strSizeOld, const QString &strSizeNew, QWidget *pParent = 0) const;
     void cannotResizeHardDiskStorage(const CProgress &comProgress, const QString &strLocation, const QString &strSizeOld, const QString &strSizeNew, QWidget *pParent = 0) const;

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

@@ -136 +136 @@
 }
 
-void UIMediumDetailsWidget::sltSizeEditorChanged(qulonglong uSize)
+void UIMediumDetailsWidget::sltSizeValueChanged(qulonglong uSize)
 {
     m_newData.m_options.m_uLogicalSize = uSize;
@@ -349 +349 @@
                     m_pEditorSize->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
                     connect(m_pEditorSize, &UIMediumSizeEditor::sigSizeChanged,
-                            this, &UIMediumDetailsWidget::sltSizeEditorChanged);
+                            this, &UIMediumDetailsWidget::sltSizeValueChanged);
 
                     /* Add into layout: */
@@ -361 +361 @@
                     /* Configure label: */
                     m_pErrorPaneSize->setAlignment(Qt::AlignCenter);
+                    m_pErrorPaneSize->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
                     m_pErrorPaneSize->setPixmap(UIIconPool::iconSet(":/status_error_16px.png")
-                                                    .pixmap(QSize(iIconMetric, iIconMetric)));
-
-                    /* Add into layout: */
-                    pLayoutSize->addWidget(m_pErrorPaneSize, 0, 1);
+                                                .pixmap(QSize(iIconMetric, iIconMetric)));
+
+                    /* Add into layout: */
+                    pLayoutSize->addWidget(m_pErrorPaneSize, 0, 1, Qt::AlignCenter);
                 }
 

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

@@ -201 +201 @@
         void sltLocationPathChanged(const QString &strPath);
         /** Handles size editor change. */
-        void sltSizeEditorChanged(qulonglong uSize);
+        void sltSizeValueChanged(qulonglong uSize);
 
         /** Handles button-box button click. */
@@ -277 +277 @@
 
         /** Holds the location label. */
-        QLabel    *m_pLabelLocation;
+        QLabel             *m_pLabelLocation;
         /** Holds the location selector. */
         UIFilePathSelector *m_pSelectorLocation;
         /** Holds the location error pane. */
-        QLabel    *m_pErrorPaneLocation;
+        QLabel             *m_pErrorPaneLocation;
 
         /** Holds the size label. */

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

@@ -943 +943 @@
         /* Show error message if necessary: */
         if (!comMedium.isOk())
-            msgCenter().cannotMoveHardDiskStorage(comMedium,
-                                                  oldData.m_options.m_strLocation,
-                                                  newData.m_options.m_strLocation,
-                                                  this);
+            msgCenter().cannotMoveMediumStorage(comMedium,
+                                                oldData.m_options.m_strLocation,
+                                                newData.m_options.m_strLocation,
+                                                this);
         else
         {
@@ -955 +955 @@
             /* Show error message if necessary: */
             if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-                msgCenter().cannotMoveHardDiskStorage(comProgress,
-                                                      oldData.m_options.m_strLocation,
-                                                      newData.m_options.m_strLocation,
-                                                      this);
+                msgCenter().cannotMoveMediumStorage(comProgress,
+                                                    oldData.m_options.m_strLocation,
+                                                    newData.m_options.m_strLocation,
+                                                    this);
         }
     }