Added tooltips to help explain various soundfilebrowser buttons.

Fixed auditioning for SoundFileChooser and SoundFileOmega.


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

4 files changed, 17 insertions, 4 deletions

diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index a914b70997..cbe0680d8c 100644
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -75,6 +75,7 @@ Editor::bring_in_external_audio (ImportMode mode, AudioTrack* track, jack_nframe
 	}
 
 	SoundFileOmega sfdb (_("Add existing audio to session"));
+	sfdb.set_session (session);
 	sfdb.set_mode (mode);
 
 	switch (sfdb.run()) {
diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index 130bf37083..9bd22ca590 100644
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -667,6 +667,7 @@ void
 OptionEditor::click_browse_clicked ()
 {
 	SoundFileChooser sfdb (_("Choose Click"));
+	sfdb.set_session (session);
 	
 	int result = sfdb.run ();
 
@@ -686,6 +687,7 @@ void
 OptionEditor::click_emphasis_browse_clicked ()
 {
 	SoundFileChooser sfdb (_("Choose Click Emphasis"));
+	sfdb.set_session (session);
 
 	int result = sfdb.run ();
 
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index 69c8200dd5..4e6d6fb875 100644
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -33,6 +33,7 @@
 #include <ardour/audioregion.h>
 #include <ardour/externalsource.h>
 
+#include "ardour_ui.h"
 #include "gui_thread.h"
 #include "prompter.h"
 #include "sfdb_ui.h"
@@ -110,7 +111,7 @@ SoundFileBox::set_session(Session* s)
 {
 	_session = s;
 
-    if (!_session) {
+	if (!_session) {
 		play_btn.set_sensitive(false);
 	} else {
 		_session->AuditionActive.connect(mem_fun (*this, &SoundFileBox::audition_status_changed));
@@ -334,8 +335,17 @@ SoundFileOmega::SoundFileOmega (string title)
 		mode_strings = internationalize (import_mode_strings);
 	}
 
-	add_button (_("Embed"), ResponseEmbed);
-	add_button (_("Import"), ResponseImport);
+	ARDOUR_UI::instance()->tooltips().set_tip(split_check, 
+			_("Create a region for each channel"));
+
+	Gtk::Button* btn = add_button (_("Embed"), ResponseEmbed);
+	ARDOUR_UI::instance()->tooltips().set_tip(*btn, 
+			_("Link to an external file"));
+
+	btn = add_button (_("Import"), ResponseImport);
+	ARDOUR_UI::instance()->tooltips().set_tip(*btn, 
+			_("Copy a file to the session folder"));
+
 	add_button (Gtk::Stock::CLOSE, Gtk::RESPONSE_CLOSE);
 
 	Gtk::HBox *box = manage (new Gtk::HBox());
diff --git a/gtk2_ardour/sfdb_ui.h b/gtk2_ardour/sfdb_ui.h
index 9d730bc3cd..79537b2adb 100644
--- a/gtk2_ardour/sfdb_ui.h
+++ b/gtk2_ardour/sfdb_ui.h
@@ -51,7 +51,7 @@ class SoundFileBox : public Gtk::VBox
     SoundFileBox ();
     virtual ~SoundFileBox () {};
 
-	void set_session (ARDOUR::Session* s);
+    void set_session (ARDOUR::Session* s);
     bool setup_labels (std::string filename);
 
   protected: