--- gigedit/trunk/src/gigedit/mainwindow.h	2014/06/08 19:09:26	2610
+++ gigedit/trunk/src/gigedit/mainwindow.h	2014/12/29 16:30:21	2683
@@ -118,9 +118,9 @@
     NoteEntry eDimensionKeyRangeHigh;
 };
 
-class LoadDialog : public Gtk::Dialog {
+class ProgressDialog : public Gtk::Dialog {
 public:
-    LoadDialog(const Glib::ustring& title, Gtk::Window& parent);
+    ProgressDialog(const Glib::ustring& title, Gtk::Window& parent);
     void set_fraction(float fraction) { progressBar.set_fraction(fraction); }
 protected:
     Gtk::ProgressBar progressBar;
@@ -131,10 +131,12 @@
     Loader(const char* filename);
     void launch();
     Glib::Dispatcher& signal_progress();
-    Glib::Dispatcher& signal_finished();
+    Glib::Dispatcher& signal_finished(); ///< Finished successfully, without error.
+    Glib::Dispatcher& signal_error();
     void progress_callback(float fraction);
     float get_progress();
-    const char* filename;
+    const Glib::ustring filename;
+    Glib::ustring error_message;
     gig::File* gig;
 
 private:
@@ -142,6 +144,30 @@
     void thread_function();
     Glib::Dispatcher finished_dispatcher;
     Glib::Dispatcher progress_dispatcher;
+    Glib::Dispatcher error_dispatcher;
+    Glib::Threads::Mutex progressMutex;
+    float progress;
+};
+
+class Saver : public sigc::trackable {
+public:
+    Saver(gig::File* file, Glib::ustring filename = ""); ///< one argument means "save", two arguments means "save as"
+    void launch();
+    Glib::Dispatcher& signal_progress();
+    Glib::Dispatcher& signal_finished(); ///< Finished successfully, without error.
+    Glib::Dispatcher& signal_error();
+    void progress_callback(float fraction);
+    float get_progress();
+    gig::File* gig;
+    const Glib::ustring filename;
+    Glib::ustring error_message;
+
+private:
+    Glib::Threads::Thread* thread;
+    void thread_function();
+    Glib::Dispatcher finished_dispatcher;
+    Glib::Dispatcher progress_dispatcher;
+    Glib::Dispatcher error_dispatcher;
     Glib::Threads::Mutex progressMutex;
     float progress;
 };
@@ -205,6 +231,11 @@
     void dimreg_changed();
     void on_loader_progress();
     void on_loader_finished();
+    void on_loader_error();
+    void on_saver_progress();
+    void on_saver_error();
+    void on_saver_finished();
+
     void dimreg_all_dimregs_toggled();
     gig::Instrument* get_instrument();
     void add_region_to_dimregs(gig::Region* region, bool stereo, bool all_dimregs);
@@ -231,17 +262,23 @@
 
     Gtk::Menu* instrument_menu;
 
+    std::map<gig::Sample*,int> sample_ref_count;
+
     class SamplesModel : public Gtk::TreeModel::ColumnRecord {
     public:
         SamplesModel() {
             add(m_col_name);
             add(m_col_sample);
             add(m_col_group);
+            add(m_col_refcount);
+            add(m_color);
         }
 
         Gtk::TreeModelColumn<Glib::ustring> m_col_name;
         Gtk::TreeModelColumn<gig::Sample*> m_col_sample;
         Gtk::TreeModelColumn<gig::Group*> m_col_group;
+        Gtk::TreeModelColumn<Glib::ustring> m_col_refcount;
+        Gtk::TreeModelColumn<Glib::ustring> m_color;
     } m_SamplesModel;
 
     class SamplesTreeStore : public Gtk::TreeStore {
@@ -336,14 +373,20 @@
     void on_action_duplicate_instrument();
     void on_action_remove_instrument();
 
+    void show_samples_tab();
+    void show_intruments_tab();
+    void show_scripts_tab();
+
     void add_instrument(gig::Instrument* instrument);
     Gtk::RadioMenuItem* add_instrument_to_menu(const Glib::ustring& name,
                                                int position = -1);
     void remove_instrument_from_menu(int index);
 
-    LoadDialog* load_dialog;
+    ProgressDialog* progress_dialog;
     Loader* loader;
+    Saver* saver;
     void load_gig(gig::File* gig, const char* filename, bool isSharedInstrument = false);
+    void updateSampleRefCountMap(gig::File* gig);
 
     gig::File* file;
     bool file_is_shared;
@@ -373,6 +416,7 @@
 
     void script_name_changed(const Gtk::TreeModel::Path& path,
                              const Gtk::TreeModel::iterator& iter);
+    void script_double_clicked(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* column);
     void sample_name_changed(const Gtk::TreeModel::Path& path,
                              const Gtk::TreeModel::iterator& iter);
     void instrument_name_changed(const Gtk::TreeModel::Path& path,
@@ -381,9 +425,14 @@
     sigc::connection instrument_name_connection;
 
     void on_action_combine_instruments();
+    void on_action_view_references();
     void on_action_merge_files();
     void mergeFiles(const std::vector<std::string>& filenames);
 
+    void on_sample_ref_changed(gig::Sample* oldSample, gig::Sample* newSample);
+    void on_sample_ref_count_incremented(gig::Sample* sample, int offset);
+    void on_samples_to_be_removed(std::list<gig::Sample*> samples);
+
     void __import_queued_samples();
     void __clear();
     void __refreshEntireGUI();