Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumDetailsWidget.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumDetailsWidget.cpp (revision 67985) +++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumDetailsWidget.cpp (revision 67986) @@ -55,6 +55,6 @@ , m_pLabelType(0), m_pComboBoxType(0), m_pErrorPaneType(0) , m_pLabelLocation(0), m_pSelectorLocation(0), m_pErrorPaneLocation(0) + , m_pLabelDescription(0), m_pEditorDescription(0), m_pErrorPaneDescription(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) @@ -94,6 +94,6 @@ m_pLabelType->setText(tr("&Type:")); m_pLabelLocation->setText(tr("&Location:")); + m_pLabelDescription->setText(tr("&Description:")); m_pLabelSize->setText(tr("&Size:")); - m_pLabelDescription->setText(tr("&Description:")); /* Translate fields: */ @@ -102,6 +102,6 @@ m_pComboBoxType->setItemText(i, gpConverter->toString(m_pComboBoxType->itemData(i).value())); m_pSelectorLocation->setToolTip(tr("Holds the location of this medium.")); + m_pEditorDescription->setToolTip(tr("Holds the description 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: */ @@ -140,15 +140,15 @@ } +void UIMediumDetailsWidget::sltDescriptionTextChanged() +{ + m_newData.m_options.m_strDescription = m_pEditorDescription->toPlainText(); + revalidate(m_pErrorPaneDescription); + updateButtonStates(); +} + void UIMediumDetailsWidget::sltSizeValueChanged(qulonglong uSize) { m_newData.m_options.m_uLogicalSize = uSize; revalidate(m_pErrorPaneSize); - updateButtonStates(); -} - -void UIMediumDetailsWidget::sltDescriptionTextChanged() -{ - m_newData.m_options.m_strDescription = m_pEditorDescription->toPlainText(); - revalidate(m_pErrorPaneDescription); updateButtonStates(); } @@ -334,54 +334,4 @@ } - /* 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); - - /* Create size editor: */ - m_pEditorSize = new UIMediumSizeEditor; - AssertPtrReturnVoid(m_pEditorSize); - { - /* Configure editor: */ - m_pLabelSize->setBuddy(m_pEditorSize); - m_pEditorSize->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); - connect(m_pEditorSize, &UIMediumSizeEditor::sigSizeChanged, - this, &UIMediumDetailsWidget::sltSizeValueChanged); - - /* Add into layout: */ - pLayoutSize->addWidget(m_pEditorSize, 0, 0, 2, 1); - } - - /* Create size error pane: */ - m_pErrorPaneSize = new QLabel; - AssertPtrReturnVoid(m_pErrorPaneSize); - { - /* 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, Qt::AlignCenter); - } - - /* Add into layout: */ - pLayoutOptions->addLayout(pLayoutSize, 2, 1, 2, 1); - } - /* Create description label: */ m_pLabelDescription = new QLabel; @@ -392,5 +342,5 @@ /* Add into layout: */ - pLayoutOptions->addWidget(m_pLabelDescription, 4, 0); + pLayoutOptions->addWidget(m_pLabelDescription, 2, 0); } @@ -436,5 +386,55 @@ /* Add into layout: */ - pLayoutOptions->addLayout(pLayoutDescription, 4, 1, 2, 1); + pLayoutOptions->addLayout(pLayoutDescription, 2, 1, 2, 1); + } + + /* 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, 4, 0); + } + + /* Create size layout: */ + QGridLayout *pLayoutSize = new QGridLayout; + AssertPtrReturnVoid(pLayoutSize); + { + /* Configure layout: */ + pLayoutSize->setContentsMargins(0, 0, 0, 0); + + /* Create size editor: */ + m_pEditorSize = new UIMediumSizeEditor; + AssertPtrReturnVoid(m_pEditorSize); + { + /* Configure editor: */ + m_pLabelSize->setBuddy(m_pEditorSize); + m_pEditorSize->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); + connect(m_pEditorSize, &UIMediumSizeEditor::sigSizeChanged, + this, &UIMediumDetailsWidget::sltSizeValueChanged); + + /* Add into layout: */ + pLayoutSize->addWidget(m_pEditorSize, 0, 0, 2, 1); + } + + /* Create size error pane: */ + m_pErrorPaneSize = new QLabel; + AssertPtrReturnVoid(m_pErrorPaneSize); + { + /* 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, Qt::AlignCenter); + } + + /* Add into layout: */ + pLayoutOptions->addLayout(pLayoutSize, 4, 1, 2, 1); } @@ -590,4 +590,9 @@ sltLocationPathChanged(m_pSelectorLocation->path()); + /* 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); + /* Load size: */ const bool fEnableResize = m_newData.m_fValid @@ -598,9 +603,4 @@ m_pEditorSize->setMediumSize(m_newData.m_options.m_uLogicalSize); sltSizeValueChanged(m_pEditorSize->mediumSize()); - - /* 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); } @@ -637,4 +637,10 @@ m_pErrorPaneLocation->setVisible(fError); } + if (!pWidget || pWidget == m_pErrorPaneDescription) + { + /* Always valid for now: */ + const bool fError = false; + m_pErrorPaneDescription->setVisible(fError); + } if (!pWidget || pWidget == m_pErrorPaneSize) { @@ -642,10 +648,4 @@ 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); } @@ -663,10 +663,10 @@ // 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_pErrorPaneDescription) +// m_pErrorPaneDescription->setToolTip(tr("Cannot change medium description from %1 to %2.") +// .arg(m_oldData.m_options.m_strDescription).arg(m_newData.m_options.m_strDescription)); // 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)); -// if (!pWidget || pWidget == m_pErrorPaneDescription) -// m_pErrorPaneDescription->setToolTip(tr("Cannot change medium description from %1 to %2.") -// .arg(m_oldData.m_options.m_strDescription).arg(m_newData.m_options.m_strDescription)); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumDetailsWidget.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumDetailsWidget.h (revision 67985) +++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumDetailsWidget.h (revision 67986) @@ -50,6 +50,6 @@ : m_enmType(KMediumType_Normal) , m_strLocation(QString()) + , m_strDescription(QString()) , m_uLogicalSize(0) - , m_strDescription(QString()) {} @@ -60,6 +60,6 @@ && (m_enmType == other.m_enmType) && (m_strLocation == other.m_strLocation) + && (m_strDescription == other.m_strDescription) && (m_uLogicalSize == other.m_uLogicalSize) - && (m_strDescription == other.m_strDescription) ; } @@ -74,8 +74,8 @@ /** Holds the location. */ QString m_strLocation; + /** Holds the description. */ + QString m_strDescription; /** Holds the logical size. */ qulonglong m_uLogicalSize; - /** Holds the description. */ - QString m_strDescription; }; @@ -205,8 +205,8 @@ /** Handles location change. */ void sltLocationPathChanged(const QString &strPath); + /** Handles description text change. */ + void sltDescriptionTextChanged(); /** Handles size editor change. */ void sltSizeValueChanged(qulonglong uSize); - /** Handles description text change. */ - void sltDescriptionTextChanged(); /** Handles button-box button click. */ @@ -290,4 +290,11 @@ QLabel *m_pErrorPaneLocation; + /** Holds the description label. */ + QLabel *m_pLabelDescription; + /** Holds the description editor. */ + QTextEdit *m_pEditorDescription; + /** Holds the description error pane. */ + QLabel *m_pErrorPaneDescription; + /** Holds the size label. */ QLabel *m_pLabelSize; @@ -297,11 +304,4 @@ 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;