From 32028a54b9274b350147f46c7dbe95ef7c2fab23 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Sun, 28 Aug 2022 08:44:45 +0200 Subject: [PATCH] make version accessible without having to read a file This works when krowlog is bundled into a single executable --- VERSION.info | 1 - main.py => krowlog.py | 6 ++---- src/plugins/krowlog/aboutdialog.py | 10 ++++------ 3 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 VERSION.info rename main.py => krowlog.py (98%) diff --git a/VERSION.info b/VERSION.info deleted file mode 100644 index 6e8bf73..0000000 --- a/VERSION.info +++ /dev/null @@ -1 +0,0 @@ -0.1.0 diff --git a/main.py b/krowlog.py similarity index 98% rename from main.py rename to krowlog.py index bea7462..137cfe4 100644 --- a/main.py +++ b/krowlog.py @@ -1,18 +1,16 @@ import logging import signal - from PySide6 import QtCore from PySide6.QtWidgets import QApplication from PySide6.QtCore import QTimer import sys - import constants from src.pluginregistry import PluginRegistry - import gettext - from src.ui.icon import Icon +__version__ = '0.2.0' + gettext.install('krowlog', 'locale') logging.basicConfig(level=logging.INFO) diff --git a/src/plugins/krowlog/aboutdialog.py b/src/plugins/krowlog/aboutdialog.py index 88ab716..9da2a9b 100644 --- a/src/plugins/krowlog/aboutdialog.py +++ b/src/plugins/krowlog/aboutdialog.py @@ -4,11 +4,12 @@ import PySide6 import urllib3 from watchdog import version as watchdog_version from PySide6.QtCore import Qt -from PySide6.QtGui import QFont, QPixmap +from PySide6.QtGui import QFont from PySide6.QtWidgets import * -from pathlib import Path import constants + +import krowlog from src.ui.icon import Icon from src.ui.label import Label from src.ui.vbox import VBox @@ -30,7 +31,7 @@ class AboutDialog(QDialog): heading_app_name.setFont(QFont("default", 25)) # heading_app_name.setTextInteractionFlags(Qt.TextInteractionFlag.TextSelectableByMouse) - version = Label(_("Version: {0}").format(self._version())) + version = Label(_("Version: {0}").format(krowlog.__version__)) version.setAlignment(Qt.AlignmentFlag.AlignLeft) app_icon = QLabel() @@ -85,6 +86,3 @@ class AboutDialog(QDialog): result.layout = QVBoxLayout(result) result.layout.addWidget(Label(label)) return result - - def _version(self): - return Path(__file__).parent.parent.parent.parent.joinpath('VERSION.info').read_text("utf8").strip()