Changeset 74732 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Oct 10, 2018 9:20:33 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9255. Some polishing on scale factor editor widget

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UIScaleFactorEditor.cpp (modified) (8 diffs)
• UIScaleFactorEditor.h (modified) (5 diffs)

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

@@ -21 +21 @@
 
 /* Qt includes: */
-#include <QComboBox>
-#include <QGridLayout>
-#include <QSpinBox>
+# include <QComboBox>
+# include <QGridLayout>
+# include <QLabel>
+# include <QSpacerItem>
+# include <QSpinBox>
 # include <QWidget>
 
 /* GUI includes: */
-#include "QIAdvancedSlider.h"
-#include "UIScaleFactorEditor.h"
+# include "QIAdvancedSlider.h"
+# include "UIScaleFactorEditor.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -38 +40 @@
     , m_pMainLayout(0)
     , m_pMonitorComboBox(0)
+    , m_pScaleSlider(0)
+    , m_pMaxScaleLabel(0)
+    , m_pMinScaleLabel(0)
 {
     /* Prepare: */
@@ -71 +76 @@
         int currentMonitorIndex = m_pMonitorComboBox->currentIndex();
         if (m_scaleFactors.size() > currentMonitorIndex && m_pScaleSpinBox)
-            m_pScaleSpinBox->setValue(100 * m_scaleFactors.at(currentMonitorIndex));
+            setSpinBoxValue(100 * m_scaleFactors.at(currentMonitorIndex));
     }
 }
@@ -82 +87 @@
 void UIScaleFactorEditor::retranslateUi()
 {
+    if (m_pMaxScaleLabel)
+    {
+        m_pMaxScaleLabel->setText(tr("Max"));
+    }
+
+    if (m_pMinScaleLabel)
+    {
+        m_pMinScaleLabel->setText(tr("Min"));
+    }
 }
 
@@ -104 +118 @@
 
     /* Update the slider and spinbox values without emitting signals: */
-    int scaleFactor = 100 *m_scaleFactors[index];
+    int scaleFactor = 100 * m_scaleFactors[index];
     setSliderValue(scaleFactor);
     setSpinBoxValue(scaleFactor);
@@ -114 +128 @@
     if (!m_pMainLayout)
         return;
+    QMargins margins = m_pMainLayout->contentsMargins();
+    m_pMainLayout->setContentsMargins(0, margins.top(), 0, margins.bottom());
     m_pMonitorComboBox = new QComboBox;
     if (m_pMonitorComboBox)
@@ -121 +137 @@
                 this, &UIScaleFactorEditor::sltMonitorComboIndexChanged);
     }
-    m_pScaleSpinBox = new QSpinBox;
-    if (m_pScaleSpinBox)
-    {
-        m_pMainLayout->addWidget(m_pScaleSpinBox, 0, 2);
-        m_pScaleSpinBox->setMinimum(100);
-        m_pScaleSpinBox->setMaximum(200);
-        connect(m_pScaleSpinBox ,static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged),
-                this, &UIScaleFactorEditor::sltScaleSpinBoxValueChanged);
-    }
-
+
+    QGridLayout *pSliderLayout = new QGridLayout;
+    pSliderLayout->setSpacing(0);
     m_pScaleSlider = new QIAdvancedSlider;
     {
-        m_pMainLayout->addWidget(m_pScaleSlider, 0, 1);
+        pSliderLayout->addWidget(m_pScaleSlider, 0, 0, 1, 3);
         m_pScaleSlider->setMinimum(100);
         m_pScaleSlider->setMaximum(200);
@@ -143 +152 @@
                 this, &UIScaleFactorEditor::sltScaleSliderValueChanged);
     }
+
+    m_pMinScaleLabel = new QLabel;
+    if (m_pMinScaleLabel)
+        pSliderLayout->addWidget(m_pMinScaleLabel, 1, 0);
+
+    QSpacerItem *pSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
+    if (pSpacer)
+        pSliderLayout->addItem(pSpacer, 1, 1);
+
+    m_pMaxScaleLabel = new QLabel;
+    if (m_pMaxScaleLabel)
+        pSliderLayout->addWidget(m_pMaxScaleLabel, 1, 2);
+
+    m_pMainLayout->addLayout(pSliderLayout, 0, 1, 2, 1);
+
+    m_pScaleSpinBox = new QSpinBox;
+    if (m_pScaleSpinBox)
+    {
+        m_pMainLayout->addWidget(m_pScaleSpinBox, 0, 3);
+        m_pScaleSpinBox->setMinimum(100);
+        m_pScaleSpinBox->setMaximum(200);
+        connect(m_pScaleSpinBox ,static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged),
+                this, &UIScaleFactorEditor::sltScaleSpinBoxValueChanged);
+    }
+
+
     setLayout(m_pMainLayout);
+    retranslateUi();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIScaleFactorEditor.h

@@ -30 +30 @@
 class QComboBox;
 class QGridLayout;
+class QLabel;
 class QSpinBox;
 class QWidget;
@@ -40 +41 @@
     Q_OBJECT;
 
-signals:
-
 public:
 
@@ -51 +50 @@
 
 protected:
+
     virtual void retranslateUi() /* override */;
 
 private slots:
+
     void sltScaleSpinBoxValueChanged(int value);
     void sltScaleSliderValueChanged(int value);
@@ -59 +60 @@
 
 private:
+
     void prepare();
     void setScaleFactor(int iMonitorIndex, int iScaleFactor);
+    /* Blocks slider's signals before settting the value. */
     void setSliderValue(int iValue);
+    /* Blocks slider's signals before settting the value. */
     void setSpinBoxValue(int iValue);
     QSpinBox          *m_pScaleSpinBox;
@@ -67 +71 @@
     QComboBox         *m_pMonitorComboBox;
     QIAdvancedSlider  *m_pScaleSlider;
+    QLabel            *m_pMaxScaleLabel;
+    QLabel            *m_pMinScaleLabel;
     /* Stores the per-monitor scale factors in range [.., 1, ..] */
     QList<double>      m_scaleFactors;