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

[officechooser] fix ccp files

Browse Source
This commit is contained in:
Philip Müller 2019-08-07 07:44:00 +02:00
parent d0a64e1736
commit 76d79d8cd0
4 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
/* === This file is part of Calamares - <https://github.com/calamares> === /* === This file is part of Calamares - <https://github.com/calamares> ===
* *
* Copyright 2019, Adriaan de Groot <groot@kde.org> * Copyright 2019, Adriaan de Groot <groot@kde.org>
* Copyright 2019, Philip MÜller <philm@manjaro.org>
* *
* Calamares is free software: you can redistribute it and/or modify * Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -30,10 +31,10 @@ PackageChooserPage::PackageChooserPage( PackageChooserMode mode, QWidget* parent
, ui( new Ui::PackageChooserPage ) , ui( new Ui::PackageChooserPage )
, m_introduction( QString(), , m_introduction( QString(),
QString(), QString(),
tr( "Package Selection" ), tr( "Office Suite" ),
tr( "Please pick a product from the list. The selected product will be installed." ) ) tr( "Please pick an office suite from the list. The selected product will be installed." ) )
{ {
m_introduction.screenshot = QPixmap( QStringLiteral( ":/images/no-selection.png" ) ); m_introduction.screenshot = QPixmap( QStringLiteral( ":/images/choose-office.jpg" ) );
ui->setupUi( this ); ui->setupUi( this );
CALAMARES_RETRANSLATE( updateLabels(); ) CALAMARES_RETRANSLATE( updateLabels(); )

31
src/modules/officechooser/PackageChooserViewStep.cpp
View File

@ -1,6 +1,7 @@
/* === This file is part of Calamares - <https://github.com/calamares> === /* === This file is part of Calamares - <https://github.com/calamares> ===
* *
* Copyright 2019, Adriaan de Groot <groot@kde.org> * Copyright 2019, Adriaan de Groot <groot@kde.org>
* Copyright 2019, Philip MÜller <philm@manjaro.org>
* *
* Calamares is free software: you can redistribute it and/or modify * Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -76,7 +77,7 @@ PackageChooserViewStep::widget()
} }
else else
{ {
cWarning() << "PackageChooser Widget created before model."; cWarning() << "OfficeChooser Widget created before model.";
} }
} }
return m_widget; return m_widget;
@ -189,16 +190,24 @@ PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap
m_model = new PackageListModel( nullptr ); m_model = new PackageListModel( nullptr );
m_model->addPackage( PackageItem { QString(), m_model->addPackage( PackageItem { QString(),
QString(), QString(),
"No Desktop", "No Office Suite",
"Please pick a desktop environment from the list. " "Please pick an office suite from the list. "
"If you don't want to install a desktop, that's fine, " "If you don't want to install an office suite, that's fine, "
"your system will start up in text-only mode and you can " "you can install one later as needed.",
"install a desktop environment later.", ":/images/choose-office.jpg" } );
":/images/no-selection.png" } ); m_model->addPackage( PackageItem { "libreoffice-still",
m_model->addPackage( PackageItem { "kde", "kde", "Plasma", "Plasma Desktop", ":/images/kde.png" } ); "libreoffice-still",
m_model->addPackage( PackageItem { "LibreOffice",
"gnome", "gnome", "GNOME", "GNU Networked Object Modeling Environment Desktop", ":/images/gnome.png" } ); "LibreOffice is a powerful and free office suite, used by millions of people around the world. "
} "Its clean interface and feature-rich tools help you unleash your creativity and enhance your productivity.",
":/images/LibreOffice.jpg" } );
m_model->addPackage( PackageItem { "freeoffice",
"freeoffice",
"FreeOffice",
"FreeOffice 2018 is a full-featured Office suite with word processing, "
"spreadsheet and presentation software. It is seamlessly compatible with Microsoft Office. "
"(Note: You need to register the product for free longterm usage)",
":/images/FreeOffice.jpg" } );
if ( first_time && m_widget && m_model ) if ( first_time && m_widget && m_model )
{ {

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

@ -1,7 +1,6 @@
/* === This file is part of Calamares - <https://github.com/calamares> === /* === This file is part of Calamares - <https://github.com/calamares> ===
* *
* Copyright 2019, Adriaan de Groot <groot@kde.org> * Copyright 2019, Adriaan de Groot <groot@kde.org>
* Copyright 2019, Philip MÜller <philm@manjaro.org>
* *
* Calamares is free software: you can redistribute it and/or modify * Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -31,10 +30,10 @@ PackageChooserPage::PackageChooserPage( PackageChooserMode mode, QWidget* parent
, ui( new Ui::PackageChooserPage ) , ui( new Ui::PackageChooserPage )
, m_introduction( QString(), , m_introduction( QString(),
QString(), QString(),
tr( "Office Suite" ), tr( "Package Selection" ),
tr( "Please pick an office suite from the list. The selected product will be installed." ) ) tr( "Please pick a product from the list. The selected product will be installed." ) )
{ {
m_introduction.screenshot = QPixmap( QStringLiteral( ":/images/choose-office.jpg" ) ); m_introduction.screenshot = QPixmap( QStringLiteral( ":/images/no-selection.png" ) );
ui->setupUi( this ); ui->setupUi( this );
CALAMARES_RETRANSLATE( updateLabels(); ) CALAMARES_RETRANSLATE( updateLabels(); )

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

@ -1,7 +1,6 @@
/* === This file is part of Calamares - <https://github.com/calamares> === /* === This file is part of Calamares - <https://github.com/calamares> ===
* *
* Copyright 2019, Adriaan de Groot <groot@kde.org> * Copyright 2019, Adriaan de Groot <groot@kde.org>
* Copyright 2019, Philip MÜller <philm@manjaro.org>
* *
* Calamares is free software: you can redistribute it and/or modify * Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -77,7 +76,7 @@ PackageChooserViewStep::widget()
} }
else else
{ {
cWarning() << "OfficeChooser Widget created before model."; cWarning() << "PackageChooser Widget created before model.";
} }
} }
return m_widget; return m_widget;
@ -190,24 +189,16 @@ PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap
m_model = new PackageListModel( nullptr ); m_model = new PackageListModel( nullptr );
m_model->addPackage( PackageItem { QString(), m_model->addPackage( PackageItem { QString(),
QString(), QString(),
"No Office Suite", "No Desktop",
"Please pick an office suite from the list. " "Please pick a desktop environment from the list. "
"If you don't want to install an office suite, that's fine, " "If you don't want to install a desktop, that's fine, "
"you can install one later as needed.", "your system will start up in text-only mode and you can "
":/images/choose-office.jpg" } ); "install a desktop environment later.",
m_model->addPackage( PackageItem { "libreoffice-still", ":/images/no-selection.png" } );
"libreoffice-still", m_model->addPackage( PackageItem { "kde", "kde", "Plasma", "Plasma Desktop", ":/images/kde.png" } );
"LibreOffice", m_model->addPackage( PackageItem {
"LibreOffice is a powerful and free office suite, used by millions of people around the world. " "gnome", "gnome", "GNOME", "GNU Networked Object Modeling Environment Desktop", ":/images/gnome.png" } );
"Its clean interface and feature-rich tools help you unleash your creativity and enhance your productivity.", }
":/images/LibreOffice.jpg" } );
m_model->addPackage( PackageItem { "freeoffice",
"freeoffice",
"FreeOffice",
"FreeOffice 2018 is a full-featured Office suite with word processing, "
"spreadsheet and presentation software. It is seamlessly compatible with Microsoft Office. "
"(Note: You need to register the product for free longterm usage)",
":/images/FreeOffice.jpg" } );
if ( first_time && m_widget && m_model ) if ( first_time && m_widget && m_model )
{ {