CLI and GUI now displays upscaler version

This commit is contained in:
k4yt3x 2020-05-15 21:28:22 -04:00
parent 748f1e5799
commit 04d598a525
3 changed files with 17 additions and 10 deletions

View File

@ -4,7 +4,7 @@
Name: Video2X Upscaler Name: Video2X Upscaler
Author: K4YT3X Author: K4YT3X
Date Created: December 10, 2018 Date Created: December 10, 2018
Last Modified: May 12, 2020 Last Modified: May 15, 2020
Description: This file contains the Upscaler class. Each Description: This file contains the Upscaler class. Each
instance of the Upscaler class is an upscaler on an image or instance of the Upscaler class is an upscaler on an image or
@ -48,6 +48,9 @@ language = gettext.translation(DOMAIN, LOCALE_DIRECTORY, [default_locale], fallb
language.install() language.install()
_ = language.gettext _ = language.gettext
# version information
UPSCALER_VERSION = '4.0.0'
# these names are consistent for # these names are consistent for
# - driver selection in command line # - driver selection in command line
# - driver wrapper file names # - driver wrapper file names

View File

@ -13,7 +13,7 @@ __ __ _ _ ___ __ __
Name: Video2X Controller Name: Video2X Controller
Creator: K4YT3X Creator: K4YT3X
Date Created: Feb 24, 2018 Date Created: Feb 24, 2018
Last Modified: May 11, 2020 Last Modified: May 15, 2020
Editor: BrianPetkovsek Editor: BrianPetkovsek
Last Modified: June 17, 2019 Last Modified: June 17, 2019
@ -50,6 +50,7 @@ smooth and edges sharp.
# local imports # local imports
from upscaler import AVAILABLE_DRIVERS from upscaler import AVAILABLE_DRIVERS
from upscaler import UPSCALER_VERSION
from upscaler import Upscaler from upscaler import Upscaler
# built-in imports # built-in imports
@ -79,13 +80,14 @@ language.install()
_ = language.gettext _ = language.gettext
VERSION = '4.0.0' CLI_VERSION = '4.0.0'
LEGAL_INFO = _('''Video2X Version: {} LEGAL_INFO = _('''Video2X CLI Version: {}
Upscaler Version: {}
Author: K4YT3X Author: K4YT3X
License: GNU GPL v3 License: GNU GPL v3
Github Page: https://github.com/k4yt3x/video2x Github Page: https://github.com/k4yt3x/video2x
Contact: k4yt3x@k4yt3x.com''').format(VERSION) Contact: k4yt3x@k4yt3x.com''').format(CLI_VERSION, UPSCALER_VERSION)
LOGO = r''' LOGO = r'''
__ __ _ _ ___ __ __ __ __ _ _ ___ __ __
@ -135,7 +137,7 @@ def print_logo():
"""print video2x logo""" """print video2x logo"""
print(LOGO) print(LOGO)
print(f'\n{"Video2X Video Enlarger".rjust(40, " ")}') print(f'\n{"Video2X Video Enlarger".rjust(40, " ")}')
print(f'\n{Avalon.FM.BD}{f"Version {VERSION}".rjust(36, " ")}{Avalon.FM.RST}\n') print(f'\n{Avalon.FM.BD}{f"Version {CLI_VERSION}".rjust(36, " ")}{Avalon.FM.RST}\n')
def read_config(config_file: pathlib.Path) -> dict: def read_config(config_file: pathlib.Path) -> dict:

View File

@ -4,10 +4,11 @@
Creator: Video2X GUI Creator: Video2X GUI
Author: K4YT3X Author: K4YT3X
Date Created: May 5, 2020 Date Created: May 5, 2020
Last Modified: May 14, 2020 Last Modified: May 15, 2020
""" """
# local imports # local imports
from upscaler import UPSCALER_VERSION
from upscaler import Upscaler from upscaler import Upscaler
from wrappers.ffmpeg import Ffmpeg from wrappers.ffmpeg import Ffmpeg
@ -30,9 +31,10 @@ from PyQt5.QtWidgets import *
import magic import magic
# QObject, pyqtSlot, pyqtSignal, QRunnable, QThreadPool, QAbstractTableModel, Qt # QObject, pyqtSlot, pyqtSignal, QRunnable, QThreadPool, QAbstractTableModel, Qt
VERSION = '2.1.0' GUI_VERSION = '2.1.0'
LEGAL_INFO = f'''Video2X GUI Version: {VERSION}\\ LEGAL_INFO = f'''Video2X GUI Version: {GUI_VERSION}\\
Upscaler Version: {UPSCALER_VERSION}\\
Author: K4YT3X\\ Author: K4YT3X\\
License: GNU GPL v3\\ License: GNU GPL v3\\
Github Page: [https://github.com/k4yt3x/video2x](https://github.com/k4yt3x/video2x)\\ Github Page: [https://github.com/k4yt3x/video2x](https://github.com/k4yt3x/video2x)\\
@ -180,7 +182,7 @@ class Video2XMainWindow(QMainWindow):
# set window title and icon # set window title and icon
self.video2x_icon_path = str(resource_path('images/video2x.png')) self.video2x_icon_path = str(resource_path('images/video2x.png'))
self.setWindowTitle(f'Video2X GUI {VERSION}') self.setWindowTitle(f'Video2X GUI {GUI_VERSION}')
self.setWindowIcon(QtGui.QIcon(self.video2x_icon_path)) self.setWindowIcon(QtGui.QIcon(self.video2x_icon_path))
# menu bar # menu bar