lordwelch/comictagger
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mizaki-source_logo_url' into develop

Browse Source
This commit is contained in:
Timmy Welch 2023-02-01 08:03:16 -08:00
commit 053295e028
No known key found for this signature in database
6 changed files with 198 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
comictaggerlib/issueselectionwindow.py
View File

@ -76,6 +76,21 @@ class IssueSelectionWindow(QtWidgets.QDialog):
self.url_fetch_thread = None
self.issue_list: list[ComicIssue] = []
# Display talker logo and set url
self.lblIssuesSourceName.setText(talker_api.static_options.attribution_string)
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:

15
comictaggerlib/seriesselectionwindow.py
View File

@ -161,6 +161,21 @@ class SeriesSelectionWindow(QtWidgets.QDialog):
# Load to retrieve settings
self.talker_api = talker_api
# Display talker logo and set url
self.lblSourceName.setText(talker_api.static_options.attribution_string)
self.imageSourceWidget = CoverImageWidget(
self.imageSourceLogo,
CoverImageWidget.URLMode,
options.runtime_config.user_cache_dir,
talker_api,
False,
)
gridlayoutSourceLogo = QtWidgets.QGridLayout(self.imageSourceLogo)
gridlayoutSourceLogo.addWidget(self.imageSourceWidget)
gridlayoutSourceLogo.setContentsMargins(0, 2, 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
self.twList.verticalHeader().setMinimumSectionSize(self.twList.verticalHeader().defaultSectionSize())

91
comictaggerlib/ui/issueselectionwindow.ui
View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>872</width>
<height>550</height>
<height>670</height>
</rect>
</property>
<property name="windowTitle">
@ -74,9 +74,6 @@
<property name="text">
<string>Title</string>
</property>
<property name="textAlignment">
<set>AlignCenter</set>
</property>
</column>
</widget>
<widget class="QTextEdit" name="teDescription">
@ -93,20 +90,78 @@
</widget>
</item>
<item>
<widget class="QWidget" name="coverImageContainer" native="true">
<property name="minimumSize">
<size>
<width>300</width>
<height>450</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>300</width>
<height>450</height>
</size>
</property>
</widget>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QWidget" name="coverImageContainer" native="true">
<property name="minimumSize">
<size>
<width>300</width>
<height>450</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>300</width>
<height>450</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="lineWidth">
<number>2</number>
</property>
<property name="midLineWidth">
<number>1</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="lblIssuesSourceName">
<property name="maximumSize">
<size>
<width>300</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>Data Source:</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QWidget" name="imageIssuesSourceLogo" native="true">
<property name="minimumSize">
<size>
<width>300</width>
<height>100</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>300</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>

107
comictaggerlib/ui/seriesselectionwindow.ui
View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>950</width>
<height>480</height>
<height>600</height>
</rect>
</property>
<property name="windowTitle">
@ -17,23 +17,96 @@
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<item row="0" column="2">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QWidget" name="imageContainer" native="true">
<property name="minimumSize">
<size>
<width>300</width>
<height>450</height>
</size>
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing">
<number>0</number>
</property>
<property name="maximumSize">
<size>
<width>300</width>
<height>450</height>
</size>
<property name="sizeConstraint">
<enum>QLayout::SetMaximumSize</enum>
</property>
</widget>
<property name="leftMargin">
<number>0</number>
</property>
<item alignment="Qt::AlignTop">
<widget class="QWidget" name="imageContainer" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>300</width>
<height>450</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>300</width>
<height>450</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line">
<property name="lineWidth">
<number>2</number>
</property>
<property name="midLineWidth">
<number>1</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="lblSourceName">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>300</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>Data Source:</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QWidget" name="imageSourceLogo" native="true">
<property name="minimumSize">
<size>
<width>300</width>
<height>100</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>300</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout">
@ -85,17 +158,11 @@
<property name="text">
<string>Year</string>
</property>
<property name="textAlignment">
<set>AlignCenter</set>
</property>
</column>
<column>
<property name="text">
<string>Issues</string>
</property>
<property name="textAlignment">
<set>AlignCenter</set>
</property>
</column>
<column>
<property name="text">

2
comictalker/talkerbase.py
View File

@ -40,6 +40,7 @@ class SourceStaticOptions:
def __init__(
self,
website: str = "",
attribution_string: str = "", # Full string including web link, example: Metadata provided by <a href='http://website'>Example</a>
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

7
comictalker/talkers/comicvine.py
View File

@ -167,9 +167,14 @@ 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="https://comicvine.gamespot.com/a/bundles/comicvinesite/images/logo.png",
)
self.static_options = SourceStaticOptions(
website="https://comicvine.gamespot.com/",
attribution_string="Metadata provided by <a href='https://comicvine.gamespot.com/'>Comic Vine</a>",
has_issues=True,
has_alt_covers=True,
requires_apikey=True,