--- gigedit/trunk/src/gigedit/mainwindow.cpp	2015/09/20 10:18:22	2845
+++ gigedit/trunk/src/gigedit/mainwindow.cpp	2016/07/18 11:22:38	2967
@@ -1,5 +1,5 @@
 /*
- * 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
@@ -192,6 +192,21 @@
     actionGroup->add(toggle_action,
                      sigc::mem_fun(
                          *this, &MainWindow::on_action_view_status_bar));
+
+    toggle_action =
+        Gtk::ToggleAction::create("AutoRestoreWinDim", _("_Auto Restore Window Dimension"));
+    toggle_action->set_active(Settings::singleton()->autoRestoreWindowDimension);
+    actionGroup->add(toggle_action,
+                     sigc::mem_fun(
+                         *this, &MainWindow::on_auto_restore_win_dim));
+
+    toggle_action =
+        Gtk::ToggleAction::create("SaveWithTemporaryFile", _("Save with _temporary file"));
+    toggle_action->set_active(Settings::singleton()->saveWithTemporaryFile);
+    actionGroup->add(toggle_action,
+                     sigc::mem_fun(
+                         *this, &MainWindow::on_save_with_temporary_file));
+
     actionGroup->add(
         Gtk::Action::create("RefreshAll", _("_Refresh All")),
         sigc::mem_fun(*this, &MainWindow::on_action_refresh_all)
@@ -364,6 +379,7 @@
         "    </menu>"
         "    <menu action='MenuView'>"
         "      <menuitem action='Statusbar'/>"
+        "      <menuitem action='AutoRestoreWinDim'/>"
         "      <separator/>"
         "      <menuitem action='RefreshAll'/>"
         "    </menu>"
@@ -375,6 +391,7 @@
         "      <menuitem action='WarnUserOnExtensions'/>"
         "      <menuitem action='SyncSamplerInstrumentSelection'/>"
         "      <menuitem action='MoveRootNoteWithRegionMoved'/>"
+        "      <menuitem action='SaveWithTemporaryFile'/>"
         "    </menu>"
         "    <menu action='MenuHelp'>"
         "      <menuitem action='About'/>"
@@ -462,6 +479,11 @@
     }
     {
         Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
+            uiManager->get_widget("/MenuBar/MenuView/AutoRestoreWinDim"));
+        item->set_tooltip_text(_("If checked, size and position of all windows will be saved and automatically restored next time."));
+    }
+    {
+        Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
             uiManager->get_widget("/MenuBar/MenuTools/CombineInstruments"));
         item->set_tooltip_text(_("Create combi sounds out of individual sounds of this .gig file."));
     }
@@ -889,7 +911,34 @@
 
         // if no filename was provided, that means "save", if filename was provided means "save as"
         if (filename.empty()) {
-            gig->Save(&progress);
+            if (!Settings::singleton()->saveWithTemporaryFile) {
+                // save directly over the existing .gig file
+                // (requires less disk space than solution below
+                // but may be slower)
+                gig->Save(&progress);
+            } else {
+                // save the file as separate temporary file first,
+                // then move the saved file over the old file
+                // (may result in performance speedup during save)
+                String tmpname = filename + ".TMP";
+                gig->Save(tmpname, &progress);
+                #if defined(WIN32)
+                if (!DeleteFile(filename.c_str()) {
+                    throw RIFF::Exception("Could not replace original file with temporary file (unable to remove original file).");
+                }
+                #else // POSIX ...
+                if (unlink(filename.c_str())) {
+                    throw RIFF::Exception("Could not replace original file with temporary file (unable to remove original file): " + String(strerror(errno)));
+                }
+                #endif
+                if (rename(tmpname.c_str(), filename.c_str())) {
+                    #if defined(WIN32)
+                    throw RIFF::Exception("Could not replace original file with temporary file (unable to rename temp file).");
+                    #else
+                    throw RIFF::Exception("Could not replace original file with temporary file (unable to rename temp file): " + String(strerror(errno)));
+                    #endif
+                }
+            }
         } else {
             gig->Save(filename, &progress);
         }
@@ -1463,7 +1512,7 @@
     dialog.set_name("Gigedit");
 #endif
     dialog.set_version(VERSION);
-    dialog.set_copyright("Copyright (C) 2006-2015 Andreas Persson");
+    dialog.set_copyright("Copyright (C) 2006-2016 Andreas Persson");
     const std::string sComment =
         _("Built " __DATE__ "\nUsing ") +
         ::gig::libraryName() + " " + ::gig::libraryVersion() + "\n\n" +
@@ -1918,6 +1967,26 @@
     else                    m_StatusBar.hide();
 }
 
+void MainWindow::on_auto_restore_win_dim() {
+    Gtk::CheckMenuItem* item =
+        dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuView/AutoRestoreWinDim"));
+    if (!item) {
+        std::cerr << "/MenuBar/MenuView/AutoRestoreWinDim == NULL\n";
+        return;
+    }
+    Settings::singleton()->autoRestoreWindowDimension = item->get_active();
+}
+
+void MainWindow::on_save_with_temporary_file() {
+    Gtk::CheckMenuItem* item =
+        dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuSettings/SaveWithTemporaryFile"));
+    if (!item) {
+        std::cerr << "/MenuBar/MenuSettings/SaveWithTemporaryFile == NULL\n";
+        return;
+    }
+    Settings::singleton()->saveWithTemporaryFile = item->get_active();
+}
+
 bool MainWindow::is_copy_samples_unity_note_enabled() const {
     Gtk::CheckMenuItem* item =
         dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuEdit/CopySampleUnity"));
@@ -2340,6 +2409,12 @@
     if (!script) return;
 
     ScriptEditor* editor = new ScriptEditor;
+    editor->signal_script_to_be_changed.connect(
+        signal_script_to_be_changed.make_slot()
+    );
+    editor->signal_script_changed.connect(
+        signal_script_changed.make_slot()
+    );
     editor->setScript(script);
     //editor->reparent(*this);
     editor->show();
@@ -3082,6 +3157,12 @@
     if (!script) return;
 
     ScriptEditor* editor = new ScriptEditor;
+    editor->signal_script_to_be_changed.connect(
+        signal_script_to_be_changed.make_slot()
+    );
+    editor->signal_script_changed.connect(
+        signal_script_changed.make_slot()
+    );
     editor->setScript(script);
     //editor->reparent(*this);
     editor->show();