projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small cleanup
[ardour.git]
/
gtk2_ardour
/
option_editor.cc
diff --git
a/gtk2_ardour/option_editor.cc
b/gtk2_ardour/option_editor.cc
index 7ff5bc5adb41a436bfdf6924a14b45ba978eb2b6..54424b5ca3619a96677c2dbdc7bdadc4797f8e53 100644
(file)
--- a/
gtk2_ardour/option_editor.cc
+++ b/
gtk2_ardour/option_editor.cc
@@
-22,12
+22,14
@@
#include <gtkmm/alignment.h>
#include "gtkmm2ext/utils.h"
#include <gtkmm/alignment.h>
#include "gtkmm2ext/utils.h"
-#include "pbd/configuration.h"
-
-#include "ardour/rc_configuration.h"
-#include "ardour/utils.h"
#include "ardour/dB.h"
#include "ardour/dB.h"
+#include "ardour/rc_configuration.h"
#include "ardour/session.h"
#include "ardour/session.h"
+#include "ardour/types.h"
+#include "ardour/utils.h"
+
+#include "pbd/configuration.h"
+#include "pbd/replace_all.h"
#include "public_editor.h"
#include "option_editor.h"
#include "public_editor.h"
#include "option_editor.h"
@@
-482,15
+484,14
@@
DirectoryOption::DirectoryOption (string const & i, string const & n, sigc::slot
, _set (s)
{
_file_chooser.set_action (Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
, _set (s)
{
_file_chooser.set_action (Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
- _file_chooser.signal_file_set().connect (sigc::mem_fun (*this, &DirectoryOption::file_set));
- _file_chooser.signal_current_folder_changed().connect (sigc::mem_fun (*this, &DirectoryOption::current_folder_set));
+ _file_chooser.signal_selection_changed().connect (sigc::mem_fun (*this, &DirectoryOption::selection_changed));
}
void
DirectoryOption::set_state_from_config ()
{
}
void
DirectoryOption::set_state_from_config ()
{
- _file_chooser.set_current_folder (
_get (
));
+ _file_chooser.set_current_folder (
poor_mans_glob(_get ()
));
}
void
}
void
@@
-503,13
+504,7
@@
DirectoryOption::add_to_page (OptionEditorPage* p)
}
void
}
void
-DirectoryOption::file_set ()
-{
- _set (_file_chooser.get_filename ());
-}
-
-void
-DirectoryOption::current_folder_set ()
+DirectoryOption::selection_changed ()
{
{
- _set (
_file_chooser.get_current_folder (
));
+ _set (
poor_mans_glob(_file_chooser.get_filename ()
));
}
}