Skip to content

Commit

Permalink
bugfix in relative links click
Browse files Browse the repository at this point in the history
  • Loading branch information
giuspen committed Dec 21, 2014
1 parent a3756d8 commit 8be8fcd
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 5 deletions.
6 changes: 6 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@

0.35.6 (December 22nd, 2014)
• bugfix in reading a cherrytree XML document
• bugfix in relative links click
• bugfix in import from treepad lite
• updated French language from new maintainer Klaus Becker

0.35.5 (November 29th, 2014)
• bugfix: conversion from rich text to plain text of links results in the link target only if the link is the sole text copied and is not a link to node
• bugfix: relative links are to be relative to the document folder and not to the executable folder
Expand Down
2 changes: 1 addition & 1 deletion debian/changelog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cherrytree (0.35.5-1) stable; urgency=low
cherrytree (0.35.6-1) stable; urgency=low

* Fellow upstream.

Expand Down
2 changes: 1 addition & 1 deletion modules/cons.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import os, sys


VERSION = "0.35.5"
VERSION = "0.35.6"
APP_NAME = "cherrytree"
NEWER_VERSION_URL = "http://www.giuspen.com/software/version_cherrytree"
if sys.platform.startswith("win"):
Expand Down
4 changes: 2 additions & 2 deletions modules/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -4369,7 +4369,7 @@ def link_clicked(self, tag_property_value):
# link to file
filepath_orig = unicode(base64.b64decode(vector[1]), cons.STR_UTF8, cons.STR_IGNORE)
filepath = support.get_proper_platform_filepath(filepath_orig, True)
if not os.path.isfile(filepath) and not os.path.isabs(filepath) and os.path.isfile(os.path.join(self.file_dir, filepath)):
if not os.path.isabs(filepath) and os.path.isfile(os.path.join(self.file_dir, filepath)):
filepath = os.path.join(self.file_dir, filepath)
if not os.path.isfile(filepath):
support.dialog_error(_("The File Link '%s' is Not Valid") % filepath, self.window)
Expand All @@ -4379,7 +4379,7 @@ def link_clicked(self, tag_property_value):
# link to folder
filepath_orig = unicode(base64.b64decode(vector[1]), cons.STR_UTF8, cons.STR_IGNORE)
filepath = support.get_proper_platform_filepath(filepath_orig, False)
if not os.path.isdir(filepath) and not os.path.isabs(filepath) and os.path.isdir(os.path.join(self.file_dir, filepath)):
if not os.path.isabs(filepath) and os.path.isdir(os.path.join(self.file_dir, filepath)):
filepath = os.path.join(self.file_dir, filepath)
if not os.path.isdir(filepath):
support.dialog_error(_("The Folder Link '%s' is Not Valid") % filepath, self.window)
Expand Down
2 changes: 1 addition & 1 deletion windows/cherrytree.iss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "CherryTree"
#define MyAppVersion "0.35.5"
#define MyAppVersion "0.35.6"
#define MyAppPublisher "Giuseppe Penone"
#define MyAppURL "http://www.giuspen.com/cherrytree/"
#define MyAppExeName "cherrytree.exe"
Expand Down

0 comments on commit 8be8fcd

Please sign in to comment.