character set selection

Changed files (2)

• modified libbirdfont/DefaultCharactersSet.vala
• modified libbirdfont/LanguageSelectionTab.vala

Diff

diff --git a/libbirdfont/DefaultCharactersSet.vala b/libbirdfont/DefaultCharactersSet.valaindex 30536d2..1a3fa71 100644--- a/libbirdfont/DefaultCharactersSet.vala+++ b/libbirdfont/DefaultCharactersSet.vala@@ -86,8 +86,6 @@ public class DefaultCharacterSet { 		foreach (unowned string code in DefaultLanguages.codes) { 			if (lang.has_prefix (code)) { 				characters = DefaultLanguages.characters.nth (i).data;-				// Compiler bug, this line causes trouble:-				// return default_characters.nth (i).data; 			} 			i++; 		}@@ -266,6 +264,10 @@ public class DefaultCharacterSet { 			gr.add_range ('\0', (unichar) 0xFFF8); 		} 	}+	+	public static DefaultLanguages get_default_languages () {+		return languages;+	} }  public class DefaultLanguages {@@ -278,6 +280,22 @@ public class DefaultLanguages { 		codes = new List<string> (); 		characters = new List<string> ();		 	}++	public string? get_name (int index) {+		if (0 <= index < names.length ()) {+			return names.nth (index).data;+		}+		+		return null;+	}++	public string? get_code (int index) {+		if (0 <= index < codes.length ()) {+			return codes.nth (index).data;+		}+		+		return null;+	} }  }diff --git a/libbirdfont/LanguageSelectionTab.vala b/libbirdfont/LanguageSelectionTab.valaindex 4e61558..9d3ef4a 100644--- a/libbirdfont/LanguageSelectionTab.vala+++ b/libbirdfont/LanguageSelectionTab.vala@@ -18,15 +18,18 @@ public class LanguageSelectionTab : FontDisplay { 	 	public LanguageSelectionTab () {	 		add_html_callback ("select_language", (val) => {-			TabBar tb = MainWindow.get_tab_bar ();-			print (val);-			Preferences.set ("language", val);-			print (Preferences.get ("language"));-			tb.close_display (this);-			Toolbox.select_tool_by_name ("custom_character_set");+			set_prefered_character_set (val); 		}); 	} +	/** @param iso_code language iso code. */+	public static void set_prefered_character_set (string iso_code) {+		TabBar tb = MainWindow.get_tab_bar ();+		Preferences.set ("language", val);+		tb.close_display (this);+		Toolbox.select_tool_by_name ("custom_character_set");		+	}+ 	public override string get_name () { 		return _("Character set"); 	}