Changeset 72191 in vbox for trunk/src

Timestamp:

May 10, 2018 5:24:37 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

122625

Message:

FE/Qt: bugref: 6769 In UIVMNamePathSelector: 1) use hi-res sensitive layout spacing and 2) show native paths in line edit

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• widgets/UIVMNamePathSelector.cpp (modified) (4 diffs)
• wizards/newvm/UIWizardNewVMPageBasic1.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVMPageExpert.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIVMNamePathSelector.cpp

@@ -24 +24 @@
 # include <QHBoxLayout>
 # include <QRegExpValidator>
+# include <QStyle>
 
 /* GUI includes: */
@@ -65 +66 @@
     if (!m_pMainLayout)
         return;
-    m_pMainLayout->setContentsMargins(0, 0, 0, 0);
-    m_pMainLayout->setContentsMargins(0, 0, 0, 0);
-    m_pMainLayout->setSpacing(0);
+            /* Configure layout: */
+#ifdef VBOX_WS_MAC
+            m_pMainLayout->setContentsMargins(0, 0, 0, 0);
+            m_pMainLayout->setSpacing(0);
+#else
+            m_pMainLayout->setContentsMargins(qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 2, 0,
+                                                 qApp->style()->pixelMetric(QStyle::PM_LayoutRightMargin) / 2, 0);
+            m_pMainLayout->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing) / 2);
+#endif
     setLayout(m_pMainLayout);
 
@@ -74 +81 @@
     {
         m_pMainLayout->addWidget(m_pFileDialogButton);
-        m_pFileDialogButton->setIcon(UIIconPool::iconSet(QString(":/sf_add_16px.png")));
+        m_pFileDialogButton->setIcon(UIIconPool::iconSet(QString(":/select_file_16px.png")));
         connect(m_pFileDialogButton, &QIToolButton::clicked, this, &UIVMNamePathSelector::sltOpenPathSelector);
     }
@@ -113 +120 @@
     if (!m_pPath || m_pPath->text() == path)
         return;
-    m_pPath->setText(path);
-    m_pPath->setFixedWidthByText(path);
-    emit sigPathChanged(path);
+    QString nativePath(QDir::toNativeSeparators(path));
+    m_pPath->setText(nativePath);
+    m_pPath->setFixedWidthByText(nativePath);
+    emit sigPathChanged(nativePath);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp

@@ -351 +351 @@
 void UIWizardNewVMPageBasic1::sltPathChanged(const QString &strNewPath)
 {
-    RT_NOREF(strNewPath);
+    Q_UNUSED(strNewPath);
     composeMachineFilePath();
 }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp

@@ -188 +188 @@
 void UIWizardNewVMPageExpert::sltPathChanged(const QString &strNewPath)
 {
-    RT_NOREF(strNewPath); /** @todo use this or get rid of it? See also UIWizardNewVMPageBasic1::sltPathChanged(). */
+    Q_UNUSED(strNewPath);
     composeMachineFilePath();
 }