make import dialog non-modal

git-svn-id: svn://localhost/ardour2/branches/3.0@13717 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 15 insertions, 3 deletions

diff --git a/gtk2_ardour/sfdb_ui.h b/gtk2_ardour/sfdb_ui.h
index 7e50834d58..d0e63568cd 100644
--- a/gtk2_ardour/sfdb_ui.h
+++ b/gtk2_ardour/sfdb_ui.h
@@ -46,7 +46,7 @@
 #include "ardour/audiofilesource.h"
 #include "ardour/session_handle.h"
 
-#include "ardour_dialog.h"
+#include "ardour_window.h"
 #include "editing.h"
 #include "audio_clock.h"
 
@@ -110,7 +110,7 @@ class SoundFileBox : public Gtk::VBox, public ARDOUR::SessionHandlePtr
 	void stop_audition ();
 };
 
-class SoundFileBrowser : public ArdourDialog
+class SoundFileBrowser : public ArdourWindow
 {
   private:
 	class FoundTagColumns : public Gtk::TreeModel::ColumnRecord
@@ -155,6 +155,9 @@ class SoundFileBrowser : public ArdourDialog
 	SoundFileBrowser (Gtk::Window& parent, std::string title, ARDOUR::Session* _s, bool persistent);
 	virtual ~SoundFileBrowser ();
 
+        int run ();
+        int status () const { return _status; }
+        
 	virtual void set_session (ARDOUR::Session*);
 	std::vector<std::string> get_paths ();
 
@@ -188,6 +191,8 @@ class SoundFileBrowser : public ArdourDialog
   protected:
 	bool resetting_ourselves;
 	int matches;
+        int _status;
+        bool _done;
 
 	Gtk::FileFilter audio_and_midi_filter;
 	Gtk::FileFilter audio_filter;
@@ -195,6 +200,11 @@ class SoundFileBrowser : public ArdourDialog
 	Gtk::FileFilter custom_filter;
 	Gtk::FileFilter matchall_filter;
 	Gtk::HBox hpacker;
+        Gtk::VBox vpacker;
+
+        Gtk::Button ok_button;
+        Gtk::Button cancel_button;
+        Gtk::Button apply_button;
 
 	static std::string persistent_folder;
 
@@ -230,7 +240,7 @@ class SoundFileBrowser : public ArdourDialog
 
   protected:
 	void on_show();
-
+        virtual void do_something (int action);
 };
 
 class SoundFileChooser : public SoundFileBrowser
@@ -293,6 +303,8 @@ class SoundFileOmega : public SoundFileBrowser
 	bool reset_options ();
 	void reset_options_noret ();
 	bool bad_file_message ();
+
+        void do_something (int action);
 };
 
 #endif // __ardour_sfdb_ui_h__