--- gigedit/trunk/src/gigedit/mainwindow.h	2014/04/23 16:49:05	2541
+++ gigedit/trunk/src/gigedit/mainwindow.h	2014/05/18 18:55:29	2560
@@ -54,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;
@@ -75,6 +77,10 @@
     Gtk::HButtonBox buttonBox;
     Gtk::Button quitButton;
     Table table;
+
+    gig::File* m_file;
+
+    void onFileFormatChanged();
 };
 
 class InstrumentProps : public Gtk::Window,
@@ -335,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();