The Birdfont Source Code


All Repositories / birdfont.git / commitdiff – RSS feed

Merge ../birdfont-2.x

These changes was commited to the Birdfont repository Sat, 17 Dec 2016 10:57:26 +0000.

Contributing

Send patches or pull requests to johan.mattsson.m@gmail.com.
Clone this repository: git clone https://github.com/johanmattssonm/birdfont.git
[Sat, 17 Dec 2016 10:57:26 +0000]

Updated Files

dodo.py
libbirdfont/MenuTab.vala
libbirdfont/Preferences.vala
scripts/version.py
diff --git a/dodo.py b/dodo.py
--- a/dodo.py +++ b/dodo.py @@ -567,6 +567,7 @@ $(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", "") + """ \
--- a/libbirdfont/MenuTab.vala +++ b/libbirdfont/MenuTab.vala @@ -441,6 +441,8 @@ } else { MainWindow.show_dialog (new SaveDialog (dialog)); } + + MainWindow.native_window.update_window_size (); } public static void show_export_settings_tab () {
--- a/libbirdfont/Preferences.vala +++ b/libbirdfont/Preferences.vala @@ -77,6 +77,25 @@ 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);
--- a/scripts/version.py +++ b/scripts/version.py @@ -13,7 +13,7 @@ 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