Merge lp:~artem-anufrij/scratch/improve-split-view into lp:~elementary-apps/scratch/scratch

[Artem Anufrij]

#1: Change two MenuItems "Add View" and "Remove View" to a ToggleButton "Split View"

#2: Fixed the saving bug.

#3: on deactivating "Split View", both views will be merged.

[lp:~artem-anufrij/scratch/improve-split-view]

1426. By artem-anufrij on 2014-12-07

ready for test

[Danielle Foré (danrabbit)]

* We typically don't remove menu items inside the same context. The "Split View" item should be made insensitive, not removed.

* Open a file, split the view, type some stuff in the new document, combine the view, crash

review: Needs Fixing

[lp:~artem-anufrij/scratch/improve-split-view]

1427. By artem-anufrij on 2014-12-07

ToggleButton: change sensetive instead visibility. Crash after 'open doc' -> 'slit view' ON/OFF

1428. By artem-anufrij on 2014-12-07

toggle off after closing last document in the split view

[Artem Anufrij (artem-anufrij)]

> * We typically don't remove menu items inside the same context. The "Split
> View" item should be made insensitive, not removed.

done

> * Open a file, split the view, type some stuff in the new document, combine
> the view, crash

fixed

[lp:~artem-anufrij/scratch/improve-split-view]

1429. By artem-anufrij on 2014-12-31

only merge lp:scratch

Unmerged revisions

1429. By artem-anufrij on 2014-12-31

only merge lp:scratch

1428. By artem-anufrij on 2014-12-07

toggle off after closing last document in the split view

1427. By artem-anufrij on 2014-12-07

ToggleButton: change sensetive instead visibility. Crash after 'open doc' -> 'slit view' ON/OFF

1426. By artem-anufrij on 2014-12-07

ready for test

1425. By artem-anufrij on 2014-12-07

ready for test

1424. By artem-anufrij on 2014-12-07

dev

1423. By artem-anufrij on 2014-12-04

dev version

1422. By artem-anufrij on 2014-12-03

Improve split view behavior and fix the saving bug

