support lib reorganized

examples/automotive/main.cpp

@@ -7,7 +7,6 @@
 #include "SkinFactory.h"
 
 #include <SkinnyShortcut.h>
-#include <SkinnyFont.h>
 
 #include <QskSetup.h>
 #include <QskSkinManager.h>
@@ -33,7 +32,6 @@ int main( int argc, char** argv )
      */
     qskSetup->setItemUpdateFlag( QskQuickItem::PreferRasterForTextures, true );
 
-    SkinnyFont::init( &app );
     SkinnyShortcut::enable( SkinnyShortcut::AllShortcuts );
 
     MainWindow window;

examples/boxes/main.cpp

@@ -5,7 +5,6 @@
 
 #include "Box.h"
 
-#include <SkinnyFont.h>
 #include <SkinnyShortcut.h>
 
 #include <QskLinearBox.h>
@@ -555,7 +554,6 @@ int main( int argc, char* argv[] )
 
     QGuiApplication app( argc, argv );
 
-    SkinnyFont::init( &app );
     SkinnyShortcut::enable( SkinnyShortcut::Quit | SkinnyShortcut::DebugShortcuts );
 
     auto* tabView = new TabView();

examples/buttons/main.cpp

@@ -3,7 +3,6 @@
  * This file may be used under the terms of the 3-clause BSD License
  *****************************************************************************/
 
-#include <SkinnyFont.h>
 #include <SkinnyShapeProvider.h>
 #include <SkinnyShortcut.h>
 
@@ -24,7 +23,6 @@ int main( int argc, char* argv[] )
 
     QGuiApplication app( argc, argv );
 
-    SkinnyFont::init( &app );
     SkinnyShortcut::enable( SkinnyShortcut::AllShortcuts );
 
     QQmlApplicationEngine engine( QUrl( "qrc:/qml/buttons.qml" ) );

examples/colorswitch/main.cpp

@@ -5,7 +5,6 @@
 
 #include "Theme.h"
 
-#include <SkinnyFont.h>
 #include <SkinnyShortcut.h>
 
 #include <QskQml.h>
@@ -28,7 +27,6 @@ int main( int argc, char* argv[] )
 
     QGuiApplication app( argc, argv );
 
-    SkinnyFont::init( &app );
     SkinnyShortcut::enable( SkinnyShortcut::Quit |
         SkinnyShortcut::ChangeFonts | SkinnyShortcut::DebugShortcuts );
 

examples/gallery/main.cpp

@@ -8,7 +8,6 @@
 #include "slider/SliderPage.h"
 #include "switchbutton/SwitchButtonPage.h"
 
-#include <SkinnyFont.h>
 #include <SkinnyShortcut.h>
 #include <SkinnyShapeProvider.h>
 
@@ -44,7 +43,6 @@ int main( int argc, char* argv[] )
 
     QGuiApplication app( argc, argv );
 
-    SkinnyFont::init( &app );
     SkinnyShortcut::enable( SkinnyShortcut::AllShortcuts );
 
     auto tabView = new TabView();

examples/iotdashboard/main.cpp

@@ -7,7 +7,6 @@
 #include "GraphicProvider.h"
 #include "Skin.h"
 
-#include <SkinnyFont.h>
 #include <SkinnyShortcut.h>
 
 #include <QskSetup.h>
@@ -61,8 +60,6 @@ int main( int argc, char* argv[] )
 
     QGuiApplication app( argc, argv );
 
-    SkinnyFont::init( &app );
-
     Qsk::addGraphicProvider( QString(), new GraphicProvider() );
 
     // disable default skins

examples/layouts/main.cpp

@@ -10,7 +10,6 @@
 #include "StackLayoutPage.h"
 #include "TestRectangle.h"
 
-#include <SkinnyFont.h>
 #include <SkinnyShortcut.h>
 
 #include <QskFocusIndicator.h>
@@ -31,7 +30,6 @@ int main( int argc, char* argv[] )
 
     QGuiApplication app( argc, argv );
 
-    SkinnyFont::init( &app );
     SkinnyShortcut::enable( SkinnyShortcut::AllShortcuts );
 
     auto tabView = new QskTabView();

examples/listbox/main.cpp

