diff --git a/qml/components/ComicInfoPanel.qml b/qml/components/ComicInfoPanel.qml index d35c9285..27bd5359 100644 --- a/qml/components/ComicInfoPanel.qml +++ b/qml/components/ComicInfoPanel.qml @@ -1,5 +1,6 @@ /** * Copyright (c) 2015 Damien Tardy-Panis + * Copyright (c) 2023 olf * * This file is subject to the terms and conditions defined in * file `LICENSE.txt`, which is part of this source code package. @@ -10,8 +11,6 @@ import Sailfish.Silica 1.0 import harbour.dailycomics.Comics 1.0 -import "../scripts/ExternalLinks.js" as ExternalLinks - DockedPanel { id: comicInfoPanel @@ -123,7 +122,7 @@ DockedPanel { MenuItem { text: qsTr("Go to homepage") - onClicked: ExternalLinks.browse(comic.homepage) + onClicked: Qt.openUrlExternally(comic.homepage) } } } diff --git a/qml/components/ComicItem.qml b/qml/components/ComicItem.qml index 1c74b51d..6fea839d 100644 --- a/qml/components/ComicItem.qml +++ b/qml/components/ComicItem.qml @@ -1,6 +1,7 @@ /** * Copyright (c) 2018-2019 Oleg Linkin * Copyright (c) 2020 Mirian Margiani + * Copyright (c) 2023 olf * * This file is subject to the terms and conditions defined in * file `LICENSE.txt`, which is part of this source code package. @@ -14,8 +15,6 @@ import harbour.dailycomics.Comics 1.0 import "../utils" import "../components" -import "../scripts/ExternalLinks.js" as ExternalLinks - ZoomableImage { id: zoomableImage imageOpacity: indicator.visible ? Theme.opacityLow : 1.0 @@ -28,10 +27,10 @@ ZoomableImage { StatusOverlay { id: indicator loadingText: qsTr("Loading comic") - defaultErrorText: qsTr("Can't display comic") - networkErrorText: qsTr("Can't download comic") - parsingErrorText: qsTr("Can't extract comic") - savingErrorText: qsTr("Can't save comic") + defaultErrorText: qsTr("Cannot display comic") + networkErrorText: qsTr("Cannot download comic") + parsingErrorText: qsTr("Cannot extract comic") + savingErrorText: qsTr("Cannot save comic") } MouseArea { @@ -50,10 +49,7 @@ ZoomableImage { width: parent.width height: Theme.itemSizeMedium - onClicked: { - ExternalLinks.mail(constants.maintainerMail, constants.mailErrorSubjectHeader, - constants.mailBodyHeader + 'There is a problem with comic "%1"'.arg(encodeURIComponent(zoomableImage.name))) - } + onClicked: Qt.openUrlExternally(constants.issuesGithub) Rectangle { anchors.fill: parent; z: -1 @@ -65,23 +61,24 @@ ZoomableImage { Label { anchors { leftMargin: Theme.horizontalPageMargin; left: parent.left - rightMargin: Theme.paddingMedium; right: mailButton.left + rightMargin: Theme.paddingMedium; right: githubButton.left top: parent.top; bottom: parent.bottom } verticalAlignment: Text.AlignVCenter - text: qsTr("Please contact me if the problem persists.") + text: qsTr("Please report if this issue persists.") font.pixelSize: Theme.fontSizeExtraSmall - wrapMode: Text.WrapAtWordBoundaryOrAnywhere + wrapMode: Text.WordWrap } HighlightImage { - id: mailButton + id: githubButton anchors { right: parent.right; rightMargin: Theme.horizontalPageMargin verticalCenter: parent.verticalCenter } height: Theme.iconSizeMedium; width: height - source: "image://theme/icon-m-mail" + fillMode: Image.PreserveAspectFit + source: Theme.colorScheme == 0 ? "qrc:/icon/light/github" : "qrc:/icon/dark/github" highlighted: parent.highlighted } } diff --git a/qml/components/Constants.qml b/qml/components/Constants.qml index 4ff1b6ac..e9384cc6 100644 --- a/qml/components/Constants.qml +++ b/qml/components/Constants.qml @@ -9,15 +9,6 @@ import QtQuick 2.0 QtObject { - property string devMail: "damien@tardypad.me" - property url devGithub: "https://github.com/tardypad" - - property string maintainerMail: "maledictusdemagog@gmail.com" - property string maintainerGithub: "https://github.com/Maledictus" - property url repoGithub: "https://github.com/sailfishos-applications/daily-comics" - - property string mailSubjectHeader: "[SailfishOS][Daily Comics " + Qt.application.version + "] " - property string mailErrorSubjectHeader: "[SailfishOS][Daily Comics " + Qt.application.version + "][Error] " - property string mailBodyHeader: "Yo man, " + property url issuesGithub: "https://github.com/sailfishos-applications/daily-comics/issues" } diff --git a/qml/components/EndPanel.qml b/qml/components/EndPanel.qml index 9d1965cd..f532e7c5 100644 --- a/qml/components/EndPanel.qml +++ b/qml/components/EndPanel.qml @@ -1,5 +1,6 @@ /** * Copyright (c) 2015 Damien Tardy-Panis + * Copyright (c) 2023 olf * * This file is subject to the terms and conditions defined in * file `LICENSE.txt`, which is part of this source code package. @@ -51,7 +52,7 @@ DockedPanel { Label { id: supportLabel - text: qsTr("If you like the app, please consider supporting your favorite comic artists") + text: qsTr("If you like this app, please consider to support your favorite comic artists") width: parent.width - supportImage.width - 3*Theme.paddingMedium wrapMode: Text.WrapAtWordBoundaryOrAnywhere font.pixelSize: Theme.fontSizeSmall diff --git a/qml/components/ImageOverlay.qml b/qml/components/ImageOverlay.qml index 53b89d6e..724e149e 100644 --- a/qml/components/ImageOverlay.qml +++ b/qml/components/ImageOverlay.qml @@ -1,5 +1,6 @@ /** * Copyright (c) 2018-2019 Oleg Linkin + * Copyright (c) 2023 olf * * This file is subject to the terms and conditions defined in * file `LICENSE.txt`, which is part of this source code package. @@ -7,13 +8,12 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 + import harbour.dailycomics.Comics 1.0 import "../utils" import "../components" -import "../scripts/ExternalLinks.js" as ExternalLinks - Item { id: overlay @@ -90,8 +90,8 @@ Item { onClicked: { Clipboard.text = comicProxy.stripImageUrl window.notify(Clipboard.text !== "" ? - qsTr("Comic strip url copied to clipboard") : - qsTr("Unable to copy comic strip url to clipboard")) + qsTr("Comic strip URL copied to clipboard") : + qsTr("Unable to copy comic strip URL to clipboard")) } } @@ -118,4 +118,3 @@ Item { } } } - diff --git a/qml/components/RequestContactDevRectangle.qml b/qml/components/ReportNewComicRectangle.qml similarity index 70% rename from qml/components/RequestContactDevRectangle.qml rename to qml/components/ReportNewComicRectangle.qml index 917b25f0..823ac60e 100644 --- a/qml/components/RequestContactDevRectangle.qml +++ b/qml/components/ReportNewComicRectangle.qml @@ -1,5 +1,6 @@ /** * Copyright (c) 2015 Damien Tardy-Panis + * Copyright (c) 2023 olf * * This file is subject to the terms and conditions defined in * file `LICENSE.txt`, which is part of this source code package. @@ -8,8 +9,6 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 -import "../scripts/ExternalLinks.js" as ExternalLinks - Item { property Item flickable @@ -38,14 +37,14 @@ Item { leftMargin: Theme.paddingSmall verticalCenter: parent.verticalCenter } - width: parent.width - mailButton.width - 3*Theme.paddingSmall + width: parent.width - githubButton.width - 3*Theme.paddingSmall wrapMode: Text.WrapAtWordBoundaryOrAnywhere - text: qsTr("Let me know if you're missing some of your favorite comics in this list") + text: qsTr("Please report if you like to see some additional comic(s)") font.pixelSize: Theme.fontSizeExtraSmall } IconButton { - id: mailButton + id: githubButton height: Theme.iconSizeMedium width: Theme.iconSizeMedium anchors { @@ -55,7 +54,7 @@ Item { verticalCenter: parent.verticalCenter } icon { - source: "image://theme/icon-m-mail" + source: Theme.colorScheme == 0 ? "qrc:/icon/light/github" : "qrc:/icon/dark/github" height: Theme.iconSizeMedium fillMode: Image.PreserveAspectFit } @@ -63,12 +62,7 @@ Item { MouseArea { anchors.fill: parent - onClicked: { - var mailRequestMail = constants.maintainerMail - var mailRequestSubject = constants.mailSubjectHeader - var mailRequestMessage = constants.mailBodyHeader + "Please add these comics to the app: " - ExternalLinks.mail(mailRequestMail, mailRequestSubject, mailRequestMessage) - } + onClicked: Qt.openUrlExternally(constants.issuesGithub) } } } diff --git a/qml/components/ZoomableImage.qml b/qml/components/ZoomableImage.qml index 87c59bae..28b3e77a 100644 --- a/qml/components/ZoomableImage.qml +++ b/qml/components/ZoomableImage.qml @@ -2,6 +2,7 @@ * Copyright (c) 2015 Damien Tardy-Panis * Copyright (c) 2018-2019 Oleg Linkin * Copyright (c) 2020 Mirian Margiani + * Copyright (c) 2023 olf * * This file is subject to the terms and conditions defined in * file `LICENSE.txt`, which is part of this source code package. @@ -13,7 +14,6 @@ import harbour.dailycomics.Comics 1.0 import "../utils" import "../components" -import "../scripts/ExternalLinks.js" as ExternalLinks SilicaFlickable { id: zoomableImage @@ -154,7 +154,7 @@ SilicaFlickable { if (status === Image.Ready) zoomableImage.read() else if (status === Image.Error) { - zoomableImage.setError(qsTr("Image error"), qsTr("Can't display strip")) + zoomableImage.setError(qsTr("Image error"), qsTr("Cannot display strip")) } } diff --git a/qml/harbour-dailycomics.qml b/qml/harbour-dailycomics.qml index a2c65c0c..6c1cdc6b 100644 --- a/qml/harbour-dailycomics.qml +++ b/qml/harbour-dailycomics.qml @@ -1,5 +1,6 @@ /** * Copyright (c) 2015 Damien Tardy-Panis + * Copyright (c) 2023 olf * * This file is subject to the terms and conditions defined in * file `LICENSE.txt`, which is part of this source code package. @@ -27,7 +28,7 @@ ApplicationWindow } Notification { - id:notification + id: notification appName: "Daily Comics" } @@ -43,5 +44,3 @@ ApplicationWindow pageStack.push(Qt.resolvedUrl("pages/NewComicsPage.qml"), {"comicsModel": favoritesPage.comicsModel}, PageStackAction.Immediate) } } - - diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml index f164f22f..e4174514 100644 --- a/qml/pages/AboutPage.qml +++ b/qml/pages/AboutPage.qml @@ -11,8 +11,6 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 -import "../scripts/ExternalLinks.js" as ExternalLinks - Page { allowedOrientations: Orientation.All @@ -32,7 +30,6 @@ Page { Column { id: contentColumn - spacing: Theme.paddingLarge anchors { top: pageHeader.bottom @@ -44,7 +41,6 @@ Page { color: "transparent" width: parent.width height: childrenRect.height - Image { id: coverImage source: Qt.resolvedUrl("../../images/harbour-cover.png") @@ -52,7 +48,7 @@ Page { smooth: true clip: true asynchronous: true - width: Screen.width + width: parent.width anchors.horizontalCenter: parent.horizontalCenter } @@ -63,184 +59,74 @@ Page { topMargin: Theme.paddingSmall horizontalCenter: parent.horizontalCenter } - width: parent.width - 2*Theme.paddingLarge + width: parent.width - Theme.horizontalPageMargin text: qsTr("Your daily fix of your favorite comic strips") - font.pixelSize: Theme.fontSizeSmall + font { + italic: true + pixelSize: Theme.fontSizeSmall + } horizontalAlignment: Text.AlignHCenter } Label { + id: versionLabel anchors { top: topText.bottom - topMargin: Theme.paddingSmall + topMargin: Theme.paddingMedium horizontalCenter: parent.horizontalCenter } - width: parent.width - text: qsTr("version %1").arg(Qt.application.version) - font.pixelSize: Theme.fontSizeExtraSmall + width: parent.width - Theme.horizontalPageMargin + text: qsTr("Version %1").arg(Qt.application.version) + font.pixelSize: Theme.fontSizeSmall horizontalAlignment: Text.AlignHCenter } - } - - Rectangle { - color: Theme.rgba(Theme.highlightBackgroundColor, Theme.highlightBackgroundOpacity / 3) - width: coverImage.width - 2*Theme.paddingLarge - height: childrenRect.height + 2*Theme.paddingMedium - anchors.horizontalCenter: parent.horizontalCenter Label { - id: authorLabel + id: codeLabel anchors { - top: parent.top - topMargin: Theme.paddingMedium + top: versionLabel.bottom + topMargin: Theme.paddingLarge horizontalCenter: parent.horizontalCenter } - font { - italic: true - pixelSize: Theme.fontSizeExtraSmall - } - color: Theme.highlightColor + width: parent.width - Theme.horizontalPageMargin + text: qsTr("Source code repository").arg(constants.repoGithub) + font.pixelSize: Theme.fontSizeSmall horizontalAlignment: Text.AlignHCenter - text: qsTr("created by %1").arg("Damien Tardy-Panis") - } - - Row { - id: authorLinksRow - anchors { - top: authorLabel.bottom - topMargin: Theme.paddingMedium - horizontalCenter: parent.horizontalCenter - } - spacing: Theme.paddingLarge - - IconButton { - id: authorGithubButton - height: Theme.iconSizeMedium - width: Theme.iconSizeMedium - icon { - source: Theme.colorScheme == 0 ? "qrc:/icon/light/github" : "qrc:/icon/dark/github" - height: Theme.iconSizeMedium - fillMode: Image.PreserveAspectFit - } - onClicked: ExternalLinks.browse(constants.devGithub) - } - - IconButton { - id: authorMailButton - height: Theme.iconSizeMedium - width: Theme.iconSizeMedium - icon { - source: "image://theme/icon-m-mail" - height: Theme.iconSizeMedium - fillMode: Image.PreserveAspectFit - } - onClicked: ExternalLinks.mail(constants.devMail, constants.mailSubjectHeader, constants.mailBodyHeader) - } + linkColor: Theme.highlightColor + onLinkActivated: Qt.openUrlExternally(link) } - } - - Rectangle { - color: Theme.rgba(Theme.highlightBackgroundColor, Theme.highlightBackgroundOpacity / 3) - width: coverImage.width - 2*Theme.paddingLarge - height: childrenRect.height + 2*Theme.paddingMedium - anchors.horizontalCenter: parent.horizontalCenter - Label { - id: maintainerLabel + id: licenseLabel anchors { - top: parent.top + top: codeLabel.bottom topMargin: Theme.paddingMedium horizontalCenter: parent.horizontalCenter } - font { - italic: true - pixelSize: Theme.fontSizeExtraSmall - } - color: Theme.highlightColor + width: parent.width - Theme.horizontalPageMargin + text: qsTr("License: %1").arg("MIT") + font.pixelSize: Theme.fontSizeSmall horizontalAlignment: Text.AlignHCenter - text: qsTr("maintained by %1").arg("Oleg Linkin") } - Row { - id: maintainerLinksRow + Label { + id: issuesLabel anchors { - top: maintainerLabel.bottom - topMargin: Theme.paddingMedium + top: licenseLabel.bottom + topMargin: Theme.paddingLarge horizontalCenter: parent.horizontalCenter } - spacing: Theme.paddingLarge - - IconButton { - id: maintainerGithubButton - height: Theme.iconSizeMedium - width: Theme.iconSizeMedium - icon { - source: Theme.colorScheme == 0 ? "qrc:/icon/light/github" : "qrc:/icon/dark/github" - height: Theme.iconSizeMedium - fillMode: Image.PreserveAspectFit - } - onClicked: ExternalLinks.browse(constants.maintainerGithub) - } - - IconButton { - id: maintainerMailButton - height: Theme.iconSizeMedium - width: Theme.iconSizeMedium - icon { - source: "image://theme/icon-m-mail" - height: Theme.iconSizeMedium - fillMode: Image.PreserveAspectFit - } - onClicked: ExternalLinks.mail(constants.maintainerMail, constants.mailSubjectHeader, constants.mailBodyHeader) - } + width: parent.width - Theme.horizontalPageMargin + wrapMode: Text.WordWrap + text: qsTr("Issue tracker for bug reports, feature suggestions and help requests").arg(constants.issuesGithub) + font.pixelSize: Theme.fontSizeSmall + horizontalAlignment: Text.AlignHCenter + linkColor: Theme.highlightColor + onLinkActivated: Qt.openUrlExternally(link) } } - Label { - id: codeLabel - width: parent.width - 2*Theme.paddingLarge - text: qsTr("The source code is available at - %2
- You can contact me for any remarks, - bugs, feature requests, ideas,...
-
- Below are few resources to find new comics.
- Let me know as well which additional comics - you would like to be included in the app.").arg(constants.repoGithub).arg(constants.repoGithub) - wrapMode: Text.WrapAtWordBoundaryOrAnywhere - font.pixelSize: Theme.fontSizeExtraSmall - horizontalAlignment: Text.AlignHCenter - textFormat: Text.StyledText - linkColor: Theme.highlightColor - onLinkActivated: ExternalLinks.browse(link) - } - - Label { - id: resourcesLabel - width: implicitWidth - anchors.horizontalCenter: parent.horizontalCenter - text: "GoComics
- Tapastic
- Comics Kingdom
- WebToons
- Reddit webcomics" - font.pixelSize: Theme.fontSizeExtraSmall - lineHeight: 1.5 - horizontalAlignment: Text.AlignLeft - textFormat: Text.StyledText - linkColor: Theme.highlightColor - onLinkActivated: ExternalLinks.browse(link) - } - - Label { - id: enjoyLabel - width: parent.width - text: qsTr("Enjoy!") - font.pixelSize: Theme.fontSizeLarge - horizontalAlignment: Text.AlignHCenter - } } } } diff --git a/qml/pages/ComicInfoPage.qml b/qml/pages/ComicInfoPage.qml index 213c5df9..79dc0a8f 100644 --- a/qml/pages/ComicInfoPage.qml +++ b/qml/pages/ComicInfoPage.qml @@ -1,6 +1,7 @@ /** * Copyright (c) 2015 Damien Tardy-Panis * Copyright (c) 2018-2019 Oleg Linkin + * Copyright (c) 2023 olf * * This file is subject to the terms and conditions defined in * file `LICENSE.txt`, which is part of this source code package. @@ -14,8 +15,6 @@ import harbour.dailycomics.Comics 1.0 import "../utils" import "../components" -import "../scripts/ExternalLinks.js" as ExternalLinks - Page { id: comicInfoPage diff --git a/qml/pages/ComicPage.qml b/qml/pages/ComicPage.qml index b081c96a..3bfab849 100644 --- a/qml/pages/ComicPage.qml +++ b/qml/pages/ComicPage.qml @@ -1,6 +1,7 @@ /** * Copyright (c) 2015 Damien Tardy-Panis * Copyright (c) 2018-2019 Oleg Linkin + * Copyright (c) 2023 olf * * This file is subject to the terms and conditions defined in * file `LICENSE.txt`, which is part of this source code package. @@ -14,8 +15,6 @@ import harbour.dailycomics.Comics 1.0 import "../utils" import "../components" -import "../scripts/ExternalLinks.js" as ExternalLinks - Page { id: comicPage diff --git a/qml/pages/FavoritesPage.qml b/qml/pages/FavoritesPage.qml index cc1a5566..3ee5df14 100644 --- a/qml/pages/FavoritesPage.qml +++ b/qml/pages/FavoritesPage.qml @@ -16,8 +16,6 @@ import harbour.dailycomics.Comics 1.0 import "../delegates" import "../utils" -import "../scripts/ExternalLinks.js" as ExternalLinks - Page { objectName: "FavoritesPage" diff --git a/qml/pages/ShareLinkPage.qml b/qml/pages/ShareLinkPage.qml index 1adbf6e4..0863d1b0 100644 --- a/qml/pages/ShareLinkPage.qml +++ b/qml/pages/ShareLinkPage.qml @@ -1,11 +1,11 @@ /** * Copyright (c) 2018-2019 Oleg Linkin + * Copyright (c) 2023 olf * * This file is subject to the terms and conditions defined in * file `LICENSE.txt`, which is part of this source code package. **/ - import QtQuick 2.0 import Sailfish.Silica 1.0 import Sailfish.TransferEngine 1.0 @@ -33,7 +33,7 @@ Page { ViewPlaceholder { enabled: shareMethodList.model.count === 0 && shareMethodList.model.ready - text: qsTr("No sharing accounts available. You can add accounts in settings") + text: qsTr("No sharing accounts available. You can add accounts in the SailfishOS settings.") } } } diff --git a/qml/scripts/ExternalLinks.js b/qml/scripts/ExternalLinks.js deleted file mode 100644 index e84b961a..00000000 --- a/qml/scripts/ExternalLinks.js +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Copyright (c) 2015 Damien Tardy-Panis - * - * This file is subject to the terms and conditions defined in - * file `LICENSE.txt`, which is part of this source code package. - **/ - -.pragma library - -function browse(url) -{ - Qt.openUrlExternally(url) -} - -function mail(email, subject, body) -{ - var subjectText = (subject !== undefined) ? subject : ''; - var bodyText = (body !== undefined) ? body : ''; - - Qt.openUrlExternally("mailto:"+email+"?subject="+subjectText+"&body="+bodyText) -} diff --git a/qml/utils/StatusOverlay.qml b/qml/utils/StatusOverlay.qml index 0b556a09..bf02c5c0 100644 --- a/qml/utils/StatusOverlay.qml +++ b/qml/utils/StatusOverlay.qml @@ -1,6 +1,7 @@ /** * Copyright (c) 2015 Damien Tardy-Panis * Copyright (c) 2020 Mirian Margiani + * Copyright (c) 2023 olf * * This file is subject to the terms and conditions defined in * file `LICENSE.txt`, which is part of this source code package. @@ -9,8 +10,6 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 -import "../scripts/ExternalLinks.js" as ExternalLinks - Item { id: loadingIndicator anchors.fill: parent @@ -74,7 +73,7 @@ Item { IconButton { icon.width: Theme.iconSizeLarge; icon.height: icon.width icon.source: "image://theme/icon-m-region" - onClicked: ExternalLinks.browse(model.homepage) + onClicked: Qt.openUrlExternally(model.homepage) } IconButton { icon.width: Theme.iconSizeLarge; icon.height: icon.width diff --git a/translations/harbour-dailycomics.ts b/translations/harbour-dailycomics.ts index e7ffc4f9..63bd87fe 100644 --- a/translations/harbour-dailycomics.ts +++ b/translations/harbour-dailycomics.ts @@ -4,69 +4,50 @@ AboutPage - + Your daily fix of your favorite comic strips Your daily fix of your favorite comic strips - - version %1 - version %1 + + Version %1 + Version %1 - - created by %1 - created by %1 + + <a href="%1">Source code repository</a> + <a href="%1">Source code repository</a> - - maintained by %1 - maintained by %1 + + License: %1 + License: %1 - - The source code is available at - <a href="%1">%2</a><br /> - You can contact me for any remarks, - bugs, feature requests, ideas,...<br /> - <br /> - Below are few resources to find new comics.<br /> - Let me know as well which additional comics - you would like to be included in the app. - The source code is available at - <a href="%1">%2</a><br /> - You can contact me for any remarks, - bugs, feature requests, ideas,...<br /> - <br /> - Below are few resources to find new comics.<br /> - Let me know as well which additional comics - you would like to be included in the app. - - - - Enjoy! - Enjoy! + + <a href="%1">Issue tracker for bug reports, feature suggestions and help requests</a> + <a href="%1">Issue tracker for bug reports, feature suggestions and help requests</a> ComicInfoPage - + Comic info Comic info - + Authors Authors - + Author Author - + Language Language @@ -74,22 +55,22 @@ ComicInfoPanel - + Authors Authors - + Author Author - + Language Language - + Go to homepage Go to homepage @@ -103,28 +84,28 @@ - Can't display comic - Can't display comic + Cannot display comic + Cannot display comic - Can't download comic - Can't download comic + Cannot download comic + Cannot download comic - Can't extract comic - Can't extract comic + Cannot extract comic + Cannot extract comic - Can't save comic - Can't save comic + Cannot save comic + Cannot save comic - - Please contact me if the problem persists. - Please contact me if the problem persists. + + Please report if this issue persists. + Please report if this issue persists. @@ -164,31 +145,21 @@ EndPanel - + That's all for now! That's all for now! - - If you like the app, please consider supporting your favorite comic artists - If you like the app, please consider supporting your favorite comic artists + + If you like this app, please consider to support your favorite comic artists + If you like this app, please consider to support your favorite comic artists - + Return to favorites Return to favorites - - ErrorContactDevRectangle - - - Please contact me -if the problem persists. - Please contact me -if the problem persists. - - FavoritesPage @@ -246,36 +217,13 @@ if the problem persists. - Comic strip url copied to clipboard - Comic strip url copied to clipboard + Comic strip URL copied to clipboard + Comic strip URL copied to clipboard - Unable to copy comic strip url to clipboard - Unable to copy comic strip url to clipboard - - - - LoadingIndicator - - - An error occured - An error occured - - - - Network error - Network error - - - - Parsing error - Parsing error - - - - Saving error - Saving error + Unable to copy comic strip URL to clipboard + Unable to copy comic strip URL to clipboard @@ -298,11 +246,11 @@ if the problem persists. - RequestContactDevRectangle + ReportNewComicRectangle - - Let me know if you're missing some of your favorite comics in this list - Let me know if you're missing some of your favorite comics in this list + + Please report if you like to see some additional comic(s) + Please report if you like to see some additional comic(s) @@ -322,8 +270,8 @@ if the problem persists. - No sharing accounts available. You can add accounts in settings - No sharing accounts available. You can add accounts in settings + No sharing accounts available. You can add accounts in the SailfishOS settings. + No sharing accounts available. You can add accounts in the SailfishOS settings. @@ -334,17 +282,40 @@ if the problem persists. Flick to display next comic + + StatusOverlay + + + An error occured + An error occured + + + + Network error + Network error + + + + Parsing error + Parsing error + + + + Saving error + Saving error + + ZoomableImage - + Image error Image error - - Can't display strip - Can't display strip + + Cannot display strip + Cannot display strip