bugfix: 0000006

Changed files (5)

• modified libbirdfont/PenTool.vala
• modified libbirdfont/Toolbox.vala
• modified scripts/export.sh
• modified scripts/macport_build.py
• modified scripts/version.py

Diff

diff --git a/libbirdfont/PenTool.vala b/libbirdfont/PenTool.valaindex f1a045a..68c3c71 100644--- a/libbirdfont/PenTool.vala+++ b/libbirdfont/PenTool.vala@@ -120,8 +120,7 @@ public class PenTool : Tool { 				} else { 					move_select_next_point (keyval); 				}-			}-					+			}	 		}); 		 		key_release_action.connect ((self, keyval) => {diff --git a/libbirdfont/Toolbox.vala b/libbirdfont/Toolbox.valaindex ccfdb8a..6f7c20b 100644--- a/libbirdfont/Toolbox.vala+++ b/libbirdfont/Toolbox.vala@@ -610,7 +610,7 @@ public class Toolbox : GLib.Object  { 			foreach (Tool t in exp.tool) { 				t.set_active (false); 				-				if (t.key == keyval && t.modifier_flag == NONE) {+				if (t.key == keyval && t.modifier_flag == NONE && KeyBindings.modifier == NONE) { 					MainWindow.get_toolbox ().select_tool (t); 				} 			}diff --git a/scripts/export.sh b/scripts/export.shindex dfbdf00..39fd819 100755--- a/scripts/export.sh+++ b/scripts/export.sh@@ -2,7 +2,7 @@  rep="$(pwd)" -mkdir build+mkdir -p build cd build mkdir -p export cd export diff --git a/scripts/macport_build.py b/scripts/macport_build.pyindex d4d0085..c39e4cf 100755--- a/scripts/macport_build.py+++ b/scripts/macport_build.py@@ -17,7 +17,6 @@ def run(cmd):  def build (prefix): 	#libbirdfont-	run("rm -rf build") 	run("mkdir -p build/libbirdfont") 	run("mkdir -p build/bin") @@ -69,6 +68,7 @@ def build_app ():  parser = OptionParser() parser.add_option ("-p", "--prefix", dest="prefix", help="install prefix", metavar="PREFIX")+parser.add_option ("-d", "--dest", dest="dest", help="install to this directory", metavar="DEST")  (options, args) = parser.parse_args() @@ -76,7 +76,7 @@ if not options.prefix: 	options.prefix = "/opt/local"  build (options.prefix)-+build_app ()   diff --git a/scripts/version.py b/scripts/version.pyindex 855f04d..9a691f7 100644--- a/scripts/version.py+++ b/scripts/version.py@@ -1,2 +1,2 @@ #!/usr/bin/python-VERSION = '0.17'+VERSION = '0.18'