@@ -3,7 +3,6 @@
  * This file may be used under the terms of the 3-clause BSD License
  *****************************************************************************/
 
-#include <SkinnyFont.h>
 #include <SkinnyShortcut.h>
 
 #include <QskAspect.h>
@@ -65,7 +64,6 @@ int main( int argc, char* argv[] )
 
     QGuiApplication app( argc, argv );
 
-    SkinnyFont::init( &app );
     SkinnyShortcut::enable( SkinnyShortcut::AllShortcuts );
 
     QskWindow window;

examples/messagebox/main.cpp

@@ -3,7 +3,6 @@
  * This file may be used under the terms of the 3-clause BSD License
  *****************************************************************************/
 
-#include <SkinnyFont.h>
 #include <SkinnyShortcut.h>
 
 #include <QFontDatabase>
@@ -126,7 +125,6 @@ int main( int argc, char* argv[] )
 
     QGuiApplication app( argc, argv );
 
-    SkinnyFont::init( &app );
     SkinnyShortcut::enable( SkinnyShortcut::AllShortcuts );
 
     qskDialog->setPolicy( QskDialog::EmbeddedBox );

examples/messageboxQml/main.cpp

@@ -3,7 +3,6 @@
  * This file may be used under the terms of the 3-clause BSD License
  *****************************************************************************/
 
-#include <SkinnyFont.h>
 #include <SkinnyShortcut.h>
 
 #include <QskQml.h>
@@ -22,7 +21,6 @@ int main( int argc, char* argv[] )
 
     QGuiApplication app( argc, argv );
 
-    SkinnyFont::init( &app );
     SkinnyShortcut::enable( SkinnyShortcut::AllShortcuts );
 
     QQmlApplicationEngine engine( QUrl( "qrc:/qml/messagebox.qml" ) );

examples/mycontrols/main.cpp

@@ -6,7 +6,6 @@
 #include "MySkin.h"
 #include "MyToggleButton.h"
 
-#include <SkinnyFont.h>
 #include <SkinnyShapeProvider.h>
 #include <SkinnyShortcut.h>
 
@@ -136,7 +135,6 @@ int main( int argc, char* argv[] )
 
     QGuiApplication app( argc, argv );
 
-    SkinnyFont::init( &app );
     SkinnyShortcut::enable( SkinnyShortcut::DebugBackground |
         SkinnyShortcut::DebugStatistics | SkinnyShortcut::Quit );
 

examples/qvgviewer/main.cpp

@@ -5,7 +5,6 @@
 
 #include "MainWindow.h"
 
-#include <SkinnyFont.h>
 #include <SkinnyShortcut.h>
 
 #ifdef CONTEXT_MENU
@@ -29,7 +28,6 @@ int main( int argc, char* argv[] )
 
     QGuiApplication app( argc, argv );
 
-    SkinnyFont::init( &app );
     SkinnyShortcut::enable( SkinnyShortcut::AllShortcuts );
 
     QskFocusIndicator* focusIndicator = new QskFocusIndicator();

examples/tabview/main.cpp

@@ -3,7 +3,6 @@
  * This file may be used under the terms of the 3-clause BSD License
  *****************************************************************************/
 
-#include <SkinnyFont.h>
 #include <SkinnyShortcut.h>
 
 #include <QskAspect.h>
@@ -90,7 +89,6 @@ int main( int argc, char* argv[] )
 
     QGuiApplication app( argc, argv );
 
-    SkinnyFont::init( &app );
     SkinnyShortcut::enable( SkinnyShortcut::AllShortcuts );
 
     auto tabView = new TabView();

playground/anchors/main.cpp

@@ -5,7 +5,6 @@
 
 #include "AnchorBox.h"
 
-#include <SkinnyFont.h>
 #include <SkinnyShortcut.h>
 
 #include <QskControl.h>
@@ -153,7 +152,6 @@ int main( int argc, char* argv[] )
 
     QGuiApplication app( argc, argv );
 
-    SkinnyFont::init( &app );
     SkinnyShortcut::enable( SkinnyShortcut::Quit | SkinnyShortcut::DebugShortcuts );
 
     auto box = new MyBox();

