Changeset 69115 in vbox for trunk

Timestamp:

Oct 17, 2017 4:52:43 PM (7 years ago)

Author:

vboxsync

Message:

Reverting r118414 as it's a bit too early.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium

Files:

• UIMediumDetailsWidget.cpp (modified) (7 diffs)
• UIMediumDetailsWidget.h (modified) (4 diffs)

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

@@ -26 +26 @@
 # include <QSlider>
 # include <QStackedLayout>
-# include <QStyle>
 # include <QTextEdit>
 # include <QVBoxLayout>
@@ -32 +31 @@
 /* GUI includes: */
 # include "QIDialogButtonBox.h"
-# include "QIFileDialog.h"
 # include "QILabel.h"
 # include "QILineEdit.h"
 # include "QITabWidget.h"
-# include "QIToolButton.h"
 # include "UIConverter.h"
+# include "UIFilePathSelector.h"
 # include "UIIconPool.h"
 # include "UIMediumDetailsWidget.h"
@@ -56 +54 @@
     , m_pTabWidget(0)
     , m_pLabelType(0), m_pComboBoxType(0), m_pErrorPaneType(0)
-    , m_pLabelLocation(0), m_pEditorLocation(0), m_pButtonLocation(0), m_pErrorPaneLocation(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)
@@ -104 +102 @@
     for (int i = 0; i < m_pComboBoxType->count(); ++i)
         m_pComboBoxType->setItemText(i, gpConverter->toString(m_pComboBoxType->itemData(i).value<KMediumType>()));
-    m_pEditorLocation->setToolTip(tr("Holds the location of this medium."));
-    m_pButtonLocation->setToolTip(tr("Choose Medium Location"));
+    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."));
@@ -142 +139 @@
     revalidate(m_pErrorPaneLocation);
     updateButtonStates();
-}
-
-void UIMediumDetailsWidget::sltChooseLocationPath()
-{
-    /* Open file-save dialog to choose location for current medium: */
-    const QString strFileName = QIFileDialog::getSaveFileName(m_pEditorLocation->text(),
-                                                              tr("Current extension (*.%1)")
-                                                                 .arg(QFileInfo(m_oldData.m_options.m_strLocation).suffix()),
-                                                              this,
-                                                              tr("Choose the location of this medium"),
-                                                              0, true, true);
-    if (!strFileName.isNull())
-        m_pEditorLocation->setText(QDir::toNativeSeparators(strFileName));
 }
 
@@ -324 +308 @@
 
                 /* Create location editor: */
-                m_pEditorLocation = new QLineEdit;
-                AssertPtrReturnVoid(m_pEditorLocation);
+                m_pSelectorLocation = new UIFilePathSelector;
+                AssertPtrReturnVoid(m_pSelectorLocation);
                 {
                     /* Configure editor: */
-                    m_pLabelLocation->setBuddy(m_pEditorLocation);
-                    m_pEditorLocation->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-                    connect(m_pEditorLocation, &QLineEdit::textChanged,
+                    m_pLabelLocation->setBuddy(m_pSelectorLocation);
+                    m_pSelectorLocation->setResetEnabled(false);
+                    m_pSelectorLocation->setMode(UIFilePathSelector::Mode_File_Save);
+                    m_pSelectorLocation->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+                    connect(m_pSelectorLocation, &UIFilePathSelector::pathChanged,
                             this, &UIMediumDetailsWidget::sltLocationPathChanged);
 
                     /* Add into layout: */
-                    pLayoutLocation->addWidget(m_pEditorLocation);
-                }
-
-                /* Create location button: */
-                m_pButtonLocation = new QIToolButton;
-                AssertPtrReturnVoid(m_pButtonLocation);
-                {
-                    /* Configure editor: */
-                    const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
-                    m_pButtonLocation->setIconSize(QSize(iIconMetric, iIconMetric));
-                    m_pButtonLocation->setIcon(UIIconPool::iconSet(":/select_file_16px.png"));
-                    m_pButtonLocation->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-                    connect(m_pButtonLocation, &QIToolButton::clicked,
-                            this, &UIMediumDetailsWidget::sltChooseLocationPath);
-
-                    /* Add into layout: */
-                    pLayoutLocation->addWidget(m_pButtonLocation);
+                    pLayoutLocation->addWidget(m_pSelectorLocation);
                 }
 
@@ -631 +601 @@
     /* Load location: */
     m_pLabelLocation->setEnabled(m_newData.m_fValid);
-    m_pEditorLocation->setEnabled(m_newData.m_fValid);
-    m_pEditorLocation->setText(m_newData.m_options.m_strLocation);
+    m_pSelectorLocation->setEnabled(m_newData.m_fValid);
+    m_pSelectorLocation->setPath(m_newData.m_options.m_strLocation);
+    sltLocationPathChanged(m_pSelectorLocation->path());
 
     /* Load description: */

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

@@ -34 +34 @@
 class QComboBox;
 class QLabel;
-class QLineEdit;
 class QStackedLayout;
 class QTextEdit;
@@ -40 +39 @@
 class QILabel;
 class QITabWidget;
-class QIToolButton;
+class UIFilePathSelector;
 class UIMediumSizeEditor;
 
@@ -208 +207 @@
         /** Handles location change. */
         void sltLocationPathChanged(const QString &strPath);
-        /** Handles request to choose location. */
-        void sltChooseLocationPath();
         /** Handles description text change. */
         void sltDescriptionTextChanged();
@@ -289 +286 @@
 
         /** Holds the location label. */
-        QLabel       *m_pLabelLocation;
-        /** Holds the location editor. */
-        QLineEdit    *m_pEditorLocation;
-        /** Holds the location button. */
-        QIToolButton *m_pButtonLocation;
+        QLabel             *m_pLabelLocation;
+        /** Holds the location selector. */
+        UIFilePathSelector *m_pSelectorLocation;
         /** Holds the location error pane. */
-        QLabel       *m_pErrorPaneLocation;
+        QLabel             *m_pErrorPaneLocation;
 
         /** Holds the description label. */