Minor updates for PathList and OptionEditor.

git-svn-id: svn://localhost/ardour2/trunk@694 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Taybin Rutkin 2006-07-26 22:18:55 +00:00
parent f8f8497330
commit 690e04ed42
4 changed files with 15 additions and 5 deletions

View file

@ -20,6 +20,7 @@
#include <pbd/whitespace.h> #include <pbd/whitespace.h>
#include <ardour/audio_library.h>
#include <ardour/session.h> #include <ardour/session.h>
#include <ardour/audioengine.h> #include <ardour/audioengine.h>
#include <ardour/configuration.h> #include <ardour/configuration.h>
@ -161,7 +162,6 @@ OptionEditor::set_session (Session *s)
return; return;
} }
click_path_entry.set_sensitive (true); click_path_entry.set_sensitive (true);
click_emphasis_path_entry.set_sensitive (true); click_emphasis_path_entry.set_sensitive (true);
session_raid_entry.set_sensitive (true); session_raid_entry.set_sensitive (true);
@ -249,9 +249,18 @@ OptionEditor::setup_path_options()
path_table.attach(*label, 0, 1, 2, 3, FILL|EXPAND, FILL); path_table.attach(*label, 0, 1, 2, 3, FILL|EXPAND, FILL);
path_table.attach(sfdb_path_view, 1, 3, 2, 3, Gtk::FILL|Gtk::EXPAND, FILL); path_table.attach(sfdb_path_view, 1, 3, 2, 3, Gtk::FILL|Gtk::EXPAND, FILL);
sfdb_path_view.set_paths(Library->get_paths());
sfdb_path_view.PathsUpdated.connect (mem_fun(*this, &OptionEditor::sfdb_paths_changed));
path_table.show_all(); path_table.show_all();
} }
void
OptionEditor::sfdb_paths_changed ()
{
Library->set_paths (sfdb_path_view.get_paths());
}
void void
OptionEditor::add_session_paths () OptionEditor::add_session_paths ()
{ {

View file

@ -81,6 +81,7 @@ class OptionEditor : public Gtk::Dialog
void add_session_paths (); void add_session_paths ();
void remove_session_paths (); void remove_session_paths ();
void raid_path_changed (); void raid_path_changed ();
void sfdb_paths_changed ();
/* fades */ /* fades */

View file

@ -36,7 +36,7 @@ class PathList : public Gtk::VBox
std::vector<std::string> get_paths (); std::vector<std::string> get_paths ();
void set_paths (std::vector<std::string> paths); void set_paths (std::vector<std::string> paths);
sigc::signal<void> paths_updated; sigc::signal<void> PathsUpdated;
protected: protected:
Gtk::Button add_btn; Gtk::Button add_btn;

View file

@ -72,7 +72,7 @@ PathList::get_paths ()
void void
PathList::set_paths (vector<string> paths) PathList::set_paths (vector<string> paths)
{ {
_store.clear(); _store->clear();
for (vector<string>::iterator i = paths.begin(); i != paths.end(); ++i) { for (vector<string>::iterator i = paths.begin(); i != paths.end(); ++i) {
Gtk::ListStore::iterator iter = _store->append(); Gtk::ListStore::iterator iter = _store->append();
@ -99,7 +99,7 @@ PathList::add_btn_clicked ()
Gtk::ListStore::Row row = *iter; Gtk::ListStore::Row row = *iter;
row[path_columns.paths] = pathname; row[path_columns.paths] = pathname;
paths_updated (); // EMIT_SIGNAL PathsUpdated (); // EMIT_SIGNAL
} }
} }
} }
@ -110,7 +110,7 @@ PathList::subtract_btn_clicked ()
Gtk::ListStore::iterator iter = _view.get_selection()->get_selected(); Gtk::ListStore::iterator iter = _view.get_selection()->get_selected();
_store->erase (iter); _store->erase (iter);
paths_updated (); // EMIT_SIGNAL PathsUpdated (); // EMIT_SIGNAL
} }
void void