Clone in a terminal:
Commit bb3aab6
Johan Mattsson - 2015-11-03T20:00:36+00:00
bb3aab6a43542acf9f0e4fe80b2b9c3c0ac7444fjohan.mattsson.m@gmail.com

Fix overwrite dialog

Changed files (3)

Diff

diff --git a/libbirdfont/OverwriteBfFile.vala b/libbirdfont/OverwriteBfFile.valaindex 7f83f67..b150b33 100644--- a/libbirdfont/OverwriteBfFile.vala+++ b/libbirdfont/OverwriteBfFile.vala@@ -26,14 +26,17 @@ public class OverwriteBfFile : QuestionDialog { 		 		replace = new Button (t_("Replace")); 		replace.action.connect (() => {-			save_callback.save (); 			MainWindow.hide_dialog ();+			save_callback.save (); 		});+		add_button (replace);  		cancel = new Button (t_("Cancel")); 		cancel.action.connect (() => {+			save_callback.is_done = true; 			MainWindow.hide_dialog (); 		});+		add_button (cancel); 	} } diff --git a/libbirdfont/QuestionDialog.vala b/libbirdfont/QuestionDialog.valaindex 8896fb2..fee202f 100644--- a/libbirdfont/QuestionDialog.vala+++ b/libbirdfont/QuestionDialog.vala@@ -35,6 +35,8 @@ public class QuestionDialog : Dialog { 		question.set_text (message); 		 		this.height = height;+		+		buttons = new Gee.ArrayList<Button> (); 	}  	public void add_button (Button button) {diff --git a/libbirdfont/SaveCallback.vala b/libbirdfont/SaveCallback.valaindex 4452606..16cd6db 100644--- a/libbirdfont/SaveCallback.vala+++ b/libbirdfont/SaveCallback.vala@@ -45,8 +45,8 @@ public class SaveCallback : GLib.Object { #if MAC 				save (); #else-				if (f.has_suffix (".bf")) {-					f = f.replace (".bf", "");+				if (!f.has_suffix (".bf")) {+					f = @"$f.bf"; 				} 				 				file_name = @"$(f)";

Contact

Email: johan.mattsson.m@gmail.com
Mastodon: typo.social/@birdfont
GitHub: johanmattssonm
LinkedIn: johan-mattsson-2ab324112