=== modified file 'plugins/terminal/terminal.vala'
--- plugins/terminal/terminal.vala	2014-12-05 20:58:48 +0000
+++ plugins/terminal/terminal.vala	2014-12-07 19:14:14 +0000
@@ -150,13 +150,15 @@
         tool_button.tooltip_text = _("Show Terminal");
         tool_button.toggled.connect (() => {
             if (this.tool_button.active) {
-                tool_button.tooltip_text = _("Hide Terminal");
+            	debug ("Show Terminal");
+            	tool_button.tooltip_text = _("Hide Terminal");
                 if (on_bottom) {
                     bottombar.set_current_page (bottombar.append_page (grid, new Gtk.Label (_("Terminal"))));
                 } else {
                     contextbar.set_current_page (contextbar.append_page (grid, new Gtk.Label (_("Terminal"))));
                 }
             } else {
+            	debug ("Hide Terminal");
                 tool_button.tooltip_text = _("Show Terminal");
                 if (on_bottom) {
                     bottombar.remove_page (bottombar.page_num (grid));

=== modified file 'src/MainWindow.vala'
--- src/MainWindow.vala	2014-11-24 19:59:52 +0000
+++ src/MainWindow.vala	2014-12-07 19:14:14 +0000
@@ -156,9 +156,6 @@
             this.toolbar.title = this.title;
             this.toolbar.show_close_button = true;
             this.set_titlebar (this.toolbar);
-            toolbar.menu = ui.get_widget ("ui/AppMenu") as Gtk.Menu;
-            var app_menu = (app as Granite.Application).create_appmenu (toolbar.menu);
-            toolbar.pack_end (app_menu);
 
             // SearchManager
             this.search_revealer = new Gtk.Revealer ();
@@ -179,6 +176,9 @@
             this.split_view.welcome_hidden.connect (() => {
                 set_widgets_sensitive (true);
             });
+            this.split_view.split_view_state_change.connect ((state) => {
+                this.toolbar.split_view.active = state;
+            });
             this.split_view.document_change.connect ((doc) => {
                 this.search_manager.set_text_view (doc.source_view);
                 // Update MainWindow title
@@ -323,6 +323,7 @@
             main_actions.get_action ("Redo").sensitive = val;
             main_actions.get_action ("Revert").sensitive = val;
             this.toolbar.share_app_menu.sensitive = val;
+            this.toolbar.split_view.sensitive = val;
 
             // Zoom button
             main_actions.get_action ("Zoom").visible = get_current_font_size () != get_default_font_size () && val;
@@ -397,7 +398,7 @@
             else {
                 view = split_view.get_focus_child () as Scratch.Widgets.DocumentView;
                 if (view == null)
-                    view = this.split_view.current_view;
+                    view = this.split_view.get_current_view ();
                 view.open_document (doc);
             }
         }
@@ -412,7 +413,7 @@
             else {
                 view = split_view.get_focus_child () as Scratch.Widgets.DocumentView;
                 if (view == null)
-                    view = this.split_view.current_view;
+                    view = this.split_view.get_current_view ();
                 view.close_document (doc);
             }
         }
@@ -703,22 +704,21 @@
             Scratch.Widgets.DocumentView? view = null;
             if (this.split_view.is_empty ()) {
                 view = split_view.add_view ();
-            }
-            else {
+            } else {
                 view = split_view.get_focus_child () as Scratch.Widgets.DocumentView;
             }
             string text_from_clipboard = clipboard.wait_for_text ();
             view.new_document_from_clipboard (text_from_clipboard);
         }
 
-        void action_new_view () {
-            var view = split_view.add_view ();
-            if (view != null)
-                view.new_document ();
-        }
-
-        void action_remove_view () {
-            split_view.remove_view ();
+        public void action_toggle_split_view (bool show_split_view) {
+            if (show_split_view) {
+                var view = split_view.add_view ();
+                if (view != null)
+                    view.new_document ();
+            } else if (split_view.views.length () > 1) {
+                split_view.remove_view ();
+            } 
         }
 
         void action_fullscreen () {
@@ -837,14 +837,6 @@
           /* label, accelerator */       N_("Add New Tab"), "<Control>n",
           /* tooltip */                  N_("Add a new tab"),
                                          action_new_tab },
-           { "NewView", "add",
-          /* label, accelerator */       N_("Add New View"), "F3",
-          /* tooltip */                  N_("Add a new view"),
-                                         action_new_view },
-           { "RemoveView", "window-close",
-          /* label, accelerator */       N_("Remove Current View"), null,
-          /* tooltip */                  N_("Remove this view"),
-                                         action_remove_view },
            { "Undo", "edit-undo",
           /* label, accelerator */       N_("Undo"), "<Control>z",
           /* tooltip */                  N_("Undo the last action"),

=== modified file 'src/Services/Document.vala'
--- src/Services/Document.vala	2014-11-03 21:19:56 +0000
+++ src/Services/Document.vala	2014-12-07 19:14:14 +0000
@@ -671,7 +671,7 @@
             }
         }
 
-        private bool delete_temporary_file (bool force = false) {
+        public bool delete_temporary_file (bool force = false) {
             if (!is_file_temporary || (get_text ().length > 0 && !force))
                 return false;
             try {

=== modified file 'src/Widgets/SourceView.vala'
--- src/Widgets/SourceView.vala	2014-11-12 23:55:34 +0000
+++ src/Widgets/SourceView.vala	2014-12-07 19:14:14 +0000
@@ -176,11 +176,8 @@
         }
 
         public void use_default_font (bool value) {
-
-            if (!value) // if false, simply return null
-                return;
-
-            this.font = ScratchApp.instance.default_font;
+            if (value)
+                this.font = ScratchApp.instance.default_font;
         }
 
         public void change_syntax_highlight_from_file (File file) {
@@ -310,7 +307,7 @@
         public void set_language (SourceLanguage? lang) {
             if (lang == null)
                 return;
-                
+
             this.buffer.set_language (lang);
             this.language_changed (lang);
         }
@@ -349,4 +346,4 @@
 
     }
 
-}
\ No newline at end of file
+}

=== modified file 'src/Widgets/SplitView.vala'
--- src/Widgets/SplitView.vala	2014-11-30 23:20:55 +0000
+++ src/Widgets/SplitView.vala	2014-12-07 19:14:14 +0000
@@ -26,16 +26,17 @@
 
         // Widgets
         public Granite.Widgets.Welcome welcome_screen;
-        public Scratch.Widgets.DocumentView? current_view = null;
+        public Scratch.Services.Document? current_document = null;
 
-        public GLib.List<Scratch.Widgets.DocumentView> views;
-        private GLib.List<Scratch.Widgets.DocumentView> hidden_views;
+        public Scratch.Widgets.DocumentView view1 = null;
+        public Scratch.Widgets.DocumentView view2 = null;
+        public GLib.List<Scratch.Widgets.DocumentView> views = new GLib.List<Scratch.Widgets.DocumentView>();
 
         // Signals
         public signal void welcome_shown ();
         public signal void welcome_hidden ();
         public signal void document_change (Scratch.Services.Document document);
-        public signal void views_changed (uint count);
+        public signal void split_view_state_change (bool splitview);
 
         private weak MainWindow window;
 
@@ -84,56 +85,47 @@
                     Gtk.drag_finish (ctx, true, false, time);
                 }
             });
