diff --git a/examples/gallery/gallery.pro b/examples/gallery/gallery.pro index 2c1eedb3..c21ad9a3 100644 --- a/examples/gallery/gallery.pro +++ b/examples/gallery/gallery.pro @@ -7,15 +7,9 @@ SOURCES += \ label/LabelPage.cpp \ HEADERS += \ - slider/CustomSlider.h \ - slider/CustomSliderSkinlet.h \ - slider/OtherSlider.h \ slider/SliderPage.h SOURCES += \ - slider/CustomSlider.cpp \ - slider/CustomSliderSkinlet.cpp \ - slider/OtherSlider.cpp \ slider/SliderPage.cpp HEADERS += \ diff --git a/examples/gallery/slider/SliderPage.cpp b/examples/gallery/slider/SliderPage.cpp index 8e164a5c..733692d6 100644 --- a/examples/gallery/slider/SliderPage.cpp +++ b/examples/gallery/slider/SliderPage.cpp @@ -4,14 +4,27 @@ *****************************************************************************/ #include "SliderPage.h" -#include "CustomSlider.h" -#include "OtherSlider.h" +#include -#include -#include +namespace +{ + class Slider : public QskSlider + { + public: + Slider( Qt::Orientation orientation, QQuickItem* parent = nullptr ) + : QskSlider( orientation, parent ) + { + setBoundaries( 0, 1000 ); -SliderPage::SliderPage( QQuickItem* parentItem ) - : Page( Qt::Vertical, parentItem ) + setPageSize( 10 ); + setStepSize( 10 ); + setSnap( true ); + } + }; +} + +SliderPage::SliderPage( QQuickItem* parent ) + : Page( Qt::Horizontal, parent ) { setMargins( 10 ); setSpacing( 20 ); @@ -35,54 +48,6 @@ SliderPage::SliderPage( QQuickItem* parentItem ) void SliderPage::populate() { - { - auto slider = new QskSlider( this ); - - slider->setMinimum( 0 ); - slider->setMaximum( 1000 ); - slider->setPageSize( 10 ); - slider->setStepSize( 10 ); - slider->setSnap( true ); - } - - { - auto slider = new OtherSlider( this ); - - slider->setMinimum( 0 ); - slider->setMaximum( 10 ); - slider->setStepSize( 1 ); - } - - - auto hBox = new QskLinearBox( Qt::Horizontal, this ); - - { - auto slider = new QskSlider( Qt::Vertical, hBox ); - - slider->setMinimum( 0 ); - slider->setMaximum( 1000 ); - slider->setPageSize( 10 ); - slider->setStepSize( 10 ); - slider->setSnap( true ); - } - - { - auto slider = new OtherSlider( hBox ); - slider->setOrientation( Qt::Vertical ); - - slider->setMinimum( 0 ); - slider->setMaximum( 10 ); - slider->setStepSize( 1 ); - } - - { - auto slider = new CustomSlider( this ); - - slider->setMargins( QskMargins( 0, 15 ) ); - slider->setSnap( true ); - slider->setMinimum( 0 ); - slider->setMaximum( 2000 ); - slider->setStepSize( 10 ); - slider->setPageSize( 10 ); - } + ( void ) new Slider( Qt::Horizontal, this ); + ( void ) new Slider( Qt::Vertical, this ); } diff --git a/examples/gallery/slider/CustomSlider.cpp b/examples/tabview/CustomSlider.cpp similarity index 100% rename from examples/gallery/slider/CustomSlider.cpp rename to examples/tabview/CustomSlider.cpp diff --git a/examples/gallery/slider/CustomSlider.h b/examples/tabview/CustomSlider.h similarity index 100% rename from examples/gallery/slider/CustomSlider.h rename to examples/tabview/CustomSlider.h diff --git a/examples/gallery/slider/CustomSliderSkinlet.cpp b/examples/tabview/CustomSliderSkinlet.cpp similarity index 100% rename from examples/gallery/slider/CustomSliderSkinlet.cpp rename to examples/tabview/CustomSliderSkinlet.cpp diff --git a/examples/gallery/slider/CustomSliderSkinlet.h b/examples/tabview/CustomSliderSkinlet.h similarity index 100% rename from examples/gallery/slider/CustomSliderSkinlet.h rename to examples/tabview/CustomSliderSkinlet.h diff --git a/examples/gallery/slider/OtherSlider.cpp b/examples/tabview/OtherSlider.cpp similarity index 100% rename from examples/gallery/slider/OtherSlider.cpp rename to examples/tabview/OtherSlider.cpp diff --git a/examples/gallery/slider/OtherSlider.h b/examples/tabview/OtherSlider.h similarity index 100% rename from examples/gallery/slider/OtherSlider.h rename to examples/tabview/OtherSlider.h diff --git a/examples/tabview/main.cpp b/examples/tabview/main.cpp index 5fbd43dc..9c8bbda2 100644 --- a/examples/tabview/main.cpp +++ b/examples/tabview/main.cpp @@ -3,6 +3,9 @@ * This file may be used under the terms of the 3-clause BSD License *****************************************************************************/ +#include "CustomSlider.h" +#include "OtherSlider.h" + #include #include @@ -33,6 +36,36 @@ class Label : public QskTextLabel } }; +class SliderBox : public QskLinearBox +{ + public: + SliderBox( QQuickItem* parent = nullptr ) + : QskLinearBox( Qt::Vertical, parent ) + { + setMargins( 30 ); + setSpacing( 50 ); + setExtraSpacingAt( Qt::BottomEdge ); + + { + auto slider = new OtherSlider( this ); + + slider->setMinimum( 0 ); + slider->setMaximum( 10 ); + slider->setStepSize( 1 ); + } + + { + auto slider = new CustomSlider( this ); + + slider->setSnap( true ); + slider->setMinimum( 0 ); + slider->setMaximum( 2000 ); + slider->setStepSize( 10 ); + slider->setPageSize( 10 ); + } + } +}; + class TabView : public QskTabView { public: @@ -43,11 +76,20 @@ class TabView : public QskTabView { QString text; if ( i == 4 ) - text = QString( "Another Tab" ); + { + const auto text = QStringLiteral( "Another Tab" ); + addTab( text, new Label( text ) ); + } + else if ( i == 7 ) + { + addTab( "Sliders", new SliderBox() ); + } else - text = QString( "Tab %1" ).arg( i + 1 ); + { + const auto text = QString( "Tab %1" ).arg( i + 1 ); + addTab( text, new Label( text ) ); + } - addTab( text, new Label( text ) ); } buttonAt( 2 )->setEnabled( false ); diff --git a/examples/tabview/tabview.pro b/examples/tabview/tabview.pro index 0a7f08c9..dbef219c 100644 --- a/examples/tabview/tabview.pro +++ b/examples/tabview/tabview.pro @@ -1,4 +1,12 @@ CONFIG += qskexample +HEADERS += \ + CustomSlider.h \ + CustomSliderSkinlet.h \ + OtherSlider.h \ + SOURCES += \ + CustomSlider.cpp \ + CustomSliderSkinlet.cpp \ + OtherSlider.cpp \ main.cpp