--- gigedit/trunk/src/gigedit/mainwindow.h	2013/04/28 06:07:22	2445
+++ gigedit/trunk/src/gigedit/mainwindow.h	2014/05/13 12:17:43	2548
@@ -1,5 +1,5 @@
 /*                                                         -*- c++ -*-
- * Copyright (C) 2006 - 2013 Andreas Persson
+ * Copyright (C) 2006 - 2014 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
@@ -42,6 +42,7 @@
 #include "regionchooser.h"
 #include "dimregionchooser.h"
 #include "dimregionedit.h"
+#include "midirules.h"
 #ifndef OLD_THREADS
 #include <glibmm/threads.h>
 #endif
@@ -176,6 +177,7 @@
 
     PropDialog propDialog;
     InstrumentProps instrumentProps;
+    MidiRules midiRules;
 
     sigc::signal<void, gig::File*> file_structure_to_be_changed_signal;
     sigc::signal<void, gig::File*> file_structure_changed_signal;
@@ -277,7 +279,9 @@
     void on_action_quit();
     void show_instr_props();
     bool instr_props_set_instrument();
+    void show_midi_rules();
     void on_action_view_status_bar();
+    void on_action_warn_user_on_extensions();
     void on_action_help_about();
 
     // sample right-click popup actions
@@ -331,6 +335,8 @@
     void instr_name_changed_by_instr_props(Gtk::TreeModel::iterator& it);
     sigc::connection instrument_name_connection;
 
+    void on_action_combine_instruments();
+
     void __import_queued_samples();
     void __clear();
 
@@ -342,6 +348,10 @@
     bool on_delete_event(GdkEventAny* event);
 
     bool first_call_to_drag_data_get;
+    
+    bool is_copy_samples_unity_note_enabled() const;
+    bool is_copy_samples_fine_tune_enabled() const;
+    bool is_copy_samples_loop_enabled() const;
 };
 
 #endif