-
-            this.views = new GLib.List<Scratch.Widgets.DocumentView> ();
-            this.hidden_views = new GLib.List<Scratch.Widgets.DocumentView> ();
         }
 
-        public Scratch.Widgets.DocumentView? add_view () {
-            if (views.length () >= 2) {
-                warning ("Maximum view number was already reached!");
-                return null;
-            }
-
-            // Hide welcome screen
-            if (get_children ().length () > 0)
-                hide_welcome ();
-
-            Scratch.Widgets.DocumentView view;
-            if (hidden_views.length () == 0) {
-                view = new Scratch.Widgets.DocumentView (window);
-
-                view.empty.connect (() => {
-                    remove_view (view);
-                });
-            } else {
-                view = hidden_views.nth_data (0);
-                hidden_views.remove (view);
-            }
-
+        private Scratch.Widgets.DocumentView crate_new_view () {
+            Scratch.Widgets.DocumentView view = new Scratch.Widgets.DocumentView (window);
+            view.empty.connect (view_on_empty);
             view.document_change.connect (on_document_changed);
-            view.vexpand = true;
-
-            if (views.length () < 1)
-                this.pack1 (view, true, true);
-            else
-                this.pack2 (view, true, true);
-
-            view.show_all ();
-
-            views.append (view);
-            this.current_view = view;
-            debug ("View added succefully");
-
-            // Enbale/Disable useless GtkActions about views
-            check_actions ();
+            this.views.append (view);
+            this.add (view);
             return view;
         }
 
-        public void remove_view (Scratch.Widgets.DocumentView? view = null) {
+        public Scratch.Widgets.DocumentView? add_view () {
+            hide_welcome ();
+
+            if (view1 == null) {
+                view1 = crate_new_view ();
+                this.pack1 (view1, true, true);
+                check_actions ();
+                return view1;
+
+            } else if (view2 == null) {
+                view2 = crate_new_view ();
+                this.pack2 (view2, true, true);
+                check_actions ();
+                return view2;
+            }
+
+            check_actions ();
+
+            return get_current_view ();
+        }
+
+        private void view_on_empty (Scratch.Widgets.DocumentView empty_view) {
+            remove_view (empty_view);
+        }
+
+        public void remove_view (Scratch.Widgets.DocumentView? remove_view = null) {
             // If no specific view is required to be removed, just remove the current one
+            Scratch.Widgets.DocumentView? view = remove_view;
             if (view == null)
-                view = get_focus_child () as Scratch.Widgets.DocumentView;
+                view = get_unfocused_view ();
             if (view == null) {
                 warning ("The is no focused view to remove!");
                 return;
@@ -141,12 +133,21 @@
 
             this.remove (view);
             this.views.remove (view);
+
+            merge_views (view);
+
             view.document_change.disconnect (on_document_changed);
-            view.visible = false;
-            this.hidden_views.append (view);
-            debug ("View removed succefully");
-
-            // Enbale/Disable useless GtkActions about views
+
+            if(view1 == view) {
+                view1.destroy ();
+                view1 = null;
+            }
+
+            if(view2 == view) {
+                view2.destroy ();
+                view2 = null;
+            }
+
             check_actions ();
 
             // Move the focus on the other view
@@ -155,15 +156,53 @@
             }
 
             // Show/Hide welcome screen
-            if (this.views.length () == 0)
+            if (this.view1 == null && this.view2 == null)
                 show_welcome ();
+
+            debug ("View removed succefully");
+        }
+
+        private void merge_views (Scratch.Widgets.DocumentView source) {
+            debug ("Merge Views");
+            Scratch.Widgets.DocumentView target = null;
+
+            if (source == view1 && view2 != null)
+                target = view2;
+            else if (source == view2 && view1 != null)
+                target = view1;
+
+            if (target == null)
+                return;
+
+            source.empty.disconnect (view_on_empty);
+            
+            foreach (Granite.Widgets.Tab? tab in source.notebook.tabs) {
+                if (tab == null)
+                    continue;
+                // Check if the tab is not a temporery and empty file
+                if (!(tab as Scratch.Services.Document).delete_temporary_file ()) {
+                    source.notebook.remove_tab (tab);
+                    target.notebook.insert_tab (tab, target.notebook.n_tabs);
+                }
+            }
         }
 
         public Scratch.Widgets.DocumentView? get_current_view () {
-            views.foreach ((v) => {
-                if (v.has_focus)
-                    current_view = v;
-            });
+            Scratch.Widgets.DocumentView? return_value = get_focus_child () as Scratch.Widgets.DocumentView;
+
+            if (return_value != null)
+                return return_value;
+
+            return view1 ?? view2;
+        }
+
+        private Scratch.Widgets.DocumentView? get_unfocused_view () {
+            Scratch.Widgets.DocumentView? current_view = get_current_view();
+            debug ("Current view is null: %s", (current_view == null).to_string ());
+            if (current_view == view1 && view2 != null) 
+                return view2;
+            else if (current_view == view2 && view1 != null)
+                return view1;
 
             return current_view;
         }
@@ -191,16 +230,16 @@
 
         // Detect the last focused Document throw a signal
         private void on_document_changed (Scratch.Services.Document? document) {
-            if (document != null)
-                document_change (document);
+            current_document = document;
+
+            if (current_document != null)
+                document_change (current_document);
+            
         }
 
         // Check the possibility to add or not a new view
-        private void check_actions () {
-            window.main_actions.get_action ("NewView").sensitive = (views.length () < 2);
-            window.main_actions.get_action ("RemoveView").sensitive = (views.length () > 1);
-
-            views_changed (views.length ());
+        private void check_actions (){
+            split_view_state_change (view1 != null && view2 != null);
         }
     }
 }

=== modified file 'src/Widgets/ToolBar.vala'
--- src/Widgets/ToolBar.vala	2014-11-12 20:19:40 +0000
+++ src/Widgets/ToolBar.vala	2014-12-07 19:14:14 +0000
@@ -32,6 +32,7 @@
         public ToolButton revert_button;
         public ToolButton find_button;
         public ToolButton zoom_default;
+        public Gtk.CheckMenuItem split_view;
 
         public Gtk.Menu share_menu;
         public Gtk.Menu menu;
@@ -82,6 +83,15 @@
             });
             share_app_menu.no_show_all = true;
 
+            // Create AppMenu
+            this.menu = ScratchApp.instance.get_last_window ().ui.get_widget ("ui/AppMenu") as Gtk.Menu;
+
+            split_view = new Gtk.CheckMenuItem.with_label ("Split View");
+
+            split_view.activate.connect (() => { ScratchApp.instance.get_last_window ().action_toggle_split_view (split_view.get_active ()); });
+            this.menu.insert (split_view, 0);
+            pack_end (ScratchApp.instance.create_appmenu (this.menu));
+
             // Add everything to the toolbar
             pack_start (open_button);
             pack_start (templates_button);

=== modified file 'src/scratch-ui.xml'
--- src/scratch-ui.xml	2014-08-11 17:35:47 +0000
+++ src/scratch-ui.xml	2014-12-07 19:14:14 +0000
@@ -23,8 +23,6 @@
     </popup>
     
     <popup name="AppMenu">
-        <menuitem action="NewView" />
-        <menuitem action="RemoveView" />
         <separator />
         <menuitem action="Preferences" />
     </popup>