--- gigedit/trunk/src/gigedit/mainwindow.h	2015/01/12 23:28:04	2701
+++ gigedit/trunk/src/gigedit/mainwindow.h	2016/04/29 14:19:53	2893
@@ -1,5 +1,5 @@
 /*                                                         -*- c++ -*-
- * Copyright (C) 2006 - 2015 Andreas Persson
+ * Copyright (C) 2006 - 2016 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
@@ -22,6 +22,7 @@
 
 #include <gig.h>
 
+#include <gtkmm/box.h>
 #include <gtkmm/actiongroup.h>
 #include <gtkmm/buttonbox.h>
 #include <gtkmm/dialog.h>
@@ -46,6 +47,7 @@
 #ifndef OLD_THREADS
 #include <glibmm/threads.h>
 #endif
+#include "ManagedWindow.h"
 
 class MainWindow;
 
@@ -172,7 +174,7 @@
     float progress;
 };
 
-class MainWindow : public Gtk::Window {
+class MainWindow : public ManagedWindow {
 public:
     MainWindow();
     virtual ~MainWindow();
@@ -197,6 +199,12 @@
     sigc::signal<void, int/*key*/, int/*velocity*/>& signal_keyboard_key_released();
 
     sigc::signal<void, gig::Instrument*>& signal_switch_sampler_instrument();
+    
+    // implementation for abstract methods of interface class "ManagedWindow"
+    virtual Settings::Property<int>* windowSettingX() { return &Settings::singleton()->mainWindowX; }
+    virtual Settings::Property<int>* windowSettingY() { return &Settings::singleton()->mainWindowY; }
+    virtual Settings::Property<int>* windowSettingWidth() { return &Settings::singleton()->mainWindowW; }
+    virtual Settings::Property<int>* windowSettingHeight() { return &Settings::singleton()->mainWindowH; }
 
 protected:
     Glib::RefPtr<Gtk::ActionGroup> actionGroup;
@@ -358,8 +366,10 @@
     void show_midi_rules();
     void show_script_slots();
     void on_action_view_status_bar();
+    void on_action_refresh_all();
     void on_action_warn_user_on_extensions();
     void on_action_sync_sampler_instrument_selection();
+    void on_action_move_root_note_with_region_moved();
     void on_action_help_about();
 
     // sample right-click popup actions
@@ -367,9 +377,11 @@
     void on_action_sample_properties();
     void on_action_add_group();
     void on_action_add_sample();
+    void on_action_replace_sample();
     void on_action_replace_all_samples_in_all_groups();
     void on_action_remove_sample();
-    
+    void on_action_remove_unused_samples();
+
     // script right-click popup actions
     void on_script_treeview_button_release(GdkEventButton* button);
     void on_action_add_script_group();
@@ -448,6 +460,8 @@
     void on_sample_ref_count_incremented(gig::Sample* sample, int offset);
     void on_samples_to_be_removed(std::list<gig::Sample*> samples);
 
+    void add_or_replace_sample(bool replace);
+
     void __import_queued_samples();
     void __clear();
     void __refreshEntireGUI();