From eeee031423cd84330e563439711a8eeb7c4d8ae0 Mon Sep 17 00:00:00 2001
From: Oscar Gustafsson <oscar.gustafsson@gmail.com>
Date: Thu, 16 Feb 2023 08:41:53 +0100
Subject: [PATCH] Update about, fix image path and move logos
---
README.md | 2 +-
b_asic/gui_utils/about_window.py | 32 +++++++++++++++----------
docs_sphinx/conf.py | 2 +-
logo.png => logos/logo.png | Bin
logo.svg => logos/logo.svg | 0
logo_tiny.png => logos/logo_tiny.png | Bin
small_logo.png => logos/small_logo.png | Bin
7 files changed, 22 insertions(+), 14 deletions(-)
rename logo.png => logos/logo.png (100%)
rename logo.svg => logos/logo.svg (100%)
rename logo_tiny.png => logos/logo_tiny.png (100%)
rename small_logo.png => logos/small_logo.png (100%)
diff --git a/README.md b/README.md
index 17224fca..f6666690 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<img src="logo.png" width="278" height="100">
+<img src="logos/logo.png" width="278" height="100">
# B-ASIC - Better ASIC Toolbox
diff --git a/b_asic/gui_utils/about_window.py b/b_asic/gui_utils/about_window.py
index 03e80415..2b8ec7d4 100644
--- a/b_asic/gui_utils/about_window.py
+++ b/b_asic/gui_utils/about_window.py
@@ -1,3 +1,4 @@
+import pathlib
import sys # ONLY FOR DEBUG
from qtpy.QtCore import Qt
@@ -43,13 +44,18 @@ class AboutWindow(QDialog):
# |3 links |4 OK | <- layout34
label1 = QLabel(
- "# B-ASIC / Better ASIC Toolbox\n*Construct, simulate and analyze"
- " components of an ASIC.*\n\nB-ASIC is an open source tool using"
- " the B-ASIC library to construct, simulate and analyze"
- " ASICs.\n\nB-ASIC is developed under the MIT-license and any"
- " extension to the program should follow that same license.\n\nTo"
- " read more about how the GUI works please refer to the FAQ under"
- f" 'Help'.\n\n*Version: {__version__}*"
+ "# B-ASIC\n__Better ASIC and FPGA Signal Processing"
+ " Toolbox__\n\n*Construct, simulate and analyze signal processing"
+ " algorithms aimed at implementation on an ASIC or"
+ " FPGA.*\n\nB-ASIC is developed by the <a"
+ " href=\"https://liu.se/en/organisation/liu/isy/da\">Division of"
+ " Computer Engineering</a> at <a"
+ " href=\"https://liu.se/?l=en\">Linköping University</a>,"
+ " Sweden.\n\nB-ASIC is released under the <a"
+ " href=\"https://gitlab.liu.se/da/B-ASIC/-/blob/master/LICENSE\">MIT-license</a>"
+ " and any extension to the program should follow that same"
+ f" license.\n\n*Version: {__version__}*\n\nCopyright 2020-2023,"
+ " Oscar Gustafsson et al."
)
label1.setTextFormat(Qt.MarkdownText)
label1.setWordWrap(True)
@@ -58,15 +64,17 @@ class AboutWindow(QDialog):
self.logo2 = QLabel(self)
self.logo2.setPixmap(
- QPixmap("../../small_logo.png").scaledToWidth(100)
+ QPixmap(
+ str(pathlib.Path(__file__).parent.resolve())
+ + "/../../logos/small_logo.png"
+ ).scaledToWidth(100)
)
self.logo2.setFixedWidth(100)
label3 = QLabel(
- """See: <a href="https://da.gitlab-pages.liu.se/B-ASIC/">documentation</a>,"""
- """ <a href="https://gitlab.liu.se/da/B-ASIC/">git</a>,"""
- """ <a href="https://www.liu.se/?l=en">liu.se</a>,"""
- """ <a href="https://liu.se/organisation/liu/isy/da">Computer Engineering</a>."""
+ """Additional resources: <a href="https://da.gitlab-pages.liu.se/B-ASIC/">documentation</a>,"""
+ """ <a href="https://gitlab.liu.se/da/B-ASIC/">git repository</a>,"""
+ """ <a href="https://gitlab.liu.se/da/B-ASIC/-/issues">report issues and suggestions</a>."""
)
label3.setOpenExternalLinks(True)
label3.linkHovered.connect(self.hoverText)
diff --git a/docs_sphinx/conf.py b/docs_sphinx/conf.py
index c0ac067d..a8ac592d 100644
--- a/docs_sphinx/conf.py
+++ b/docs_sphinx/conf.py
@@ -10,7 +10,7 @@ import shutil
project = 'B-ASIC'
copyright = '2020-2023, Oscar Gustafsson et al'
author = 'Oscar Gustafsson et al'
-html_logo = "../logo_tiny.png"
+html_logo = "../logos/logo_tiny.png"
pygments_style = 'sphinx'
diff --git a/logo.png b/logos/logo.png
similarity index 100%
rename from logo.png
rename to logos/logo.png
diff --git a/logo.svg b/logos/logo.svg
similarity index 100%
rename from logo.svg
rename to logos/logo.svg
diff --git a/logo_tiny.png b/logos/logo_tiny.png
similarity index 100%
rename from logo_tiny.png
rename to logos/logo_tiny.png
diff --git a/small_logo.png b/logos/small_logo.png
similarity index 100%
rename from small_logo.png
rename to logos/small_logo.png
--
GitLab