From 5ff92a9fb8d4f2c79316d58ce9e8a12538307346 Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Tue, 5 Jul 2022 08:36:25 +0200 Subject: [PATCH] Material: Rename new skin to Material3 --- examples/iotdashboard/main.cpp | 2 +- skins/material/metadata.json | 4 --- .../QskMaterial3Global.h} | 14 ++++----- .../QskMaterial3Skin.cpp} | 30 +++++++++---------- .../QskMaterial3Skin.h} | 18 +++++------ .../QskMaterial3SkinFactory.cpp} | 26 ++++++++-------- .../QskMaterial3SkinFactory.h} | 8 ++--- .../material.pro => material3/material3.pro} | 14 ++++----- skins/material3/metadata.json | 4 +++ skins/skins.pro | 2 +- support/SkinnyNamespace.cpp | 4 +-- support/SkinnyPlugin.cpp | 4 +-- support/support.pro | 2 +- 13 files changed, 66 insertions(+), 66 deletions(-) delete mode 100644 skins/material/metadata.json rename skins/{material/QskMaterialGlobal.h => material3/QskMaterial3Global.h} (60%) rename skins/{material/QskMaterialSkin.cpp => material3/QskMaterial3Skin.cpp} (97%) rename skins/{material/QskMaterialSkin.h => material3/QskMaterial3Skin.h} (80%) rename skins/{material/QskMaterialSkinFactory.cpp => material3/QskMaterial3SkinFactory.cpp} (55%) rename skins/{material/QskMaterialSkinFactory.h => material3/QskMaterial3SkinFactory.h} (75%) rename skins/{material/material.pro => material3/material3.pro} (51%) create mode 100644 skins/material3/metadata.json diff --git a/examples/iotdashboard/main.cpp b/examples/iotdashboard/main.cpp index 12ffb4d9..36ee139b 100644 --- a/examples/iotdashboard/main.cpp +++ b/examples/iotdashboard/main.cpp @@ -66,7 +66,7 @@ int main( int argc, char* argv[] ) // disable default skins qskSkinManager->setPluginPaths( QStringList() ); // no plugins - qskSkinManager->unregisterFactory( "materialfactory" ); + qskSkinManager->unregisterFactory( "material3factory" ); qskSkinManager->unregisterFactory( "squiekfactory" ); qskSkinManager->registerFactory( diff --git a/skins/material/metadata.json b/skins/material/metadata.json deleted file mode 100644 index 57af8644..00000000 --- a/skins/material/metadata.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "FactoryId": "MaterialFactory", - "Skins": [ "materialLight", "materialDark" ] -} diff --git a/skins/material/QskMaterialGlobal.h b/skins/material3/QskMaterial3Global.h similarity index 60% rename from skins/material/QskMaterialGlobal.h rename to skins/material3/QskMaterial3Global.h index 76e58182..be12d9d4 100644 --- a/skins/material/QskMaterialGlobal.h +++ b/skins/material3/QskMaterial3Global.h @@ -3,23 +3,23 @@ * This file may be used under the terms of the QSkinny License, Version 1.0 *****************************************************************************/ -#ifndef QSK_MATERIAL_GLOBAL_H -#define QSK_MATERIAL_GLOBAL_H +#ifndef QSK_MATERIAL3_GLOBAL_H +#define QSK_MATERIAL3_GLOBAL_H #include "QskGlobal.h" #ifdef QSK_DLL -#if defined( QSK_MATERIAL_MAKEDLL ) // create a DLL library -#define QSK_MATERIAL_EXPORT Q_DECL_EXPORT +#if defined( QSK_MATERIAL3_MAKEDLL ) // create a DLL library +#define QSK_MATERIAL3_EXPORT Q_DECL_EXPORT #else // use a DLL library -#define QSK_MATERIAL_EXPORT Q_DECL_IMPORT +#define QSK_MATERIAL3_EXPORT Q_DECL_IMPORT #endif #endif // QSK_DLL -#ifndef QSK_MATERIAL_EXPORT -#define QSK_MATERIAL_EXPORT +#ifndef QSK_MATERIAL3_EXPORT +#define QSK_MATERIAL3_EXPORT #endif #endif diff --git a/skins/material/QskMaterialSkin.cpp b/skins/material3/QskMaterial3Skin.cpp similarity index 97% rename from skins/material/QskMaterialSkin.cpp rename to skins/material3/QskMaterial3Skin.cpp index f0b3c776..4fc89578 100644 --- a/skins/material/QskMaterialSkin.cpp +++ b/skins/material3/QskMaterial3Skin.cpp @@ -3,7 +3,7 @@ * This file may be used under the terms of the QSkinny License, Version 1.0 *****************************************************************************/ -#include "QskMaterialSkin.h" +#include "QskMaterial3Skin.h" #include @@ -50,7 +50,7 @@ namespace class Editor : private QskSkinHintTableEditor { public: - Editor( QskSkinHintTable* table, const QskMaterialTheme& palette ) + Editor( QskSkinHintTable* table, const QskMaterial3Theme& palette ) : QskSkinHintTableEditor( table ) , m_pal( palette ) { @@ -86,7 +86,7 @@ namespace void setupTextInput(); void setupTextLabel(); - const QskMaterialTheme& m_pal; + const QskMaterial3Theme& m_pal; const uint rippleSize = 40; // ### remove }; @@ -227,7 +227,7 @@ void Editor::setupMenu() setStrutSize( Q::Graphic, { 46, -1 } ); setColor( Q::Text, m_pal.onSurface ); - setFontRole( Q::Text, QskMaterialSkin::M3BodyLarge ); + setFontRole( Q::Text, QskMaterial3Skin::M3BodyLarge ); setPosition( Q::Panel, 0 ); setPosition( Q::Panel | QskPopup::Closed, 1 ); @@ -380,7 +380,7 @@ void Editor::setupSegmentedBar() { // Text - setFontRole( Q::Text, QskMaterialSkin::M3LabelLarge ); + setFontRole( Q::Text, QskMaterial3Skin::M3LabelLarge ); setColor( Q::Text, m_pal.onSurface ); setColor( Q::Text | Q::Selected, m_pal.onSecondaryContainer ); @@ -449,7 +449,7 @@ void Editor::setupPushButton() setAlignment( Q::Graphic | A::Alignment, Qt::AlignLeft ); setPadding( Q::Graphic, 5 ); - setFontRole( Q::Text, QskMaterialSkin::M3LabelLarge ); + setFontRole( Q::Text, QskMaterial3Skin::M3LabelLarge ); setAlignment( Q::Text, Qt::AlignCenter ); @@ -513,7 +513,7 @@ void Editor::setupDialogButton() setColor( Q::Text, m_pal.onPrimary ); setColor( Q::Text | Q::Disabled, m_pal.onSurface38 ); - setFontRole( Q::Text, QskMaterialSkin::M3LabelLarge ); + setFontRole( Q::Text, QskMaterial3Skin::M3LabelLarge ); setAlignment( Q::Text, Qt::AlignCenter ); for ( auto state1 : { A::NoState, Q::Focused } ) @@ -685,7 +685,7 @@ void Editor::setupTabButton() setAnimation( Q::Panel | A::Color, qskDuration ); - setFontRole( Q::Text, QskMaterialSkin::M3LabelLarge ); + setFontRole( Q::Text, QskMaterial3Skin::M3LabelLarge ); setAlignment( Q::Text, Qt::AlignCenter ); } @@ -824,8 +824,8 @@ void Editor::setupSubWindow() } -QskMaterialTheme::QskMaterialTheme( Lightness lightness ) - : QskMaterialTheme( lightness, +QskMaterial3Theme::QskMaterial3Theme( Lightness lightness ) + : QskMaterial3Theme( lightness, { // default Material colors: 0xff6750A4, 0xff625B71, @@ -837,7 +837,7 @@ QskMaterialTheme::QskMaterialTheme( Lightness lightness ) { } -QskMaterialTheme::QskMaterialTheme(Lightness lightness, +QskMaterial3Theme::QskMaterial3Theme(Lightness lightness, std::array palettes ) : m_palettes( palettes ) { @@ -924,7 +924,7 @@ QskMaterialTheme::QskMaterialTheme(Lightness lightness, elevationLight2 = QskShadowMetrics( -2, 8, { 0, 2 } ); } -QskMaterialSkin::QskMaterialSkin( const QskMaterialTheme& palette, QObject* parent ) +QskMaterial3Skin::QskMaterial3Skin( const QskMaterial3Theme& palette, QObject* parent ) : Inherited( parent ) { setupFonts(); @@ -933,11 +933,11 @@ QskMaterialSkin::QskMaterialSkin( const QskMaterialTheme& palette, QObject* pare editor.setup(); } -QskMaterialSkin::~QskMaterialSkin() +QskMaterial3Skin::~QskMaterial3Skin() { } -void QskMaterialSkin::setupFonts() +void QskMaterial3Skin::setupFonts() { Inherited::setupFonts( QStringLiteral( "Roboto" ) ); @@ -945,4 +945,4 @@ void QskMaterialSkin::setupFonts() setFont( M3LabelLarge, createFont( 14 ) ); } -#include "moc_QskMaterialSkin.cpp" +#include "moc_QskMaterial3Skin.cpp" diff --git a/skins/material/QskMaterialSkin.h b/skins/material3/QskMaterial3Skin.h similarity index 80% rename from skins/material/QskMaterialSkin.h rename to skins/material3/QskMaterial3Skin.h index f97b2c5b..5c2b0700 100644 --- a/skins/material/QskMaterialSkin.h +++ b/skins/material3/QskMaterial3Skin.h @@ -3,10 +3,10 @@ * This file may be used under the terms of the QSkinny License, Version 1.0 *****************************************************************************/ -#ifndef QSK_MATERIAL_SKIN_H -#define QSK_MATERIAL_SKIN_H +#ifndef QSK_MATERIAL3_SKIN_H +#define QSK_MATERIAL3_SKIN_H -#include "QskMaterialGlobal.h" +#include "QskMaterial3Global.h" #include #include @@ -14,7 +14,7 @@ #include -class QSK_MATERIAL_EXPORT QskMaterialTheme +class QSK_MATERIAL3_EXPORT QskMaterial3Theme { public: enum Lightness @@ -35,8 +35,8 @@ class QSK_MATERIAL_EXPORT QskMaterialTheme NumPaletteTypes }; - QskMaterialTheme( Lightness ); - QskMaterialTheme( Lightness, std::array< QskHctColor, NumPaletteTypes > ); + QskMaterial3Theme( Lightness ); + QskMaterial3Theme( Lightness, std::array< QskHctColor, NumPaletteTypes > ); QRgb primary; QColor primary12; @@ -85,15 +85,15 @@ class QSK_MATERIAL_EXPORT QskMaterialTheme std::array< QskHctColor, NumPaletteTypes > m_palettes; }; -class QSK_MATERIAL_EXPORT QskMaterialSkin : public QskSkin +class QSK_MATERIAL3_EXPORT QskMaterial3Skin : public QskSkin { Q_OBJECT using Inherited = QskSkin; public: - QskMaterialSkin( const QskMaterialTheme&, QObject* parent = nullptr ); - ~QskMaterialSkin() override; + QskMaterial3Skin( const QskMaterial3Theme&, QObject* parent = nullptr ); + ~QskMaterial3Skin() override; enum FontRole { diff --git a/skins/material/QskMaterialSkinFactory.cpp b/skins/material3/QskMaterial3SkinFactory.cpp similarity index 55% rename from skins/material/QskMaterialSkinFactory.cpp rename to skins/material3/QskMaterial3SkinFactory.cpp index e73cd20f..4f43f841 100644 --- a/skins/material/QskMaterialSkinFactory.cpp +++ b/skins/material3/QskMaterial3SkinFactory.cpp @@ -3,40 +3,40 @@ * This file may be used under the terms of the 3-clause BSD License *****************************************************************************/ -#include "QskMaterialSkinFactory.h" -#include "QskMaterialSkin.h" +#include "QskMaterial3SkinFactory.h" +#include "QskMaterial3Skin.h" -static const QString materialLightSkinName = QStringLiteral( "materialLight" ); -static const QString materialDarkSkinName = QStringLiteral( "materialDark" ); +static const QString materialLightSkinName = QStringLiteral( "material3Light" ); +static const QString materialDarkSkinName = QStringLiteral( "material3Dark" ); -QskMaterialSkinFactory::QskMaterialSkinFactory( QObject* parent ) +QskMaterial3SkinFactory::QskMaterial3SkinFactory( QObject* parent ) : QskSkinFactory( parent ) { } -QskMaterialSkinFactory::~QskMaterialSkinFactory() +QskMaterial3SkinFactory::~QskMaterial3SkinFactory() { } -QStringList QskMaterialSkinFactory::skinNames() const +QStringList QskMaterial3SkinFactory::skinNames() const { return { materialLightSkinName, materialDarkSkinName }; } -QskSkin* QskMaterialSkinFactory::createSkin( const QString& skinName ) +QskSkin* QskMaterial3SkinFactory::createSkin( const QString& skinName ) { if ( QString::compare( skinName, materialLightSkinName, Qt::CaseInsensitive ) == 0 ) { - QskMaterialTheme theme( QskMaterialTheme::Light ); - return new QskMaterialSkin( theme ); + QskMaterial3Theme theme( QskMaterial3Theme::Light ); + return new QskMaterial3Skin( theme ); } else if ( QString::compare( skinName, materialDarkSkinName, Qt::CaseInsensitive ) == 0 ) { - QskMaterialTheme theme( QskMaterialTheme::Dark ); - return new QskMaterialSkin( theme ); + QskMaterial3Theme theme( QskMaterial3Theme::Dark ); + return new QskMaterial3Skin( theme ); } return nullptr; } -#include "moc_QskMaterialSkinFactory.cpp" +#include "moc_QskMaterial3SkinFactory.cpp" diff --git a/skins/material/QskMaterialSkinFactory.h b/skins/material3/QskMaterial3SkinFactory.h similarity index 75% rename from skins/material/QskMaterialSkinFactory.h rename to skins/material3/QskMaterial3SkinFactory.h index 8294e824..9727a329 100644 --- a/skins/material/QskMaterialSkinFactory.h +++ b/skins/material3/QskMaterial3SkinFactory.h @@ -6,10 +6,10 @@ #ifndef QSK_MATERIAL_SKIN_FACTORY_H #define QSK_MATERIAL_SKIN_FACTORY_H -#include "QskMaterialGlobal.h" +#include "QskMaterial3Global.h" #include -class QSK_MATERIAL_EXPORT QskMaterialSkinFactory : public QskSkinFactory +class QSK_MATERIAL3_EXPORT QskMaterial3SkinFactory : public QskSkinFactory { Q_OBJECT @@ -17,8 +17,8 @@ class QSK_MATERIAL_EXPORT QskMaterialSkinFactory : public QskSkinFactory Q_INTERFACES( QskSkinFactory ) public: - QskMaterialSkinFactory( QObject* parent = nullptr ); - ~QskMaterialSkinFactory() override; + QskMaterial3SkinFactory( QObject* parent = nullptr ); + ~QskMaterial3SkinFactory() override; QStringList skinNames() const override; QskSkin* createSkin( const QString& skinName ) override; diff --git a/skins/material/material.pro b/skins/material3/material3.pro similarity index 51% rename from skins/material/material.pro rename to skins/material3/material3.pro index c1259315..97317b2d 100644 --- a/skins/material/material.pro +++ b/skins/material3/material3.pro @@ -4,17 +4,17 @@ CONFIG += qskinny TEMPLATE = lib QSK_PLUGIN_SUBDIR = skins -TARGET = $$qskPluginTarget(materialskin) -DEFINES += QSK_MATERIAL_MAKEDLL +TARGET = $$qskPluginTarget(material3skin) +DEFINES += QSK_MATERIAL3_MAKEDLL HEADERS += \ - QskMaterialGlobal.h \ - QskMaterialSkin.h \ - QskMaterialSkinFactory.h + QskMaterial3Global.h \ + QskMaterial3Skin.h \ + QskMaterial3SkinFactory.h SOURCES += \ - QskMaterialSkin.cpp \ - QskMaterialSkinFactory.cpp + QskMaterial3Skin.cpp \ + QskMaterial3SkinFactory.cpp OTHER_FILES += metadata.json diff --git a/skins/material3/metadata.json b/skins/material3/metadata.json new file mode 100644 index 00000000..c668d63e --- /dev/null +++ b/skins/material3/metadata.json @@ -0,0 +1,4 @@ +{ + "FactoryId": "Material3Factory", + "Skins": [ "material3Light", "material3Dark" ] +} diff --git a/skins/skins.pro b/skins/skins.pro index 42e5f9bb..2a2c6621 100644 --- a/skins/skins.pro +++ b/skins/skins.pro @@ -2,4 +2,4 @@ TEMPLATE = subdirs SUBDIRS += \ squiek \ - material + material3 diff --git a/support/SkinnyNamespace.cpp b/support/SkinnyNamespace.cpp index 6878794e..f6e12307 100644 --- a/support/SkinnyNamespace.cpp +++ b/support/SkinnyNamespace.cpp @@ -20,7 +20,7 @@ #if defined( ENSURE_SKINS ) #include - #include + #include static void initSkins() { @@ -32,7 +32,7 @@ */ qskSkinManager->registerFactory( "SquiekFactory", new QskSquiekSkinFactory() ); - qskSkinManager->registerFactory( "MaterialFactory", new QskMaterialSkinFactory() ); + qskSkinManager->registerFactory( "Material3Factory", new QskMaterial3SkinFactory() ); qWarning() << "Couldn't find skin plugins, adding some manually."; } diff --git a/support/SkinnyPlugin.cpp b/support/SkinnyPlugin.cpp index e6718926..0b37eab7 100644 --- a/support/SkinnyPlugin.cpp +++ b/support/SkinnyPlugin.cpp @@ -37,7 +37,7 @@ static bool pluginPath = initPluginPath(); #include #include -#include +#include #include #include @@ -53,7 +53,7 @@ static void initSkins() */ qskSkinManager->registerFactory( "SquiekFactory", new QskSquiekSkinFactory() ); - qskSkinManager->registerFactory( "MaterialFactory", new QskMaterialSkinFactory() ); + qskSkinManager->registerFactory( "Material3Factory", new QskMaterial3SkinFactory() ); cout << "Couldn't find skin plugins, adding some manually." << endl; } diff --git a/support/support.pro b/support/support.pro index b02cb0d9..71c2c00e 100644 --- a/support/support.pro +++ b/support/support.pro @@ -40,7 +40,7 @@ ensure_skins { use_local_rpath: QMAKE_RPATHDIR *= $${QSK_PLUGIN_DIR}/skins qskAddLibrary($${QSK_PLUGIN_DIR}/skins, squiekskin) - qskAddLibrary($${QSK_PLUGIN_DIR}/skins, materialskin) + qskAddLibrary($${QSK_PLUGIN_DIR}/skins, material3skin) } fontconfig {