add new clear-gray color theme

[ardour.git] / gtk2_ardour / session_import_dialog.h

diff --git a/gtk2_ardour/session_import_dialog.h b/gtk2_ardour/session_import_dialog.h
index cf1f5b0a4ec246ce5c9156293e8f75f80f645534..b31751115f4ede5d4641a45248209a14739517fc 100644 (file)
--- a/gtk2_ardour/session_import_dialog.h
+++ b/gtk2_ardour/session_import_dialog.h
@@ -29,14 +29,11 @@
 #include <gtkmm.h>
 
 #include "pbd/xml++.h"
-#include "ardour/element_importer.h"
-#include "ardour/element_import_handler.h"
 
 #include "ardour_dialog.h"
-
-using std::string;
-
 namespace ARDOUR {
+       class ElementImportHandler;
+       class ElementImporter;
        class Session;
 }
 
@@ -45,39 +42,38 @@ class SessionImportDialog : public ArdourDialog
   private:
        typedef boost::shared_ptr<ARDOUR::ElementImportHandler> HandlerPtr;
        typedef std::list<HandlerPtr> HandlerList;
-       
+
        typedef boost::shared_ptr<ARDOUR::ElementImporter> ElementPtr;
        typedef std::list<ElementPtr> ElementList;
 
   public:
-       SessionImportDialog (ARDOUR::Session & target);
-       
+       SessionImportDialog (ARDOUR::Session* target);
+
        virtual Gtk::FileChooserAction browse_action() const { return Gtk::FILE_CHOOSER_ACTION_OPEN; }
-       
+
   private:
 
-       void load_session (const string& filename);
+       void load_session (const std::string& filename);
        void fill_list ();
        void browse ();
        void do_merge ();
        void end_dialog ();
-       void update (string path);
+       void update (std::string path);
        void show_info(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* column);
-       
-       std::pair<bool, string> open_rename_dialog (string text, string name);
-       bool open_prompt_dialog (string text);
+
+       std::pair<bool, std::string> open_rename_dialog (std::string text, std::string name);
+       bool open_prompt_dialog (std::string text);
 
        // Data
        HandlerList        handlers;
        XMLTree            tree;
-       ARDOUR::Session   &target;
 
        // GUI
        Gtk::Frame                    file_frame;
        Gtk::HBox                     file_hbox;
        Gtk::Entry                    file_entry;
        Gtk::Button                   file_browse_button;
-       
+
        struct SessionBrowserColumns : public Gtk::TreeModel::ColumnRecord
        {
        public:
@@ -88,14 +84,16 @@ class SessionImportDialog : public ArdourDialog
 
          SessionBrowserColumns() { add (name); add (queued); add (element); add (info); }
        };
-       
+
        SessionBrowserColumns         sb_cols;
        Glib::RefPtr<Gtk::TreeStore>  session_tree;
        Gtk::TreeView                 session_browser;
        Gtk::ScrolledWindow           session_scroll;
-       
+
        Gtk::Button*                  ok_button;
        Gtk::Button*                  cancel_button;
+
+       PBD::ScopedConnectionList connections;
 };
 
 #endif