--- gigedit/trunk/src/gigedit/mainwindow.h	2016/07/18 11:22:38	2967
+++ gigedit/trunk/src/gigedit/mainwindow.h	2017/05/11 20:59:46	3177
@@ -1,5 +1,5 @@
 /*                                                         -*- c++ -*-
- * Copyright (C) 2006 - 2016 Andreas Persson
+ * Copyright (C) 2006 - 2017 Andreas Persson
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -20,7 +20,13 @@
 #ifndef GIGEDIT_MAINWINDOW_H
 #define GIGEDIT_MAINWINDOW_H
 
-#include <gig.h>
+#ifdef LIBGIG_HEADER_FILE
+# include LIBGIG_HEADER_FILE(gig.h)
+# include LIBGIG_HEADER_FILE(Serialization.h)
+#else
+# include <gig.h>
+# include <Serialization.h>
+#endif
 
 #include <gtkmm/box.h>
 #include <gtkmm/actiongroup.h>
@@ -238,6 +244,19 @@
     InstrumentProps instrumentProps;
     MidiRules midiRules;
 
+    /**
+     * Ensures that the 2 signals MainWindow::dimreg_to_be_changed_signal and
+     * MainWindowv::dimreg_changed_signal are always triggered correctly as a
+     * pair. It behaves similar to a "mutex lock guard" design pattern.
+     */
+    class DimRegionChangeGuard : public SignalGuard<gig::DimensionRegion*> {
+    public:
+        DimRegionChangeGuard(MainWindow* w, gig::DimensionRegion* pDimReg) :
+        SignalGuard<gig::DimensionRegion*>(w->dimreg_to_be_changed_signal, w->dimreg_changed_signal, pDimReg)
+        {
+        }
+    };
+
     sigc::signal<void, gig::File*> file_structure_to_be_changed_signal;
     sigc::signal<void, gig::File*> file_structure_changed_signal;
     sigc::signal<void, std::list<gig::Sample*> > samples_to_be_removed_signal;
@@ -267,6 +286,11 @@
     void on_saver_progress();
     void on_saver_error();
     void on_saver_finished();
+    void updateMacroMenu();
+    void onMacroSelected(int iMacro);
+    void setupMacros();
+    void onMacrosSetupChanged(const std::vector<Serialization::Archive>& macros);
+    void applyMacro(Serialization::Archive& macro);
 
     void dimreg_all_dimregs_toggled();
     gig::Instrument* get_instrument();
@@ -276,10 +300,12 @@
     class ModelColumns : public Gtk::TreeModel::ColumnRecord {
     public:
         ModelColumns() {
+          add(m_col_nr);
           add(m_col_name);
           add(m_col_instr);
         }
 
+        Gtk::TreeModelColumn<int> m_col_nr;
         Gtk::TreeModelColumn<Glib::ustring> m_col_name;
         Gtk::TreeModelColumn<gig::Instrument*> m_col_instr;
     } m_Columns;
@@ -358,6 +384,17 @@
     Gtk::CheckButton dimreg_all_regions;
     Gtk::CheckButton dimreg_all_dimregs;
     Gtk::CheckButton dimreg_stereo;
+
+    Gtk::HBox legend_hbox;
+    Gtk::Label labelLegend;
+    Gtk::Image imageNoSample;
+    Gtk::Label labelNoSample;
+    Gtk::Image imageMissingSample;
+    Gtk::Label labelMissingSample;
+    Gtk::Image imageLooped;
+    Gtk::Label labelLooped;
+    Gtk::Image imageSomeLoops;
+    Gtk::Label labelSomeLoops;
     DimRegionEdit dimreg_edit;
 
     Gtk::Notebook m_TreeViewNotebook;
@@ -369,7 +406,7 @@
         Glib::ustring sample_path; // file name of the sample to be
                                    // imported
     };
-    std::list<SampleImportItem> m_SampleImportQueue;
+    std::map<gig::Sample*, SampleImportItem> m_SampleImportQueue;
 
 
     void on_action_file_new();
@@ -416,6 +453,30 @@
     void show_intruments_tab();
     void show_scripts_tab();
 
+    void select_prev_region();
+    void select_next_region();
+
+    void select_next_dim_rgn_zone();
+    void select_prev_dim_rgn_zone();
+    void select_add_next_dim_rgn_zone();
+    void select_add_prev_dim_rgn_zone();
+    void select_prev_dimension();
+    void select_next_dimension();
+
+    Serialization::Archive m_serializationArchive; ///< Clipboard content.
+    std::vector<Serialization::Archive> m_macros; ///< User configured list of macros.
+
+    void copy_selected_dimrgn();
+    void paste_copied_dimrgn();
+    void adjust_clipboard_content();
+    void updateClipboardCopyAvailable();
+    void updateClipboardPasteAvailable();
+    void on_clipboard_owner_change(GdkEventOwnerChange* event);
+    void on_clipboard_get(Gtk::SelectionData& selection_data, guint info);
+    void on_clipboard_clear();
+    void on_clipboard_received(const Gtk::SelectionData& selection_data);
+    void on_clipboard_received_targets(const std::vector<Glib::ustring>& targets);
+
     void add_instrument(gig::Instrument* instrument);
     Gtk::RadioMenuItem* add_instrument_to_menu(const Glib::ustring& name,
                                                int position = -1);