Skip to content

Commit

Permalink
v. 0.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
damian-krawczyk committed May 18, 2019
1 parent 4930aef commit 30adeb2
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 11 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ Change Log
This document records all notable changes to `converter-csv by LimberDuck <https://github.com/LimberDuck/converter-csv>`_.
This project adheres to `Semantic Versioning <http://semver.org/>`_.

0.2.1 (2019-05-18)
---------------------

* Cancel option handled if change target directory action has been taken.
* About dialog window format changed to display release date.


0.2.0 (2019-05-12)
---------------------
Expand Down
6 changes: 3 additions & 3 deletions converter_csv/__about__.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
__summary__ = "Converter CSV by LimberDuck (pronounced *ˈlɪm.bɚ dʌk*) is a GUI tool which lets you convert multiple " \
"large csv files to xlsx files."
__uri__ = "https://github.com/LimberDuck"
__version__ = "0.2.0"
__release_date__ = "2019.5.12"
__version__ = "0.2.1"
__release_date__ = "2019.5.18"
__author__ = u"Damian Krawczyk"
__email__ = "[email protected]"
__license_name__ = "GNU GPLv3"
__license_link__ = "https://www.gnu.org/licenses/gpl-3.0.en.html"
__copyright__ = u"\N{COPYRIGHT SIGN} 2018-{} {}".format(datetime.datetime.now().year, __author__)
__copyright__ = u"\N{COPYRIGHT SIGN} 2018-{} by {}".format(datetime.datetime.now().year, __author__)
17 changes: 11 additions & 6 deletions converter_csv/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -386,13 +386,18 @@ def change_target_directory(self):

directories = file_dialog.getExistingDirectory(None, title, starting_directory, options=options)

self.set_target_directory(directories)
self.get_target_directory_from_file()
if directories:
self.set_target_directory(directories)
self.get_target_directory_from_file()

color = 'green'
info = 'Target directory changed from "' + old_target_directory + '" to "' + self.__target_directory + '"'
self.print_log(info, color)
self.__target_directory_changed = True
color = 'green'
info = 'Target directory changed from "' + old_target_directory + '" to "' + self.__target_directory + '"'
self.print_log(info, color)
self.__target_directory_changed = True
else:
info = 'Target directory not changed.'
color = 'black'
self.print_log(info, color=color)

def open_files(self):
"""
Expand Down
5 changes: 3 additions & 2 deletions converter_csv/dialogs/about.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ def __init__(self, parent=None):
self.setWindowTitle("About")
self.appName = __about__.__title__
self.version = __about__.__version__
self.release_date = __about__.__release_date__

website = __about__.__uri__
email = __about__.__email__
Expand All @@ -43,8 +44,8 @@ def __init__(self, parent=None):
msg_box.setTextFormat(Qt.RichText)
# msg_box.setIconPixmap(QPixmap(ComicTaggerSettings.getGraphic('about.png')))
msg_box.setText("<br>"
+ self.appName + " v" + self.version + "<br>"
+ copyright_info + "<br><br>"
+ self.appName + " v" + self.version + " [" + self.release_date + "] <br>"
+ "Copyright " + copyright_info + "<br><br>"
+ "<a href='{0}'>{0}</a><br><br>".format(website)
+ "<a href='mailto:{0}'>{0}</a><br><br>".format(email)
+ "License: <a href='{0}'>{1}</a>".format(license_link, license_name))
Expand Down

0 comments on commit 30adeb2

Please sign in to comment.