Merge lp:~artem-anufrij/footnote/restore-button-and-note-selection into lp:footnote

[Artem Anufrij]

- Show last opened note after selecting a notebook (before: always first note was selected)
- Restore button will be disabled if the selected note hasn't changes.
- Don't cut the title text on start up.

- Show last opened note after selecting a notebook (before: always first note was selected)
- Restore button will be disabled if the selected note hasn't changes.
- Don't cut the title text on start up.

[Artem Anufrij (artem-anufrij)]

review: Approve

=== modified file 'src/Footnote.vala'
--- src/Footnote.vala	2015-01-08 20:01:16 +0000
+++ src/Footnote.vala	2015-01-09 13:10:45 +0000
@@ -296,12 +296,14 @@
                     add_button.sensitive = true;
                     var selected_item = ((Widgets.NotebookItem)item).notebook;
                     switch_to_notebook (selected_item);
+                    topbar.show ();
                 } else if (item is Widgets.BookmarkItem) { //bookmarks
                     edit_button.sensitive = false;
                     add_button.sensitive = false;
                     var note = ((Widgets.BookmarkItem)item).note;
                     stack.set_visible_child (note.notebook.view);
                     note.notebook.view.open_note (note, true);
+                    topbar.hide ();
                 }
             });
             /*add a new notebook*/
@@ -382,14 +384,6 @@
                 generate_year_combobox ();
             });
 
-            notebook.view.start_editing.connect (() => {
-                topbar.hide ();
-            });
-
-            notebook.view.stop_editing.connect (() => {
-                topbar.show ();
-            });
-
             notebook.note_trashed.connect ((note) => {
                 generate_year_combobox ();
             });
 
=== modified file 'src/Widgets/EditView.vala'
--- src/Widgets/EditView.vala	2015-01-08 19:51:05 +0000
+++ src/Widgets/EditView.vala	2015-01-09 13:10:45 +0000
@@ -31,6 +31,8 @@
         private Gtk.ToggleToolButton strike;
         private Gtk.ToggleToolButton mark;
         
+        private Gtk.ToolButton revert;
+        
         private bool applying_style = false;
         
         public signal void close (bool reverse=false);
@@ -100,7 +102,7 @@
                     current_note.tag ("marked", mark.active);
             });
 
-            var revert = new Gtk.ToolButton (null, null);
+            revert = new Gtk.ToolButton (null, null);
             revert.label = _("revert");
             revert.icon_name = "document-revert";
             revert.tooltip_text = _("Restore this file");
@@ -121,6 +123,7 @@
             this.content.wrap_mode = Gtk.WrapMode.WORD_CHAR;
             this.title.get_style_context ().add_class ("h2");
             this.title.margin_top = 12;
+            this.title.style_updated ();
 
             content_scroll.margin_left = content_scroll.margin_right = this.title.margin_left = 12;
 
@@ -132,15 +135,23 @@
             
             this.add (container);
             
-            title.key_press_event.connect ( (e) => {
+            /*
+             * EVENTS
+             */
+            
+            this.title.key_press_event.connect ( (e) => {
                 if (e.keyval == Gdk.Key.Tab || e.keyval == Gdk.Key.Return) {
                     content.grab_focus ();
                     return true;
                 }
                 return false;
             });
+            
+            this.title.buffer.changed.connect ( () => {
+                this.revert.sensitive = true;
+            });
 
-            revert.clicked.connect ( () => {
+            this.revert.clicked.connect ( () => {
                 this.cancel ();
             });
 
@@ -160,11 +171,14 @@
                 
                 this.title.buffer.set_modified (false);
                 this.content.buffer.set_modified (false);
+                this.revert.sensitive = false;
             }
         }
         
         private void cancel () {
             current_note.restore ();
+            this.title.buffer.text = current_note.title.label;
+            this.revert.sensitive = false;
         }
         
         public void open_note (Note n) {
@@ -193,6 +207,10 @@
                 applying_style = false;
             });
             
+            content.buffer.changed.connect ( () => {
+                revert.sensitive = true;
+            });
+            
             if (n.title.label == _("Untitled") || n.title.label == _("New Note")) {
                 title.grab_focus ();
                 title.select_all (true);
@@ -202,7 +220,7 @@
             
             this.title.buffer.set_modified (false);
             this.content.buffer.set_modified (false);
-            
+            this.revert.sensitive = false;
             current_note = n;
         }
     }
 
