diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-03-22 17:03:00 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-03-22 17:03:00 +0000 |
| commit | 3aa346b253d515c3d0715ec5e0fa8b6ad477c4e5 (patch) | |
| tree | a41d4380ad270324a2d05cbbab0d1e57dce2bdfe /gtk2_ardour/sfdb_ui.h | |
| parent | 004a49b0c7051a4d0f8972b0aff0ef8fa9cab03d (diff) | |
significant changes in code to handle import/embedding - much cleaner and less code, plus the import progress bar now works; unify response handling for Gtkmm2ext::Choice
git-svn-id: svn://localhost/trunk/ardour2@415 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/sfdb_ui.h')
| -rw-r--r-- | gtk2_ardour/sfdb_ui.h | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/gtk2_ardour/sfdb_ui.h b/gtk2_ardour/sfdb_ui.h index 10a5e9e0fc..9d730bc3cd 100644 --- a/gtk2_ardour/sfdb_ui.h +++ b/gtk2_ardour/sfdb_ui.h @@ -33,6 +33,7 @@ #include <gtkmm/dialog.h> #include <gtkmm/entry.h> #include <gtkmm/filechooserwidget.h> +#include <gtkmm/comboboxtext.h> #include <gtkmm/frame.h> #include <gtkmm/label.h> #include <gtkmm/liststore.h> @@ -42,6 +43,7 @@ #include <ardour/externalsource.h> #include "ardour_dialog.h" +#include "editing.h" class SoundFileBox : public Gtk::VBox { @@ -110,7 +112,8 @@ class SoundFileBrowser : public ArdourDialog SoundFileBrowser (std::string title); virtual ~SoundFileBrowser () {}; - virtual void set_session (ARDOUR::Session*); + virtual void set_session (ARDOUR::Session*); + protected: Gtk::FileChooserWidget chooser; SoundFileBox preview; @@ -133,16 +136,27 @@ class SoundFileOmega : public SoundFileBrowser SoundFileOmega (std::string title); virtual ~SoundFileOmega () {}; - sigc::signal<void, std::vector<std::string>, bool> Embedded; - sigc::signal<void, std::vector<std::string>, bool> Imported; + /* these are returned by the Dialog::run() method. note + that builtin GTK responses are all negative, leaving + positive values for application-defined responses. + */ + + const static int ResponseImport = 1; + const static int ResponseEmbed = 2; + + std::vector<Glib::ustring> get_paths (); + bool get_split (); + + void set_mode (Editing::ImportMode); + Editing::ImportMode get_mode (); protected: - Gtk::Button embed_btn; - Gtk::Button import_btn; - Gtk::CheckButton split_check; + Gtk::CheckButton split_check; + Gtk::ComboBoxText mode_combo; + + void mode_changed (); - void embed_clicked (); - void import_clicked (); + static std::vector<std::string> mode_strings; }; #endif // __ardour_sfdb_ui_h__ |