thumbnails, tool tips & key bindings

Changed files (5)

• modified src/Glyph.vala
• modified src/GridTool.vala
• modified src/KeyBindings.vala
• modified src/MenuTab.vala
• modified src/Toolbox.vala

Diff

diff --git a/src/Glyph.vala b/src/Glyph.valaindex 09f4c1a..72efdfd 100644--- a/src/Glyph.vala+++ b/src/Glyph.vala@@ -1602,11 +1602,16 @@ class Glyph : FontDisplay {  		remove_empty_paths (); 		boundries (out x1, out y1, out x2, out y2);++		if (x2 - x1 < 1 || y2 - y1 < 1) { // create an empty thumbnail +			img = new ImageSurface (Format.ARGB32, 100, 100);+		} else {+			img = new ImageSurface (Format.ARGB32, (int) (x2 - x1), (int) (y2 - y1));+		} 		 		gx = left_limit - x1; 		gy = (y2 - y1) + font.base_line + y1; 		-		img = new ImageSurface (Format.ARGB32, (int) (x2 - x1), (int) (y2 - y1)); 		cr = new Context (img); 		 		Svg.draw_svg_path (cr, get_svg_data (), gx, gy, 1.0);	diff --git a/src/GridTool.vala b/src/GridTool.valaindex a152b53..7d0a293 100644--- a/src/GridTool.vala+++ b/src/GridTool.vala@@ -33,7 +33,7 @@ class GridTool : Tool { 	public static List <SpinButton> sizes; 	 	public GridTool (string n) {-		base (n, "show grid", 'g', NONE);+		base (n, "Show grid", 'g', NONE); 		 		horizontal = new List <Line> (); 		vertical = new List <Line> ();diff --git a/src/KeyBindings.vala b/src/KeyBindings.valaindex 204455a..9b6789b 100644--- a/src/KeyBindings.vala+++ b/src/KeyBindings.vala@@ -108,6 +108,16 @@ class BindingList { 	} } +class ExportFonts : ShortCut {+	+	public override void run () {+		ExportTool.export_all ();+	}+	+	public override uint get_default_modifier ()      { return CTRL; }+	public override uint get_default_key ()           { return 'e';	}	+	public override unowned string get_description () { return "Export"; }+}  class ShowPreview : ShortCut { 	diff --git a/src/MenuTab.vala b/src/MenuTab.valaindex 0420638..782e063 100644--- a/src/MenuTab.vala+++ b/src/MenuTab.vala@@ -87,6 +87,9 @@ class MenuTab : FontDisplay { 			show_kerning_context (); 		});	 +		add_html_callback ("help", (val) => {+			MainWindow.get_tool_tip ().show_text (val);+		}); 	} 		 	public override string get_name () {@@ -117,13 +120,13 @@ class MenuTab : FontDisplay { <body> 	<div class="inner_format_box"> 		<div class="heading"><h2>Menu</h2></div>-		<div class="menu_item" onclick="call ('newfile:');">New</div>-		<div class="menu_item" onclick="call ('open:');">Open</div>-		<div class="menu_item" onclick="call ('save:');">Save</div>-		<div class="menu_item" onclick="call ('save_as:');">Save as</div>-		<div class="menu_item" onclick="call ('kerning_context:');">Kerning context</div>-		<div class="menu_item" onclick="call ('grid:add');">Add grid</div>-		<div class="menu_item" onclick="call ('grid:remove');">Remove grid</div>+		<div class="menu_item" onclick="call ('newfile:');" onmouseover="call ('help:(Ctrl+n) Create a new font');">New</div>+		<div class="menu_item" onclick="call ('open:');" onmouseover="call ('help:(Ctrl+o) Open an existing ffi file');">Open</div>+		<div class="menu_item" onclick="call ('save:');" onmouseover="call ('help:(Ctrl+s) Save font');">Save</div>+		<div class="menu_item" onclick="call ('save_as:');" onmouseover="call ('help:Save font with a different name');">Save as</div>+		<div class="menu_item" onclick="call ('kerning_context:');" onmouseover="call ('help:(Ctrl+k) Show kerning context');">Kerning context</div>+		<div class="menu_item" onclick="call ('grid:add');" onmouseover="call ('help:Add a new size for grid');">Add grid</div>+		<div class="menu_item" onclick="call ('grid:remove');" onmouseover="call ('help:Remove current grid size');">Remove grid</div> 	</div> 	 	<div class="inner_format_box">@@ -137,23 +140,9 @@ c.append (""" 				<h3>Name</h3> 				<input class="text" type="text" id="fontname" value=""" + "\"" + f.get_name () + "\"" + """ onchange="update_export_settings ();"/><br /> 				-				<input class="button" type="button" value="Export" id="export_button" onclick="call ('export:fonts');"/>-				<input class="button" type="button" value="Preview" id="preview_button" onclick="call ('preview:fonts');"/><br />+				<input class="button" type="button" value="Export" id="export_button" onclick="call ('export:fonts');" onmouseover="call ('help:(Ctrl+e) Export SVG, TTF & EOF fonts');"/>+				<input class="button" type="button" value="Preview" id="preview_button" onclick="call ('preview:fonts');" onmouseover="call ('help:(Ctrl+p) Export SVG font and view the result');"/><br /> """);--	if (!Supplement.experimental) {-		c.append ("""<div style="visibility:hidden;">""");-	}-	-	c.append ("""-				<h3>Formats</h3>-				<input class="checkbox" type="checkbox" id="svg" checked="checked" onchange="update_export_settings ();"/> SVG<br />-				<input class="checkbox" type="checkbox" id="ttf" checked="checked" onchange="update_export_settings ();"/> TTF<br />-				""");--	if (!Supplement.experimental) {-		c.append ("</div>");-	} 	 c.append (""" 			</form> @@ -180,8 +169,9 @@ foreach (Font font in recent_fonts) { 	c.append (path_to_uri ((!) Supplement.get_thumbnail_directory ().get_path ())); 	c.append ("/"); 	c.append (fn);-	c.append (@".png?$(Random.next_int ())\" alt=\"\"><br /><br />");+	c.append (@".png?$(Random.next_int ())\" alt=\"\">"); 	+	c.append ("<br /><br />"); 	c.append ("</div>\n"); } diff --git a/src/Toolbox.vala b/src/Toolbox.valaindex 765a9b9..e7a8857 100644--- a/src/Toolbox.vala+++ b/src/Toolbox.vala@@ -220,7 +220,7 @@ class Toolbox : DrawingArea { 			}); 		characterset_tools.add_tool (avalilable_characters); -		Tool delete_glyph = new Tool ("delete_selected_glyph", "Delete selected glyph or path");+		Tool delete_glyph = new Tool ("delete_selected_glyph", "Delete selected glyph"); 		delete_glyph.select_action.connect ((self) => { 					OverView o = MainWindow.get_overview (); 					@@ -368,7 +368,7 @@ class Toolbox : DrawingArea { 			}); 		view_tools.add_tool (zoom_bg); -		Tool zoom_prev = new Tool ("prev", "previous view", 'j', CTRL);+		Tool zoom_prev = new Tool ("prev", "Previous view", 'j', CTRL); 		zoom_prev.select_action.connect((self) => { 				zoom_tool.previous_view (); 			});