diff --git a/main.py b/main.py index 59f1fe2..b6c095e 100644 --- a/main.py +++ b/main.py @@ -155,6 +155,7 @@ class gPotherSide: return { 'id': episode.id, 'title': episode.trimmed_title, + 'subtitle': episode.subtitle, 'progress': episode.download_progress(), 'downloadState': episode.state, 'isNew': episode.is_new, @@ -352,7 +353,7 @@ class gPotherSide: return { 'title': episode.trimmed_title, - 'description': util.remove_html_tags(episode.description), + 'description': episode.description_html or episode.description, 'metadata': ' | '.join(self._format_metadata(episode)), 'link': episode.link if episode.link != episode.url else '', 'chapters': getattr(episode, 'chapters', []), diff --git a/touch/EpisodeDetail.qml b/touch/EpisodeDetail.qml index 4439d41..9b57f49 100644 --- a/touch/EpisodeDetail.qml +++ b/touch/EpisodeDetail.qml @@ -136,7 +136,7 @@ SlidePage { font.pixelSize: 30 * pgst.scalef wrapMode: Text.WordWrap } - } + } } } diff --git a/touch/EpisodeItem.qml b/touch/EpisodeItem.qml index fd6ebca..801b0fa 100644 --- a/touch/EpisodeItem.qml +++ b/touch/EpisodeItem.qml @@ -171,9 +171,7 @@ Item { color: titleLabel.color } - PLabel { - id: titleLabel - + Column { anchors { left: parent.left leftMargin: 2 * Constants.layout.padding * pgst.scalef @@ -182,29 +180,54 @@ Item { verticalCenter: parent.verticalCenter } - elide: Text.ElideRight - text: title + PLabel { + id: titleLabel - color: { - if (episodeItem.isPlaying) { - return Constants.colors.playback; - } else if (progress > 0) { - return Constants.colors.download; - } else if (episodeItem.opened) { - return Constants.colors.highlight; - } else if (isNew) { - return Constants.colors.fresh; - } else { - return Constants.colors.text; + anchors { + left: parent.left + right: parent.right + } + + elide: Text.ElideRight + text: title + + color: { + if (episodeItem.isPlaying) { + return Constants.colors.playback; + } else if (progress > 0) { + return Constants.colors.download; + } else if (episodeItem.opened) { + return Constants.colors.highlight; + } else if (isNew) { + return Constants.colors.fresh; + } else { + return Constants.colors.text; + } + } + + opacity: { + if (downloadState == Constants.state.deleted && !isNew && progress <= 0) { + return 0.3; + } else { + return 1.0; + } } } - opacity: { - if (downloadState == Constants.state.deleted && !isNew && progress <= 0) { - return 0.3; - } else { - return 1.0; + PLabel { + id: subtitleLabel + + anchors { + left: titleLabel.left + right: titleLabel.right } + + text: subtitle + font.pixelSize: 20 * pgst.scalef + + visible: subtitle !== '' + elide: Text.ElideRight + opacity: titleLabel.opacity } } } diff --git a/touch/PLabel.qml b/touch/PLabel.qml index bb2a80f..dfdced6 100644 --- a/touch/PLabel.qml +++ b/touch/PLabel.qml @@ -26,5 +26,6 @@ Text { font.pixelSize: 30 * pgst.scalef font.family: Constants.font color: Constants.colors.text + onLinkActivated: Qt.openUrlExternally(link) }