Move key binding string to tool item

Changed files (2)

• modified libbirdfont/Tool.vala
• modified libbirdfont/ToolItem.vala

Diff

diff --git a/libbirdfont/Tool.vala b/libbirdfont/Tool.valaindex 4431c68..72aae75 100644--- a/libbirdfont/Tool.vala+++ b/libbirdfont/Tool.vala@@ -217,43 +217,16 @@ public class Tool : Widget { 	} 	 	public string get_key_binding () {-		StringBuilder sb = new StringBuilder (); 		ToolItem? ti = MainWindow.get_menu ().get_item_for_tool (this); 		ToolItem t; 		 		if (ti == null) {+			warning ("No key binding for tool."); 			return ""; 		} 		 		t = (!) ti;--		if (t.key == '\0') {-			return "";-		}-			-		if ((t.modifiers & CTRL) > 0) {-			sb.append ("Ctrl");-			sb.append ("+");-		}--		if ((t.modifiers & SHIFT) > 0) {-			sb.append (t_("Shift"));-			sb.append ("+");-		}--		if ((t.modifiers & ALT) > 0) {-			sb.append ("Alt");-			sb.append ("+");-		}--		if ((t.modifiers & LOGO) > 0) {-			sb.append ("Super");-			sb.append ("+");-		}-	-		sb.append_unichar (t.key);-			-		return sb.str;+		return t.get_key_binding (); 	} 	 	public void set_icon (string name) {diff --git a/libbirdfont/ToolItem.vala b/libbirdfont/ToolItem.valaindex 0d1b4b1..f3e168a 100644--- a/libbirdfont/ToolItem.vala+++ b/libbirdfont/ToolItem.vala@@ -27,6 +27,38 @@ public class ToolItem : MenuItem { 			tool.select_action (tool); 		}); 	}+	+	public string get_key_binding () {+		StringBuilder sb = new StringBuilder ();+		+		if (key == '\0') {+			return "".dup ();+		}+			+		if ((modifiers & CTRL) > 0) {+			sb.append ("Ctrl");+			sb.append ("+");+		}++		if ((modifiers & SHIFT) > 0) {+			sb.append (t_("Shift"));+			sb.append ("+");+		}++		if ((modifiers & ALT) > 0) {+			sb.append ("Alt");+			sb.append ("+");+		}++		if ((modifiers & LOGO) > 0) {+			sb.append ("Super");+			sb.append ("+");+		}+	+		sb.append_unichar (key);+		+		return sb.str;+	} }  }