--- gigedit/trunk/src/gigedit/mainwindow.h	2013/09/05 00:49:13	2464
+++ gigedit/trunk/src/gigedit/mainwindow.h	2014/05/18 18:55:29	2560
@@ -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
@@ -53,7 +54,9 @@
 public:
     PropDialog();
     void set_info(DLS::Info* info);
+    void set_file(gig::File* file);
 protected:
+    ChoiceEntry<int> eFileFormat;
     StringEntry eName;
     StringEntry eCreationDate;
     StringEntryMultiLine eComments;
@@ -74,6 +77,10 @@
     Gtk::HButtonBox buttonBox;
     Gtk::Button quitButton;
     Table table;
+
+    gig::File* m_file;
+
+    void onFileFormatChanged();
 };
 
 class InstrumentProps : public Gtk::Window,
@@ -176,6 +183,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 +285,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,8 +341,13 @@
     void instr_name_changed_by_instr_props(Gtk::TreeModel::iterator& it);
     sigc::connection instrument_name_connection;
 
+    void on_action_combine_instruments();
+    void on_action_merge_files();
+    void mergeFiles(const std::vector<std::string>& filenames);
+
     void __import_queued_samples();
     void __clear();
+    void __refreshEntireGUI();
 
     bool close_confirmation_dialog();
     bool leaving_shared_mode_dialog();