vbox的更動 69131 路徑 trunk/src/VBox

時間撮記:

2017-10-18 上午10:09:36 (7 年 以前)

作者:

vboxsync

訊息:

FE/Qt: bugref:8400: Media Manager: Reworking medium location widget to be more simple (s.a. r118414 & r118416).

位置:

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

檔案:

• UIMediumDetailsWidget.cpp (修改) (9 筆差異)
• UIMediumDetailsWidget.h (修改) (4 筆差異)

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

@@ -26 +26 @@
 # include <QSlider>
 # include <QStackedLayout>
+# include <QStyle>
 # include <QTextEdit>
 # include <QVBoxLayout>
@@ -31 +32 @@
 /* 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"
@@ -54 +56 @@
     , m_pTabWidget(0)
     , m_pLabelType(0), m_pComboBoxType(0), m_pErrorPaneType(0)
-    , m_pLabelLocation(0), m_pSelectorLocation(0), m_pErrorPaneLocation(0)
+    , m_pLabelLocation(0), m_pEditorLocation(0), m_pButtonLocation(0), m_pErrorPaneLocation(0)
     , m_pLabelDescription(0), m_pEditorDescription(0), m_pErrorPaneDescription(0)
     , m_pLabelSize(0), m_pEditorSize(0), m_pErrorPaneSize(0)
@@ -102 +104 @@
     for (int i = 0; i < m_pComboBoxType->count(); ++i)
         m_pComboBoxType->setItemText(i, gpConverter->toString(m_pComboBoxType->itemData(i).value<KMediumType>()));
-    m_pSelectorLocation->setToolTip(tr("Holds the location of this medium."));
+    m_pEditorLocation->setToolTip(tr("Holds the location of this medium."));
+    m_pButtonLocation->setToolTip(tr("Choose Medium Location"));
     m_pEditorDescription->setToolTip(tr("Holds the description of this medium."));
     m_pEditorSize->setToolTip(tr("Holds the size of this medium."));
@@ -139 +142 @@
     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(),
+                                                              QApplication::translate("UIMediumManager", "Current extension (*.%1)")
+                                                                 .arg(QFileInfo(m_oldData.m_options.m_strLocation).suffix()),
+                                                              this,
+                                                              QApplication::translate("UIMediumManager", "Choose the location of this medium"),
+                                                              0, true, true);
+    if (!strFileName.isNull())
+        m_pEditorLocation->setText(QDir::toNativeSeparators(strFileName));
 }
 
@@ -308 +324 @@
 
                 /* Create location editor: */
-                m_pSelectorLocation = new UIFilePathSelector;
-                AssertPtrReturnVoid(m_pSelectorLocation);
+                m_pEditorLocation = new QLineEdit;
+                AssertPtrReturnVoid(m_pEditorLocation);
                 {
                     /* Configure editor: */
-                    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,
+                    m_pLabelLocation->setBuddy(m_pEditorLocation);
+                    m_pEditorLocation->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+                    connect(m_pEditorLocation, &QLineEdit::textChanged,
                             this, &UIMediumDetailsWidget::sltLocationPathChanged);
 
                     /* Add into layout: */
-                    pLayoutLocation->addWidget(m_pSelectorLocation);
+                    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);
                 }
 
@@ -601 +631 @@
     /* Load location: */
     m_pLabelLocation->setEnabled(m_newData.m_fValid);
-    m_pSelectorLocation->setEnabled(m_newData.m_fValid);
-    m_pSelectorLocation->setPath(m_newData.m_options.m_strLocation);
-    sltLocationPathChanged(m_pSelectorLocation->path());
+    m_pEditorLocation->setEnabled(m_newData.m_fValid);
+    m_pEditorLocation->setText(m_newData.m_options.m_strLocation);
 
     /* Load description: */
@@ -654 +683 @@
     {
         /* Always valid for now: */
-        const bool fError = false;
+        const bool fError = m_newData.m_options.m_strLocation.isEmpty();
         m_pErrorPaneLocation->setVisible(fError);
         if (fError)
@@ -686 +715 @@
 //        m_pErrorPaneType->setToolTip(tr("Cannot change from type <b>%1</b> to <b>%2</b>.")
 //                                     .arg(m_oldData.m_options.m_enmType).arg(m_newData.m_options.m_enmType));
-//    if (!pWidget || pWidget == m_pErrorPaneLocation)
-//        m_pErrorPaneLocation->setToolTip(tr("Cannot change medium location from <b>%1</b> to <b>%2</b>.")
-//                                         .arg(m_oldData.m_options.m_strLocation).arg(m_newData.m_options.m_strLocation));
+    if (!pWidget || pWidget == m_pErrorPaneLocation)
+        m_pErrorPaneLocation->setToolTip(tr("Location can not be empty."));
 //    if (!pWidget || pWidget == m_pErrorPaneDescription)
 //        m_pErrorPaneDescription->setToolTip(tr("Cannot change medium description from <b>%1</b> to <b>%2</b>.")

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

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