Skip to content

Commit 32c26c6

Browse files
committed
Adding frozen version to About and launch logs, to make it very clear when and what build version is running on a user's computer (in cases where they are running the frozen version).
1 parent dd08a97 commit 32c26c6

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

src/classes/app.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ def __init__(self, *args, mode=None):
124124
if os.path.exists(version_path):
125125
with open(version_path, "r", encoding="UTF-8") as f:
126126
version_info = json.loads(f.read())
127-
log.info("Frozen version info from build server:\n%s" % json.dumps(version_info, indent=4, sort_keys=True))
127+
log.info("Frozen version info from build server:\n%s" %
128+
json.dumps(version_info, indent=4, sort_keys=True))
128129

129130
except Exception:
130131
log.debug("Error displaying dependency/system details", exc_info=1)

src/windows/about.py

+11-1
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,21 @@ def __init__(self):
179179
self.btnlicense.clicked.connect(self.load_license)
180180
self.btnchangelog.clicked.connect(self.load_changelog)
181181

182+
# Look for frozen version info
183+
frozen_version_label = ""
184+
version_path = os.path.join(info.PATH, "settings", "version.json")
185+
if os.path.exists(version_path):
186+
with open(version_path, "r", encoding="UTF-8") as f:
187+
version_info = json.loads(f.read())
188+
if version_info:
189+
frozen_version_label = "<br/><br/><b>%s</b><br/>Build Date: %s" % \
190+
(version_info.get('build_name'), version_info.get('date'))
191+
182192
# Init some variables
183193
openshot_qt_version = _("Version: %s") % info.VERSION
184194
libopenshot_version = "libopenshot: %s" % openshot.OPENSHOT_VERSION_FULL
185195
self.txtversion.setText(
186-
"<b>%s</b><br/>%s" % (openshot_qt_version, libopenshot_version))
196+
"<b>%s</b><br/>%s%s" % (openshot_qt_version, libopenshot_version, frozen_version_label))
187197
self.txtversion.setAlignment(Qt.AlignCenter)
188198

189199
# Track metrics

0 commit comments

Comments
 (0)