Merge lp:~artem-anufrij/scratch/dont-force-to-save-unsaved into lp:~elementary-apps/scratch/scratch

[Artem Anufrij]

Use temporary files for unsaved files to be able to restore them at next startup

BLUEPRINT DESCRIPTION:
+1 for keeping in .local/share/scratch/unsaved/. Because losing work is the worst user experience ever. If we keep files in /tmp they can get deleted by the system (think sudden power outage and user boots again or even someone is keeping /tmp in RAM - other systems and maybe future eOS). And if we keep them in trash user can delete them unknowingly because he expects that only files that he himself moved to trash are there. Also files that are not saved anywhere IMHO should have a *highly visible* warning so that even user that is absolutely new to PCs knows it's not saved. (Perhaps a red exclamation mark on the tab? Or the entire tab tinted slightly red?) Won't it be annoying? No, because how often do you write and keep in editor (for a longer time) something that you don't want to save? ~grzesiek1e5

[lp:~artem-anufrij/scratch/dont-force-to-save-unsaved]

1399. By artem-anufrij on 2014-10-04

Ready for check (clear 'file != null' block)

1400. By artem-anufrij on 2014-10-04

Replace 'scratch' to exec_name. Fix code style.

1401. By artem-anufrij on 2014-10-04

Delete old backup file after 'save as...'

[Robert Roth (evfool)]

Code looks mostly OK, here are some notes:
* Singleton is not needed here, accessing data_home_folder_unsaved seems to be the only reason you're making the Scratch instance a singleton, but that variable should be part of settings (e.g I want to configure that in dconf - or scratch Preferences if Dan allows - to use /tmp instead of my home dir)
* string message = _("File ") + " \"<b>%s</b>\" ".printf (get_basename ()) + _("was modified by an external application. Do you want to load it again or continue your editing?");
This is not translation-friendly, and there are more like this. Translatable strings should not be concatenated.
It can also be written like: _("File %s was modified by an external application.").printf ("<b>%s</b>".printf (get_basename ())).
I see that there are some of these coming from before your commits, so it's not 100% your code, but they should be fixed too (not necessarily on this branch), but at least the code we touch should get better after each touch.
* Add a description and a commit message to the merge proposal
I haven't tested this yet, this is just a code review, will test later, with the fixes.

review: Needs Fixing (code review)

[lp:~artem-anufrij/scratch/dont-force-to-save-unsaved]

1402. By artem-anufrij on 2014-10-11

dev-commit

1403. By artem-anufrij on 2014-10-11

get_user_cache_dir() for termporary files; changed the text.

1404. By artem-anufrij on 2014-10-11

always open temporary files on startup

[Artem Anufrij (artem-anufrij)]

Please check the fixes.
- temporary location: .local/share/scretch-text-editor/unsaved
- text style was fixed.

[Robert Roth (evfool)]

See my inline comments. I'm still not sure the scratch app instance should be made singleton just to be able to access the path variable, that's a second reason why settings-based path was suggested, as the settings object is available globally.

review: Needs Fixing

[lp:~artem-anufrij/scratch/dont-force-to-save-unsaved]

1405. By artem-anufrij on 2014-10-13

code fixing

[Robert Roth (evfool)]

Ok, looks nice, as per Slack comments the path doesn't have to be configurable, so we're keeping the app instance singleton. Approved.

review: Approve

[lp:~artem-anufrij/scratch/dont-force-to-save-unsaved]

1406. By artem-anufrij on 2014-10-13

temporary typer

[Danielle Foré (danrabbit)]

I think if you close the individual tab (as opposed to the whole app) you should be prompted to either save or delete. I don't think we should encourage a workflow where users can perpetually store a bunch of documents in a hidden folder. Additionally, in the current workflow I'm not sure how I'm supposed to discard a document that I've decided I don't actually want to save.

I'm also thinking that we should override the tab/title name for unsaved documents and just call them "unsaved document" or something instead of referring to them as a file name with a location inside the app.

review: Needs Fixing (ux)

[lp:~artem-anufrij/scratch/dont-force-to-save-unsaved]

1407. By artem-anufrij on 2014-10-15

