Merge lp:~artem-anufrij/scratch/close-current-document-ctrl-w into lp:~elementary-apps/scratch/scratch

[Artem Anufrij]

Close current tab with ctrl+w

Close current tab with ctrl+w

[Robert Roth (evfool)]

Patch would be relatively short if it wouldn't include trailing spaces removal. After finding the code to review I've found and commented a small whitespace issue, other than that, it looks OK code-wise, can't test right now, but if it works, it can be approved.

[Fabio Zaramella (fabiozaramella)]

It works.

review: Approve

=== modified file 'src/MainWindow.vala'
--- src/MainWindow.vala	2015-03-19 21:34:20 +0000
+++ src/MainWindow.vala	2015-03-30 21:07:33 +0000
@@ -214,20 +214,20 @@
             this.contextbar = new Gtk.Notebook ();
             this.contextbar.no_show_all = true;
             this.contextbar.page_removed.connect (() => { on_plugin_toggled (contextbar); });
-            this.contextbar.page_added.connect (() => { 
+            this.contextbar.page_added.connect (() => {
                 if (!this.split_view.is_empty ())
-                    on_plugin_toggled (contextbar); 
+                    on_plugin_toggled (contextbar);
             });
-            
+
 
 
             this.bottombar = new Gtk.Notebook ();
             this.bottombar.no_show_all = true;
             this.bottombar.page_removed.connect (() => { on_plugin_toggled (bottombar); });
-            this.bottombar.page_added.connect (() => { 
+            this.bottombar.page_added.connect (() => {
                 if (!this.split_view.is_empty ())
-                    on_plugin_toggled (bottombar); 
-            });            
+                    on_plugin_toggled (bottombar);
+            });
 
             hp1 = new Gtk.Paned (Gtk.Orientation.HORIZONTAL);
             hp2 = new Gtk.Paned (Gtk.Orientation.HORIZONTAL);
@@ -612,7 +612,9 @@
         }
 
         void action_close_tab () {
-
+            var view = get_current_view ();
+            if (view != null)
+                view.close_current_document ();
         }
 
         void action_quit () {

=== modified file 'src/Widgets/DocumentView.vala'
--- src/Widgets/DocumentView.vala	2015-03-19 21:34:20 +0000
+++ src/Widgets/DocumentView.vala	2015-03-30 21:07:33 +0000
@@ -24,23 +24,23 @@
 using Granite.Widgets;
 
 namespace Scratch.Widgets {
-    
+
     public class DocumentView : Gtk.Box {
 
         // Parent window
         private weak MainWindow window;
-        
+
         // Widgets
         public DynamicNotebook notebook;
-        
+
         public GLib.List<Document> docs;
-        
+
         public Scratch.Services.Document current {
             set {
                 notebook.current = value;
             }
         }
-        
+
         // Signals
         public signal void document_change (Document? document);
         public signal void empty ();
@@ -48,9 +48,9 @@
         public DocumentView (MainWindow window) {
             orientation = Orientation.VERTICAL;
             this.window = window;
-            
+
             docs = new GLib.List<Document> ();
-            
+
             // Layout
             this.notebook = new DynamicNotebook ();
             this.notebook.allow_restoring = true;
@@ -87,7 +87,7 @@
             });
 
             this.pack_start (notebook, true, true, 0);
-            
+
             show_all ();
         }
 
@@ -97,17 +97,17 @@
 
             return ScratchApp.instance.data_home_folder_unsaved + new_text_file;
         }
-        
+
         public void new_document () {
             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;
-            
+
             doc.focus ();
         }
 
@@ -117,7 +117,7 @@
 
             var doc = new Document (window.main_actions, file);
             doc.create_page ();
-            
+
             // Set clipboard content
             try {
                 string s;
@@ -131,24 +131,24 @@
 
             doc.focus ();
         }
-        
+
         public void open_document (Document doc) {
             for (int n = 0; n <= docs.length (); n++) {
                 if (docs.nth_data (n) == null)
                     continue;
-                if (docs.nth_data (n).file != null 
+                if (docs.nth_data (n).file != null
                         && docs.nth_data (n).file.get_uri () == doc.file.get_uri ()) {
                     this.notebook.current = docs.nth_data (n);
                     warning ("This Document was already opened! Not opening a duplicate!");
                     return;
                 }
             }
-           
+
             doc.create_page ();
-            
+
             this.notebook.insert_tab (doc, -1);
             this.notebook.current = doc;
-            
+
             doc.focus ();
         }
 
@@ -158,7 +158,7 @@
 
             var doc = new Document (window.main_actions, file);
             doc.create_page ();
-            
+
             // Set a copy of content
             try {
                 string s;
@@ -172,16 +172,16 @@
 
             doc.focus ();
         }
-        
+
         public void next_document () {
             uint current_index = docs.index (get_current_document ()) + 1;
             if (current_index < docs.length ()) {
                 Document? next_doc = docs.nth_data (current_index++);
                 this.notebook.current = next_doc;
                 next_doc.focus();
-            } 
+            }
         }
-        
+
         public void previous_document () {
             uint current_index = docs.index (get_current_document ());
             if (current_index > 0) {
@@ -190,28 +190,36 @@
                 previous_doc.focus ();
             }
         }
-        
+
         public void close_document (Document doc) {
             this.notebook.remove_tab (doc);
             doc.close ();
         }
-        
+
+        public void close_current_document () {
+            var doc = get_current_document ();
+            if (doc != null) {
+                if(this.notebook.close_tab_requested (doc))
+                     this.notebook.remove_tab (doc);
+            }
+        }
+
         public Document? get_current_document () {
             return this.notebook.current as Document;
         }
-        
+
         public void set_current_document (Document doc) {
             this.notebook.current = doc;
         }
-        
+
         public bool is_empty () {
             return this.docs.length () == 0;
         }
-        
+
         public new void focus () {
             get_current_document ().focus ();
         }
-        
+
         private void on_doc_added (Granite.Widgets.Tab tab) {
             var doc = tab as Document;
             doc.main_actions = window.main_actions;
@@ -261,13 +269,13 @@
                 document_change (doc);
             }
 
-            return true;  
+            return true;
         }
-        
+
         private bool drag_motion (Gdk.DragContext ctx, int x, int y, uint time){
             return true;
         }
-        
+
         private void drag_received(Gdk.DragContext ctx, int x, int y, Gtk.SelectionData sel,  uint info, uint time){
             var uris = sel.get_uris ();
             if (uris.length > 0) {
@@ -277,7 +285,7 @@
                     Document doc = new Document (window.main_actions, file);
                     this.open_document (doc);
                 }
-                
+
                 Gtk.drag_finish (ctx, true, false, time);
             }
         }

=== modified file 'src/Widgets/SourceView.vala'
--- src/Widgets/SourceView.vala	2015-03-19 21:34:20 +0000
+++ src/Widgets/SourceView.vala	2015-03-30 21:07:33 +0000
@@ -97,6 +97,7 @@
             });
 
             this.key_press_event.connect ((key_event) => {
+
                 switch (key_event.keyval) {
                     case Gdk.Key.plus:
                         if (Gdk.ModifierType.CONTROL_MASK in key_event.state) {
@@ -309,7 +310,7 @@
         public void set_language (SourceLanguage? lang) {
             if (lang == null)
                 return;
-                
+
             this.buffer.set_language (lang);
             this.language_changed (lang);
         }
@@ -345,7 +346,5 @@
                 deselected ();
             return false;
         }
-
     }
-
-}
\ No newline at end of file
+}