bugfix: load color

Changed files (4)

• modified install
• modified libbirdfont/ColorTool.vala
• modified libbirdfont/Toolbox.vala
• modified uninstall

Diff

diff --git a/install b/installindex fe9e617..6d56cb4 100755--- a/install+++ b/install@@ -19,6 +19,10 @@ if not os.path.exists ("build/configured"): 	print ("Project is not configured") 	exit (1) +if not os.path.exists ("build/installed"):+        print ("Project is not built")+        exit (1)+ 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")diff --git a/libbirdfont/ColorTool.vala b/libbirdfont/ColorTool.valaindex 8c9fd51..8114ea8 100644--- a/libbirdfont/ColorTool.vala+++ b/libbirdfont/ColorTool.vala@@ -29,7 +29,7 @@ public class ColorTool : Tool { 	public signal void color_updated (); 	 	public ColorTool (string tool_tip) {-		base ("color_selection", tool_tip);+		base (null, tool_tip);  		select_action.connect((self) => { 			MainWindow.native_window.color_selection (this);diff --git a/libbirdfont/Toolbox.vala b/libbirdfont/Toolbox.valaindex 7cf7efc..0c8260e 100644--- a/libbirdfont/Toolbox.vala+++ b/libbirdfont/Toolbox.vala@@ -521,10 +521,10 @@ public class Toolbox : GLib.Object  { 			Path.handle_color_b = handle_color.color_b; 			Path.handle_color_a = handle_color.color_a; -			Preferences.set ("handle_color_r", @"$(Path.line_color_r)");-			Preferences.set ("handle_color_g", @"$(Path.line_color_g)");-			Preferences.set ("handle_color_b", @"$(Path.line_color_b)");-			Preferences.set ("handle_color_a", @"$(Path.line_color_a)");+			Preferences.set ("handle_color_r", @"$(Path.handle_color_r)");+			Preferences.set ("handle_color_g", @"$(Path.handle_color_g)");+			Preferences.set ("handle_color_b", @"$(Path.handle_color_b)");+			Preferences.set ("handle_color_a", @"$(Path.handle_color_a)");  			Glyph g = MainWindow.get_current_glyph (); 			g.redraw_area (0, 0, g.allocation.width, g.allocation.height);diff --git a/uninstall b/uninstallindex fe7a4f6..bde86ca 100755--- a/uninstall+++ b/uninstall@@ -9,7 +9,7 @@ if not os.path.exists ("build/configured"): if not os.path.exists ("build/installed"): 	print ("Project is not installed") 	exit (1)-		+ f = open('build/installed') for file in iter(f): 	print ('Removing ' + file.replace ('\n', ''))