diff --git a/examples/qvgviewer/MainWindow.cpp b/examples/qvgviewer/MainWindow.cpp index bd32d95f..33269930 100644 --- a/examples/qvgviewer/MainWindow.cpp +++ b/examples/qvgviewer/MainWindow.cpp @@ -17,7 +17,6 @@ #include #include #include -#include #include #include @@ -75,18 +74,7 @@ class GraphicLabel : public QskGraphicLabel MainWindow::MainWindow() { - m_tabView = new QskTabView(); - m_tabView->setTabBarEdge( Qt::LeftEdge ); - - const QString resourceDir( ":/qvg" ); - const QStringList icons = QDir( resourceDir ).entryList(); - - for ( const auto& icon : icons ) - { - auto title = icon; - m_tabView->addTab( title.replace( ".qvg", "" ), - new GraphicLabel( QskGraphicIO::read( resourceDir + "/" + icon ) ) ); - } + auto label = new GraphicLabel( QskGraphicIO::read( QString( ":/qvg/Tux.qvg" ) ) ); auto invertButton = new QskPushButton( "Inverted" ); invertButton->setSizePolicy( Qt::Horizontal, QskSizePolicy::Fixed ); @@ -97,12 +85,12 @@ MainWindow::MainWindow() box->setPanel( true ); box->setPadding( 5 ); box->addItem( invertButton ); - box->addItem( m_tabView ); + box->addItem( label ); addItem( box ); connect( invertButton, &QskPushButton::toggled, - this, &MainWindow::setDarknessMode ); + label, &GraphicLabel::setDarknessMode ); connect( qskSetup, &QskSetup::skinChanged, this, &MainWindow::setGraphicRoles ); @@ -110,21 +98,11 @@ MainWindow::MainWindow() setGraphicRoles( qskSetup->skin() ); } -void MainWindow::setDarknessMode( bool on ) -{ - for ( int i = 0; i < m_tabView->count(); i++ ) - { - auto label = static_cast< GraphicLabel* >( m_tabView->pageAt( i ) ); - label->setDarknessMode( on ); - } -} - void MainWindow::setGraphicRoles( QskSkin* skin ) { - // substituting black and white + // substituting black QskColorFilter colorFilter; - colorFilter.addColorSubstitution( qRgb( 0, 0, 0 ), qRgb( 189, 183, 107 ) ); - colorFilter.addColorSubstitution( qRgb( 255, 255, 255 ), qRgb( 50, 50, 50 ) ); + colorFilter.addColorSubstitution( QskRgb::Black, QskRgb::DarkKhaki ); skin->setGraphicFilter( GraphicLabel::Inverted, colorFilter ); } diff --git a/examples/qvgviewer/MainWindow.h b/examples/qvgviewer/MainWindow.h index aca9d988..2d8eb8b5 100644 --- a/examples/qvgviewer/MainWindow.h +++ b/examples/qvgviewer/MainWindow.h @@ -7,7 +7,6 @@ #include -class QskTabView; class QskSkin; class MainWindow : public QskWindow @@ -18,9 +17,5 @@ class MainWindow : public QskWindow MainWindow(); private Q_SLOTS: - void setDarknessMode( bool on ); void setGraphicRoles( QskSkin* ); - - private: - QskTabView* m_tabView; }; diff --git a/examples/qvgviewer/qvg/01.01.10.qvg b/examples/qvgviewer/qvg/01.01.10.qvg deleted file mode 100644 index ecc02b2e..00000000 Binary files a/examples/qvgviewer/qvg/01.01.10.qvg and /dev/null differ diff --git a/examples/qvgviewer/qvg/01.03.04q.qvg b/examples/qvgviewer/qvg/01.03.04q.qvg deleted file mode 100644 index f7a92670..00000000 Binary files a/examples/qvgviewer/qvg/01.03.04q.qvg and /dev/null differ diff --git a/examples/qvgviewer/qvg/01.08.05q.qvg b/examples/qvgviewer/qvg/01.08.05q.qvg deleted file mode 100644 index 5f0f72d4..00000000 Binary files a/examples/qvgviewer/qvg/01.08.05q.qvg and /dev/null differ diff --git a/examples/qvgviewer/qvg/01.25.18.qvg b/examples/qvgviewer/qvg/01.25.18.qvg deleted file mode 100644 index 73c0ea83..00000000 Binary files a/examples/qvgviewer/qvg/01.25.18.qvg and /dev/null differ diff --git a/examples/qvgviewer/qvg/Tux.qvg b/examples/qvgviewer/qvg/Tux.qvg new file mode 100644 index 00000000..f94effbf Binary files /dev/null and b/examples/qvgviewer/qvg/Tux.qvg differ diff --git a/examples/qvgviewer/qvgviewer.qrc b/examples/qvgviewer/qvgviewer.qrc index 336168ae..75be73f3 100644 --- a/examples/qvgviewer/qvgviewer.qrc +++ b/examples/qvgviewer/qvgviewer.qrc @@ -1,9 +1,8 @@ + + - qvg/01.01.10.qvg - qvg/01.03.04q.qvg - qvg/01.25.18.qvg - qvg/01.08.05q.qvg + qvg/Tux.qvg diff --git a/examples/qvgviewer/svg/01.01.10.svg b/examples/qvgviewer/svg/01.01.10.svg deleted file mode 100644 index 557ae7d3..00000000 --- a/examples/qvgviewer/svg/01.01.10.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - diff --git a/examples/qvgviewer/svg/01.03.04q.svg b/examples/qvgviewer/svg/01.03.04q.svg deleted file mode 100644 index 29041bbd..00000000 --- a/examples/qvgviewer/svg/01.03.04q.svg +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/examples/qvgviewer/svg/01.08.05q.svg b/examples/qvgviewer/svg/01.08.05q.svg deleted file mode 100644 index 413339ff..00000000 --- a/examples/qvgviewer/svg/01.08.05q.svg +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/qvgviewer/svg/01.25.18.svg b/examples/qvgviewer/svg/01.25.18.svg deleted file mode 100644 index 958cb57c..00000000 --- a/examples/qvgviewer/svg/01.25.18.svg +++ /dev/null @@ -1,34 +0,0 @@ - - - -image/svg+xml diff --git a/examples/qvgviewer/svg/Tux.svg b/examples/qvgviewer/svg/Tux.svg new file mode 100644 index 00000000..2daa3da1 --- /dev/null +++ b/examples/qvgviewer/svg/Tux.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + +