smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 14:54:56 +01:00
Code Issues Projects Releases Wiki Activity

Added tooltips to help explain various soundfilebrowser buttons.

Browse source 
Fixed auditioning for SoundFileChooser and SoundFileOmega.


git-svn-id: svn://localhost/trunk/ardour2@453 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Taybin Rutkin 2006-04-12 03:09:25 +00:00
parent bcf432184d
commit dca6c6d91f
4 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gtk2_ardour/editor_audio_import.cc
View file

@ -75,6 +75,7 @@ Editor::bring_in_external_audio (ImportMode mode, AudioTrack* track, jack_nframe
} }
SoundFileOmega sfdb (_("Add existing audio to session")); SoundFileOmega sfdb (_("Add existing audio to session"));
sfdb.set_session (session);
sfdb.set_mode (mode); sfdb.set_mode (mode);
switch (sfdb.run()) { switch (sfdb.run()) {

2
gtk2_ardour/option_editor.cc
View file

@ -667,6 +667,7 @@ void
OptionEditor::click_browse_clicked () OptionEditor::click_browse_clicked ()
{ {
SoundFileChooser sfdb (_("Choose Click")); SoundFileChooser sfdb (_("Choose Click"));
sfdb.set_session (session);
int result = sfdb.run (); int result = sfdb.run ();
@ -686,6 +687,7 @@ void
OptionEditor::click_emphasis_browse_clicked () OptionEditor::click_emphasis_browse_clicked ()
{ {
SoundFileChooser sfdb (_("Choose Click Emphasis")); SoundFileChooser sfdb (_("Choose Click Emphasis"));
sfdb.set_session (session);
int result = sfdb.run (); int result = sfdb.run ();

16
gtk2_ardour/sfdb_ui.cc
View file

@ -33,6 +33,7 @@
#include <ardour/audioregion.h> #include <ardour/audioregion.h>
#include <ardour/externalsource.h> #include <ardour/externalsource.h>
#include "ardour_ui.h"
#include "gui_thread.h" #include "gui_thread.h"
#include "prompter.h" #include "prompter.h"
#include "sfdb_ui.h" #include "sfdb_ui.h"
@ -110,7 +111,7 @@ SoundFileBox::set_session(Session* s)
{ {
_session = s; _session = s;
if (!_session) { if (!_session) {
play_btn.set_sensitive(false); play_btn.set_sensitive(false);
} else { } else {
_session->AuditionActive.connect(mem_fun (*this, &SoundFileBox::audition_status_changed)); _session->AuditionActive.connect(mem_fun (*this, &SoundFileBox::audition_status_changed));
@ -334,8 +335,17 @@ SoundFileOmega::SoundFileOmega (string title)
mode_strings = internationalize (import_mode_strings); mode_strings = internationalize (import_mode_strings);
} }
add_button (_("Embed"), ResponseEmbed); ARDOUR_UI::instance()->tooltips().set_tip(split_check,
add_button (_("Import"), ResponseImport); _("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); add_button (Gtk::Stock::CLOSE, Gtk::RESPONSE_CLOSE);
Gtk::HBox *box = manage (new Gtk::HBox()); Gtk::HBox *box = manage (new Gtk::HBox());

2
gtk2_ardour/sfdb_ui.h
View file

@ -51,7 +51,7 @@ class SoundFileBox : public Gtk::VBox
SoundFileBox (); SoundFileBox ();
virtual ~SoundFileBox () {}; virtual ~SoundFileBox () {};
void set_session (ARDOUR::Session* s); void set_session (ARDOUR::Session* s);
bool setup_labels (std::string filename); bool setup_labels (std::string filename);
protected: protected: