From 5d66815765ca5496590beb723040aca63bf2fb85 Mon Sep 17 00:00:00 2001
From: Mizaki <jinxybob@hotmail.com>
Date: Fri, 20 Jan 2023 00:29:02 +0000
Subject: [PATCH] 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} <a href="{talker_api.static_options.website}">{talker_api.source_details.name}</a>'
+        )
+
+        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: <a href="{talker_api.static_options.website}">{talker_api.source_details.name}</a>'
+            f'{talker_api.static_options.attribution_string} <a href="{talker_api.static_options.website}">{talker_api.source_details.name}</a>'
         )
 
         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 @@
     <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,75 @@
         </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>
+          </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>
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,