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

[packagechooser] Fix build, tidy code

Browse Source
This commit is contained in:
Adriaan de Groot 2019-08-03 23:28:55 +02:00
parent 87d7b2a5c0
commit b711c791bd
5 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/packagechooser/PackageChooserPage.cpp
View File

@ -42,9 +42,9 @@ PackageChooserPage::PackageChooserPage( PackageChooserMode mode, QWidget* parent
switch ( mode ) switch ( mode )
{ {
case PackageChooserMode::Optional: case PackageChooserMode::Optional:
case PackageChooserMode::Exclusive: case PackageChooserMode::Required:
ui->products->setSelectionMode( QAbstractItemView::SingleSelection ); ui->products->setSelectionMode( QAbstractItemView::SingleSelection );
case PackageChooserMode::Multiple: case PackageChooserMode::OptionalMultiple:
case PackageChooserMode::RequiredMultiple: case PackageChooserMode::RequiredMultiple:
ui->products->setSelectionMode( QAbstractItemView::ExtendedSelection ); ui->products->setSelectionMode( QAbstractItemView::ExtendedSelection );
} }

14
src/modules/packagechooser/PackageChooserViewStep.cpp
View File

@ -37,7 +37,7 @@ PackageChooserViewStep::PackageChooserViewStep( QObject* parent )
: Calamares::ViewStep( parent ) : Calamares::ViewStep( parent )
, m_widget( nullptr ) , m_widget( nullptr )
, m_model( nullptr ) , m_model( nullptr )
, m_mode( PackageChooserMode::Exclusive ) , m_mode( PackageChooserMode::Required )
{ {
emit nextStatusChanged( false ); emit nextStatusChanged( false );
} }
@ -100,10 +100,10 @@ PackageChooserViewStep::isNextEnabled() const
switch ( m_mode ) switch ( m_mode )
{ {
case PackageChooserMode::Optional: case PackageChooserMode::Optional:
case PackageChooserMode::Multiple: case PackageChooserMode::OptionalMultiple:
// zero or one OR zero or more // zero or one OR zero or more
return true; return true;
case PackageChooserMode::Exclusive: case PackageChooserMode::Required:
case PackageChooserMode::RequiredMultiple: case PackageChooserMode::RequiredMultiple:
// exactly one OR one or more // exactly one OR one or more
return m_widget->hasSelection(); return m_widget->hasSelection();
@ -159,17 +159,17 @@ PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap
{ {
m_mode = PackageChooserMode::Required; m_mode = PackageChooserMode::Required;
} }
m_id = CalamaresUtils::getString( configurationMap, "id" ); m_id = CalamaresUtils::getString( configurationMap, "id" );
// TODO: replace this hard-coded model // TODO: replace this hard-coded model
if ( !m_model ) if ( !m_model )
{ {
m_model = new PackageListModel( nullptr ); m_model = new PackageListModel( nullptr );
m_model->addPackage( PackageItem { "kde", "kde", "Plasma", "Plasma Desktop", ":/images/kde.png" } ); m_model->addPackage( PackageItem { "kde", "kde", "Plasma", "Plasma Desktop", ":/images/kde.png" } );
m_model->addPackage( m_model->addPackage( PackageItem {
PackageItem { "gnome", "gnome", "GNOME", "GNU Networked Object Modeling Environment Desktop", ":/images/gnome.png" } ); "gnome", "gnome", "GNOME", "GNU Networked Object Modeling Environment Desktop", ":/images/gnome.png" } );
if ( m_widget ) if ( m_widget )

2
src/modules/packagechooser/PackageChooserViewStep.h
View File

@ -60,7 +60,7 @@ private:
PackageChooserPage* m_widget; PackageChooserPage* m_widget;
PackageListModel* m_model; PackageListModel* m_model;
// Configuration // Configuration
PackageChooserMode m_mode; PackageChooserMode m_mode;
QString m_id; QString m_id;

3
src/modules/packagechooser/PackageModel.cpp
View File

@ -35,7 +35,8 @@ roleNames()
{ "set", PackageChooserMode::OptionalMultiple }, { "set", PackageChooserMode::OptionalMultiple },
{ "zero-or-more", PackageChooserMode::OptionalMultiple }, { "zero-or-more", PackageChooserMode::OptionalMultiple },
{ "multiple", PackageChooserMode::RequiredMultiple }, { "multiple", PackageChooserMode::RequiredMultiple },
{ "one-or-more", PackageChooserMode::RequiredMultiple } }; { "one-or-more", PackageChooserMode::RequiredMultiple }
};
return names; return names;
} }

2
src/modules/packagechooser/PackageModel.h
View File

@ -73,7 +73,7 @@ class PackageListModel : public QAbstractListModel
public: public:
PackageListModel( PackageList&& items, QObject* parent ); PackageListModel( PackageList&& items, QObject* parent );
PackageListModel( QObject* parent ); PackageListModel( QObject* parent );
virtual ~PackageListModel(); virtual ~PackageListModel() override;
void addPackage( PackageItem&& p ); void addPackage( PackageItem&& p );