Merge lp:~superscript18/scratch/bugfix-1390607 into lp:~elementary-apps/scratch/scratch

[SuperScript]

I have reworked the logic in launching Scratch. This new method is quite a bit cleaner and fixes several problems:

1. Scratch opens temporary (unsaved) documents when you open a second window. This is a pain because they are opened twice and cannot be closed in either instance without losing data.

2. When you opened a new window in Scratch, the previous window would try to get your attention (`window.present ()`) resulting in an unneeded red icon in Plank.

3. Middle-clicking on the Scratch icon in Plank did nothing. Now it should open a blank new window ready for you to work.

I've included elementary-design to decide if all this functionality is correct.

This fixes bugs:
Bug #1420549: middle-click on Plank does nothing
Bug #1390607: don't open unsaved files in new windows

[lp:~superscript18/scratch/bugfix-1390607]

1451. By SuperScript on 2015-02-12

 isn't needed anymore.

Unmerged revisions

1451. By SuperScript on 2015-02-12

 isn't needed anymore.

1450. By SuperScript on 2015-02-10

fixed tab/space to match elementary guidelines

1449. By SuperScript on 2015-02-10

Redid Scratch's startup procedure

=== modified file 'data/scratch-text-editor.desktop'
--- data/scratch-text-editor.desktop	2014-04-12 23:26:29 +0000
+++ data/scratch-text-editor.desktop	2015-02-12 23:05:53 +0000
@@ -3,7 +3,7 @@
 Name=Scratch
 Comment=Edit text files
 GenericName=Text Editor
-Exec=scratch-text-editor %U
+Exec=scratch-text-editor --new-window %U
 Icon=accessories-text-editor
 Terminal=false
 Categories=GNOME;GTK;Utility;TextEditor;

=== modified file 'src/MainWindow.vala'
--- src/MainWindow.vala	2014-11-24 19:59:52 +0000
+++ src/MainWindow.vala	2015-02-12 23:05:53 +0000
@@ -94,9 +94,6 @@
             // 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 ();
@@ -263,17 +260,13 @@
 
             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;
             });
-
-            if (has_temporary_files ())
-                action_open_temporary_files ();
-            else
-                this.split_view.show_welcome ();
+            
+            this.split_view.show_welcome ();
 
             // Plugins hook
             HookFunc hook_func = () => {
@@ -422,18 +415,6 @@
             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 ()) {
@@ -471,16 +452,6 @@
             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
@@ -650,21 +621,6 @@
             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 ();
         }

=== modified file 'src/Scratch.vala'
--- src/Scratch.vala	2014-11-29 11:46:53 +0000
+++ src/Scratch.vala	2015-02-12 23:05:53 +0000
@@ -125,22 +125,56 @@
 
                 return Posix.EXIT_FAILURE;
             }
-
-            bool is_app_launch = (get_last_window () == null);
-
-            // Create (or show) the first window
-            activate ();
-
-            // Create a next window if requested and it's not the app launch
-            if (create_new_window && !is_app_launch) {
+            
+            var window = get_last_window ();
+
+            bool is_app_launch = (window == null);
+            
+            if (create_new_window || is_app_launch) {
                 create_new_window = false;
-                this.new_window ();
+                window = this.new_window ();
+            }
+            
+            // Crate folder for unsaved documents
+            create_unsaved_documents_directory ();
+            
+            if (is_app_launch) {
+                // restore opened documents
+                if (settings.show_at_start == "last-tabs") {
+                    window.start_loading ();
+
+                    string[] uris = settings.schema.get_strv ("opened-files");
+
+                    foreach (string uri in uris) {
+                       if (uri != "") {
+                            var file = File.new_for_uri (uri);
+                            if (file.query_exists ()) {
+                                var doc = new Scratch.Services.Document (window.main_actions, file);
+                                window.open_document (doc);
+                            }
+                        }
+                    }
+                    window.stop_loading ();
+                }
+                
+                // restore temporary files
+                FileEnumerator enumerator = File.new_for_path (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 (data_home_folder_unsaved + fileinfo.get_name ());
+                        var doc = new Scratch.Services.Document (window.main_actions, file);
+                        window.open_document (doc);
+                    }
+                    // Next file info
+                    fileinfo = enumerator.next_file (null);
+                }
             }
 
             // Create a new document if requested
             if (create_new_tab) {
                 create_new_tab = false;
-                var window = get_last_window ();
                 window.main_actions.get_action ("NewTab").activate ();
             }
 
@@ -162,32 +196,20 @@
             return Posix.EXIT_SUCCESS;
         }
 
+        private void create_unsaved_documents_directory () {
+            File directory = File.new_for_path (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.");
+        }
+
         protected override void activate () {
-            var window = get_last_window ();
-            if (window == null) {
-                window = this.new_window ();
-                window.show ();
-                // Restore opened documents
-                if (settings.show_at_start == "last-tabs") {
-                    window.start_loading ();
-
-                    string[] uris = settings.schema.get_strv ("opened-files");
-
-                    foreach (string uri in uris) {
-                       if (uri != "") {
-                            var file = File.new_for_uri (uri);
-                            if (file.query_exists ()) {
-                                var doc = new Scratch.Services.Document (window.main_actions, file);
-                                window.open_document (doc);
-                            }
-                        }
-                    }
-                    window.stop_loading ();
-                }
-            } else {
+            var window = get_last_window();
+            if (window != null)
                 window.present ();
-            }
-
         }
 
         protected override void open (File[] files, string hint) {