From d0e3b487ebd42fd16f81427b5605d7389591c0e8 Mon Sep 17 00:00:00 2001 From: Mizaki Date: Sun, 22 Jan 2023 17:16:33 +0000 Subject: [PATCH] Mark label for external links. attrib str to be complete. --- comictaggerlib/issueselectionwindow.py | 4 +--- comictaggerlib/seriesselectionwindow.py | 4 +--- comictaggerlib/ui/issueselectionwindow.ui | 3 +++ comictaggerlib/ui/seriesselectionwindow.ui | 3 +++ comictalker/talkerbase.py | 2 +- comictalker/talkers/comicvine.py | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/comictaggerlib/issueselectionwindow.py b/comictaggerlib/issueselectionwindow.py index 0f04800..12cc245 100644 --- a/comictaggerlib/issueselectionwindow.py +++ b/comictaggerlib/issueselectionwindow.py @@ -77,9 +77,7 @@ class IssueSelectionWindow(QtWidgets.QDialog): self.issue_list: list[ComicIssue] = [] # Display talker logo and set url - self.lblIssuesSourceName.setText( - f'{talker_api.static_options.attribution_string} {talker_api.source_details.name}' - ) + self.lblIssuesSourceName.setText(talker_api.static_options.attribution_string) self.imageIssuesSourceWidget = CoverImageWidget( self.imageIssuesSourceLogo, diff --git a/comictaggerlib/seriesselectionwindow.py b/comictaggerlib/seriesselectionwindow.py index 05bcc84..0401930 100644 --- a/comictaggerlib/seriesselectionwindow.py +++ b/comictaggerlib/seriesselectionwindow.py @@ -162,9 +162,7 @@ class SeriesSelectionWindow(QtWidgets.QDialog): self.talker_api = talker_api # Display talker logo and set url - self.lblSourceName.setText( - f'{talker_api.static_options.attribution_string} {talker_api.source_details.name}' - ) + self.lblSourceName.setText(talker_api.static_options.attribution_string) self.imageSourceWidget = CoverImageWidget( self.imageSourceLogo, diff --git a/comictaggerlib/ui/issueselectionwindow.ui b/comictaggerlib/ui/issueselectionwindow.ui index 2362f9c..4d23de9 100644 --- a/comictaggerlib/ui/issueselectionwindow.ui +++ b/comictaggerlib/ui/issueselectionwindow.ui @@ -140,6 +140,9 @@ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + true + diff --git a/comictaggerlib/ui/seriesselectionwindow.ui b/comictaggerlib/ui/seriesselectionwindow.ui index 2cb570e..ceafc65 100644 --- a/comictaggerlib/ui/seriesselectionwindow.ui +++ b/comictaggerlib/ui/seriesselectionwindow.ui @@ -85,6 +85,9 @@ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + true + diff --git a/comictalker/talkerbase.py b/comictalker/talkerbase.py index fcd7be6..9c70c7c 100644 --- a/comictalker/talkerbase.py +++ b/comictalker/talkerbase.py @@ -40,7 +40,7 @@ class SourceStaticOptions: def __init__( self, website: str = "", - attribution_string: str = "", # Website link will be added after this text using source_details.name + attribution_string: str = "", # Full string including web link: Source: Example has_issues: bool = False, has_alt_covers: bool = False, requires_apikey: bool = False, diff --git a/comictalker/talkers/comicvine.py b/comictalker/talkers/comicvine.py index f10e7c9..54aa372 100644 --- a/comictalker/talkers/comicvine.py +++ b/comictalker/talkers/comicvine.py @@ -174,7 +174,7 @@ class ComicVineTalker(ComicTalker): ) self.static_options = SourceStaticOptions( website="https://comicvine.gamespot.com/", - attribution_string="Data Source:", + attribution_string="Data Source: Comic Vine", has_issues=True, has_alt_covers=True, requires_apikey=True,