Merge branch '1.x' of gitorious.org:birdfont/birdfont

Changed files (3)

• modified birdfont/Main.vala
• modified libbirdfont/BirdFont.vala
• modified libbirdfont/BirdFontFile.vala

Diff

diff --git a/birdfont/Main.vala b/birdfont/Main.valaindex 665bebf..8c0c3de 100644--- a/birdfont/Main.vala+++ b/birdfont/Main.vala@@ -35,10 +35,7 @@ public static int main (string[] arg) { 	window.set_native (native_window); 	native_window.init (); -	file = BirdFont.BirdFont.args.get_file ();-	if (file != "") {-		FileTab.load_font (file);-	}+	birdfont.load_file_from_command_line ();  	load_ucd (); 	Gtk.main ();diff --git a/libbirdfont/BirdFont.vala b/libbirdfont/BirdFont.valaindex 36f7974..70a9013 100644--- a/libbirdfont/BirdFont.vala+++ b/libbirdfont/BirdFont.vala@@ -499,6 +499,13 @@ public class BirdFont { #endif 	} 	+	public static void load_font_from_command_line () {+		string file = args.get_file ();+		if (file != "") {+			FileTab.load_font (file);+		}	+	}+	 	public static Font get_current_font () { 		return current_font; 	}diff --git a/libbirdfont/BirdFontFile.vala b/libbirdfont/BirdFontFile.valaindex 3bc0478..0be3d7b 100644--- a/libbirdfont/BirdFontFile.vala+++ b/libbirdfont/BirdFontFile.vala@@ -293,6 +293,7 @@ class BirdFontFile : GLib.Object { 		os.put_string (@"<version>$(Markup.escape_text (font.version))</version>\n"); 		os.put_string (@"<description>$(Markup.escape_text (font.description))</description>\n"); 		os.put_string (@"<copyright>$(Markup.escape_text (font.copyright))</copyright>\n");+		os.put_string (@"<weight>$(font.weight)</weight>\n"); 	}  	public void write_lines (DataOutputStream os) throws GLib.Error {@@ -665,7 +666,11 @@ class BirdFontFile : GLib.Object { 			if (t.get_name () == "ligature") { 				parse_ligature (t); 			}-												++			if (t.get_name () == "weight") {+				font.weight = int.parse (t.get_content ());+			}+							 			TooltipArea.show_text (t_("Loading XML data.")); 		}