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

[plasmalnf] Rip out the intermediate model again, in prep for a delegate

Browse Source
This commit is contained in:
Adriaan de Groot 2020-11-28 16:53:35 +01:00
parent 06cbabd189
commit dac590a094
3 changed files with 3 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,13 +27,7 @@ set_package_properties(
PURPOSE "For Plasma Look-and-Feel selection" PURPOSE "For Plasma Look-and-Feel selection"
) )
find_package( KF5ItemModels ${lnf_ver} ) if ( KF5Plasma_FOUND AND KF5Package_FOUND )
set_package_properties(
KF5ItemModels PROPERTIES
PURPOSE "For Plasma Look-and-Feel display"
)
if ( KF5Plasma_FOUND AND KF5Package_FOUND AND KF5ItemModels_FOUND )
calamares_add_plugin( plasmalnf calamares_add_plugin( plasmalnf
TYPE viewmodule TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO EXPORT_MACRO PLUGINDLLEXPORT_PRO
@ -51,7 +45,6 @@ if ( KF5Plasma_FOUND AND KF5Package_FOUND AND KF5ItemModels_FOUND )
page_plasmalnf.ui page_plasmalnf.ui
LINK_PRIVATE_LIBRARIES LINK_PRIVATE_LIBRARIES
calamaresui calamaresui
KF5::ItemModels
KF5::Package KF5::Package
KF5::Plasma KF5::Plasma
SHARED_LIB SHARED_LIB

43
src/modules/plasmalnf/PlasmaLnfPage.cpp
View File

@ -17,46 +17,10 @@
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/Retranslator.h" #include "utils/Retranslator.h"
#include <KExtraColumnsProxyModel>
#include <QHeaderView> #include <QHeaderView>
#include <QStyledItemDelegate> #include <QStyledItemDelegate>
#include <QTableView> #include <QTableView>
class ThemeColumns : public KExtraColumnsProxyModel
{
public:
ThemeColumns( QObject* parent );
QVariant extraColumnData( const QModelIndex& parent, int row, int extraColumn, int role ) const override;
};
ThemeColumns::ThemeColumns( QObject* parent )
: KExtraColumnsProxyModel( parent )
{
appendColumn();
appendColumn();
}
QVariant
ThemeColumns::extraColumnData( const QModelIndex&, int row, int extraColumn, int role ) const
{
if ( role != Qt::DisplayRole )
{
return QVariant();
}
switch ( extraColumn )
{
case 0:
return sourceModel()->data( sourceModel()->index( row, 0 ), ThemesModel::DescriptionRole );
case 1:
return sourceModel()->data( sourceModel()->index( row, 0 ), ThemesModel::ImageRole );
default:
return QVariant();
}
__builtin_unreachable();
}
PlasmaLnfPage::PlasmaLnfPage( Config* config, QWidget* parent ) PlasmaLnfPage::PlasmaLnfPage( Config* config, QWidget* parent )
: QWidget( parent ) : QWidget( parent )
@ -77,12 +41,9 @@ PlasmaLnfPage::PlasmaLnfPage( Config* config, QWidget* parent )
"once the system is installed. Clicking on a look-and-feel " "once the system is installed. Clicking on a look-and-feel "
"selection will give you a live preview of that look-and-feel." ) ); "selection will give you a live preview of that look-and-feel." ) );
} ) } )
connect( this, &PlasmaLnfPage::plasmaThemeSelected, config, &Config::setTheme );
QTableView* view = new QTableView( this ); QTableView* view = new QTableView( this );
ThemeColumns* columnsModel = new ThemeColumns( this ); view->setModel( m_config->themeModel() );
columnsModel->setSourceModel( m_config->themeModel() );
view->setModel( columnsModel );
view->verticalHeader()->hide(); view->verticalHeader()->hide();
view->horizontalHeader()->hide(); view->horizontalHeader()->hide();
ui->verticalLayout->addWidget( view ); ui->verticalLayout->addWidget( view );
@ -98,7 +59,7 @@ PlasmaLnfPage::PlasmaLnfPage( Config* config, QWidget* parent )
auto id = model->data( model->index( row, 0 ), ThemesModel::KeyRole ).toString(); auto id = model->data( model->index( row, 0 ), ThemesModel::KeyRole ).toString();
if ( !id.isEmpty() ) if ( !id.isEmpty() )
{ {
emit plasmaThemeSelected( id ); m_config->setTheme( id );
} }
} }
} ); } );

3
src/modules/plasmalnf/PlasmaLnfPage.h
View File

@ -38,9 +38,6 @@ class PlasmaLnfPage : public QWidget
public: public:
explicit PlasmaLnfPage( Config* config, QWidget* parent = nullptr ); explicit PlasmaLnfPage( Config* config, QWidget* parent = nullptr );
signals:
void plasmaThemeSelected( const QString& id );
private: private:
Ui::PlasmaLnfPage* ui; Ui::PlasmaLnfPage* ui;
Config* m_config; Config* m_config;