playground/dialogbuttons/main.cpp

@@ -5,7 +5,6 @@
 
 #include "Window.h"
 
-#include <SkinnyFont.h>
 #include <SkinnyShortcut.h>
 
 #include <QskFocusIndicator.h>
@@ -21,7 +20,6 @@ int main( int argc, char* argv[] )
 
     QGuiApplication app( argc, argv );
 
-    SkinnyFont::init( &app );
     SkinnyShortcut::enable( SkinnyShortcut::AllShortcuts );
 
     Window window( Qt::Horizontal );

playground/grids/main.cpp

@@ -5,8 +5,6 @@
 
 #include "TestBox.h"
 
-#include <SkinnyFont.h>
-
 #include <QskSizePolicy.h>
 #include <QskFunctions.h>
 
@@ -389,15 +387,6 @@ int main( int argc, char** argv )
 {
     QApplication app( argc, argv );
 
-#if 1
-    /*
-        we don't need the fonts, but by calling something from
-        the support library initializations regarding the skins
-        are loaded. TODO ...
-     */
-    SkinnyFont::init( &app );
-#endif
-
     int testcase = 0;
     if ( argc == 2 )
         testcase = atoi( argv[1] );

playground/inputpanel/main.cpp

@@ -3,7 +3,6 @@
  * This file may be used under the terms of the 3-clause BSD License
  *****************************************************************************/
 
-#include <SkinnyFont.h>
 #include <SkinnyShortcut.h>
 
 #include <QskDialog.h>
@@ -285,7 +284,6 @@ int main( int argc, char* argv[] )
 
     QGuiApplication app( argc, argv );
 
-    SkinnyFont::init( &app );
     SkinnyShortcut::enable( SkinnyShortcut::AllShortcuts );
 
 #if 1

playground/webview/main.cpp

@@ -3,7 +3,6 @@
  * This file may be used under the terms of the 3-clause BSD License
  *****************************************************************************/
 
-#include <SkinnyFont.h>
 #include <SkinnyShortcut.h>
 
 #include <QskWindow.h>
@@ -43,7 +42,6 @@ int main( int argc, char* argv[] )
     QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     QGuiApplication app( argc, argv );
 
-    SkinnyFont::init( &app );
     SkinnyShortcut::enable( SkinnyShortcut::Quit | SkinnyShortcut::DebugShortcuts );
 
     QskWindow window;

support/SkinnyFont.cpp

@@ -1,43 +0,0 @@
-/******************************************************************************
- * QSkinny - Copyright (C) 2016 Uwe Rathmann
- * This file may be used under the terms of the 3-clause BSD License
- *****************************************************************************/
-
-#include "SkinnyFont.h"
-
-#include <QFontDatabase>
-#include <QGuiApplication>
-#include <QElapsedTimer>
-#include <QDebug>
-
-#define STRINGIFY(x) #x
-#define STRING(x) STRINGIFY(x)
-
-void SkinnyFont::init( QGuiApplication* )
-{
-#ifdef FONTCONFIG_FILE
-    const char env[] = "FONTCONFIG_FILE";
-    if ( !qEnvironmentVariableIsSet( env ) )
-        qputenv( env, STRING( FONTCONFIG_FILE ) );
-#endif
-
-    QElapsedTimer timer;
-    timer.start();
-
-    QFontDatabase();
-
-    const auto elapsed = timer.elapsed();
-
-    if ( elapsed > 20 )
-    {
-        qWarning() << "Loading fonts needed" << elapsed << "ms"
-            << "- usually because of creating a font cache.";
-    }
-
-    /*
-        The default initialization in QskSkin sets up its font table
-        with using the application font for the default font role.
-     */
-    QGuiApplication::setFont( QFont( "DejaVuSans", 12 ) );
-}
-

support/SkinnyGlobal.h

@@ -3,23 +3,20 @@
  * This file may be used under the terms of the 3-clause BSD License
  *****************************************************************************/
 
-#ifndef SKINNY_GLOBAL_H
+#pragma once
-#define SKINNY_GLOBAL_H
 
 #include <QskGlobal.h>
 
 #ifdef QSK_DLL
 
-#if defined( SKINNY_MAKEDLL )     // create a DLL library
+    #if defined( SKINNY_MAKEDLL )     // create a DLL library
-#define SKINNY_EXPORT Q_DECL_EXPORT
+        #define SKINNY_EXPORT Q_DECL_EXPORT
-#else                           // use a DLL library
+    #else                           // use a DLL library
-#define SKINNY_EXPORT Q_DECL_IMPORT
+        #define SKINNY_EXPORT Q_DECL_IMPORT
-#endif
+    #endif
 
 #endif // QSK_DLL
 
 #ifndef SKINNY_EXPORT
-#define SKINNY_EXPORT
+    #define SKINNY_EXPORT
-#endif
-
 #endif

support/SkinnyNamespace.cpp

@@ -0,0 +1,140 @@
+/******************************************************************************
+ * QSkinny - Copyright (C) 2016 Uwe Rathmann
+ * This file may be used under the terms of the 3-clause BSD License
+ *****************************************************************************/
+
+#include "SkinnyNamespace.h"
+
+#include <QskSetup.h>
+#include <QskSkinManager.h>
+#include <QskSkin.h>
+#include <QskSkinTransition.h>
+#include <QskAnimationHint.h>
+
+#include <QGuiApplication>
+#include <QDebug>
+
+#define STRINGIFY(x) #x
+#define STRING(x) STRINGIFY(x)
+
+#if defined( ENSURE_SKINS )
+
+    #include <squiek/QskSquiekSkinFactory.h>
+    #include <material/QskMaterialSkinFactory.h>
+
+    static void initSkins()
+    {
+        if ( qskSkinManager->skinNames().isEmpty() )
+        {
+            /*
+                To avoid having problems with not finding the skin plugins
+                we manually add them here.
+             */
+
+            qskSkinManager->registerFactory( "SquiekFactory", new QskSquiekSkinFactory() );
+            qskSkinManager->registerFactory( "MaterialFactory", new QskMaterialSkinFactory() );
+
+            qWarning() << "Couldn't find skin plugins, adding some manually.";
+        }
+    }
+
+    Q_COREAPP_STARTUP_FUNCTION( initSkins )
+
+#endif
+
+#define ENSURE_FONTS
+
+#if defined( ENSURE_FONTS )
+
+    #include <QFontDatabase>
+    #include <QElapsedTimer>
+
+    static void initFonts()
+    {
+    #ifdef FONTCONFIG_FILE
+        const char env[] = "FONTCONFIG_FILE";
+        if ( !qEnvironmentVariableIsSet( env ) )
+            qputenv( env, STRING( FONTCONFIG_FILE ) );
+    #endif
+
+        QElapsedTimer timer;
+        timer.start();
+
+        QFontDatabase();
+
+        const auto elapsed = timer.elapsed();
+
+        if ( elapsed > 20 )
+        {
+            qWarning() << "Loading fonts needed" << elapsed << "ms"
+                << "- usually because of creating a font cache.";
+        }
+
+        /*
+            The default initialization in QskSkin sets up its font table
+            with using the application font for the default font role.
+         */
+        QGuiApplication::setFont( QFont( "DejaVuSans", 12 ) );
+    }
+#endif
+
+Q_COREAPP_STARTUP_FUNCTION( initFonts )
+
+void Skinny::changeSkin( QskAnimationHint hint )
+{
+    const auto names = qskSkinManager->skinNames();
+    if ( names.size() <= 1 )
+        return;
+
+    int index = names.indexOf( qskSetup->skinName() );
+    index = ( index + 1 ) % names.size();
+
+    auto oldSkin = qskSetup->skin();
+    if ( oldSkin->parent() == qskSetup )
+        oldSkin->setParent( nullptr ); // otherwise setSkin deletes it
+
+    if ( auto newSkin = qskSetup->setSkin( names[ index ] ) )
+    {
+        QskSkinTransition transition;
+
+        //transition.setMask( QskAspect::Color ); // Metrics are flickering -> TODO
+        transition.setSourceSkin( oldSkin );
+        transition.setTargetSkin( newSkin );
+        transition.setAnimation( hint );
+
+        transition.process();
+
+        if ( oldSkin->parent() == nullptr )
+            delete oldSkin;
+    }
+}
+
+void Skinny::changeFonts( int increment )
+{   
+    auto skin = qskSetup->skin();
+    
+    const auto fonts = skin->fonts();
+    
+    for ( auto it = fonts.begin(); it != fonts.end(); ++it )
+    {   
+        auto role = it->first;
+        auto font = it->second;
+        
+        if ( font.pixelSize() > 0 )
+        {   
+            const auto newSize = font.pixelSize() + increment;
+            if ( newSize > 0 )
+                font.setPixelSize( newSize );
+        }
+        else
+        {   
+            const auto newSize = font.pointSizeF() + increment;
+            if ( newSize > 0 )
+                font.setPointSizeF( font.pointSizeF() + increment );
+        }
+        
+        skin->setFont( role, font );
+    }
+    
+    Q_EMIT qskSetup->skinChanged( skin );
+}

support/SkinnyNamespace.h

@@ -3,16 +3,13 @@
  * This file may be used under the terms of the 3-clause BSD License
  *****************************************************************************/
 
-#ifndef SKINNY_FONT_H_
+#pragma once
-#define SKINNY_FONT_H_
 
 #include "SkinnyGlobal.h"
+#include <QskAnimationHint.h>
 
-class QGuiApplication;
+namespace Skinny
-
-namespace SkinnyFont
 {
-    SKINNY_EXPORT void init( QGuiApplication* );
+    SKINNY_EXPORT void changeSkin( QskAnimationHint hint = 500 );
+    SKINNY_EXPORT void changeFonts( int increment );
 }
-
-#endif

support/SkinnyShapeFactory.h

@@ -3,8 +3,7 @@
  * This file may be used under the terms of the 3-clause BSD License
  *****************************************************************************/
 
-#ifndef SKINNY_SHAPE_FACTORY_H_
+#pragma once
-#define SKINNY_SHAPE_FACTORY_H_
 
 #include "SkinnyGlobal.h"
 #include <QPainterPath>
@@ -32,5 +31,3 @@ namespace SkinnyShapeFactory
 
     SKINNY_EXPORT QPainterPath shapePath( Shape, const QSizeF& );
 }