Implemented as agreed.

1408. By artem-anufrij on 2014-10-15

Implemented as agreed.

1409. By artem-anufrij on 2014-10-15

Implemented as agreed.

[Artem Anufrij (artem-anufrij)]

I have changed the functionality as agreed. Please check this out.

[Robert Roth (evfool)]

Code style is mostly ok, see one minor request inline.

review: Needs Fixing (code style)

[lp:~artem-anufrij/scratch/dont-force-to-save-unsaved]

1410. By artem-anufrij on 2014-10-16

Code style has been improved.

[Robert Roth (evfool)]

Code style fixed, approving, waiting for Dan's approval.

review: Approve (code style)

[Danielle Foré (danrabbit)]

Maybe I'm missing something, but the feature seems to no longer work at all. Trying to close the app with an unsaved document prompts me to save.

Also the window title still reflects the name and location of the file

[lp:~artem-anufrij/scratch/dont-force-to-save-unsaved]

1411. By artem-anufrij on 2014-10-17

Window title fixed

App closing: save 'unsaved' files in ./local/share/... without save dialog
Tab closing: show save dialog for 'unsaved' files

[Artem Anufrij (artem-anufrij)]

Hey Dan,

sorry I have overlooked the: "...(as opposed to the whole app)...".

Now it feels smooth.

[lp:~artem-anufrij/scratch/dont-force-to-save-unsaved]

1412. By artem-anufrij on 2014-10-17

code style

1413. By artem-anufrij on 2014-10-17

code style

[Danielle Foré (danrabbit)]

Works as expected now. Thanks Artem! This is great :)

review: Approve (ux)

[Robert Roth (evfool)]

Looks fine, two more indentation issues to fix before the final approval.

review: Needs Fixing (code review)

[lp:~artem-anufrij/scratch/dont-force-to-save-unsaved]

1414. By artem-anufrij on 2014-10-18

code style fixed

[Artem Anufrij (artem-anufrij)]

@Robert,

line 155: this is only code style:
https://files.slack.com/files-pri/T028SLY6K-F02QDF163/screenshot_from_2014-10-18_21_51_27.png

line 292: fixed

[Robert Roth (evfool)]

Ok, Approving. Thanks for the several fixes and your perseverence, it is something of great value.

review: Approve (code review)

=== modified file 'HACKING'
--- HACKING	2013-08-17 21:53:30 +0000
+++ HACKING	2014-10-18 19:50:44 +0000
@@ -152,4 +152,4 @@
     bzr branch lp:scratch scratch
     bzr branch scratch/ scratch-fix-123456
     cd scratch-fix-123456
-    bzr pull lp:scratch
+    bzr pull lp:scratch
\ No newline at end of file

=== modified file 'src/Dialogs/PreferencesDialog.vala'
--- src/Dialogs/PreferencesDialog.vala	2014-08-07 09:22:40 +0000
+++ src/Dialogs/PreferencesDialog.vala	2014-10-18 19:50:44 +0000
@@ -288,10 +288,6 @@
                 var scheme = scheme_manager.get_scheme (scheme_id);
                 style_scheme.append (scheme.id, scheme.name);
             }
-            
-
         }
-
     }
-
-} // Namespace
+} // Namespace
\ No newline at end of file

=== modified file 'src/MainWindow.vala'
--- src/MainWindow.vala	2014-10-05 20:56:25 +0000
+++ src/MainWindow.vala	2014-10-18 19:50:44 +0000
@@ -86,6 +86,9 @@
             // Restore session
             restore_saved_state_extra ();
 
+            // Crate folder for unsaved documents
+            create_unsaved_documents_directory ();
+
 #if HAVE_ZEITGEIST
             // Set up the Data Source Registry for Zeitgeist
             registry = new DataSourceRegistry ();
@@ -181,7 +184,12 @@
                         path = _("Trash");
 
                     path = Uri.unescape_string (path);
