Merge ../birdfont-2.x

Changed files (4)

• modified dodo.py
• modified libbirdfont/MenuTab.vala
• modified libbirdfont/Preferences.vala
• modified scripts/version.py

Diff

diff --git a/dodo.py b/dodo.pyindex 94d9c23..4d28499 100644--- a/dodo.py+++ b/dodo.py@@ -567,6 +567,7 @@ def make_birdfont_test(target_binary, deps): 		$(pkg-config --cflags gio-2.0) \ 		$(pkg-config --cflags cairo) \ 		$(pkg-config --cflags glib-2.0) \+		$(pkg-config --cflags xmlbird) \         -o OBJECT_FILE"""              linker_command = config.CC + " " + config.LDFLAGS.get("birdfont-test", "") + """ \diff --git a/libbirdfont/MenuTab.vala b/libbirdfont/MenuTab.valaindex 56cd1ef..951827f 100644--- a/libbirdfont/MenuTab.vala+++ b/libbirdfont/MenuTab.vala@@ -441,6 +441,8 @@ public class MenuTab : FontDisplay { 		} else { 			MainWindow.show_dialog (new SaveDialog (dialog)); 		}+		+		MainWindow.native_window.update_window_size (); 	}  	 	public static void show_export_settings_tab () {diff --git a/libbirdfont/Preferences.vala b/libbirdfont/Preferences.valaindex fb512f4..d4d5f37 100644--- a/libbirdfont/Preferences.vala+++ b/libbirdfont/Preferences.vala@@ -77,6 +77,25 @@ public class Preferences { 		set ("recent_files", @"$(recent.str)"); 	} +	public static void set_window_size (int x, int y, int width, int height) {+		set ("window_x", @"$x");+		set ("window_y", @"$y");+		set ("window_width", @"$width");+		set ("window_height", @"$height");+	}++	public static int get_window_x () {+		string wp = get ("window_x");+		int x = int.parse (wp);+		return x;+	}++	public static int get_window_y () {+		string wp = get ("window_y");+		int y = int.parse (wp);+		return y;+	}+	 	public static int get_window_width() { 		string wp = get ("window_width"); 		int w = int.parse (wp);diff --git a/scripts/version.py b/scripts/version.pyindex 192c685..cceff78 100644--- a/scripts/version.py+++ b/scripts/version.py@@ -13,7 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. """ -VERSION = '2.17.1'+VERSION = '2.18.3' SO_VERSION_MAJOR = '36' SO_VERSION_MINOR = '0' SO_VERSION = SO_VERSION_MAJOR + '.' + SO_VERSION_MINOR