-
-#endif

support/SkinnyShapeProvider.h

@@ -3,8 +3,7 @@
  * This file may be used under the terms of the 3-clause BSD License
  *****************************************************************************/
 
-#ifndef SKINNY_SHAPE_PROVIDER_H
+#pragma once
-#define SKINNY_SHAPE_PROVIDER_H
 
 #include "SkinnyGlobal.h"
 #include <QskGraphicProvider.h>
@@ -15,5 +14,3 @@ class SKINNY_EXPORT SkinnyShapeProvider : public QskGraphicProvider
     const QskGraphic* loadGraphic( const QString& id ) const override final;
 };
 
-#endif
-

support/SkinnyShortcut.cpp

@@ -1,15 +1,11 @@
 #include "SkinnyShortcut.h"
+#include "SkinnyNamespace.h"
 
 #include <QskShortcutMap.h>
 #include <QskSetup.h>
-#include <QskSkinManager.h>
 #include <QskWindow.h>
-#include <QskAspect.h>
-#include <QskSkin.h>
 #include <QskControl.h>
 #include <QskQuick.h>
-#include <QskAnimationHint.h>
-#include <QskSkinTransition.h>
 
 #include <QQuickItem>
 #include <QKeySequence>
@@ -17,7 +13,6 @@
 #include <QSGNode>
 #include <QDebug>
 
