peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bye, bye squiek

Browse Source
This commit is contained in:
Uwe Rathmann 2024-01-25 08:56:01 +01:00
parent 2c33949916
commit 459b1ae93b
12 changed files with 6 additions and 1421 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
designsystems/CMakeLists.txt
View File

@ -1,4 +1,3 @@
add_subdirectory(squiek)
add_subdirectory(material3)
add_subdirectory(fluent2)
add_subdirectory(fusion)

10
designsystems/squiek/CMakeLists.txt
View File

@ -1,10 +0,0 @@
############################################################################
# QSkinny - Copyright (C) The authors
# SPDX-License-Identifier: BSD-3-Clause
############################################################################
qsk_add_plugin(squiekskin skins QskSquiekSkinFactory
QskSquiekGlobal.h QskSquiekSkin.h QskSquiekSkin.cpp
QskSquiekSkinFactory.h QskSquiekSkinFactory.cpp
)
set_target_properties(squiekskin PROPERTIES DEFINE_SYMBOL QSK_SQUIEK_MAKEDLL)

25
designsystems/squiek/QskSquiekGlobal.h
View File

@ -1,25 +0,0 @@
/******************************************************************************
* QSkinny - Copyright (C) The authors
* SPDX-License-Identifier: BSD-3-Clause
*****************************************************************************/
#ifndef QSK_SQUIEK_GLOBAL_H
#define QSK_SQUIEK_GLOBAL_H
#include "QskGlobal.h"
#ifdef QSK_DLL
#if defined( QSK_SQUIEK_MAKEDLL ) // create a DLL library
#define QSK_SQUIEK_EXPORT Q_DECL_EXPORT
#else // use a DLL library
#define QSK_SQUIEK_EXPORT Q_DECL_IMPORT
#endif
#endif // QSK_DLL
#ifndef QSK_SQUIEK_EXPORT
#define QSK_SQUIEK_EXPORT
#endif
#endif

1279
designsystems/squiek/QskSquiekSkin.cpp
View File

File diff suppressed because it is too large Load Diff

31
designsystems/squiek/QskSquiekSkin.h
View File

@ -1,31 +0,0 @@
/******************************************************************************
* QSkinny - Copyright (C) The authors
* SPDX-License-Identifier: BSD-3-Clause
*****************************************************************************/
#ifndef QSK_SQUIEK_SKIN_H
#define QSK_SQUIEK_SKIN_H
#include "QskSquiekGlobal.h"
#include <QskSkin.h>
#include <memory>
class QSK_SQUIEK_EXPORT QskSquiekSkin : public QskSkin
{
Q_OBJECT
using Inherited = QskSkin;
public:
QskSquiekSkin( QObject* parent = nullptr );
~QskSquiekSkin() override;
private:
void resetColors( const QColor& accent ) override;
void addGraphicRole( int role, const QColor& );
class PrivateData;
std::unique_ptr< PrivateData > m_data;
};
#endif

33
designsystems/squiek/QskSquiekSkinFactory.cpp
View File

@ -1,33 +0,0 @@
/******************************************************************************
* QSkinny - Copyright (C) The authors
* SPDX-License-Identifier: BSD-3-Clause
*****************************************************************************/
#include "QskSquiekSkinFactory.h"
#include "QskSquiekSkin.h"
static const QString squiekSkinName = QStringLiteral( "Squiek" );
QskSquiekSkinFactory::QskSquiekSkinFactory( QObject* parent )
: QskSkinFactory( parent )
{
}
QskSquiekSkinFactory::~QskSquiekSkinFactory()
{
}
QStringList QskSquiekSkinFactory::skinNames() const
{
return { squiekSkinName };
}
QskSkin* QskSquiekSkinFactory::createSkin( const QString& skinName )
{
if ( QString::compare( skinName, squiekSkinName, Qt::CaseInsensitive ) == 0 )
return new QskSquiekSkin();
return nullptr;
}
#include "moc_QskSquiekSkinFactory.cpp"

