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

[packagechooser] Simplify parameters

Browse Source 
- Just pass the no-package-selected item around.
This commit is contained in:
Adriaan de Groot 2019-09-04 19:40:35 +02:00
parent 996714dd06
commit 01c4383178
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,9 +164,8 @@ PackageChooserPage::selectedPackageIds() const
} }
void void
PackageChooserPage::setIntroduction( const CalamaresUtils::Locale::TranslatedString& name, PackageChooserPage::setIntroduction( const PackageItem& item )
const CalamaresUtils::Locale::TranslatedString& description )
{ {
m_introduction.name = name; m_introduction.name = item.name;
m_introduction.description = description; m_introduction.description = item.description;
} }

5
src/modules/packagechooser/PackageChooserPage.h
View File

@ -21,8 +21,6 @@
#include "PackageModel.h" #include "PackageModel.h"
#include "locale/TranslatableConfiguration.h"
#include <QAbstractItemModel> #include <QAbstractItemModel>
#include <QWidget> #include <QWidget>
@ -40,8 +38,7 @@ public:
void setModel( QAbstractItemModel* model ); void setModel( QAbstractItemModel* model );
/// @brief Sets the introductory (no-package-selected) texts /// @brief Sets the introductory (no-package-selected) texts
void setIntroduction( const CalamaresUtils::Locale::TranslatedString& name, void setIntroduction( const PackageItem& item );
const CalamaresUtils::Locale::TranslatedString& description );
/// @brief Is anything selected? /// @brief Is anything selected?
bool hasSelection() const; bool hasSelection() const;
/** @brief Get the list of selected ids /** @brief Get the list of selected ids

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

@ -288,7 +288,7 @@ PackageChooserViewStep::hookupModel()
const auto& package = m_model->packageData( i ); const auto& package = m_model->packageData( i );
if ( package.id.isEmpty() ) if ( package.id.isEmpty() )
{ {
m_widget->setIntroduction( package.name, package.description ); m_widget->setIntroduction( package );
break; break;
} }
} }