Merge lp:~donadigo/pantheon-notes/improvements into lp:pantheon-notes

[Adam Bieńkowski]

Fixes:
#1553826 "Larger margin",
#1553820 "Delete icon is sensitive when nothing is selected",
#1553822 "Window title should be either "Notes" or file name",
#1553824 "Deleting everything leaves you with an unclickable text area".

The branch improves general UI list management as well as fixes some problems with current set_focus () warnings.

Some notes:
* The Notes path is now located in ~/.local/share/pantheon-notes.
* On startup Notes now will automatically select the page that you were previously working on.
* Page object wasn't removed at all from pages variable which caused wrong information and blocked fixing #1553824, now it is.

Also I'm not sure about some things like if margin should be also at the bottom.

Fixes:
#1553826 "Larger margin",
#1553820 "Delete icon is sensitive when nothing is selected",
#1553822 "Window title should be either "Notes" or file name",
#1553824 "Deleting everything leaves you with an unclickable text area".

[Felipe Escoto (philip.scott)]

review: Approve

=== modified file 'src/Application.vala'
--- src/Application.vala	2016-03-06 22:15:46 +0000
+++ src/Application.vala	2016-03-07 12:16:33 +0000
@@ -23,7 +23,7 @@
             settings = new Notes.Services.Settings ();
 
             if (settings.notes_location == "") {
-                settings.notes_location = GLib.Environment.get_home_dir () + "/.pantheon-notes/";
+                settings.notes_location = Path.build_filename (Environment.get_user_data_dir (), CODE_NAME);
             }
 
 	        Notes.NOTES_DIR = settings.notes_location;
 
=== modified file 'src/Main.vala'
--- src/Main.vala	2016-03-06 21:56:56 +0000
+++ src/Main.vala	2016-03-07 12:16:33 +0000
@@ -14,8 +14,8 @@
     with this program. If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-public static const string APP_NAME = "Pantheon Notes";
-public static const string TERMINAL_NAME = "pantheon-notes";
+public static const string APP_NAME = "Notes";
+public static const string CODE_NAME = "pantheon-notes";
 
 public static int main (string[] args) {
     /* Initiliaze gettext support */
@@ -23,7 +23,7 @@
     //Intl.textdomain (Config.GETTEXT_PACKAGE);
 
     Environment.set_application_name (APP_NAME);
-    Environment.set_prgname (APP_NAME);
+    Environment.set_prgname (CODE_NAME);
 
     var application = new Notes.Application ();
 
 
=== modified file 'src/Widgets/Editor.vala'
--- src/Widgets/Editor.vala	2016-03-06 21:56:56 +0000
+++ src/Widgets/Editor.vala	2016-03-07 12:16:33 +0000
@@ -19,7 +19,6 @@
 
 	    current_page = page;
         code_buffer.text = page.load_text ();
-        window.set_title (page.name);
 
         code_buffer.end_not_undoable_action ();
 
@@ -104,7 +103,7 @@
 
         code_buffer.changed.connect (trigger_changed);
 
-        code_view.left_margin = 12;
+        code_view.left_margin = code_view.right_margin = code_view.top_margin = 24;
         code_view.pixels_above_lines = 6;
         code_view.wrap_mode = Gtk.WrapMode.WORD;
         code_view.show_line_numbers = false;
 
=== modified file 'src/Widgets/Headerbar.vala'
--- src/Widgets/Headerbar.vala	2016-03-06 21:56:56 +0000
+++ src/Widgets/Headerbar.vala	2016-03-07 12:16:33 +0000
@@ -5,20 +5,11 @@
     }
 
     private void build_ui () {
-        set_title (null);
         set_show_close_button (true);
         
         Granite.Widgets.Utils.set_theming_for_screen (this.get_screen (), CUSTOM_STYLESHEET, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
     }
 
-    public new void set_title (string? title) {
-        if (title != null) {
-            this.title = title + " - " + APP_NAME;
-        } else {
-            this.title = APP_NAME;
-        }
-    }
-
      private const string CUSTOM_STYLESHEET = """
             @define-color colorPrimary #695E56;
             .titlebar .label  {
 
=== modified file 'src/Widgets/PagesList.vala'
--- src/Widgets/PagesList.vala	2016-03-06 22:15:46 +0000
+++ src/Widgets/PagesList.vala	2016-03-07 12:16:33 +0000
@@ -77,6 +77,21 @@
         return frame;
     }
 
+    public void select_first () {
+        listbox.select_row (listbox.get_row_at_index (0));
+    }
+
+    public Gtk.ListBoxRow? get_row_from_path (string full_path) {
+        foreach (var row in listbox.get_children ()) {
+            if (row is Notes.PageItem
+                && ((Notes.PageItem)row).page.full_path == full_path) {
+                return (Gtk.ListBoxRow)row;
+            }
+        }
+
+        return null;
+    }
+
     public void clear_pages () {
         listbox.unselect_all ();
         var childerns = listbox.get_children ();
@@ -87,11 +102,6 @@
         }
     }
 
-    private void refresh () {
-    	current_notebook.refresh ();
-        load_pages (current_notebook);
-    }
-
     public void load_pages (Notes.Notebook notebook) {
         clear_pages ();
         this.current_notebook = notebook;
@@ -142,17 +152,22 @@
         });
 
         minus_button.clicked.connect (() => {
-            editor.set_sensitive (false);
             editor.reset (false);
-            window.set_title (null);
-            var row = listbox.get_selected_row ();
-            ((Notes.PageItem) row).trash_page ();
-            refresh ();
+            var row = (Notes.PageItem)listbox.get_selected_row ();
+            if (row != null) {
+                row.trash_page ();
+                current_notebook.pages.remove (row.page);
+                row.destroy ();
+                select_first ();
+                editor.give_focus ();
+            }
         });
 
         listbox.row_selected.connect ((row) => {
+            minus_button.sensitive = (row != null);
             if (row == null) return;
             editor.load_file (((Notes.PageItem) row).page);
+            editor.give_focus ();
         });
     }
 }
 
=== modified file 'src/Widgets/Window.vala'
--- src/Widgets/Window.vala	2016-03-06 21:56:56 +0000
+++ src/Widgets/Window.vala	2016-03-07 12:16:33 +0000
@@ -31,6 +31,15 @@
 		return false;
 	}
 
+	protected override bool key_press_event (Gdk.EventKey event) {
+		if (pages_list.current_notebook.pages.length () <= 0) {
+			new_page ();
+			pages_list.select_first ();
+		}
+
+		return base.key_press_event (event);
+	}
+
 	private void load_settings () {
         resize (settings.window_width, settings.window_height);
 		pane.position = settings.panel_size;
@@ -42,18 +51,15 @@
 		    pages_list.load_pages (notebook);
 		}
 
-		string path = settings.page_path;
-		
-		if (path != "") {
-		    var page = new Notes.Page (path);
-
-		    if (!page.new_page)
-			    editor.load_file (page);
+		var row = pages_list.get_row_from_path (settings.page_path);
+		if (row != null) {
+			row.activate ();
 		}
 	}
 
     private void build_ui () {
         headerbar = new Notes.Headerbar ();
+        headerbar.set_title (APP_NAME);
         set_titlebar (headerbar);
 
         pane = new Gtk.Paned (Gtk.Orientation.HORIZONTAL);
@@ -102,13 +108,6 @@
 		show ();
     	present ();
 
-    	set_focus (editor);
-	}
-
-	public new void set_title (string? title) {
-	    if (title != null)
-	        headerbar.set_title (title);
-	    else
-	        headerbar.set_title (APP_NAME);
+    	editor.give_focus ();
 	}
 }