- Timestamp:
- Oct 27, 2022 11:49:30 AM (2 years ago)
- Location:
- trunk/src/VBox/Frontends/VirtualBox/src
- Files:
-
- 3 edited
-
extradata/UIExtraDataDefs.cpp (modified) (1 diff)
-
settings/editors/UIFontScaleEditor.cpp (modified) (6 diffs)
-
settings/editors/UIFontScaleEditor.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp
r97311 r97318 268 268 const char *UIExtraDataDefs::GUI_MediumSelector_DialogGeometry = "GUI/MediumSelector/DialogGeometry"; 269 269 270 const int UIExtraDataDefs::iFontScaleMin = 50;271 const int UIExtraDataDefs::iFontScaleMax = 1 50;270 const int UIExtraDataDefs::iFontScaleMin = 30; 271 const int UIExtraDataDefs::iFontScaleMax = 170; 272 272 273 273 /* Obsolete keys: */ -
trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIFontScaleEditor.cpp
r97312 r97318 29 29 #include <QGridLayout> 30 30 #include <QLabel> 31 #include <QLineEdit> 31 32 #include <QSpacerItem> 32 33 #include <QSpinBox> … … 42 43 #include <math.h> 43 44 45 class UIFontScaleFactorSpinBox : public QSpinBox 46 { 47 public: 48 UIFontScaleFactorSpinBox(QWidget *parent = 0); 49 }; 50 51 UIFontScaleFactorSpinBox::UIFontScaleFactorSpinBox(QWidget *pParent /* = 0*/) 52 :QSpinBox(pParent) 53 { 54 QLineEdit *pLineEdit = new QLineEdit; 55 if (pLineEdit) 56 { 57 pLineEdit->setReadOnly(true); 58 setLineEdit(pLineEdit); 59 } 60 } 44 61 45 62 UIFontScaleEditor::UIFontScaleEditor(QWidget *pParent) … … 84 101 if (m_pMinScaleLabel) 85 102 { 86 m_pMinScaleLabel->setText(QString("%1%").arg(m_pScaleS lider->minimum()));103 m_pMinScaleLabel->setText(QString("%1%").arg(m_pScaleSpinBox->minimum())); 87 104 m_pMinScaleLabel->setToolTip(tr("Minimum possible scale factor.")); 88 105 } 89 106 if (m_pMaxScaleLabel) 90 107 { 91 m_pMaxScaleLabel->setText(QString("%1%").arg(m_pScaleS lider->maximum()));108 m_pMaxScaleLabel->setText(QString("%1%").arg(m_pScaleSpinBox->maximum())); 92 109 m_pMaxScaleLabel->setToolTip(tr("Maximum possible scale factor.")); 93 110 } … … 96 113 void UIFontScaleEditor::sltScaleSpinBoxValueChanged(int value) 97 114 { 98 setSliderValue( value);115 setSliderValue(0.1 * value); 99 116 } 100 117 101 118 void UIFontScaleEditor::sltScaleSliderValueChanged(int value) 102 119 { 103 setSpinBoxValue( value);104 setFontScaleFactor( value);120 setSpinBoxValue(10 * value); 121 setFontScaleFactor(10 * value); 105 122 } 106 123 107 124 void UIFontScaleEditor::setFontScaleFactor(int iFontScaleFactor) 108 125 { 109 setSliderValue( iFontScaleFactor);126 setSliderValue(0.1 * iFontScaleFactor); 110 127 setSpinBoxValue(iFontScaleFactor); 111 128 } … … 150 167 } 151 168 152 m_pScaleSpinBox = new QSpinBox(this);169 m_pScaleSpinBox = new UIFontScaleFactorSpinBox(this); 153 170 if (m_pScaleSpinBox) 154 171 { … … 180 197 const int iMaximum = UIExtraDataDefs::iFontScaleMax; 181 198 182 m_pScaleSlider->setMinimum(iMinimum); 183 m_pScaleSlider->setMaximum(iMaximum); 184 m_pScaleSlider->setPageStep(20); 185 m_pScaleSlider->setSingleStep(10); 186 m_pScaleSlider->setTickInterval(10); 199 /* Set slider to 1/10 of the range to make sure mouse drag stops only on ticks: */ 200 m_pScaleSlider->setMinimum(0.1 * iMinimum); 201 m_pScaleSlider->setMaximum(0.1 * iMaximum); 202 203 m_pScaleSlider->setPageStep(2); 204 m_pScaleSlider->setSingleStep(1); 205 m_pScaleSlider->setTickInterval(1); 187 206 m_pScaleSpinBox->setSingleStep(10); 207 188 208 m_pScaleSpinBox->setMinimum(iMinimum); 189 209 m_pScaleSpinBox->setMaximum(iMaximum); 210 211 QLineEdit *pLineEdit = new QLineEdit; 212 pLineEdit->setReadOnly(true); 213 190 214 m_pScaleSlider->blockSignals(false); 191 215 m_pScaleSpinBox->blockSignals(false); -
trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIFontScaleEditor.h
r97307 r97318 42 42 class QWidget; 43 43 class QIAdvancedSlider; 44 class UIFontScaleFactorSpinBox; 44 45 45 46 /** QWidget reimplementation providing GUI with monitor scale factor editing functionality. … … 98 99 QLabel *m_pLabel; 99 100 QIAdvancedSlider *m_pScaleSlider; 100 QSpinBox *m_pScaleSpinBox;101 UIFontScaleFactorSpinBox *m_pScaleSpinBox; 101 102 QLabel *m_pMinScaleLabel; 102 103 QLabel *m_pMaxScaleLabel;
Note:
See TracChangeset
for help on using the changeset viewer.