=== modified file 'src/Widgets/Note.vala'
--- src/Widgets/Note.vala	2015-01-08 19:51:05 +0000
+++ src/Widgets/Note.vala	2015-01-09 13:10:45 +0000
@@ -103,6 +103,7 @@
             content.buffer.create_tag ("italic", "style", Pango.Style.ITALIC);
             content.buffer.create_tag ("strikethrough", "strikethrough", true);
             content.buffer.create_tag ("marked", "background", "#ffff00");
+
             content.override_background_color (Gtk.StateFlags.NORMAL, {0, 0, 0, 0});
 
             if (bookmarked) {
 
=== modified file 'src/Widgets/NoteView.vala'
--- src/Widgets/NoteView.vala	2015-01-08 20:03:43 +0000
+++ src/Widgets/NoteView.vala	2015-01-09 13:10:45 +0000
@@ -102,7 +102,7 @@
     /*
      * minimal version of note, just the ui
      **/
-    public class NoteViewer : Gtk.Box {
+    /*public class NoteViewer : Gtk.Box {
         
         public Gtk.Label    date;
         public Gtk.Label    title;
@@ -176,7 +176,7 @@
             this.title.label = n.title.label;
             this.date.label = n.date.label;
         }
-    }
+    }*/
 
     /**
      * Display a (filtered) list of Notes for the currently
@@ -189,13 +189,11 @@
 
         private FootnoteApp app;
 
-        private Gtk.ScrolledWindow  list_scroll;
         private Gtk.Paned           miller_paned;
         private Gtk.ListBox         miller_listbox;
         private Gtk.ScrolledWindow  miller_scroll;
         public EditView             miller_noteviewer;
         private Gtk.ScrolledWindow  miller_view_scroll;
-        private Gtk.ListBox         note_list;
         private Notebook            notebook;
         private Gtk.Stack           main_stack;
 
@@ -240,11 +238,6 @@
                 deletion_infobar.hide ();
             });
 
-            note_list = new Gtk.ListBox ();
-            list_scroll = new Gtk.ScrolledWindow (null, null);
-            list_scroll.add (note_list);
-            list_scroll.expand = true;
-
             miller_paned = new Gtk.Paned (Gtk.Orientation.HORIZONTAL);
             miller_paned.position = Settings.get_default ().miller_handle_position;
             miller_paned.key_press_event.connect ( (e) => {
@@ -269,10 +262,6 @@
                 return should_appear (((MillerRow)row).note);
             });
 
-            note_list.set_filter_func ((row) => {
-                return should_appear ((Note)row.get_child ());
-            });
-
             var empty_label = new Gtk.Label (_("Notebook \"%s\" is empty").printf (notebook.title));
             empty_label.expand = true;
             empty_label.halign = Gtk.Align.CENTER;
@@ -292,7 +281,6 @@
             main_stack = new Gtk.Stack ();
             main_stack.transition_type = Gtk.StackTransitionType.SLIDE_LEFT_RIGHT;
             main_stack.add_named (empty_grid, "empty");
-            main_stack.add_named (list_scroll, "list");
             main_stack.add_named (miller_paned, "miller");
 
             add (deletion_infobar);
@@ -316,7 +304,6 @@
          * Add a note to the view
          */
         public void add_note (Note n, int pos=0) {
-            note_list.insert (n, pos);
             update_view ();
 
             var row = new MillerRow (n);
@@ -356,13 +343,16 @@
                 return;
             }
 
+            if (miller_listbox.get_selected_row () == null) {
+                var row = miller_listbox.get_row_at_index (0);
+                if (row != null) {
+                    miller_listbox.select_row (row);
+                    miller_listbox.row_activated (row);
+                }
+            } else 
+                 miller_view_scroll.show ();
+
             main_stack.set_visible_child_name ("miller");
-            var row = miller_listbox.get_row_at_index (0);
-            if (row != null) {
-                miller_listbox.select_row (row);
-                miller_listbox.row_activated (row);
-            }
-
         }
 
         public void change_month (int month) {
@@ -387,7 +377,6 @@
 
         private async void update_notes_visibility () {
             miller_listbox.invalidate_filter ();
-            note_list.invalidate_filter ();
         }
 
         private bool should_appear (Note? note) {