diff options
Diffstat (limited to 'examples/widgets/widgets/sliders')
-rw-r--r-- | examples/widgets/widgets/sliders/CMakeLists.txt | 31 | ||||
-rw-r--r-- | examples/widgets/widgets/sliders/slidersgroup.cpp | 34 | ||||
-rw-r--r-- | examples/widgets/widgets/sliders/slidersgroup.h | 6 | ||||
-rw-r--r-- | examples/widgets/widgets/sliders/window.cpp | 83 | ||||
-rw-r--r-- | examples/widgets/widgets/sliders/window.h | 8 |
5 files changed, 79 insertions, 83 deletions
diff --git a/examples/widgets/widgets/sliders/CMakeLists.txt b/examples/widgets/widgets/sliders/CMakeLists.txt index 9fb2a56979..c4c9d11e03 100644 --- a/examples/widgets/widgets/sliders/CMakeLists.txt +++ b/examples/widgets/widgets/sliders/CMakeLists.txt @@ -4,16 +4,10 @@ cmake_minimum_required(VERSION 3.16) project(sliders LANGUAGES CXX) -set(CMAKE_AUTOMOC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/widgets/sliders") - find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) +qt_standard_project_setup() + qt_add_executable(sliders main.cpp slidersgroup.cpp slidersgroup.h @@ -25,14 +19,21 @@ set_target_properties(sliders PROPERTIES MACOSX_BUNDLE TRUE ) -target_link_libraries(sliders PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets +target_link_libraries(sliders PRIVATE + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS sliders - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION . + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +) + +qt_generate_deploy_app_script( + TARGET sliders + OUTPUT_SCRIPT deploy_script + NO_UNSUPPORTED_PLATFORM_ERROR ) +install(SCRIPT ${deploy_script}) diff --git a/examples/widgets/widgets/sliders/slidersgroup.cpp b/examples/widgets/widgets/sliders/slidersgroup.cpp index c5d01cdb37..87841c43f9 100644 --- a/examples/widgets/widgets/sliders/slidersgroup.cpp +++ b/examples/widgets/widgets/sliders/slidersgroup.cpp @@ -9,39 +9,28 @@ #include <QSlider> //! [0] -SlidersGroup::SlidersGroup(Qt::Orientation orientation, const QString &title, - QWidget *parent) +SlidersGroup::SlidersGroup(const QString &title, QWidget *parent) : QGroupBox(title, parent) { - slider = new QSlider(orientation); + slider = new QSlider; slider->setFocusPolicy(Qt::StrongFocus); slider->setTickPosition(QSlider::TicksBothSides); slider->setTickInterval(10); slider->setSingleStep(1); - scrollBar = new QScrollBar(orientation); + scrollBar = new QScrollBar; scrollBar->setFocusPolicy(Qt::StrongFocus); dial = new QDial; dial->setFocusPolicy(Qt::StrongFocus); +//! [0] //! [1] connect(slider, &QSlider::valueChanged, scrollBar, &QScrollBar::setValue); connect(scrollBar, &QScrollBar::valueChanged, dial, &QDial::setValue); connect(dial, &QDial::valueChanged, slider, &QSlider::setValue); -//! [0] //! [1] connect(dial, &QDial::valueChanged, this, &SlidersGroup::valueChanged); -//! [1] //! [2] - -//! [2] //! [3] - QBoxLayout::Direction direction; -//! [3] //! [4] - - if (orientation == Qt::Horizontal) - direction = QBoxLayout::TopToBottom; - else - direction = QBoxLayout::LeftToRight; - - QBoxLayout *slidersLayout = new QBoxLayout(direction); +//! [1] //! [4] + slidersLayout = new QBoxLayout(QBoxLayout::LeftToRight); slidersLayout->addWidget(slider); slidersLayout->addWidget(scrollBar); slidersLayout->addWidget(dial); @@ -96,3 +85,14 @@ void SlidersGroup::invertKeyBindings(bool invert) dial->setInvertedControls(invert); } //! [14] + +//! [15] +void SlidersGroup::setOrientation(Qt::Orientation orientation) +{ + slidersLayout->setDirection(orientation == Qt::Horizontal + ? QBoxLayout::TopToBottom + : QBoxLayout::LeftToRight); + scrollBar->setOrientation(orientation); + slider->setOrientation(orientation); +} +//! [15] diff --git a/examples/widgets/widgets/sliders/slidersgroup.h b/examples/widgets/widgets/sliders/slidersgroup.h index 66821ca558..7e7d887018 100644 --- a/examples/widgets/widgets/sliders/slidersgroup.h +++ b/examples/widgets/widgets/sliders/slidersgroup.h @@ -10,6 +10,7 @@ QT_BEGIN_NAMESPACE class QDial; class QScrollBar; class QSlider; +class QBoxLayout; QT_END_NAMESPACE //! [0] @@ -18,8 +19,7 @@ class SlidersGroup : public QGroupBox Q_OBJECT public: - SlidersGroup(Qt::Orientation orientation, const QString &title, - QWidget *parent = nullptr); + SlidersGroup(const QString &title, QWidget *parent = nullptr); signals: void valueChanged(int value); @@ -30,11 +30,13 @@ public slots: void setMaximum(int value); void invertAppearance(bool invert); void invertKeyBindings(bool invert); + void setOrientation(Qt::Orientation orientation); private: QSlider *slider; QScrollBar *scrollBar; QDial *dial; + QBoxLayout *slidersLayout; }; //! [0] diff --git a/examples/widgets/widgets/sliders/window.cpp b/examples/widgets/widgets/sliders/window.cpp index 397c9b8b72..c62c3b83f5 100644 --- a/examples/widgets/widgets/sliders/window.cpp +++ b/examples/widgets/widgets/sliders/window.cpp @@ -3,10 +3,8 @@ #include "slidersgroup.h" #include "window.h" - #include <QCheckBox> #include <QComboBox> -#include <QHBoxLayout> #include <QLabel> #include <QSpinBox> #include <QStackedWidget> @@ -15,28 +13,15 @@ Window::Window(QWidget *parent) : QWidget(parent) { - horizontalSliders = new SlidersGroup(Qt::Horizontal, tr("Horizontal")); - verticalSliders = new SlidersGroup(Qt::Vertical, tr("Vertical")); - - stackedWidget = new QStackedWidget; - stackedWidget->addWidget(horizontalSliders); - stackedWidget->addWidget(verticalSliders); + slidersGroup = new SlidersGroup(tr("Sliders")); createControls(tr("Controls")); //! [0] //! [1] - connect(horizontalSliders, &SlidersGroup::valueChanged, -//! [1] //! [2] - verticalSliders, &SlidersGroup::setValue); - connect(verticalSliders, &SlidersGroup::valueChanged, - valueSpinBox, &QSpinBox::setValue); - connect(valueSpinBox, &QSpinBox::valueChanged, - horizontalSliders, &SlidersGroup::setValue); - - QHBoxLayout *layout = new QHBoxLayout; + layout = new QBoxLayout(QBoxLayout::LeftToRight); layout->addWidget(controlsGroup); - layout->addWidget(stackedWidget); + layout->addWidget(slidersGroup); setLayout(layout); minimumSpinBox->setValue(0); @@ -45,11 +30,11 @@ Window::Window(QWidget *parent) setWindowTitle(tr("Sliders")); } -//! [2] +//! [1] -//! [3] +//! [2] void Window::createControls(const QString &title) -//! [3] //! [4] +//! [2] //! [3] { controlsGroup = new QGroupBox(title); @@ -60,9 +45,9 @@ void Window::createControls(const QString &title) invertedAppearance = new QCheckBox(tr("Inverted appearance")); invertedKeyBindings = new QCheckBox(tr("Inverted key bindings")); -//! [4] //! [5] +//! [3] //! [4] minimumSpinBox = new QSpinBox; -//! [5] //! [6] +//! [4] //! [5] minimumSpinBox->setRange(-100, 100); minimumSpinBox->setSingleStep(1); @@ -74,30 +59,19 @@ void Window::createControls(const QString &title) valueSpinBox->setRange(-100, 100); valueSpinBox->setSingleStep(1); - orientationCombo = new QComboBox; - orientationCombo->addItem(tr("Horizontal slider-like widgets")); - orientationCombo->addItem(tr("Vertical slider-like widgets")); - -//! [6] //! [7] - connect(orientationCombo, &QComboBox::activated, -//! [7] //! [8] - stackedWidget, &QStackedWidget::setCurrentIndex); - connect(minimumSpinBox, &QSpinBox::valueChanged, - horizontalSliders, &SlidersGroup::setMinimum); +//! [5] //! [6] + connect(slidersGroup, &SlidersGroup::valueChanged, + valueSpinBox, &QSpinBox::setValue); + connect(valueSpinBox, &QSpinBox::valueChanged, + slidersGroup, &SlidersGroup::setValue); connect(minimumSpinBox, &QSpinBox::valueChanged, - verticalSliders, &SlidersGroup::setMinimum); - connect(maximumSpinBox, &QSpinBox::valueChanged, - horizontalSliders, &SlidersGroup::setMaximum); + slidersGroup, &SlidersGroup::setMinimum); connect(maximumSpinBox, &QSpinBox::valueChanged, - verticalSliders, &SlidersGroup::setMaximum); - connect(invertedAppearance, &QCheckBox::toggled, - horizontalSliders, &SlidersGroup::invertAppearance); + slidersGroup, &SlidersGroup::setMaximum); connect(invertedAppearance, &QCheckBox::toggled, - verticalSliders, &SlidersGroup::invertAppearance); + slidersGroup, &SlidersGroup::invertAppearance); connect(invertedKeyBindings, &QCheckBox::toggled, - horizontalSliders, &SlidersGroup::invertKeyBindings); - connect(invertedKeyBindings, &QCheckBox::toggled, - verticalSliders, &SlidersGroup::invertKeyBindings); + slidersGroup, &SlidersGroup::invertKeyBindings); QGridLayout *controlsLayout = new QGridLayout; controlsLayout->addWidget(minimumLabel, 0, 0); @@ -108,7 +82,26 @@ void Window::createControls(const QString &title) controlsLayout->addWidget(valueSpinBox, 2, 1); controlsLayout->addWidget(invertedAppearance, 0, 2); controlsLayout->addWidget(invertedKeyBindings, 1, 2); - controlsLayout->addWidget(orientationCombo, 3, 0, 1, 3); controlsGroup->setLayout(controlsLayout); + +} +//! [6] + + +//! [7] +void Window::resizeEvent(QResizeEvent *) +{ + if (width() == 0 || height() == 0) + return; + + const double aspectRatio = double(width()) / double(height()); + + if (aspectRatio < 1.0) { + layout->setDirection(QBoxLayout::TopToBottom); + slidersGroup->setOrientation(Qt::Horizontal); + } else if (aspectRatio > 1.0) { + layout->setDirection(QBoxLayout::LeftToRight); + slidersGroup->setOrientation(Qt::Vertical); + } } -//! [8] +//! [7] diff --git a/examples/widgets/widgets/sliders/window.h b/examples/widgets/widgets/sliders/window.h index 8a98fcb2a1..8d7338f27c 100644 --- a/examples/widgets/widgets/sliders/window.h +++ b/examples/widgets/widgets/sliders/window.h @@ -5,6 +5,7 @@ #define WINDOW_H #include <QWidget> +#include <QGridLayout> QT_BEGIN_NAMESPACE class QCheckBox; @@ -26,10 +27,9 @@ public: private: void createControls(const QString &title); + void resizeEvent(QResizeEvent *e); - SlidersGroup *horizontalSliders; - SlidersGroup *verticalSliders; - QStackedWidget *stackedWidget; + SlidersGroup *slidersGroup; QGroupBox *controlsGroup; QLabel *minimumLabel; @@ -40,7 +40,7 @@ private: QSpinBox *minimumSpinBox; QSpinBox *maximumSpinBox; QSpinBox *valueSpinBox; - QComboBox *orientationCombo; + QBoxLayout *layout; }; //! [0] |