applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-07-02 20:05:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[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
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() ) 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->productScreenshot->setPixmap( m_introduction.screenshot );
ui->productDescription->setText( m_introduction.description ); ui->productDescription->setText( m_introduction.description.get() );
} }
else 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 */ ) if ( role == Qt::DisplayRole /* Also PackageNameRole */ )
{ {
return m_packages[ row ].name; return m_packages[ row ].name.get();
} }
else if ( role == DescriptionRole ) else if ( role == DescriptionRole )
{ {
return m_packages[ row ].description; return m_packages[ row ].description.get();
} }
else if ( role == ScreenshotRole ) else if ( role == ScreenshotRole )
{ {

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

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