napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[plasmalnf] Expose only the themes model

Browse Source 
- make ThemeInfo and ThemeInfoList internal, expose only
  ThemesModel to the rest of the PlasmaLnF module
- don't build the widget anymore (needs to be replaced by
  a delegate)
This commit is contained in:
Adriaan de Groot 2020-11-17 11:56:09 +01:00
parent 04a6fbc4c4
commit 258a14bea2
3 changed files with 90 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/modules/plasmalnf/CMakeLists.txt
View File

@ -37,7 +37,6 @@ if ( KF5Plasma_FOUND AND KF5Package_FOUND )
PlasmaLnfPage.cpp
PlasmaLnfJob.cpp
ThemeInfo.cpp
ThemeWidget.cpp
RESOURCES
page_plasmalnf.qrc
UI

100
src/modules/plasmalnf/ThemeInfo.cpp
View File

@ -11,22 +11,98 @@
#include <KPackage/Package>
#include <KPackage/PackageLoader>
/** @brief describes a single plasma LnF theme.
*
* A theme description has an id, which is really the name of the desktop
* file (e.g. org.kde.breeze.desktop), a name which is human-readable and
* translated, and an optional image Page, which points to a local screenshot
* of that theme.
*/
struct ThemeInfo
{
QString id;
QString name;
QString description;
QString imagePath;
bool show = true;
ThemeInfo() {}
explicit ThemeInfo( const QString& _id )
: id( _id )
{
}
explicit ThemeInfo( const QString& _id, const QString& image )
: id( _id )
, imagePath( image )
{
}
explicit ThemeInfo( const KPluginMetaData& );
bool isValid() const { return !id.isEmpty(); }
};
class ThemeInfoList : public QList< ThemeInfo >
{
public:
std::pair< int, const ThemeInfo* > indexById( const QString& id ) const
{
int index = 0;
for ( const ThemeInfo& i : *this )
{
if ( i.id == id )
{
return { index, &i };
}
}
return { -1, nullptr };
}
std::pair< int, ThemeInfo* > indexById( const QString& id )
{
// Call the const version and then munge the types
auto [ i, p ] = const_cast< const ThemeInfoList* >( this )->indexById( id );
return { i, const_cast< ThemeInfo* >( p ) };
}
/** @brief Looks for a given @p id in the list of themes, returns nullptr if not found. */
ThemeInfo* findById( const QString& id )
{
auto [ i, p ] = indexById( id );
return p;
}
/** @brief Looks for a given @p id in the list of themes, returns nullptr if not found. */
const ThemeInfo* findById( const QString& id ) const
{
auto [ i, p ] = indexById( id );
return p;
}
/** @brief Checks if a given @p id is in the list of themes. */
bool contains( const QString& id ) const { return findById( id ) != nullptr; }
};
ThemesModel::ThemesModel( QObject* parent )
: QAbstractListModel( parent )
, m_themes( new ThemeInfoList )
{
auto packages = KPackage::PackageLoader::self()->listPackages( "Plasma/LookAndFeel" );
m_themes.reserve( packages.length() );
m_themes->reserve( packages.length() );
for ( const auto& p : packages )
{
m_themes.append( ThemeInfo { p } );
m_themes->append( ThemeInfo { p } );
}
}
int
ThemesModel::rowCount( const QModelIndex& ) const
{
return m_themes.count();
return m_themes->count();
}
QVariant
@ -36,12 +112,12 @@ ThemesModel::data( const QModelIndex& index, int role ) const
{
return QVariant();
}
if ( index.row() < 0 || index.row() >= m_themes.count() )
if ( index.row() < 0 || index.row() >= m_themes->count() )
{
return QVariant();
}
const auto& item = m_themes.at( index.row() );
const auto& item = m_themes->at( index.row() );
switch ( role )
{
case LabelRole:
@ -65,7 +141,7 @@ ThemesModel::roleNames() const
void
ThemesModel::setThemeImage( const QString& id, const QString& imagePath )
{
auto [ i, theme ] = m_themes.indexById( id );
auto [ i, theme ] = m_themes->indexById( id );
if ( theme )
{
theme->imagePath = imagePath;
@ -76,7 +152,7 @@ ThemesModel::setThemeImage( const QString& id, const QString& imagePath )
void
ThemesModel::setThemeImage( const QMap< QString, QString >& images )
{
if ( m_themes.isEmpty() )
if ( m_themes->isEmpty() )
{
return;
}
@ -89,13 +165,13 @@ ThemesModel::setThemeImage( const QMap< QString, QString >& images )
setThemeImage( k, images[ k ] );
}
}
emit dataChanged( index( 0, 0 ), index( m_themes.count() - 1 ), { ImageRole } );
emit dataChanged( index( 0, 0 ), index( m_themes->count() - 1 ), { ImageRole } );
}
void
ThemesModel::showTheme( const QString& id, bool show )
{
auto [ i, theme ] = m_themes.indexById( id );
auto [ i, theme ] = m_themes->indexById( id );
if ( theme )
{
theme->show = show;
@ -106,18 +182,18 @@ ThemesModel::showTheme( const QString& id, bool show )
void
ThemesModel::showOnlyThemes( const QMap< QString, QString >& onlyThese )
{
if ( m_themes.isEmpty() )
if ( m_themes->isEmpty() )
{
return;
}
// No signal blocker block needed here because we're not calling showTheme()
// QSignalBlocker b( this );
for ( auto& t : m_themes )
for ( auto& t : *m_themes )
{
t.show = onlyThese.contains( t.id );
}
emit dataChanged( index( 0, 0 ), index( m_themes.count() - 1 ), { ShownRole } );
emit dataChanged( index( 0, 0 ), index( m_themes->count() - 1 ), { ShownRole } );
}

81
src/modules/plasmalnf/ThemeInfo.h
View File

@ -14,82 +14,7 @@
#include <QList>
#include <QString>
class KPluginMetaData;
/** @brief describes a single plasma LnF theme.
*
* A theme description has an id, which is really the name of the desktop
* file (e.g. org.kde.breeze.desktop), a name which is human-readable and
* translated, and an optional image Page, which points to a local screenshot
* of that theme.
*/
struct ThemeInfo
{
QString id;
QString name;
QString description;
QString imagePath;
bool show = true;
ThemeInfo() {}
explicit ThemeInfo( const QString& _id )
: id( _id )
{
}
explicit ThemeInfo( const QString& _id, const QString& image )
: id( _id )
, imagePath( image )
{
}
explicit ThemeInfo( const KPluginMetaData& );
bool isValid() const { return !id.isEmpty(); }
};
class ThemeInfoList : public QList< ThemeInfo >
{
public:
std::pair< int, const ThemeInfo* > indexById( const QString& id ) const
{
int index = 0;
for ( const ThemeInfo& i : *this )
{
if ( i.id == id )
{
return { index, &i };
}
}
return { -1, nullptr };
}
std::pair< int, ThemeInfo* > indexById( const QString& id )
{
// Call the const version and then munge the types
auto [ i, p ] = const_cast< const ThemeInfoList* >( this )->indexById( id );
return { i, const_cast< ThemeInfo* >( p ) };
}
/** @brief Looks for a given @p id in the list of themes, returns nullptr if not found. */
ThemeInfo* findById( const QString& id )
{
auto [ i, p ] = indexById( id );
return p;
}
/** @brief Looks for a given @p id in the list of themes, returns nullptr if not found. */
const ThemeInfo* findById( const QString& id ) const
{
auto [ i, p ] = indexById( id );
return p;
}
/** @brief Checks if a given @p id is in the list of themes. */
bool contains( const QString& id ) const { return findById( id ) != nullptr; }
};
class ThemeInfoList;
class ThemesModel : public QAbstractListModel
{
@ -111,8 +36,6 @@ public:
QHash< int, QByteArray > roleNames() const override;
const ThemeInfo* findById( const QString& id ) const { return m_themes.findById( id ); }
/// @brief Set the screenshot to go with the given @p id
void setThemeImage( const QString& id, const QString& imagePath );
@ -126,7 +49,7 @@ public:
void showOnlyThemes( const QMap< QString, QString >& onlyThese );
private:
ThemeInfoList m_themes;
ThemeInfoList* m_themes;
};