From 87cd106b28bb2e91c0d87af48a03b5c364f2206a Mon Sep 17 00:00:00 2001
From: Mizaki
Date: Wed, 4 Jan 2023 23:51:39 +0000
Subject: [PATCH 1/6] Add source logo and URL to series window
---
comictaggerlib/seriesselectionwindow.py | 11 +++
comictaggerlib/ui/seriesselectionwindow.ui | 95 ++++++++++++++++-----
comictalker/talkers/comicvine.py | 4 +-
comictalker/talkers/logos/comicvine.png | Bin 0 -> 17414 bytes
4 files changed, 89 insertions(+), 21 deletions(-)
create mode 100644 comictalker/talkers/logos/comicvine.png
diff --git a/comictaggerlib/seriesselectionwindow.py b/comictaggerlib/seriesselectionwindow.py
index 7c1c479..7ab4fda 100644
--- a/comictaggerlib/seriesselectionwindow.py
+++ b/comictaggerlib/seriesselectionwindow.py
@@ -161,6 +161,17 @@ class SeriesSelectionWindow(QtWidgets.QDialog):
# Load to retrieve settings
self.talker_api = talker_api
+ # Display talker logo and set url
+ self.lblSourceName.setText(
+ f'Data Source: {talker_api.static_options.website}
'
+ )
+ source_label_logo = QtGui.QPixmap(talker_api.source_details.logo)
+ if source_label_logo.height() > 100 or source_label_logo.width() > 300:
+ source_label_logo = source_label_logo.scaled(
+ 300, 100, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation
+ )
+ self.lblSourceLogo.setPixmap(source_label_logo)
+
# Set the minimum row height to the default.
# this way rows will be more consistent when resizeRowsToContents is called
self.twList.verticalHeader().setMinimumSectionSize(self.twList.verticalHeader().defaultSectionSize())
diff --git a/comictaggerlib/ui/seriesselectionwindow.ui b/comictaggerlib/ui/seriesselectionwindow.ui
index 4812423..967768f 100644
--- a/comictaggerlib/ui/seriesselectionwindow.ui
+++ b/comictaggerlib/ui/seriesselectionwindow.ui
@@ -7,7 +7,7 @@
0
0
950
- 480
+ 600
@@ -17,23 +17,84 @@
false
- -
+
-
-
-
-
-
- 300
- 450
-
+
+
+ 0
-
-
- 300
- 450
-
+
+ QLayout::SetMaximumSize
-
+
+ 0
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 300
+ 450
+
+
+
+
+ 300
+ 450
+
+
+
+
+ -
+
+
+ 2
+
+
+ 1
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+ Data Source:
+
+
+
+ -
+
+
+
+ 300
+ 100
+
+
+
+
+ 300
+ 100
+
+
+
+ 0
+
+
+
+
+
+
+
-
@@ -85,17 +146,11 @@
Year
-
- AlignCenter
-
Issues
-
- AlignCenter
-
diff --git a/comictalker/talkers/comicvine.py b/comictalker/talkers/comicvine.py
index 3b264f3..0bc7223 100644
--- a/comictalker/talkers/comicvine.py
+++ b/comictalker/talkers/comicvine.py
@@ -167,7 +167,9 @@ class ComicVineTalker(ComicTalker):
wait_on_ratelimit: bool = False,
):
super().__init__(version, cache_folder, api_url, api_key)
- self.source_details = SourceDetails(name="Comic Vine", ident="comicvine")
+ self.source_details = SourceDetails(
+ name="Comic Vine", ident="comicvine", logo="comictalker/talkers/logos/comicvine.png"
+ )
self.static_options = SourceStaticOptions(
website="https://comicvine.gamespot.com/",
has_issues=True,
diff --git a/comictalker/talkers/logos/comicvine.png b/comictalker/talkers/logos/comicvine.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e3bb89ad0b447a2d6091bfe80cff89d7e39fb17
GIT binary patch
literal 17414
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
JPDHLkV1hfU6hr_3
literal 0
HcmV?d00001
From 725b2c66d3017bd023aa62efa557e8edb6b52513 Mon Sep 17 00:00:00 2001
From: Mizaki
Date: Thu, 12 Jan 2023 16:58:50 +0000
Subject: [PATCH 2/6] Use imageWidget for source logo and URL.
---
comictaggerlib/seriesselectionwindow.py | 20 +++++++++++++-------
comictalker/talkers/comicvine.py | 4 +++-
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/comictaggerlib/seriesselectionwindow.py b/comictaggerlib/seriesselectionwindow.py
index 7ab4fda..215c037 100644
--- a/comictaggerlib/seriesselectionwindow.py
+++ b/comictaggerlib/seriesselectionwindow.py
@@ -163,14 +163,20 @@ class SeriesSelectionWindow(QtWidgets.QDialog):
# Display talker logo and set url
self.lblSourceName.setText(
- f'
Data Source: {talker_api.static_options.website}
'
+ f'Data Source: {talker_api.static_options.website}'
)
- source_label_logo = QtGui.QPixmap(talker_api.source_details.logo)
- if source_label_logo.height() > 100 or source_label_logo.width() > 300:
- source_label_logo = source_label_logo.scaled(
- 300, 100, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation
- )
- self.lblSourceLogo.setPixmap(source_label_logo)
+
+ self.imageSourceWidget = CoverImageWidget(
+ self.lblSourceLogo,
+ CoverImageWidget.URLMode,
+ options.runtime_config.user_cache_dir,
+ talker_api,
+ False,
+ )
+ gridlayoutSourceLogo = QtWidgets.QGridLayout(self.lblSourceLogo)
+ gridlayoutSourceLogo.addWidget(self.imageSourceWidget)
+ gridlayoutSourceLogo.setContentsMargins(0, 0, 0, 0)
+ self.imageSourceWidget.set_url(talker_api.source_details.logo)
# Set the minimum row height to the default.
# this way rows will be more consistent when resizeRowsToContents is called
diff --git a/comictalker/talkers/comicvine.py b/comictalker/talkers/comicvine.py
index 0bc7223..46be864 100644
--- a/comictalker/talkers/comicvine.py
+++ b/comictalker/talkers/comicvine.py
@@ -168,7 +168,9 @@ class ComicVineTalker(ComicTalker):
):
super().__init__(version, cache_folder, api_url, api_key)
self.source_details = SourceDetails(
- name="Comic Vine", ident="comicvine", logo="comictalker/talkers/logos/comicvine.png"
+ name="Comic Vine",
+ ident="comicvine",
+ logo="https://comicvine.gamespot.com/a/bundles/comicvinesite/images/logo.png",
)
self.static_options = SourceStaticOptions(
website="https://comicvine.gamespot.com/",
From 55e3b7c7e0f5f9fb1213bb5ac5039de5eca799d1 Mon Sep 17 00:00:00 2001
From: Mizaki
Date: Fri, 13 Jan 2023 21:27:40 +0000
Subject: [PATCH 3/6] Use name for URL display. Window sizes.
---
comictaggerlib/seriesselectionwindow.py | 8 +++----
comictaggerlib/ui/seriesselectionwindow.ui | 25 ++++++++++++++-------
comictalker/talkers/logos/comicvine.png | Bin 17414 -> 0 bytes
3 files changed, 21 insertions(+), 12 deletions(-)
delete mode 100644 comictalker/talkers/logos/comicvine.png
diff --git a/comictaggerlib/seriesselectionwindow.py b/comictaggerlib/seriesselectionwindow.py
index 215c037..7fc512d 100644
--- a/comictaggerlib/seriesselectionwindow.py
+++ b/comictaggerlib/seriesselectionwindow.py
@@ -163,19 +163,19 @@ class SeriesSelectionWindow(QtWidgets.QDialog):
# Display talker logo and set url
self.lblSourceName.setText(
- f'Data Source: {talker_api.static_options.website}'
+ f'Data Source: {talker_api.source_details.name}'
)
self.imageSourceWidget = CoverImageWidget(
- self.lblSourceLogo,
+ self.imageSourceLogo,
CoverImageWidget.URLMode,
options.runtime_config.user_cache_dir,
talker_api,
False,
)
- gridlayoutSourceLogo = QtWidgets.QGridLayout(self.lblSourceLogo)
+ gridlayoutSourceLogo = QtWidgets.QGridLayout(self.imageSourceLogo)
gridlayoutSourceLogo.addWidget(self.imageSourceWidget)
- gridlayoutSourceLogo.setContentsMargins(0, 0, 0, 0)
+ gridlayoutSourceLogo.setContentsMargins(0, 2, 0, 0)
self.imageSourceWidget.set_url(talker_api.source_details.logo)
# Set the minimum row height to the default.
diff --git a/comictaggerlib/ui/seriesselectionwindow.ui b/comictaggerlib/ui/seriesselectionwindow.ui
index 967768f..2cb570e 100644
--- a/comictaggerlib/ui/seriesselectionwindow.ui
+++ b/comictaggerlib/ui/seriesselectionwindow.ui
@@ -67,13 +67,28 @@
-
+
+
+ 0
+ 0
+
+
+
+
+ 300
+ 16777215
+
+
Data Source:
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
-
-
+
300
@@ -83,15 +98,9 @@
300
- 100
+ 16777215
-
- 0
-
-
-
-
diff --git a/comictalker/talkers/logos/comicvine.png b/comictalker/talkers/logos/comicvine.png
deleted file mode 100644
index 9e3bb89ad0b447a2d6091bfe80cff89d7e39fb17..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 17414
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
JPDHLkV1hfU6hr_3
From 5d66815765ca5496590beb723040aca63bf2fb85 Mon Sep 17 00:00:00 2001
From: Mizaki
Date: Fri, 20 Jan 2023 00:29:02 +0000
Subject: [PATCH 4/6] Add attrib string for source. Add logo and URL to issues
window.
---
comictaggerlib/issueselectionwindow.py | 17 +++++
comictaggerlib/seriesselectionwindow.py | 2 +-
comictaggerlib/ui/issueselectionwindow.ui | 88 ++++++++++++++++++-----
comictalker/talkerbase.py | 2 +
comictalker/talkers/comicvine.py | 1 +
5 files changed, 91 insertions(+), 19 deletions(-)
diff --git a/comictaggerlib/issueselectionwindow.py b/comictaggerlib/issueselectionwindow.py
index fc48fc2..0f04800 100644
--- a/comictaggerlib/issueselectionwindow.py
+++ b/comictaggerlib/issueselectionwindow.py
@@ -76,6 +76,23 @@ class IssueSelectionWindow(QtWidgets.QDialog):
self.url_fetch_thread = None
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.imageIssuesSourceWidget = CoverImageWidget(
+ self.imageIssuesSourceLogo,
+ CoverImageWidget.URLMode,
+ options.runtime_config.user_cache_dir,
+ talker_api,
+ False,
+ )
+ gridlayoutIssuesSourceLogo = QtWidgets.QGridLayout(self.imageIssuesSourceLogo)
+ gridlayoutIssuesSourceLogo.addWidget(self.imageIssuesSourceWidget)
+ gridlayoutIssuesSourceLogo.setContentsMargins(0, 2, 0, 0)
+ self.imageIssuesSourceWidget.set_url(talker_api.source_details.logo)
+
if issue_number is None or issue_number == "":
self.issue_number = "1"
else:
diff --git a/comictaggerlib/seriesselectionwindow.py b/comictaggerlib/seriesselectionwindow.py
index 7fc512d..05bcc84 100644
--- a/comictaggerlib/seriesselectionwindow.py
+++ b/comictaggerlib/seriesselectionwindow.py
@@ -163,7 +163,7 @@ class SeriesSelectionWindow(QtWidgets.QDialog):
# Display talker logo and set url
self.lblSourceName.setText(
- f'Data Source: {talker_api.source_details.name}'
+ f'{talker_api.static_options.attribution_string} {talker_api.source_details.name}'
)
self.imageSourceWidget = CoverImageWidget(
diff --git a/comictaggerlib/ui/issueselectionwindow.ui b/comictaggerlib/ui/issueselectionwindow.ui
index 8e3845c..2362f9c 100644
--- a/comictaggerlib/ui/issueselectionwindow.ui
+++ b/comictaggerlib/ui/issueselectionwindow.ui
@@ -7,7 +7,7 @@
0
0
872
- 550
+ 670
@@ -74,9 +74,6 @@
Title
-
- AlignCenter
-
@@ -93,20 +90,75 @@
-
-
-
-
- 300
- 450
-
-
-
-
- 300
- 450
-
-
-
+
+
-
+
+
+
+ 300
+ 450
+
+
+
+
+ 300
+ 450
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ 2
+
+
+ 1
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 300
+ 16777215
+
+
+
+ Data Source:
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+
+ -
+
+
+
+ 300
+ 100
+
+
+
+
+ 300
+ 16777215
+
+
+
+
+
diff --git a/comictalker/talkerbase.py b/comictalker/talkerbase.py
index 7e87304..fcd7be6 100644
--- a/comictalker/talkerbase.py
+++ b/comictalker/talkerbase.py
@@ -40,6 +40,7 @@ class SourceStaticOptions:
def __init__(
self,
website: str = "",
+ attribution_string: str = "", # Website link will be added after this text using source_details.name
has_issues: bool = False,
has_alt_covers: bool = False,
requires_apikey: bool = False,
@@ -47,6 +48,7 @@ class SourceStaticOptions:
has_censored_covers: bool = False,
) -> None:
self.website = website
+ self.attribution_string = attribution_string
self.has_issues = has_issues
self.has_alt_covers = has_alt_covers
self.requires_apikey = requires_apikey
diff --git a/comictalker/talkers/comicvine.py b/comictalker/talkers/comicvine.py
index 46be864..f10e7c9 100644
--- a/comictalker/talkers/comicvine.py
+++ b/comictalker/talkers/comicvine.py
@@ -174,6 +174,7 @@ class ComicVineTalker(ComicTalker):
)
self.static_options = SourceStaticOptions(
website="https://comicvine.gamespot.com/",
+ attribution_string="Data Source:",
has_issues=True,
has_alt_covers=True,
requires_apikey=True,
From d0e3b487ebd42fd16f81427b5605d7389591c0e8 Mon Sep 17 00:00:00 2001
From: Mizaki
Date: Sun, 22 Jan 2023 17:16:33 +0000
Subject: [PATCH 5/6] 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,
From c6e3266f605fefdd3ca0950ddccc32793890fc1b Mon Sep 17 00:00:00 2001
From: Mizaki
Date: Wed, 1 Feb 2023 15:39:24 +0000
Subject: [PATCH 6/6] More verbose attrib string
---
comictalker/talkerbase.py | 2 +-
comictalker/talkers/comicvine.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/comictalker/talkerbase.py b/comictalker/talkerbase.py
index 9c70c7c..6ef88aa 100644
--- a/comictalker/talkerbase.py
+++ b/comictalker/talkerbase.py
@@ -40,7 +40,7 @@ class SourceStaticOptions:
def __init__(
self,
website: str = "",
- attribution_string: str = "", # Full string including web link: Source: Example
+ attribution_string: str = "", # Full string including web link, example: Metadata provided by 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 54aa372..6826edb 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: Comic Vine",
+ attribution_string="Metadata provided by Comic Vine",
has_issues=True,
has_alt_covers=True,
requires_apikey=True,