-                    this.toolbar.title = doc.file.get_basename () + " (%s)".printf(path);
+
+                    string toolbar_title = doc.file.get_basename () + " (%s)".printf (path);
+                    if (doc.is_file_temporary)
+                        toolbar_title = "(%s)".printf (doc.get_basename ());
+
+                    this.toolbar.title = toolbar_title;
                 }
                 else {
                     this.toolbar.title = this.app.app_cmd_name;
@@ -241,14 +249,17 @@
 
             this.search_revealer.set_reveal_child (false);
             
+            main_actions.get_action ("OpenTemporaryFiles").visible = this.has_temporary_files ();
             main_actions.get_action ("SaveFile").visible = !settings.autosave;
             main_actions.get_action ("Templates").visible = plugins.plugin_iface.template_manager.template_available;
             plugins.plugin_iface.template_manager.notify["template_available"].connect ( () => {
                 main_actions.get_action ("Templates").visible = plugins.plugin_iface.template_manager.template_available;
             });
 
-            // Show welcome by default
-            this.split_view.show_welcome ();
+            if (has_temporary_files ())
+                action_open_temporary_files ();
+            else
+                this.split_view.show_welcome ();
 
             // Plugins hook
             HookFunc hook_func = () => {
@@ -268,7 +279,6 @@
                 hook_func ();
             });
             hook_func ();
-
         }
 
          private void on_plugin_toggled (Gtk.Notebook notebook) {
@@ -381,13 +391,25 @@
             return split_view.is_empty ();
         }
 
+        public bool has_temporary_files () {
+            FileEnumerator enumerator = File.new_for_path (app.data_home_folder_unsaved).enumerate_children (FILE_ATTRIBUTE_STANDARD_NAME, 0, null);
+            var fileinfo = enumerator.next_file (null);
+            while (fileinfo != null) {
+                if (!fileinfo.get_name ().has_suffix ("~")) {
+                    return true;
+                }
+                fileinfo = enumerator.next_file (null);
+            }
+            return false;        
+        }
+        
         // Check if there no unsaved changes
         private bool check_unsaved_changes () {
             if (!is_empty ()) {
                 foreach (var w in this.split_view.views) {
                     var view = w as Scratch.Widgets.DocumentView;
                     foreach (var doc in view.docs) {
-                        if (!doc.close ()) {
+                        if (!doc.close (true)) {
                             view.set_current_document (doc);
                             return false;
                         }
@@ -418,6 +440,16 @@
             vp.set_position (Scratch.saved_state.vp_size);
         }
 
+        private void create_unsaved_documents_directory () {
+            File directory = File.new_for_path (app.data_home_folder_unsaved);
+            if (!directory.query_exists ()) {
+                debug ("create 'unsaved' directory: %s", directory.get_path ());
+                directory.make_directory_with_parents ();
+                return;
+            }
+            debug ("'unsaved' directory already exists.");
+        }
+
         private void update_saved_state () {
 
             // Save window state
@@ -517,6 +549,21 @@
             filech.close ();
         }
 
+        void action_open_temporary_files () {
+            FileEnumerator enumerator = File.new_for_path (app.data_home_folder_unsaved).enumerate_children (FILE_ATTRIBUTE_STANDARD_NAME, 0, null);
+            var fileinfo = enumerator.next_file (null);
+            while (fileinfo != null) {
+                if (!fileinfo.get_name ().has_suffix ("~")) {
+                    debug ("open temporary file: %s", fileinfo.get_name ());
+                    var file = File.new_for_path (app.data_home_folder_unsaved + fileinfo.get_name ());
+                    var doc = new Scratch.Services.Document (this.main_actions, file);
+                    this.open_document (doc);
+                }
+                // Next file info
+                fileinfo = enumerator.next_file (null);
+            }
+        }
+
         void action_save () {
             this.get_current_document ().save ();
         }
@@ -694,7 +741,7 @@
           /* label, accelerator */       N_("Redo"), "<Control><shift>z",
           /* tooltip */                  N_("Redo the last undone action"),
                                          action_redo },
-          { "Revert", Gtk.Stock.REVERT_TO_SAVED,
+           { "Revert", Gtk.Stock.REVERT_TO_SAVED,
           /* label, accelerator */       N_("Revert"), "<Control><shift>o",
           /* tooltip */                  N_("Restore this file"),
                                          action_revert },

=== modified file 'src/Scratch.vala'
--- src/Scratch.vala	2014-10-05 21:21:40 +0000
+++ src/Scratch.vala	2014-10-18 19:50:44 +0000
@@ -34,7 +34,9 @@
         private GLib.List <MainWindow> windows;
 
         public string app_cmd_name { get { return _app_cmd_name; } }
+        public string data_home_folder_unsaved { get { return _data_home_folder_unsaved; } }
         private static string _app_cmd_name;
+        private static string _data_home_folder_unsaved;
         private static string _cwd;
         private static bool print_version = false;
         private static bool create_new_tab = false;
@@ -90,6 +92,18 @@
             services = new ServicesSettings ();
             windows = new GLib.List <MainWindow> ();
             
+            // Init data home folder for unsaved text files
+            _data_home_folder_unsaved = Environment.get_user_data_dir () + "/" + exec_name + "/unsaved/";
+        }
+
+        public static ScratchApp _instance = null;
+
+        public static ScratchApp instance {
+            get {
+                if (_instance == null)
+                    _instance = new ScratchApp ();
+                return _instance;
+            }
         }
 
         protected override int command_line (ApplicationCommandLine command_line) {
@@ -253,8 +267,8 @@
                 return Posix.EXIT_SUCCESS;
             }
 
-            var app = new ScratchApp ();
+            ScratchApp app = ScratchApp.instance;
             return app.run (args_primary_instance);
         }
     }
-}
+}
\ No newline at end of file

