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

[packagechooser] Use translated strings

Browse Source
This commit is contained in:
Adriaan de Groot 2019-08-06 00:17:50 +02:00
parent fd75b33784
commit 56db9e9341
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,9 +54,9 @@ PackageChooserPage::currentChanged( const QModelIndex& index )
{
if ( !index.isValid() || !ui->products->selectionModel()->hasSelection() )
{
ui->productName->setText( m_introduction.name );
ui->productName->setText( m_introduction.name.get() );
ui->productScreenshot->setPixmap( m_introduction.screenshot );
ui->productDescription->setText( m_introduction.description );
ui->productDescription->setText( m_introduction.description.get() );
}
else
{

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

@ -118,11 +118,11 @@ PackageListModel::data( const QModelIndex& index, int role ) const
if ( role == Qt::DisplayRole /* Also PackageNameRole */ )
{
return m_packages[ row ].name;
return m_packages[ row ].name.get();
}
else if ( role == DescriptionRole )
{
return m_packages[ row ].description;
return m_packages[ row ].description.get();
}
else if ( role == ScreenshotRole )
{

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

@ -19,6 +19,7 @@
#ifndef PACKAGEMODEL_H
#define PACKAGEMODEL_H
#include "locale/TranslatableConfiguration.h"
#include "utils/NamedEnum.h"
#include <QAbstractListModel>
@ -41,9 +42,8 @@ struct PackageItem
QString id;
// TODO: may need more than one
QString package;
// TODO: name and description are localized
QString name;
QString description;
CalamaresUtils::Locale::TranslatedString name;
CalamaresUtils::Locale::TranslatedString description;
// TODO: may be more than one
QPixmap screenshot;