Default grid sizes

Changed files (5)

• modified install.py
• modified libbirdfont/BirdFont.vala
• modified libbirdfont/DrawingTools.vala
• modified libbirdfont/LoadCallback.vala
• modified libbirdfont/Renderer/FontCache.vala

Diff

diff --git a/install.py b/install.pyindex a99738f..65031e2 100755--- a/install.py+++ b/install.py@@ -94,7 +94,7 @@ install ('resources/linux/birdfont.desktop', '/share/applications', 644) install ('resources/linux/128x128/birdfont.png', '/share/icons/hicolor/128x128/apps', 644) install ('resources/linux/48x48/birdfont.png', '/share/icons/hicolor/48x48/apps', 644) -install ('resources/linux/birdfont.appdata.xml', '/share/appdata/', 644)+install ('resources/linux/birdfont.appdata.xml', '/share/appdata', 644)  if os.path.isfile ('build/bin/birdfont'): 	install ('build/bin/birdfont', '/bin', 755)diff --git a/libbirdfont/BirdFont.vala b/libbirdfont/BirdFont.valaindex 86256c1..e4f7b62 100644--- a/libbirdfont/BirdFont.vala+++ b/libbirdfont/BirdFont.vala@@ -525,8 +525,9 @@ public class BirdFont { 		 		if (!is_null (MainWindow.tools)) { 			MainWindow.get_drawing_tools ().remove_all_grid_buttons ();-			MainWindow.get_drawing_tools ().add_new_grid ();-			MainWindow.get_drawing_tools ().add_new_grid ();+			MainWindow.get_drawing_tools ().add_new_grid (1);+			MainWindow.get_drawing_tools ().add_new_grid (2);+			MainWindow.get_drawing_tools ().add_new_grid (4); 		} 		 		if (!is_null (Toolbox.background_tools)) {diff --git a/libbirdfont/DrawingTools.vala b/libbirdfont/DrawingTools.valaindex d48326c..f189d85 100644--- a/libbirdfont/DrawingTools.vala+++ b/libbirdfont/DrawingTools.vala@@ -916,7 +916,7 @@ public class DrawingTools : ToolCollection  { 		}); 		view_tools.add_tool (zoom_prev); -		Tool zoom_next = new Tool ("next");+		Tool zoom_next = new Tool ("next", t_("Next view")); 		zoom_next.select_action.connect((self) => { 			zoom_tool.next_view (); 		});@@ -1011,8 +1011,9 @@ public class DrawingTools : ToolCollection  { 				help_lines.set_active (false); 			} -			add_new_grid ();-			add_new_grid ();+			add_new_grid (1);+			add_new_grid (2);+			add_new_grid (4); 			 			MainWindow.get_toolbox ().move (0, 0); 			@@ -1262,7 +1263,7 @@ public class DrawingTools : ToolCollection  { 		MainWindow.get_toolbox ().select_tool (sb); 	} -	public SpinButton add_new_grid () {+	public SpinButton add_new_grid (double size = 2) { 		SpinButton grid_width = new SpinButton ("grid_width", t_("Set size for grid")); 		Toolbox tb = MainWindow.get_toolbox (); 		@@ -1279,6 +1280,8 @@ public class DrawingTools : ToolCollection  { 		grid_expander.add_tool (grid_width);  		GridTool.sizes.add (grid_width);+		+		grid_width.set_value_round (size);  		tb.update_expanders (); 		diff --git a/libbirdfont/LoadCallback.vala b/libbirdfont/LoadCallback.valaindex 21a5481..a356d13 100644--- a/libbirdfont/LoadCallback.vala+++ b/libbirdfont/LoadCallback.vala@@ -71,12 +71,12 @@ public class LoadCallback : GLib.Object { 				MainWindow.clear_glyph_cache (); 				 				f.set_file ((!) fn);+				Preferences.add_recent_files ((!) fn); 				MainWindow.native_window.load (); 				 				file_loaded.connect (() => { 					KerningTools.update_kerning_classes (); 					MenuTab.show_all_available_characters ();-					Preferences.add_recent_files (fn); 				}); 			} 		});diff --git a/libbirdfont/Renderer/FontCache.vala b/libbirdfont/Renderer/FontCache.valaindex f90f7d8..7158029 100644--- a/libbirdfont/Renderer/FontCache.vala+++ b/libbirdfont/Renderer/FontCache.vala@@ -39,7 +39,7 @@ public class FontCache { 			f = new Font (); 			this.file_name = file_name; 			-			f.set_file (file_name, false);+			f.set_file (file_name); 			ok = f.load (); 			if (!ok) { 				stderr.printf ("Can't load %s\n", file_name);