Use .birdfont as default file extension instead of .bf

Changed files (6)

• modified libbirdfont/BirdFontFile.vala
• modified libbirdfont/Font.vala
• modified libbirdfont/FontSettings.vala
• modified libbirdfont/ImportUtils.vala
• modified libbirdfont/RecentFiles.vala
• modified libbirdfont/SaveCallback.vala

Diff

diff --git a/libbirdfont/BirdFontFile.vala b/libbirdfont/BirdFontFile.valaindex 8f7f32e..e50d1dd 100644--- a/libbirdfont/BirdFontFile.vala+++ b/libbirdfont/BirdFontFile.vala@@ -81,7 +81,7 @@ class BirdFontFile : GLib.Object { 		bool ok; 		XmlParser parser; 		-		font.font_file = "typeface.bf";+		font.font_file = "typeface.birdfont"; 		parser = new XmlParser (xml_data); 		ok = load_xml (parser); 		diff --git a/libbirdfont/Font.vala b/libbirdfont/Font.valaindex deb61a3..43c5af2 100644--- a/libbirdfont/Font.vala+++ b/libbirdfont/Font.vala@@ -342,14 +342,14 @@ public class Font : GLib.Object { 		 		StringBuilder sb = new StringBuilder (); 		sb.append (Environment.get_home_dir ());-		sb.append (@"/$(get_name ()).bf");+		sb.append (@"/$(get_name ()).birdfont"); 		 		f = File.new_for_path (sb.str);  		while (f.query_exists ()) { 			sb.erase (); 			sb.append (Environment.get_home_dir ());-			sb.append (@"/$(get_name ())$(++i).bf");+			sb.append (@"/$(get_name ())$(++i).birdfont"); 			f = File.new_for_path (sb.str); 		} 		@@ -730,7 +730,7 @@ public class Font : GLib.Object { 		File file; 		string backup_file; 		-		new_file = get_child (dir, @"$(name).bf");+		new_file = get_child (dir, @"$(name).birdfont"); 		backup_file = (!) ((!) new_file).get_path (); 		 		try {@@ -751,7 +751,7 @@ public class Font : GLib.Object { 		string backup_file; 		BirdFontFile birdfont_file = new BirdFontFile (this); -		temp_file = get_child (dir, @"$(name).bf");+		temp_file = get_child (dir, @"$(name).birdfont"); 		backup_file = (!) ((!) temp_file).get_path (); 		backup_file = backup_file.replace (" ", "_"); 		@@ -817,8 +817,8 @@ public class Font : GLib.Object { 			return;			 		} 				-		if (!path.has_suffix (".bf")) {-			warning ("Expecting .bf format.");+		if (!path.has_suffix (".bf") && !path.has_suffix (".birdfont")) {+			warning ("Expecting .bf or .birdfont format."); 			return; 		} 		@@ -886,7 +886,11 @@ public class Font : GLib.Object { 			format = FontFormat.FFI; 		} -		if (path.has_suffix (".bf") || path.has_suffix (".BF")) {+		if (path.has_suffix (".bf")+			|| path.has_suffix (".BF")+			|| path.has_suffix (".BIRDFONT")+			|| path.has_suffix (".birdfont")) {+			 			loaded = parse_bf_file (path); 			format = FontFormat.BIRDFONT; 		}diff --git a/libbirdfont/FontSettings.vala b/libbirdfont/FontSettings.valaindex 238dcfb..e4f3ccb 100644--- a/libbirdfont/FontSettings.vala+++ b/libbirdfont/FontSettings.vala@@ -42,7 +42,9 @@ public class FontSettings : GLib.Object { 	 	File get_settings_file () { 		File config_directory = BirdFont.get_settings_directory ();-		return get_child (config_directory, font_name.replace (".bf", ".config"));+		string settings_file = font_name.replace (".bf", ".config");+		settings_file = settings_file.replace (".birdfont", ".config");+		return get_child (config_directory, settings_file); 	} 	 	public void save (string font_file_name) {diff --git a/libbirdfont/ImportUtils.vala b/libbirdfont/ImportUtils.valaindex 3b47709..cf85337 100644--- a/libbirdfont/ImportUtils.vala+++ b/libbirdfont/ImportUtils.vala@@ -67,7 +67,7 @@ public static int run_import (string[] arg) { 		if (!font.load ()) { 			warning (@"Failed to load font $bf_file.\n"); 			-			if (!bf_file.has_suffix (".bf")) {+			if (!bf_file.has_suffix (".bf") && !bf_file.has_suffix (".birdfont")) { 				warning (@"Is it a .bf file?\n"); 			} 			diff --git a/libbirdfont/RecentFiles.vala b/libbirdfont/RecentFiles.valaindex 0377d27..b6e051c 100644--- a/libbirdfont/RecentFiles.vala+++ b/libbirdfont/RecentFiles.vala@@ -164,11 +164,6 @@ public class RecentFiles : Table { 					continue; 				} 				-				// ignore backup of the current font-				if (file_name == @"$(font.get_name ()).bf") {-					continue;-				}-				 				backup_font = new Font (); 				backup_font.set_font_file ((!) get_child (dir, file_name).get_path ()); 				backups.insert (0, backup_font);diff --git a/libbirdfont/SaveCallback.vala b/libbirdfont/SaveCallback.valaindex 23d0db2..659cdda 100644--- a/libbirdfont/SaveCallback.vala+++ b/libbirdfont/SaveCallback.vala@@ -49,8 +49,8 @@ public class SaveCallback : GLib.Object { 				font_file_path = f; 				save (); #else-				if (!f.has_suffix (".bf")) {-					f = @"$f.bf";+				if (!f.has_suffix (".bf") && !f.has_suffix (".birdfont")) {+					f = @"$f.birdfont"; 				} 				 				file_name = @"$(f)";@@ -95,7 +95,9 @@ public class SaveCallback : GLib.Object { 			f.delete_backup (); 			fn = f.get_path (); 			-			if (f.font_file != null && fn.has_suffix (".bf")) {+			if (f.font_file != null+				&& (fn.has_suffix (".bf") || fn.has_suffix (".birdfont"))) {+				 				f.set_font_file (fn); 				MainWindow.native_window.save (); 			} else {