29
designsystems/squiek/QskSquiekSkinFactory.h
View File

@ -1,29 +0,0 @@
/******************************************************************************
* QSkinny - Copyright (C) The authors
* SPDX-License-Identifier: BSD-3-Clause
*****************************************************************************/
#ifndef QSK_SQUIEK_SKIN_FACTORY_H
#define QSK_SQUIEK_SKIN_FACTORY_H
#include "QskSquiekGlobal.h"
#include <QskSkinFactory.h>
class QSK_SQUIEK_EXPORT QskSquiekSkinFactory : public QskSkinFactory
{
Q_OBJECT
#if defined( QSK_SQUIEK_MAKEDLL )
Q_PLUGIN_METADATA( IID QskSkinFactoryIID FILE "metadata.json" )
Q_INTERFACES( QskSkinFactory )
#endif
public:
QskSquiekSkinFactory( QObject* parent = nullptr );
~QskSquiekSkinFactory() override;
QStringList skinNames() const override;
QskSkin* createSkin( const QString& skinName ) override;
};
#endif

4
designsystems/squiek/metadata.json
View File

@ -1,4 +0,0 @@
{
"FactoryId": "SquiekFactory",
"Skins": [ { "Name": "Squiek", "Scheme": "Unknown" } ]
}

5
examples/iotdashboard/main.cpp
View File

@ -69,9 +69,12 @@ int main( int argc, char* argv[] )
// disable default skins
qskSkinManager->setPluginPaths( QStringList() ); // no plugins
#if 1
// we should find a better way: TODO ...
qskSkinManager->unregisterFactory( "material3factory" );
qskSkinManager->unregisterFactory( "squiekfactory" );
qskSkinManager->unregisterFactory( "fusionfactory" );
qskSkinManager->unregisterFactory( "fluent2factory" );
#endif
qskSkinManager->registerFactory(
QStringLiteral( "SampleSkinFactory" ), new SkinFactory() );

2
playground/gradients/main.cpp
View File

@ -208,7 +208,7 @@ int main( int argc, char** argv )
Skinny::init(); // we need a skin
SkinnyShortcut::enable( SkinnyShortcut::Quit | SkinnyShortcut::DebugBackground );
qskSetup->setSkin( "squiek" );
qskSetup->setSkin( "fusion" );
QskWindow window;
window.setColor( QskRgb::Wheat );

2
support/CMakeLists.txt
View File

@ -33,7 +33,7 @@ target_include_directories(${target} PUBLIC ${CMAKE_CURRENT_LIST_DIR})
if(ENABLE_ENSURE_SKINS)
target_include_directories(${target} PRIVATE ${QSK_SOURCE_DIR}/designsystems)
target_compile_definitions(${target} PRIVATE ENSURE_SKINS)
target_link_libraries(${target} PRIVATE squiekskin material3skin fluent2skin fusionskin)
target_link_libraries(${target} PRIVATE material3skin fluent2skin fusionskin)
endif()
set(HIDE_SYSTEM_FONTS ON)

6
support/SkinnyNamespace.cpp
View File

@ -49,9 +49,6 @@ static bool pluginPath = initPluginPath();
#if defined( ENSURE_SKINS )
#if 0
#include <squiek/QskSquiekSkinFactory.h>
#endif
#include <material3/QskMaterial3SkinFactory.h>
#include <fluent2/QskFluent2SkinFactory.h>
#include <fusion/QskFusionSkinFactory.h>
@ -67,9 +64,6 @@ static bool pluginPath = initPluginPath();
we manually add them here.
*/
#if 0
qskSkinManager->registerFactory( "SquiekFactory", new QskSquiekSkinFactory() );
#endif
qskSkinManager->registerFactory( "Material3Factory", new QskMaterial3SkinFactory() );
qskSkinManager->registerFactory( "Fluent2Factory", new QskFluent2SkinFactory() );
qskSkinManager->registerFactory( "FusionFactory", new QskFusionSkinFactory() );