-#include <unordered_map>
 #include <iostream>
 
 SkinnyShortcut::SkinnyShortcut( QObject* parent ):
@@ -34,17 +29,17 @@ void SkinnyShortcut::enable( Types types )
     if ( types & RotateSkin )
     {
         QskShortcutMap::addShortcut( QKeySequence( Qt::CTRL | Qt::Key_S ),
-            false, &s_shortcut, &SkinnyShortcut::rotateSkin );
+            false, &s_shortcut, [] { Skinny::changeSkin(); } );
         cout << "CTRL-S to change the skin." << endl;
     }
 
     if ( types & ChangeFonts )
     {
         QskShortcutMap::addShortcut( QKeySequence( Qt::CTRL | Qt::Key_F ),
-            false, &s_shortcut, [] { s_shortcut.changeFonts( +1 ); } );
+            false, &s_shortcut, [] { Skinny::changeFonts( +1 ); } );
 
         QskShortcutMap::addShortcut( QKeySequence( Qt::CTRL | Qt::Key_G ),
-            false, &s_shortcut, [] { s_shortcut.changeFonts( -1 ); } );
+            false, &s_shortcut, [] { Skinny::changeFonts( -1 ); } );
 
         cout << "CTRL-F to increase the font size." << endl;
         cout << "CTRL-G to decrease the font size." << endl;
