Commit 153ef60d authored by Andreas Cord-Landwehr's avatar Andreas Cord-Landwehr
Browse files

Use Kirigami about page for KAboutData information

parent 9af211ec
......@@ -34,15 +34,17 @@ int main(int argc, char **argv)
ResourceRepository repository;
repository.reloadCourses();
app.installResourceRepository(&repository);
app.setWindowIcon(QIcon::fromTheme(QStringLiteral("artikulate")));
KAboutData aboutData(QStringLiteral("artikulate"),
i18nc("@title Displayed program name", "Artikulate"),
ARTIKULATE_VERSION_STRING,
i18nc("@title KAboutData: short program description", "Artikulate Pronunciation Trainer"),
KAboutLicense::GPL_V2,
i18nc("@info:credit", "(c) 2013-2017 The Artikulate Developers"),
i18nc("@title Short program description", "Training your pronunciation in a foreign language.")
i18nc("@info:credit", "(c) 2013-2019 The Artikulate Developers"),
i18nc("@title Short program description", "Train your pronunciation in a foreign language.")
);
aboutData.setProgramLogo(app.windowIcon());
aboutData.addAuthor(i18nc("@info:credit Developer name", "Andreas Cord-Landwehr"),
i18nc("@info:credit Role", "Original Author"),
......@@ -53,10 +55,12 @@ int main(int argc, char **argv)
QStringLiteral("samikshan@gmail.com"));
aboutData.addAuthor(i18nc("@info:credit Developer name", "Oindrila Gupta"),
i18nc("@info:credit Role", "Developer and Course Data"));
i18nc("@info:credit Role", "Developer and Course Data"),
QStringLiteral("edu@kde.org"));
aboutData.addAuthor(i18nc("@info:credit Developer name", "Magdalena Konkiewicz"),
i18nc("@info:credit Role", "Developer and Course Data"));
i18nc("@info:credit Role", "Developer and Course Data"),
QStringLiteral("edu@kde.org"));
aboutData.setTranslator(i18nc("NAME OF TRANSLATORS", "Your names"), i18nc("EMAIL OF TRANSLATORS", "Your emails"));
......
......@@ -36,6 +36,7 @@
#include <KActionCollection>
#include <KConfigDialog>
#include <KAboutData>
#include <KHelpMenu>
#include <KLocalizedString>
#include <KLocalizedContext>
......@@ -67,6 +68,7 @@ MainWindow::MainWindow()
// set view
rootContext()->setContextProperty(QStringLiteral("g_trainingSession"), m_trainingSession);
rootContext()->setContextProperty(QStringLiteral("g_profileManager"), m_profileManager);
rootContext()->setContextProperty(QStringLiteral("g_artikulateAboutData"), QVariant::fromValue(KAboutData::applicationData()));
rootContext()->setContextProperty(QStringLiteral("kcfg_UseContributorResources"), Settings::useCourseRepository());
rootContext()->setContextProperty(QStringLiteral("kcfg_ShowMenuBar"), Settings::showMenuBar());
......
......@@ -92,14 +92,6 @@ Kirigami.GlobalDrawer {
// }
// }
// Kirigami.Action {
// text: i18n("About Artikulate")
// iconName: "artikulate"
// onTriggered: {
// triggerAction("help_about_app")
// globalDrawer.resetMenu();
// }
// }
// Kirigami.Action {
// text: i18n("About KDE")
// iconName: "help-about"
// onTriggered: {
......@@ -147,5 +139,15 @@ Kirigami.GlobalDrawer {
}
}
}
ActionListItem {
action: Kirigami.Action {
text: i18n("About")
iconName: "help-about"
onTriggered: {
root.pageStack.pop();
root.pageStack.push(aboutPageComponent);
}
}
}
}
}
......@@ -20,10 +20,10 @@
import QtQuick 2.5
import QtQuick.Controls 2.0 as QQC2
import org.kde.kirigami 2.0 as Kirigami2
import org.kde.kirigami 2.6
import artikulate 1.0
Kirigami2.ApplicationWindow {
ApplicationWindow {
id: root
function changePage(pageItem) {
......@@ -36,7 +36,7 @@ Kirigami2.ApplicationWindow {
pageStack: root.pageStack
}
contextDrawer: Kirigami2.OverlayDrawer {
contextDrawer: OverlayDrawer {
id: contextDrawer
}
......@@ -52,7 +52,7 @@ Kirigami2.ApplicationWindow {
}
pageStack.initialPage: welcomePageComponent
pageStack.globalToolBar.style: Kirigami2.ApplicationHeaderStyle.Titles
pageStack.globalToolBar.style: ApplicationHeaderStyle.Titles
// pages
Component {
......@@ -67,6 +67,13 @@ Kirigami2.ApplicationWindow {
id: profileSettingsPageComponent
ProfileSettingsPage { }
}
Component {
id: aboutPageComponent
AboutPage {
aboutData: g_artikulateAboutData
}
}
Component {
id: downloadPageComponent
DownloadPage {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment