Philipp Hörist pushed to branch master at gajim / gajim
Commits:
dde60cbc by Philipp Hörist at 2024-07-02T20:11:41+02:00
cfix: Windows: Catch error when checking for ms store version
- - - - -
9223d591 by Philipp Hörist at 2024-07-02T20:25:53+02:00
imprv: AboutDialog: Add package information
- - - - -
3 changed files:
- gajim/__init__.py
- + gajim/common/util/app.py
- gajim/gtk/about.py
Changes:
=====================================
gajim/__init__.py
=====================================
@@ -15,7 +15,7 @@
from winrt.windows.applicationmodel import AppInfo
_current_appinfo = AppInfo.current() # type: ignore
has_ms_appinfo = True
-except (ImportError, OSError):
+except (AttributeError, ImportError, OSError):
pass
IS_MS_STORE = has_ms_appinfo
=====================================
gajim/common/util/app.py
=====================================
@@ -0,0 +1,26 @@
+# This file is part of Gajim.
+#
+# SPDX-License-Identifier: GPL-3.0-only
+
+from __future__ import annotations
+
+import sys
+
+import gajim
+
+
+def get_extended_app_version() -> str:
+ if gajim.IS_FLATPAK:
+ package = 'Flatpak'
+ elif gajim.IS_PORTABLE:
+ package = 'Windows Portable'
+ elif gajim.IS_MS_STORE:
+ package = 'Windows Store'
+ elif sys.platform == 'win32':
+ package = 'Windows'
+ elif sys.platform == 'darwin':
+ package = 'MacOS'
+ else:
+ package = 'Unix/Linux'
+
+ return f'{gajim.__version__} ({package})'
=====================================
gajim/gtk/about.py
=====================================
@@ -18,6 +18,7 @@
from gajim.common.helpers import get_soup_version
from gajim.common.helpers import open_uri
from gajim.common.i18n import _
+from gajim.common.util.app import get_extended_app_version
from gajim.gtk.util import get_gtk_version
@@ -27,7 +28,7 @@ def __init__(self):
Gtk.AboutDialog.__init__(self)
self.set_transient_for(app.window)
self.set_name('Gajim')
- self.set_version(app.version)
+ self.set_version(get_extended_app_version())
self.set_copyright('Copyright © 2003-2024 Gajim Team')
self.set_license_type(Gtk.License.GPL_3_0_ONLY)
self.set_website('https://gajim.org/')
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/b2a634258bcf93ad10f9f0dc7c86fe375b5cd629...9223d5919be82212d3c41416bfecfa1c135327c8
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/b2a634258bcf93ad10f9f0dc7c86fe375b5cd629...9223d5919be82212d3c41416bfecfa1c135327c8
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