@@ -75,35 +70,6 @@ void SkinnyShortcut::enable( Types types )
     }
 }
 
-void SkinnyShortcut::rotateSkin()
-{
-    const auto names = qskSkinManager->skinNames();
-    if ( names.size() <= 1 )
-        return;
-
-    int index = names.indexOf( qskSetup->skinName() );
-    index = ( index + 1 ) % names.size();
-
-    auto oldSkin = qskSetup->skin();
-    if ( oldSkin->parent() == qskSetup )
-        oldSkin->setParent( nullptr ); // otherwise setSkin deletes it
-
-    if ( auto newSkin = qskSetup->setSkin( names[ index ] ) )
-    {
-        QskSkinTransition transition;
-
-        //transition.setMask( QskAspect::Color ); // Metrics are flickering -> TODO
-        transition.setSourceSkin( oldSkin );
-        transition.setTargetSkin( newSkin );
-        transition.setAnimation( 500 );
-
-        transition.process();
-
-        if ( oldSkin->parent() == nullptr )
-            delete oldSkin;
-    }
-}
-
 void SkinnyShortcut::showBackground()
 {
 #if 0
@@ -149,36 +115,6 @@ void SkinnyShortcut::showBackground()
     }
 }
 
-void SkinnyShortcut::changeFonts( int increment )
-{
-    auto skin = qskSetup->skin();
-
-    const auto fonts = skin->fonts();
-
-    for ( auto it = fonts.begin(); it != fonts.end(); ++it )
-    {
-        auto role = it->first;
-        auto font = it->second;
-
-        if ( font.pixelSize() > 0 )
-        {
-            const auto newSize = font.pixelSize() + increment;
-            if ( newSize > 0 )
-                font.setPixelSize( newSize );
-        }
-        else
-        {
-            const auto newSize = font.pointSizeF() + increment;
-            if ( newSize > 0 )
-                font.setPointSizeF( font.pointSizeF() + increment );
-        }
-
-        skin->setFont( role, font );
-    }
-
-    Q_EMIT qskSetup->skinChanged( skin );
-}
-
 static inline void countNodes( const QSGNode* node, int& counter )
 {
     if ( node )

support/SkinnyShortcut.h

@@ -3,8 +3,7 @@
  * This file may be used under the terms of the 3-clause BSD License
  *****************************************************************************/
 
-#ifndef SKINNY_SHORTCUT_H_
+#pragma once
-#define SKINNY_SHORTCUT_H_
 
 #include "SkinnyGlobal.h"
 #include <QObject>
@@ -34,12 +33,8 @@ class SKINNY_EXPORT SkinnyShortcut : public QObject
   private:
     SkinnyShortcut( QObject* parent = nullptr );
 
-    void rotateSkin();
-    void changeFonts( int increment );
     void showBackground();
     void debugStatistics();
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS( SkinnyShortcut::Types )
-
-#endif

support/support.pro

@@ -12,13 +12,13 @@ contains(QSK_CONFIG, QskDll): DEFINES += SKINNY_MAKEDLL
 
 HEADERS += \
     SkinnyGlobal.h \
-    SkinnyFont.h \
+    SkinnyNamespace.h \
     SkinnyShapeFactory.h \
     SkinnyShapeProvider.h \
     SkinnyShortcut.h
 
 SOURCES += \
-    SkinnyFont.cpp \
+    SkinnyNamespace.cpp \
     SkinnyPlugin.cpp \
     SkinnyShapeFactory.cpp \
     SkinnyShapeProvider.cpp \