custom sliders moved from gallery to tabview. we do not want to have

custom controlsin the gallery, that is intended to show the default
versions
This commit is contained in:
Uwe Rathmann 2022-04-04 17:45:49 +02:00
parent ae5a348b50
commit b06687662b
10 changed files with 74 additions and 65 deletions

View File

@ -7,15 +7,9 @@ SOURCES += \
label/LabelPage.cpp \ label/LabelPage.cpp \
HEADERS += \ HEADERS += \
slider/CustomSlider.h \
slider/CustomSliderSkinlet.h \
slider/OtherSlider.h \
slider/SliderPage.h slider/SliderPage.h
SOURCES += \ SOURCES += \
slider/CustomSlider.cpp \
slider/CustomSliderSkinlet.cpp \
slider/OtherSlider.cpp \
slider/SliderPage.cpp slider/SliderPage.cpp
HEADERS += \ HEADERS += \

View File

@ -4,14 +4,27 @@
*****************************************************************************/ *****************************************************************************/
#include "SliderPage.h" #include "SliderPage.h"
#include "CustomSlider.h" #include <QskSlider.h>
#include "OtherSlider.h"
#include <QskRgbValue.h> namespace
#include <QskMargins.h> {
class Slider : public QskSlider
{
public:
Slider( Qt::Orientation orientation, QQuickItem* parent = nullptr )
: QskSlider( orientation, parent )
{
setBoundaries( 0, 1000 );
SliderPage::SliderPage( QQuickItem* parentItem ) setPageSize( 10 );
: Page( Qt::Vertical, parentItem ) setStepSize( 10 );
setSnap( true );
}
};
}
SliderPage::SliderPage( QQuickItem* parent )
: Page( Qt::Horizontal, parent )
{ {
setMargins( 10 ); setMargins( 10 );
setSpacing( 20 ); setSpacing( 20 );
@ -35,54 +48,6 @@ SliderPage::SliderPage( QQuickItem* parentItem )
void SliderPage::populate() void SliderPage::populate()
{ {
{ ( void ) new Slider( Qt::Horizontal, this );
auto slider = new QskSlider( this ); ( void ) new Slider( Qt::Vertical, 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 );
}
} }

View File

@ -3,6 +3,9 @@
* This file may be used under the terms of the 3-clause BSD License * This file may be used under the terms of the 3-clause BSD License
*****************************************************************************/ *****************************************************************************/
#include "CustomSlider.h"
#include "OtherSlider.h"
#include <SkinnyShortcut.h> #include <SkinnyShortcut.h>
#include <QskAspect.h> #include <QskAspect.h>
@ -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 class TabView : public QskTabView
{ {
public: public:
@ -43,11 +76,20 @@ class TabView : public QskTabView
{ {
QString text; QString text;
if ( i == 4 ) 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 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 ); buttonAt( 2 )->setEnabled( false );

View File

@ -1,4 +1,12 @@
CONFIG += qskexample CONFIG += qskexample
HEADERS += \
CustomSlider.h \
CustomSliderSkinlet.h \
OtherSlider.h \
SOURCES += \ SOURCES += \
CustomSlider.cpp \
CustomSliderSkinlet.cpp \
OtherSlider.cpp \
main.cpp main.cpp