diff --git a/src/app/puzzle/vpmainwindow.cpp b/src/app/puzzle/vpmainwindow.cpp index 2ea07d45e..27fb1ded2 100644 --- a/src/app/puzzle/vpmainwindow.cpp +++ b/src/app/puzzle/vpmainwindow.cpp @@ -97,6 +97,7 @@ VPMainWindow::VPMainWindow(const VPCommandLinePtr &cmd, QWidget *parent) : InitMainGraphics(); InitZoomToolBar(); + InitScaleToolBar(); SetPropertiesData(); @@ -637,27 +638,29 @@ void VPMainWindow::InitZoomToolBar() zoomFitBestShortcuts.append(QKeySequence(Qt::ControlModifier + Qt::Key_Equal)); ui->actionZoomFitBest->setShortcuts(zoomFitBestShortcuts); connect(ui->actionZoomFitBest, &QAction::triggered, m_graphicsView, &VPMainGraphicsView::ZoomFitBest); +} - // defined the scale - ui->toolBarZoom->addSeparator(); +//--------------------------------------------------------------------------------------------------------------------- +void VPMainWindow::InitScaleToolBar() +{ auto* zoomScale = new QLabel(tr("Scale:"), this); - ui->toolBarZoom->addWidget(zoomScale); + ui->toolBarScale->addWidget(zoomScale); m_doubleSpinBoxScale = new QDoubleSpinBox(this); m_doubleSpinBoxScale->setDecimals(1); - m_doubleSpinBoxScale->setSuffix("%"); + m_doubleSpinBoxScale->setSuffix(QChar('%')); on_ScaleChanged(m_graphicsView->transform().m11()); connect(m_doubleSpinBoxScale.data(), QOverload::of(&QDoubleSpinBox::valueChanged), this, [this](double d){m_graphicsView->Zoom(d/100.0);}); - ui->toolBarZoom->addWidget(m_doubleSpinBoxScale); + ui->toolBarScale->addWidget(m_doubleSpinBoxScale); // define the mouse position - ui->toolBarZoom->addSeparator(); + ui->toolBarScale->addSeparator(); - m_mouseCoordinate = new QLabel(QString("0, 0 (%1)").arg(UnitsToStr(m_layout->GetUnit(), true))); - ui->toolBarZoom->addWidget(m_mouseCoordinate); - ui->toolBarZoom->addSeparator(); + m_mouseCoordinate = new QLabel(QStringLiteral("0, 0 (%1)").arg(UnitsToStr(m_layout->GetUnit(), true))); + ui->toolBarScale->addWidget(m_mouseCoordinate); + ui->toolBarScale->addSeparator(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/puzzle/vpmainwindow.h b/src/app/puzzle/vpmainwindow.h index ded4ace04..10bc7ece3 100644 --- a/src/app/puzzle/vpmainwindow.h +++ b/src/app/puzzle/vpmainwindow.h @@ -471,6 +471,11 @@ private: */ void InitZoomToolBar(); + /** + * @brief InitScaleToolBar Initialises the scale tool bar + */ + void InitScaleToolBar(); + /** * @brief SetPropertiesData Sets the values of UI elements * in all the property tabs to the values saved in m_layout diff --git a/src/app/puzzle/vpmainwindow.ui b/src/app/puzzle/vpmainwindow.ui index ecd727620..f984cdb6f 100644 --- a/src/app/puzzle/vpmainwindow.ui +++ b/src/app/puzzle/vpmainwindow.ui @@ -99,7 +99,6 @@ - @@ -1134,7 +1133,7 @@ 0 0 356 - 717 + 706 @@ -1422,7 +1421,7 @@ 0 0 356 - 717 + 706 @@ -1564,6 +1563,21 @@ + + + + Scale + + + Qt::AllToolBarAreas + + + BottomToolBarArea + + + false + +