=== modified file 'src/Services/Document.vala'
--- src/Services/Document.vala	2014-08-06 05:45:44 +0000
+++ src/Services/Document.vala	2014-10-18 19:50:44 +0000
@@ -56,15 +56,23 @@
         private Gtk.InfoBar info_bar =                  new Gtk.InfoBar ();
 
         // Objects
-        private File? _file = null;
-        public File? file {
+        private File _file = null;
+        public File file {
             get { return _file; }
-            set { _file = value; file_changed (); }
+            set { 
+                _file = value; 
+                file_changed (); 
+            }
         }
         public string original_content;
         public string? last_saved_content = null;
         public bool saved = true;
         private bool error_shown = false;
+        public bool is_file_temporary {
+            get {
+                return file.get_path ().has_prefix (ScratchApp.instance.data_home_folder_unsaved);
+            }
+        }
         
         // It is used to load file content on focusing
         private bool loaded = false;
@@ -134,43 +142,6 @@
 
         public async bool open () {
             this.source_view.buffer.create_tag ("highlight_search_all", "background", "yellow", null);
-            if (file == null) {
-                message ("New Document opened");
-                this.source_view.focus_in_event.connect (() => {
-                    main_actions.get_action ("SaveFile").visible = true;
-                    check_file_status ();
-                    check_undoable_actions ();
-                    return false;
-                });
-                uint timeout_saving = -1;
-                this.source_view.buffer.changed.connect (() => {
-                    check_undoable_actions ();
-                    // If it wasn't yet saved
-                    if (file == null) {
-                        this.set_saved_status (false);
-                        return;
-                    }
-                    // Save if autosave is ON
-                    if (settings.autosave) {
-                        if (timeout_saving >= 0) {
-                            Source.remove (timeout_saving);
-                            timeout_saving = -1;
-                        }
-                        timeout_saving = Timeout.add (3000, () => {
-                            save ();
-                            timeout_saving = -1;
-                            return false;
-                        });
-                    }
-                    else if (!settings.autosave || file == null)
-                        this.set_saved_status (false);
-                });
-                this.set_saved_status (true);
-                this.has_started_loading = true;
-                this.loaded = true;
-
-                return true;
-            }
 
             // If it does not exists, let's create it!
             if (!exists ()) {
@@ -227,14 +198,17 @@
             return true;
         }
 
-        public new bool close () {
+        public new bool close (bool app_closing = false) {
 
             message ("Closing \"%s\"", get_basename ());
 
             bool ret_value = true;
-            
+            if (app_closing && is_file_temporary && !delete_temporary_file ()) {
+                debug ("Save temporary file!");
+                this.save ();
+            }
             // Check for unsaved changes
-            if (!this.saved) {
+            else if (!this.saved || (!app_closing && is_file_temporary && !delete_temporary_file ())) {
                 debug ("There are unsaved changes, showing a Message Dialog!");
 
                 // Create a GtkDialog
@@ -265,42 +239,40 @@
                         ret_value = false;
                         break;
                     case Gtk.ResponseType.YES:
-                        this.save ();
-                        ret_value = true;
+                        if (this.is_file_temporary)
+                            this.save_as ();
+                        else
+                            this.save ();
                         break;
                     case Gtk.ResponseType.NO:
-                        ret_value = true;
+                        if (this.is_file_temporary)
+                            delete_temporary_file (true);
                         break;
                 }
                 dialog.destroy ();
-            }
+            }          
 
-            if (file != null && ret_value) {
-                // Delete backup copy file
+            if (ret_value) {
+                // Delete backup copy file                
                 delete_backup ();
+            }
 #if HAVE_ZEITGEIST
-                // Zeitgeist integration
-                zg_log.close_insert (file.get_uri (), get_mime_type ());
+            // Zeitgeist integration
+            zg_log.close_insert (file.get_uri (), get_mime_type ());
 #endif
-            }
             
             return ret_value;
         }
 
         public bool save () {
-            if (last_saved_content == get_text () && this.file != null)
+            if (last_saved_content == get_text ())
                 return false;
 
             if (!this.loaded)
                 return false;
 
-            // Create backup copy file if it does not still exist
-            if (this.file != null)
-                create_backup ();
-
-            // Show save as dialog if file is null
-            if (this.file == null)
-                return this.save_as ();
+            // Create backup copy file
+            this.create_backup ();
 
             // Replace old content with the new one
             try {
@@ -308,6 +280,7 @@
                 file.replace_contents (this.source_view.buffer.text.data, null, false, 0, out s);
             } catch (Error e) {
                 warning ("Cannot save \"%s\": %s", get_basename (), e.message);
+                return false;
             }
 
 #if HAVE_ZEITGEIST
@@ -330,6 +303,9 @@
             // New file
             var filech = Utils.new_file_chooser_dialog (Gtk.FileChooserAction.SAVE, _("Save File"), null);
 
+            string current_file = file.get_path ();
+            bool is_current_file_temporary = this.is_file_temporary;
+
             if (filech.run () == Gtk.ResponseType.ACCEPT) {
                 this.file = File.new_for_uri (filech.get_file ().get_uri ());
                 // Update last visited path
@@ -341,10 +317,20 @@
                 return false;
             }
 
-            // reset the last saved content
+            // Reset the last saved content
             last_saved_content = null;
 
-            save ();
+            if (save () && is_current_file_temporary) {
+                try {
+                    // Delete temporary file
+                    File.new_for_path (current_file).delete ();
+                } catch (Error err) {
+                    message ("Temporary file cannot be deleted: %s", current_file);
+                }
+            }
+
+            // Delete backup file
+            delete_backup (current_file + "~");
 
             // Change syntax highlight
             this.source_view.change_syntax_highlight_from_file (this.file);
@@ -369,19 +355,15 @@
 
         // Get mime type for the document
         public string get_mime_type () {
-            if (file == null)
-                return "text/plain";
-            else {
-                FileInfo info;
-                string mime_type;
-                try {
-                    info = file.query_info ("standard::*", FileQueryInfoFlags.NONE, null);
-                    mime_type = ContentType.get_mime_type (info.get_attribute_as_string (FileAttribute.STANDARD_CONTENT_TYPE));
-                    return mime_type;
-                } catch (Error e) {
-                    warning ("%s", e.message);
-                    return "undefined";
-                }
+            FileInfo info;
+            string mime_type;
+            try {
+                info = file.query_info ("standard::*", FileQueryInfoFlags.NONE, null);
+                mime_type = ContentType.get_mime_type (info.get_attribute_as_string (FileAttribute.STANDARD_CONTENT_TYPE));
+                return mime_type;
+            } catch (Error e) {
+                warning ("%s", e.message);
+                return "undefined";
             }
         }
 
@@ -406,17 +388,15 @@
 
         // Get file uri
         public string get_uri () {
-            if (file == null)
-                return "";
             return this.file.get_uri ();
-        }        
+        }
         
         // Get file name
         public string get_basename () {
-            if (file != null)
+            if (is_file_temporary)
+                return _("New Document");
+            else
                 return file.get_basename ();
-            else
-                return _("New Document");
         }
 
         // Set InfoBars message
@@ -553,7 +533,7 @@
             if (this.error_shown)
                 return;
             this.error_shown = true;
-            string message = _("File \"<b>%s</b>\" cannot be read. Maybe it is corrupt\nor you do not have the necessary permissions to read it.").printf (get_basename ());
+            string message = _("File \"%s\" cannot be read. Maybe it is corrupt\nor you do not have the necessary permissions to read it.").printf ("<b>%s</b>".printf (get_basename ()));
             var parent_window = source_view.get_toplevel () as Gtk.Window;
             var dialog = new Gtk.MessageDialog.with_markup (parent_window, Gtk.DialogFlags.MODAL,
                                                  Gtk.MessageType.ERROR,
@@ -566,84 +546,73 @@
         
         // Check if the file was deleted/changed by an external source
         public void check_file_status () {
-            if (file != null) {
-                // If the file does not exist anymore
-                if (!exists ()) {
-                    if (mounted == false) {
-                        string message = _("The location containing the file") +  " \"<b>%s</b>\" ".printf (get_basename ()) +
-                                         _("was unmounted. Do you want to save somewhere else?");
-
-                        set_message (Gtk.MessageType.WARNING, message, _("Save As…"), () => {
-                            this.save_as ();
-                            hide_info_bar ();
-                        });
-                    } else {
-                        string message = _("File") +  " \"<b>%s</b>\" ".printf (get_basename ()) +
-                                         _("was deleted. Do you want to save it anyway?");
-
-                        set_message (Gtk.MessageType.WARNING, message, _("Save"), () => {
-                            this.save ();
-                            hide_info_bar ();
-                        });
-                    }
-                    main_actions.get_action ("SaveFile").sensitive = false;
-                    this.source_view.editable = false;
-                    return;
-                }
-                // If the file can't be written
-                if (!can_write ()) {
-                    string message = _("You cannot save changes on file") +  " \"<b>%s</b>\". ".printf (get_basename ()) +
-                                     _("Do you want to save the changes to this file in a different location?");
-
-                    set_message (Gtk.MessageType.WARNING, message, _("Save changes elsewhere"), () => {
+            // If the file does not exist anymore
+            if (!exists ()) {
+                if (mounted == false) {
+                    string message = _("The location containing the file \"%s\" was unmounted. Do you want to save somewhere else?").printf ("<b>%s</b>".printf (get_basename ()));
+
+                    set_message (Gtk.MessageType.WARNING, message, _("Save As…"), () => {
                         this.save_as ();
                         hide_info_bar ();
                     });
-                    main_actions.get_action ("SaveFile").sensitive = false;
-                    this.source_view.editable = !settings.autosave;
-                }
-                else {
-                    main_actions.get_action ("SaveFile").sensitive = true;
-                    this.source_view.editable = true;
-                }
-                // Detect external changes
-                FileHandler.load_content_from_file.begin (file, (obj, res) => {
-                    var text = FileHandler.load_content_from_file.end (res);
-                    if (text == null) {
-                        show_error_dialog ();
-                        return;
-                    }
-                    if (!text.validate())
-                        text = file_content_to_utf8 (file, text);
-                    // Reload automatically if auto save is ON
-                    if (last_saved_content != null && text != last_saved_content) {
-                        if (settings.autosave)
-                            this.source_view.set_text (text, false);
-                        else {
-                            string message = _("File ") +  " \"<b>%s</b>\" ".printf (get_basename ()) +
-                                             _("was modified by an external application. Do you want to load it again or continue your editing?");
-
-                            set_message (Gtk.MessageType.WARNING, message, _("Load"), () => {
-                                this.source_view.set_text (text, false);
-                                hide_info_bar ();
-                            }, _("Continue"), () => {
-                                hide_info_bar ();
-                            });
-                        }
-                    }
+                } else {
+                    string message = _("File \"%s\" was deleted. Do you want to save it anyway?").printf ("<b>%s</b>".printf (get_basename ()));
+
+                    set_message (Gtk.MessageType.WARNING, message, _("Save"), () => {
+                        this.save ();
+                        hide_info_bar ();
+                    });
+                }
+                main_actions.get_action ("SaveFile").sensitive = false;
+                this.source_view.editable = false;
+                return;
+            }
+            // If the file can't be written
+            if (!can_write ()) {
+                string message = _("You cannot save changes on file \"%s\". Do you want to save the changes to this file in a different location?").printf ("<b>%s</b>".printf (get_basename ()));
+
+                set_message (Gtk.MessageType.WARNING, message, _("Save changes elsewhere"), () => {
+                    this.save_as ();
+                    hide_info_bar ();
                 });
+                main_actions.get_action ("SaveFile").sensitive = false;
+                this.source_view.editable = !settings.autosave;
             }
             else {
                 main_actions.get_action ("SaveFile").sensitive = true;
                 this.source_view.editable = true;
             }
+            // Detect external changes
+            FileHandler.load_content_from_file.begin (file, (obj, res) => {
+                var text = FileHandler.load_content_from_file.end (res);
+                if (text == null) {
+                    show_error_dialog ();
+                    return;
+                }
+                if (!text.validate ())
+                    text = file_content_to_utf8 (file, text);
+                // Reload automatically if auto save is ON
+                if (last_saved_content != null && text != last_saved_content) {
+                    if (settings.autosave)
+                        this.source_view.set_text (text, false);
+                    else {
+                        string message =  _("File \"%s\" was modified by an external application. Do you want to load it again or continue your editing?").printf ("<b>%s</b>".printf (get_basename ()));
+                        set_message (Gtk.MessageType.WARNING, message, _("Load"), () => {
+                            this.source_view.set_text (text, false);
+                            hide_info_bar ();
+                        }, _("Continue"), () => {
+                            hide_info_bar ();
+                        });
+                    }
+                }
+            });
         }
 
         // Set Undo/Redo action sensitive property
         public void check_undoable_actions () {
             main_actions.get_action ("Undo").sensitive = this.source_view.buffer.can_undo;
             main_actions.get_action ("Redo").sensitive = this.source_view.buffer.can_redo;
-            main_actions.get_action ("Revert").sensitive = (file != null && original_content != source_view.buffer.text);
+            main_actions.get_action ("Revert").sensitive = (original_content != source_view.buffer.text);
         }
 
         // Set saved status
@@ -676,35 +645,55 @@
             }
         }
 
-        private void delete_backup () {
-            var backup = File.new_for_path (this.file.get_path () + "~");
-            if (!backup.query_exists ())
+        private void delete_backup (string? backup_path = null) {
+
+            string backup_file  = "";
+
+            if (backup_path == null)
+                backup_file = file.get_path () + "~";
+            else
+                backup_file = backup_path;
+
+            debug ("Backup file deleting: %s", backup_file);
+            
+            var backup = File.new_for_path (backup_file);
+            if (backup == null || !backup.query_exists ()) {
+                debug ("Backup file doesn't exists: %s", backup.get_path ());
                 return;
+            }
             try {
                 backup.delete ();
+                debug ("Backup file deleted: %s", backup_file);
             } catch (Error e) {
                 warning ("Cannot delete backup for file \"%s\": %s", get_basename (), e.message);
             }
         }
 
+        private bool delete_temporary_file (bool force = false) {
+            if (!is_file_temporary || (get_text ().length > 0 && !force))
+                return false;
+            try {
+                file.delete ();
+                return true;
+            } catch (Error e) {
+                warning ("Cannot delete temporary file \"%s\": %s", file.get_uri (), e.message);
+            }   
+            return false;
+        }
+
         // Return true if the file is writable
         public bool can_write () {
             FileInfo info;
 
             bool writable = false;
 
-            if (this.file == null)
-                return writable = true;
-
             try {
                 info = this.file.query_info (FileAttribute.ACCESS_CAN_WRITE, FileQueryInfoFlags.NONE, null);
                 writable = info.get_attribute_boolean (FileAttribute.ACCESS_CAN_WRITE);
                 return writable;
             } catch (Error e) {
-                if (this.file != null ) {
-                    warning ("query_info failed, but filename appears to be correct, allowing as new file");
-                    writable = true;
-                }
+                warning ("query_info failed, but filename appears to be correct, allowing as new file");
+                writable = true;
                 return writable;
             }
         }
@@ -715,11 +704,6 @@
         }
 
         private void file_changed () {
-            if (file == null) {
-                mounted = true;
-                return;
-            }
-
             if (mount != null) {
                 mount.unmounted.disconnect (unmounted_cb);
                 mount = null;
@@ -740,4 +724,4 @@
             mounted = false;
         }
     }
-}
+}
\ No newline at end of file

=== modified file 'src/Widgets/DocumentView.vala'
--- src/Widgets/DocumentView.vala	2014-06-02 16:22:42 +0000
+++ src/Widgets/DocumentView.vala	2014-10-18 19:50:44 +0000
@@ -85,11 +85,21 @@
             
             show_all ();
         }
+
+        private string unsaved_file_path_builder () {
+            DateTime timestamp = new DateTime.now_local ();
+            string new_text_file = _("Text file from ") + timestamp.format ("%Y-%m-%d %H:%M:%S");
+
+            return ScratchApp.instance.data_home_folder_unsaved + new_text_file;
+        }
         
         public void new_document () {
-            var doc = new Document (window.main_actions);
+            File file = File.new_for_path (unsaved_file_path_builder ());
+            file.create (FileCreateFlags.PRIVATE);
+
+            var doc = new Document (window.main_actions, file);
             doc.create_page ();
-           
+            
             this.notebook.insert_tab (doc, -1);
             this.notebook.current = doc;
             
@@ -220,4 +230,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

=== modified file 'src/Widgets/ToolBar.vala'
--- src/Widgets/ToolBar.vala	2014-08-11 17:35:47 +0000
+++ src/Widgets/ToolBar.vala	2014-10-18 19:50:44 +0000
@@ -39,19 +39,18 @@
         public AppMenu app_menu;
 
         public Toolbar (Gtk.ActionGroup main_actions) {
-
             // Toolbar properties
             // compliant with elementary HIG
             get_style_context ().add_class ("primary-toolbar");
             
             // Create ToolButtons
-            open_button = main_actions.get_action ("Open").create_tool_item() as Gtk.ToolButton;
-            templates_button = main_actions.get_action ("Templates").create_tool_item() as Gtk.ToolButton;
-            save_button = main_actions.get_action ("SaveFile").create_tool_item() as Gtk.ToolButton;
-            save_as_button = main_actions.get_action ("SaveFileAs").create_tool_item() as Gtk.ToolButton;
-            revert_button = main_actions.get_action ("Revert").create_tool_item() as Gtk.ToolButton;
-            find_button = main_actions.get_action ("Fetch").create_tool_item() as Gtk.ToolButton;
-            
+            open_button = main_actions.get_action ("Open").create_tool_item () as Gtk.ToolButton;
+            templates_button = main_actions.get_action ("Templates").create_tool_item () as Gtk.ToolButton;
+            save_button = main_actions.get_action ("SaveFile").create_tool_item () as Gtk.ToolButton;
+            save_as_button = main_actions.get_action ("SaveFileAs").create_tool_item () as Gtk.ToolButton;
+            revert_button = main_actions.get_action ("Revert").create_tool_item () as Gtk.ToolButton;
+            find_button = main_actions.get_action ("Fetch").create_tool_item () as Gtk.ToolButton;
+
             // Create Share and AppMenu
             share_menu = new Gtk.Menu ();
             share_app_menu = new Granite.Widgets.ToolButtonWithMenu (new Image.from_icon_name ("document-export", IconSize.MENU), _("Share"), share_menu);