Add a stock question image to the choices dialog, other general dialog love.. Forgot to mention that in the last commit the default snapshot name has been modified for slightly better alphabetical sorting goodness (year is now first, weekday last).

git-svn-id: svn://localhost/trunk/ardour2@459 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 6 insertions, 6 deletions

diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index cbe0680d8c..ddb3bedbb4 100644
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -229,29 +229,29 @@ Editor::embed_sndfile (Glib::ustring path, bool split, bool multiple_files, bool
 	if (check_sample_rate  && (finfo.samplerate != (int) session->frame_rate())) {
 		vector<string> choices;
 		
-		choices.push_back (_("Embed it anyway"));
-		
 		if (multiple_files) {
+			choices.push_back (_("Cancel entire import"));
 			choices.push_back (_("Don't embed it"));
 			choices.push_back (_("Embed all without questions"));
-			choices.push_back (_("Cancel entire import"));
 		} else {
 			choices.push_back (_("Cancel"));
 		}
+
+		choices.push_back (_("Embed it anyway"));
 		
 		Gtkmm2ext::Choice rate_choice (
 			string_compose (_("%1\nThis audiofile's sample rate doesn't match the session sample rate!"), path),
 			choices, false);
 		
 		switch (rate_choice.run()) {
-		case 0: /* do it */
-			break;
+		case 0: /* stop a multi-file import */
 		case 1: /* don't import this one */
 			return -1;
 		case 2: /* do it, and the rest without asking */
 			check_sample_rate = false;
 			break;
-		case 3: /* stop a multi-file import */
+		case 3: /* do it */
+			break;
 		default:
 			return -2;
 		}