Index: /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc (revision 67922)
+++ /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc (revision 67923)
@@ -51,4 +51,5 @@
images/progress_media_delete_90px.png
images/progress_media_move_90px.png
+ images/progress_media_resize_90px.png
images/progress_network_interface_90px.png
images/progress_poweroff_90px.png
Index: /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2_hidpi.qrc
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2_hidpi.qrc (revision 67922)
+++ /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2_hidpi.qrc (revision 67923)
@@ -60,4 +60,5 @@
images/hidpi/progress_media_delete_90px_hidpi.png
images/hidpi/progress_media_move_90px_hidpi.png
+ images/hidpi/progress_media_resize_90px_hidpi.png
images/hidpi/progress_network_interface_90px_hidpi.png
images/hidpi/progress_poweroff_90px_hidpi.png
Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp (revision 67922)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp (revision 67923)
@@ -1340,4 +1340,20 @@
tr("Failed to move the storage unit of the hard disk %1 to %2.")
.arg(strLocationOld, strLocationNew),
+ formatErrorInfo(comProgress));
+}
+
+void UIMessageCenter::cannotResizeHardDiskStorage(const CMedium &comMedium, const QString &strLocation, const QString &strSizeOld, const QString &strSizeNew, QWidget *pParent /* = 0 */) const
+{
+ error(pParent, MessageType_Error,
+ tr("Failed to resize the storage unit of the hard disk %1 from %2 to %3.")
+ .arg(strLocation, strSizeOld, strSizeNew),
+ formatErrorInfo(comMedium));
+}
+
+void UIMessageCenter::cannotResizeHardDiskStorage(const CProgress &comProgress, const QString &strLocation, const QString &strSizeOld, const QString &strSizeNew, QWidget *pParent /* = 0 */) const
+{
+ error(pParent, MessageType_Error,
+ tr("Failed to resize the storage unit of the hard disk %1 from %2 to %3.")
+ .arg(strLocation, strSizeOld, strSizeNew),
formatErrorInfo(comProgress));
}
Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h (revision 67922)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h (revision 67923)
@@ -252,4 +252,6 @@
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;
void cannotDetachDevice(const CMachine &machine, UIMediumType type, const QString &strLocation, const StorageSlot &storageSlot, QWidget *pParent = 0) const;
bool cannotRemountMedium(const CMachine &machine, const UIMedium &medium, bool fMount, bool fRetry, QWidget *pParent = 0) const;
Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumDetailsWidget.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumDetailsWidget.cpp (revision 67922)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumDetailsWidget.cpp (revision 67923)
@@ -24,4 +24,5 @@
# include
# include
+# include
# include
# include
@@ -30,4 +31,5 @@
# include "QIDialogButtonBox.h"
# include "QILabel.h"
+# include "QILineEdit.h"
# include "QITabWidget.h"
# include "UIConverter.h"
@@ -35,4 +37,8 @@
# include "UIIconPool.h"
# include "UIMediumDetailsWidget.h"
+# include "VBoxGlobal.h"
+
+/* COM includes: */
+# include "CSystemProperties.h"
#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -47,4 +53,8 @@
, m_pLabelType(0), m_pComboBoxType(0), m_pErrorPaneType(0)
, m_pLabelLocation(0), m_pSelectorLocation(0), m_pErrorPaneLocation(0)
+ , m_uMediumSizeMin(_4M)
+ , m_uMediumSizeMax(vboxGlobal().virtualBox().GetSystemProperties().GetInfoVDSize())
+ , m_iSliderScale(calculateSliderScale(m_uMediumSizeMax))
+ , m_pLabelSize(0), m_pSliderSize(0), m_pLabelMinSize(0), m_pLabelMaxSize(0), m_pEditorSize(0), m_pErrorPaneSize(0)
, m_pButtonBox(0)
, m_pLayoutDetails(0)
@@ -84,4 +94,7 @@
m_pLabelType->setText(tr("&Type:"));
m_pLabelLocation->setText(tr("&Location:"));
+ m_pLabelSize->setText(tr("&Size:"));
+ m_pLabelMinSize->setText(vboxGlobal().formatSize(m_uMediumSizeMin));
+ m_pLabelMaxSize->setText(vboxGlobal().formatSize(m_uMediumSizeMax));
/* Translate fields: */
@@ -90,4 +103,6 @@
m_pComboBoxType->setItemText(i, gpConverter->toString(m_pComboBoxType->itemData(i).value()));
m_pSelectorLocation->setToolTip(tr("Holds the location of this medium."));
+ m_pSliderSize->setToolTip(tr("Holds the size of this medium."));
+ m_pEditorSize->setToolTip(tr("Holds the size of this medium."));
/* Translate button-box: */
@@ -126,4 +141,26 @@
}
+void UIMediumDetailsWidget::sltSizeSliderChanged(int iValue)
+{
+ m_newData.m_options.m_uLogicalSize = sliderToSizeMB(iValue, m_iSliderScale);
+ m_pEditorSize->blockSignals(true);
+ m_pEditorSize->setText(vboxGlobal().formatSize(m_newData.m_options.m_uLogicalSize));
+ m_pEditorSize->blockSignals(false);
+ revalidate(m_pErrorPaneSize);
+ updateSizeToolTips(m_newData.m_options.m_uLogicalSize);
+ updateButtonStates();
+}
+
+void UIMediumDetailsWidget::sltSizeEditorChanged(const QString &strValue)
+{
+ m_newData.m_options.m_uLogicalSize = vboxGlobal().parseSize(strValue);
+ m_pSliderSize->blockSignals(true);
+ m_pSliderSize->setValue(sizeMBToSlider(m_newData.m_options.m_uLogicalSize, m_iSliderScale));
+ m_pSliderSize->blockSignals(false);
+ revalidate(m_pErrorPaneSize);
+ updateSizeToolTips(m_newData.m_options.m_uLogicalSize);
+ updateButtonStates();
+}
+
void UIMediumDetailsWidget::sltHandleButtonBoxClick(QAbstractButton *pButton)
{
@@ -303,4 +340,103 @@
}
+ /* Create size label: */
+ m_pLabelSize = new QLabel;
+ AssertPtrReturnVoid(m_pLabelSize);
+ {
+ /* Configure label: */
+ m_pLabelSize->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+
+ /* Add into layout: */
+ pLayoutOptions->addWidget(m_pLabelSize, 2, 0);
+ }
+
+ /* Create size layout: */
+ QGridLayout *pLayoutSize = new QGridLayout;
+ AssertPtrReturnVoid(pLayoutSize);
+ {
+ /* Configure layout: */
+ pLayoutSize->setContentsMargins(0, 0, 0, 0);
+ pLayoutSize->setColumnStretch(0, 1);
+ pLayoutSize->setColumnStretch(1, 1);
+ pLayoutSize->setColumnStretch(2, 0);
+ pLayoutSize->setColumnStretch(3, 0);
+
+ /* Create size slider: */
+ m_pSliderSize = new QSlider;
+ AssertPtrReturnVoid(m_pSliderSize);
+ {
+ /* Configure slider: */
+ m_pSliderSize->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+ m_pSliderSize->setOrientation(Qt::Horizontal);
+ m_pSliderSize->setTickPosition(QSlider::TicksBelow);
+ m_pSliderSize->setFocusPolicy(Qt::StrongFocus);
+ m_pSliderSize->setPageStep(m_iSliderScale);
+ m_pSliderSize->setSingleStep(m_iSliderScale / 8);
+ m_pSliderSize->setTickInterval(0);
+ m_pSliderSize->setMinimum(sizeMBToSlider(m_uMediumSizeMin, m_iSliderScale));
+ m_pSliderSize->setMaximum(sizeMBToSlider(m_uMediumSizeMax, m_iSliderScale));
+ connect(m_pSliderSize, &QSlider::valueChanged,
+ this, &UIMediumDetailsWidget::sltSizeSliderChanged);
+
+ /* Add into layout: */
+ pLayoutSize->addWidget(m_pSliderSize, 0, 0, 1, 2);
+ }
+
+ /* Create minimum size label: */
+ m_pLabelMinSize = new QLabel;
+ AssertPtrReturnVoid(m_pLabelMinSize);
+ {
+ /* Configure label: */
+ m_pLabelMinSize->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
+
+ /* Add into layout: */
+ pLayoutSize->addWidget(m_pLabelMinSize, 1, 0);
+ }
+
+ /* Create maximum size label: */
+ m_pLabelMaxSize = new QLabel;
+ AssertPtrReturnVoid(m_pLabelMaxSize);
+ {
+ /* Configure label: */
+ m_pLabelMaxSize->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+
+ /* Add into layout: */
+ pLayoutSize->addWidget(m_pLabelMaxSize, 1, 1);
+ }
+
+ /* Create size editor: */
+ m_pEditorSize = new QILineEdit;
+ AssertPtrReturnVoid(m_pEditorSize);
+ {
+ /* Configure editor: */
+ m_pLabelSize->setBuddy(m_pEditorSize);
+ m_pEditorSize->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+ m_pEditorSize->setFixedWidthByText("88888.88 MB");
+ m_pEditorSize->setAlignment(Qt::AlignRight);
+ m_pEditorSize->setValidator(new QRegExpValidator(QRegExp(vboxGlobal().sizeRegexp()), this));
+ connect(m_pEditorSize, &QILineEdit::textChanged,
+ this, &UIMediumDetailsWidget::sltSizeEditorChanged);
+
+ /* Add into layout: */
+ pLayoutSize->addWidget(m_pEditorSize, 0, 2);
+ }
+
+ /* Create size error pane: */
+ m_pErrorPaneSize = new QLabel;
+ AssertPtrReturnVoid(m_pErrorPaneSize);
+ {
+ /* Configure label: */
+ m_pErrorPaneSize->setAlignment(Qt::AlignCenter);
+ m_pErrorPaneSize->setPixmap(UIIconPool::iconSet(":/status_error_16px.png")
+ .pixmap(QSize(iIconMetric, iIconMetric)));
+
+ /* Add into layout: */
+ pLayoutSize->addWidget(m_pErrorPaneSize, 0, 3);
+ }
+
+ /* Add into layout: */
+ pLayoutOptions->addLayout(pLayoutSize, 2, 1, 2, 1);
+ }
+
/* Create stretch: */
QSpacerItem *pSpacer2 = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
@@ -308,5 +444,5 @@
{
/* Add into layout: */
- pLayoutOptions->addItem(pSpacer2, 2, 0, 1, 2);
+ pLayoutOptions->addItem(pSpacer2, 4, 0, 1, 2);
}
@@ -322,5 +458,5 @@
/* Add into layout: */
- pLayoutOptions->addWidget(m_pButtonBox, 3, 0, 1, 2);
+ pLayoutOptions->addWidget(m_pButtonBox, 5, 0, 1, 2);
}
}
@@ -453,4 +589,12 @@
m_pSelectorLocation->setPath(m_newData.m_options.m_strLocation);
sltLocationPathChanged(m_pSelectorLocation->path());
+
+ /* Load size: */
+ m_pLabelSize->setEnabled(m_newData.m_fValid && m_newData.m_enmType == UIMediumType_HardDisk);
+ m_pSliderSize->setEnabled(m_newData.m_fValid && m_newData.m_enmType == UIMediumType_HardDisk);
+ m_pLabelMinSize->setEnabled(m_newData.m_fValid && m_newData.m_enmType == UIMediumType_HardDisk);
+ m_pLabelMaxSize->setEnabled(m_newData.m_fValid && m_newData.m_enmType == UIMediumType_HardDisk);
+ m_pEditorSize->setEnabled(m_newData.m_fValid && m_newData.m_enmType == UIMediumType_HardDisk);
+ m_pEditorSize->setText(vboxGlobal().formatSize(m_newData.m_options.m_uLogicalSize));
}
@@ -487,4 +631,10 @@
m_pErrorPaneLocation->setVisible(fError);
}
+ if (!pWidget || pWidget == m_pErrorPaneSize)
+ {
+ /* Always valid for now: */
+ const bool fError = false;
+ m_pErrorPaneSize->setVisible(fError);
+ }
/* Retranslate validation: */
@@ -501,4 +651,7 @@
// m_pErrorPaneLocation->setToolTip(tr("Cannot change medium location from %1 to %2.")
// .arg(m_oldData.m_options.m_strLocation).arg(m_newData.m_options.m_strLocation));
+// if (!pWidget || pWidget == m_pErrorPaneSize)
+// m_pErrorPaneSize->setToolTip(tr("Cannot change medium size from %1 to %2.")
+// .arg(m_oldData.m_options.m_uLogicalSize).arg(m_newData.m_options.m_uLogicalSize));
}
@@ -520,4 +673,83 @@
}
+/* static */
+int UIMediumDetailsWidget::calculateSliderScale(qulonglong uMaximumMediumSize)
+{
+ /* Detect how many steps to recognize between adjacent powers of 2
+ * to ensure that the last slider step is exactly that we need: */
+ int iSliderScale = 0;
+ int iPower = log2i(uMaximumMediumSize);
+ qulonglong uTickMB = (qulonglong)1 << iPower;
+ if (uTickMB < uMaximumMediumSize)
+ {
+ qulonglong uTickMBNext = (qulonglong)1 << (iPower + 1);
+ qulonglong uGap = uTickMBNext - uMaximumMediumSize;
+ iSliderScale = (int)((uTickMBNext - uTickMB) / uGap);
+#ifdef VBOX_WS_MAC
+ // WORKAROUND:
+ // There is an issue with Qt5 QSlider under OSX:
+ // Slider tick count (maximum - minimum) is limited with some
+ // "magical number" - 588351, having it more than that brings
+ // unpredictable results like slider token jumping and disappearing,
+ // so we are limiting tick count by lowering slider-scale 128 times.
+ iSliderScale /= 128;
+#endif /* VBOX_WS_MAC */
+ }
+ return qMax(iSliderScale, 8);
+}
+
+/* static */
+int UIMediumDetailsWidget::log2i(qulonglong uValue)
+{
+ int iPower = -1;
+ while (uValue)
+ {
+ ++iPower;
+ uValue >>= 1;
+ }
+ return iPower;
+}
+
+/* static */
+int UIMediumDetailsWidget::sizeMBToSlider(qulonglong uValue, int iSliderScale)
+{
+ /* Make sure *any* slider value is multiple of 512: */
+ uValue /= 512;
+
+ /* Calculate result: */
+ int iPower = log2i(uValue);
+ qulonglong uTickMB = qulonglong (1) << iPower;
+ qulonglong uTickMBNext = qulonglong (1) << (iPower + 1);
+ int iStep = (uValue - uTickMB) * iSliderScale / (uTickMBNext - uTickMB);
+ int iResult = iPower * iSliderScale + iStep;
+
+ /* Return result: */
+ return iResult;
+}
+
+/* static */
+qulonglong UIMediumDetailsWidget::sliderToSizeMB(int uValue, int iSliderScale)
+{
+ /* Calculate result: */
+ int iPower = uValue / iSliderScale;
+ int iStep = uValue % iSliderScale;
+ qulonglong uTickMB = qulonglong (1) << iPower;
+ qulonglong uTickMBNext = qulonglong (1) << (iPower + 1);
+ qulonglong uResult = uTickMB + (uTickMBNext - uTickMB) * iStep / iSliderScale;
+
+ /* Make sure *any* slider value is multiple of 512: */
+ uResult *= 512;
+
+ /* Return result: */
+ return uResult;
+}
+
+void UIMediumDetailsWidget::updateSizeToolTips(qulonglong uSize)
+{
+ const QString strToolTip = tr("%1 (%2 B)").arg(vboxGlobal().formatSize(uSize)).arg(uSize);
+ m_pSliderSize->setToolTip(strToolTip);
+ m_pEditorSize->setToolTip(strToolTip);
+}
+
QWidget *UIMediumDetailsWidget::infoContainer(UIMediumType enmType) const
{
Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumDetailsWidget.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumDetailsWidget.h (revision 67922)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumDetailsWidget.h (revision 67923)
@@ -34,7 +34,9 @@
class QComboBox;
class QLabel;
+class QSlider;
class QStackedLayout;
class QWidget;
class QILabel;
+class QILineEdit;
class QITabWidget;
class UIFilePathSelector;
@@ -48,4 +50,5 @@
: m_enmType(KMediumType_Normal)
, m_strLocation(QString())
+ , m_uLogicalSize(0)
{}
@@ -56,4 +59,5 @@
&& (m_enmType == other.m_enmType)
&& (m_strLocation == other.m_strLocation)
+ && (m_uLogicalSize == other.m_uLogicalSize)
;
}
@@ -68,4 +72,6 @@
/** Holds the location. */
QString m_strLocation;
+ /** Holds the logical size. */
+ qulonglong m_uLogicalSize;
};
@@ -190,4 +196,8 @@
/** Handles location change. */
void sltLocationPathChanged(const QString &strPath);
+ /** Handles size slider change. */
+ void sltSizeSliderChanged(int iValue);
+ /** Handles size editor change. */
+ void sltSizeEditorChanged(const QString &strValue);
/** Handles button-box button click. */
@@ -229,4 +239,15 @@
/** Updates button states. */
void updateButtonStates();
+
+ /** Calculates slider scale according to passed @a uMaximumMediumSize. */
+ static int calculateSliderScale(qulonglong uMaximumMediumSize);
+ /** Returns log2 for passed @a uValue. */
+ static int log2i(qulonglong uValue);
+ /** Converts passed bytes @a uValue to slides scaled value using @a iSliderScale. */
+ static int sizeMBToSlider(qulonglong uValue, int iSliderScale);
+ /** Converts passed slider @a uValue to bytes unscaled value using @a iSliderScale. */
+ static qulonglong sliderToSizeMB(int uValue, int iSliderScale);
+ /** Updates slider/editor tool-tips. */
+ void updateSizeToolTips(qulonglong uSize);
/** @} */
@@ -271,4 +292,23 @@
QLabel *m_pErrorPaneLocation;
+ /** Holds the minimum medium size. */
+ const qulonglong m_uMediumSizeMin;
+ /** Holds the maximum medium size. */
+ const qulonglong m_uMediumSizeMax;
+ /** Holds the slider scale. */
+ const int m_iSliderScale;
+ /** Holds the size label. */
+ QLabel *m_pLabelSize;
+ /** Holds the size slider. */
+ QSlider *m_pSliderSize;
+ /** Holds the minimum size label. */
+ QLabel *m_pLabelMinSize;
+ /** Holds the maximum size label. */
+ QLabel *m_pLabelMaxSize;
+ /** Holds the size editor. */
+ QILineEdit *m_pEditorSize;
+ /** Holds the size error pane. */
+ QLabel *m_pErrorPaneSize;
+
/** Holds the button-box instance. */
QIDialogButtonBox *m_pButtonBox;
Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp (revision 67922)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp (revision 67923)
@@ -342,5 +342,5 @@
void UIMediumItem::refreshAll()
{
- m_guiMedium.refresh();
+ m_guiMedium.blockAndQueryState();
refresh();
}
@@ -386,4 +386,5 @@
m_options.m_enmType = m_guiMedium.mediumType();
m_options.m_strLocation = m_guiMedium.location();
+ m_options.m_uLogicalSize = m_guiMedium.logicalSizeInBytes();
/* Gather medium details data: */
m_details.m_aFields.clear();
@@ -957,4 +958,34 @@
newData.m_options.m_strLocation,
this);
+ }
+ }
+
+ /* Try to assign new medium size: */
+ if ( comMedium.isOk()
+ && newData.m_options.m_uLogicalSize != oldData.m_options.m_uLogicalSize)
+ {
+ /* Prepare resize storage progress: */
+ CProgress comProgress = comMedium.Resize(newData.m_options.m_uLogicalSize);
+
+ /* Show error message if necessary: */
+ if (!comMedium.isOk())
+ msgCenter().cannotResizeHardDiskStorage(comMedium,
+ oldData.m_options.m_strLocation,
+ vboxGlobal().formatSize(oldData.m_options.m_uLogicalSize),
+ vboxGlobal().formatSize(newData.m_options.m_uLogicalSize),
+ this);
+ else
+ {
+ /* Show resize storage progress: */
+ msgCenter().showModalProgressDialog(comProgress, UIMediumManager::tr("Moving medium..."),
+ ":/progress_media_move_90px.png", this);
+
+ /* Show error message if necessary: */
+ if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
+ msgCenter().cannotResizeHardDiskStorage(comProgress,
+ oldData.m_options.m_strLocation,
+ vboxGlobal().formatSize(oldData.m_options.m_uLogicalSize),
+ vboxGlobal().formatSize(newData.m_options.m_uLogicalSize),
+ this);
}
}