From c21c5a0ed156fd8d6c174b8f4e82f490592f603a Mon Sep 17 00:00:00 2001
From: Saara Saaninkoski <saara.saaninkoski@tuni.fi>
Date: Mon, 25 Jan 2021 12:55:09 +0200
Subject: [PATCH] Add version number to window header, update changelog
---
CHANGES.rst | 5 +++++
kvalikirstu2/gui.py | 6 ++++--
setup.py | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/CHANGES.rst b/CHANGES.rst
index be36bfb..0fcc684 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,11 @@
Kvalikirstu2 Changelog
======================
+1.0.8 - 2021/01/25
+------------------
+- Fixed bug with sidebar buttons disappearing
+- wxPython version fixed to 4.1.1.
+
1.0.7 - 2020/11/24
------------------
- Fixed bug with citation requirement being added to files outside of the data folder
diff --git a/kvalikirstu2/gui.py b/kvalikirstu2/gui.py
index ac4ec2a..20d86c8 100644
--- a/kvalikirstu2/gui.py
+++ b/kvalikirstu2/gui.py
@@ -6,6 +6,7 @@ import locale
import logging
import math
import os
+import pkg_resources
import sys
import traceback
import wx
@@ -59,11 +60,12 @@ class MainWindow(wx.Frame):
def _update_title(self, exists):
"""Updates the title of the window.
"""
+ title_with_version = 'Kvalikirstu2 (v.{})'.format(pkg_resources.get_distribution('kvalikirstu2').version)
if exists:
metadata = self.model.get_metadata()
- self.SetTitle('%s: %s - Kvalikirstu2' % (metadata.study_id, self.model.get_study_path()))
+ self.SetTitle('%s: %s - %s' % (metadata.study_id, self.model.get_study_path(), title_with_version))
else:
- self.SetTitle('Kvalikirstu2')
+ self.SetTitle(title_with_version)
def add_button_exists_hook(self, button_bar, button_id, msg):
"""Enable/disable this button in the button bar based on the message type msg.
diff --git a/setup.py b/setup.py
index 6721678..b12d9c8 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ from setuptools import setup, find_packages
setup(
name='kvalikirstu2',
- version='1.0.7',
+ version='1.0.8',
url='',
description='A tool for analyzing qualitative studies',
author='Jukka Lipsanen and Saara Saaninkoski',
--
GitLab