The Birdfont Source Code


All Repositories / birdfont.git / commitdiff – RSS feed

Update resources path on Mac and fix image conversion

These changes was commited to the Birdfont repository Sun, 25 Oct 2015 18:20:33 +0000.

Contributing

Send patches or pull requests to johan.mattsson.m@gmail.com.
Clone this repository: git clone https://github.com/johanmattssonm/birdfont.git
[Sun, 25 Oct 2015 18:20:33 +0000]

Updated Files

libbirdfont/BackgroundImage.vala
libbirdfont/SearchPaths.vala
--- a/libbirdfont/BackgroundImage.vala +++ b/libbirdfont/BackgroundImage.vala @@ -327,6 +327,8 @@ return; } + folder.make_directory (); + converted = MainWindow.native_window.convert_to_png (path.dup (), ((!) png_image.get_path ()).dup ()); if (!converted) {
--- a/libbirdfont/SearchPaths.vala +++ b/libbirdfont/SearchPaths.vala @@ -61,15 +61,12 @@ f = get_file (BirdFont.exec_path + "\\", name + "\\"); if (likely (f.query_exists ())) return f; - f = get_file (bundle_path + "/Contents/Resources/", d + "/" + name); + f = get_file (bundle_path + "/Contents/Resources/birdfont_resources/", d + "/" + name); if (likely (f.query_exists ())) return f; - f = get_file (bundle_path + "/Contents/Resources/", name + "/"); + f = get_file (bundle_path + "/Contents/Resources/birdfont_resources/", name + "/"); if (likely (f.query_exists ())) return f; - - f = get_file (bundle_path + "/Contents/MacOS/", name); - if (likely (f.query_exists ())) return f; - + f = get_file ("./" + d + "/", name); if (likely (f.query_exists ())) return f; @@ -113,9 +110,9 @@ } if (!is_null (BirdFont.exec_path)) { - f = BirdFont.exec_path + "/Contents/Resources/locale/sv/LC_MESSAGES/birdfont.mo"; + f = BirdFont.exec_path + "/Contents/Resources/birdfont_resources/locale/sv/LC_MESSAGES/birdfont.mo"; if (exists (f)) { - return BirdFont.exec_path + "/Contents/Resources/locale"; + return BirdFont.exec_path + "/Contents/birdfont_resources/Resources/locale"; } f = BirdFont.exec_path + "\\locale\\sv\\LC_MESSAGES\\birdfont.mo"; @@ -144,14 +141,14 @@ return "/usr/share/locale"; } - f = BirdFont.exec_path + "/Contents/Resources/locale"; + f = BirdFont.exec_path + "/Contents/Resources/birdfont_resources/locale"; if (exists (f)) { - return BirdFont.exec_path + "/Contents/Resources/locale"; + return BirdFont.exec_path + "/Contents/Resources/birdfont_resources/locale"; } - f = bundle_path + "/Contents/Resources/locale"; + f = bundle_path + "/Contents/Resources/birdfont_resources/locale"; if (exists (f)) { - return bundle_path + "/Contents/Resources/locale"; + return bundle_path + "/Contents/Resources/birdfont_resources/locale"; } warning ("translations not found");