Merge lp:~artem-anufrij/footnote/optimize-workflow into lp:footnote

[Artem Anufrij]

- Show last save date, instead create date.
- autosave on selection_changed (like Scratch)
- autosave on window destroy (like Scratch)
- no "read_only" mode. The note can be instant modified after selected it.
- delete/export/bookmark - buttons are moved into listbox items (mouse over, like Geary).
- some improvement of code design

- Show last save date, instead create date.
- autosave on selection_changed (like Scratch)
- autosave on window destroy (like Scratch)
- no "read_only" mode. The note can be instant modified after selected it.
- delete/export/bookmark - buttons are moved into listbox items (mouse over, like Geary).
- some improvement of code design

[lp:~artem-anufrij/footnote/optimize-workflow]

317. By artem-anufrij on 2015-01-08

remove // line

318. By artem-anufrij on 2015-01-08

remove comment lines

319. By artem-anufrij on 2015-01-08

remove comment lines

[Artem Anufrij (artem-anufrij)]

review: Approve

=== modified file 'src/Database.vala'
--- src/Database.vala	2015-01-06 21:31:31 +0000
+++ src/Database.vala	2015-01-08 20:03:55 +0000
@@ -31,10 +31,10 @@
     private SQLHeavy.Database db;
 
     private DataBase () {
-        var db_file = File.new_for_path (Environment.get_user_data_dir ()+"/footnote/notes.db");
+        var db_file = File.new_for_path (Environment.get_user_data_dir () + "/footnote/notes.db");
         var need_create = !db_file.query_exists ();
         try {
-            db = new SQLHeavy.Database (Environment.get_user_data_dir ()+"/footnote/notes.db", 
+            db = new SQLHeavy.Database (Environment.get_user_data_dir () + "/footnote/notes.db", 
                 SQLHeavy.FileMode.READ | SQLHeavy.FileMode.WRITE | SQLHeavy.FileMode.CREATE);
             if (need_create) {
                 db.execute ("CREATE TABLE notebooks (name TEXT, color TEXT, id INTEGER PRIMARY KEY AUTOINCREMENT);");
@@ -66,6 +66,7 @@
 
     public void update_note (Widgets.Note note) {
         try {
+            DateTime datetime = new DateTime.now_local ();
             Gtk.TextIter s, e;
             note.content.buffer.get_bounds (out s, out e);
             uint8 [] data = note.content.buffer.serialize (note.content.buffer, note.format, s, e);
@@ -73,9 +74,10 @@
             q.set_string (":title", note.title.label);
             q.set_blob (":content", data);
             q.set_int (":bookmarked", (int)note.bookmarked);
-            q.set_int64 (":date", note.datetime.to_unix ());
+            q.set_int64 (":date", datetime.to_unix ());
             q.set_int (":id", note.id);
             q.execute ();
+            note.datetime = datetime;
             note.edited ();
         } catch (SQLHeavy.Error e) {
             critical (e.message);
@@ -95,12 +97,12 @@
     public void restore_note (Widgets.Note note) {
         
         try {
-            var q = db.prepare ("SELECT title,content,rowid,date,bookmarked FROM 'notes' WHERE rowid=:id");
+            var q = db.prepare ("SELECT title, content, rowid, date, bookmarked FROM 'notes' WHERE rowid=:id");
             q.set_int (":id", note.id);
-            
+
             var res = q.execute ();
 
-            DateTime datetime = datetime_converter (res);
+            DateTime datetime = datetime_converter (res, 3);
 
             // TITLE
             note.title.label = res.fetch_string (0);
@@ -138,10 +140,10 @@
     public Gee.ArrayList<Widgets.Note> get_notes_from_notebook (Widgets.Notebook nb) {
         var list = new Gee.ArrayList<Widgets.Note> ();
         try {
-            var q = db.prepare ("SELECT title,content,rowid,date,bookmarked FROM 'notes' WHERE notebook = :id ORDER BY rowid ASC;");
+            var q = db.prepare ("SELECT title, content, rowid, date, bookmarked FROM 'notes' WHERE notebook = :id ORDER BY rowid ASC;");
             q.set_int (":id", nb.id);
             for (var res = q.execute (); !res.finished; res.next ()) {
-                DateTime datetime = datetime_converter (res);
+                DateTime datetime = datetime_converter (res, 3);
 
                 var note = new Widgets.Note.from_existing (nb, res.fetch_string (0), res.fetch_blob (1), 
                     res.fetch_int (2), datetime, (bool)res.fetch_int (4));
@@ -262,12 +264,12 @@
         dialog.destroy ();
     }
     
-    public DateTime datetime_converter (SQLHeavy.QueryResult res) {
+    public DateTime datetime_converter (SQLHeavy.QueryResult res, int column_index) {
         DateTime return_value = new DateTime.now_local ();
 
         try {
-            if (res.field_type (3) == typeof(string)) {
-                var date_string = res.fetch_string (3);
+            if (res.field_type (column_index) == typeof(string)) {
+                var date_string = res.fetch_string (column_index);
                 var parts = date_string.split (" ", 3);
                 var hour_parts = parts[0].split (":", 2);
                 var day_parts = parts[2].split (".", 3);
@@ -279,7 +281,7 @@
                 
                 return_value = new DateTime.local (year, month, day, hours, minutes, 0);
             } else
-                return_value = new DateTime.from_unix_local (res.fetch_int64 (3));
+                return_value = new DateTime.from_unix_local (res.fetch_int64 (column_index));
         } catch (SQLHeavy.Error e) {
             critical (e.message);
         }

=== modified file 'src/Footnote.vala'
--- src/Footnote.vala	2015-01-03 23:38:01 +0000
+++ src/Footnote.vala	2015-01-08 20:03:55 +0000
@@ -55,7 +55,6 @@
         public Gtk.Window                mainwindow;
         public Widgets.SideBar sidebar;
         public Granite.Widgets.Welcome welcome;
-        public Granite.Widgets.ModeButton view_mode;
         public Granite.Widgets.ThinPaned hmain;
         private Gtk.Stack stack;
         
@@ -86,7 +85,7 @@
         public bool                      showing_search;
         public bool                      fullscreened;
         public Gtk.InfoBar               undo_bar;
-        private Gtk.ToolButton add_new_button;
+        private Gtk.ToolButton           add_new_button;
 
         public int                       year;
         public int                       month;
@@ -170,9 +169,10 @@
                 settings.window_state = window_state;
 
                 settings.sidebar_width = hmain.position;
-                settings.view_mode = view_mode.selected;
-                if (selected_notebook != null)
+                if (selected_notebook != null) {
                     settings.last_notebook = selected_notebook.id;
+                    selected_notebook.view.miller_noteviewer.save ();
+                }
 
                 Gtk.main_quit ();
             });
@@ -201,20 +201,13 @@
             export_button.icon_name = "document-export";
             export_button.name = _("Export notebook");
             export_button.tooltip_text = _("Export current notebook…");
-
-            view_mode = new Granite.Widgets.ModeButton ();
-            view_mode.append (new Gtk.Image.from_icon_name ("view-filter-symbolic", Gtk.IconSize.BUTTON));
-            view_mode.append (new Gtk.Image.from_icon_name ("view-column-symbolic", Gtk.IconSize.BUTTON));
-            view_mode.valign = Gtk.Align.CENTER;
-            view_mode.selected = settings.view_mode;
-
+            
             search = new Gtk.SearchEntry ();
             search.placeholder_text = _("Search Notes");
 
             var tb = new Gtk.HeaderBar ();
             tb.show_close_button = true;
             tb.pack_start (add_new_button);
-            tb.pack_start (view_mode);
             tb.pack_end (export_button);
             tb.pack_end (search);
 
@@ -283,10 +276,6 @@
             /**
              * events
              **/
-            /*switch views*/
-            view_mode.mode_changed.connect (() => {
-                selected_notebook.view.update_view ();
-            });
             /*search on every keypress*/
             search.search_changed.connect (() => {
                 on_search_changed ();
@@ -312,7 +301,7 @@
                     add_button.sensitive = false;
                     var note = ((Widgets.BookmarkItem)item).note;
                     stack.set_visible_child (note.notebook.view);
-                    note.notebook.view.open_note (note);
+                    note.notebook.view.open_note (note, true);
                 }
             });
             /*add a new notebook*/
@@ -376,11 +365,6 @@
             sidebar.selected = notebook.sidebar_item;
             selected_notebook.view.update_view ();
             generate_year_combobox ();
-            if (notebook.is_empty ()) {
-                view_mode.sensitive = false;
-            } else {
-                view_mode.sensitive = true;
-            }
         }
 
         private void on_search_changed () {
@@ -396,23 +380,6 @@
             sidebar.add_notebook (notebook);
             notebook.note_added.connect ((note) => {
                 generate_year_combobox ();
-                if (notebook == selected_notebook) {
-                    if (notebook.is_empty ()) {
-                        view_mode.sensitive = false;
-                    } else {
-                        view_mode.sensitive = true;
-                    }
-                }
-            });
-
-            notebook.note_trashed.connect (() => {
-                if (notebook == selected_notebook) {
-                    if (notebook.is_empty ()) {
-                        view_mode.sensitive = false;
-                    } else {
-                        view_mode.sensitive = true;
-                    }
-                }
             });
 
             notebook.view.start_editing.connect (() => {

=== modified file 'src/Widgets/EditView.vala'
--- src/Widgets/EditView.vala	2015-01-06 21:31:31 +0000
+++ src/Widgets/EditView.vala	2015-01-08 20:03:55 +0000
@@ -23,9 +23,9 @@
     
     public class EditView : Gtk.EventBox {
         
-        public Gtk.TextView title;
-        public Gtk.TextView content;
-        public Gtk.Toolbar  editbar;
+        public Gtk.TextView     title;
+        public Gtk.TextView     content;
+        public Gtk.Toolbar      editbar;
         private Gtk.ToggleToolButton bold;
         private Gtk.ToggleToolButton italic;
         private Gtk.ToggleToolButton strike;
@@ -100,19 +100,12 @@
                     current_note.tag ("marked", mark.active);
             });
 
-            var done = new Gtk.ToolButton (null, null);
-            done.label = _("Save");
-            done.icon_name = "document-save";
-            done.tooltip_text = _("Save the current note");
-            done.get_style_context ().add_class (Gtk.STYLE_CLASS_SUGGESTED_ACTION);
-
-            var cancel = new Gtk.ToolButton (null, null);
-            cancel.label = _("Cancel");
-            cancel.icon_name = "go-previous";
-            cancel.tooltip_text = _("Cancel all changes");
-
-            editbar.insert (cancel,                       -1);
-            editbar.insert (done,                         -1);
+            var revert = new Gtk.ToolButton (null, null);
+            revert.label = _("revert");
+            revert.icon_name = "document-revert";
+            revert.tooltip_text = _("Restore this file");
+
+            editbar.insert (revert,                       -1);
             editbar.insert (new Gtk.SeparatorToolItem (), -1);
             editbar.insert (undo,                         -1);
             editbar.insert (redo,                         -1);
@@ -126,13 +119,13 @@
             content_scroll.add (this.content);
             content_scroll.hscrollbar_policy = Gtk.PolicyType.NEVER;
             this.content.wrap_mode = Gtk.WrapMode.WORD_CHAR;
-            title.get_style_context ().add_class ("h2");
+            this.title.get_style_context ().add_class ("h2");
             this.title.margin_top = 12;
 
             content_scroll.margin_left = content_scroll.margin_right = this.title.margin_left = 12;
-            
+
             container.pack_start (editbar, false);
-            container.pack_start (title,   false);
+            container.pack_start (title, false);
             container.pack_start (content_scroll);
             
             this.title.margin_bottom = 12;
@@ -146,46 +139,37 @@
                 }
                 return false;
             });
-            
-            done.clicked.connect ( () => {
-                this.done ();
-            });
-            
-            cancel.clicked.connect ( () => {
+
+            revert.clicked.connect ( () => {
                 this.cancel ();
             });
-            
-            title.buffer.changed.connect ( () => {
-                if (title.buffer.text == "")
-                    done.sensitive = false;
-                else
-                    done.sensitive = true;
-            });
-            
+
             this.key_press_event.connect ( (e) => {
-                if (e.keyval == Gdk.Key.Escape) {
-                    this.cancel ();
-                    return true;
-                } else if (e.keyval == Gdk.Key.s && Gdk.ModifierType.CONTROL_MASK in e.state) {
-                    this.done ();
+                if (e.keyval == Gdk.Key.s && Gdk.ModifierType.CONTROL_MASK in e.state) {
+                    this.save ();
                     return true;
                 }
                 return false;
             });
         }
         
-        private void done () {
-            current_note.title.label = this.title.buffer.text;
-            current_note.save ();
-            this.close ();
+        public void save () {
+            if (current_note != null && (this.title.buffer.get_modified () || this.content.buffer.get_modified ())) {
+                current_note.title.label = this.title.buffer.text;
+                current_note.save ();
+                
+                this.title.buffer.set_modified (false);
+                this.content.buffer.set_modified (false);
+            }
         }
         
         private void cancel () {
             current_note.restore ();
-            this.close ();
         }
         
         public void open_note (Note n) {
+            this.save ();
+
             if (parent == null)
                 open (); //show the edit view
 
@@ -215,7 +199,10 @@
             }
             else
                 content.grab_focus ();
-                
+            
+            this.title.buffer.set_modified (false);
+            this.content.buffer.set_modified (false);
+            
             current_note = n;
         }
     }

=== modified file 'src/Widgets/Note.vala'
--- src/Widgets/Note.vala	2015-01-06 21:31:31 +0000
+++ src/Widgets/Note.vala	2015-01-08 20:03:55 +0000
@@ -32,8 +32,8 @@
         public Gtk.TextView     content;
         public Gtk.Label        date;
         public Notebook         notebook;
-        public Gtk.Button bookmarked_button;
-        public bool bookmarked;
+        public Gtk.Button       bookmarked_button;
+        public bool             bookmarked;
 
         public int          id;
         public int          month;
@@ -47,7 +47,7 @@
         public Gdk.Atom deformat;
 
         public Note.from_existing (Notebook notebook, 
-            string title, uint8[] content_, int id, DateTime datetime, bool bookmarked){
+            string title, uint8[] content_, int id, DateTime datetime, bool bookmarked) {
             this.bookmarked = bookmarked;
             this.notebook = notebook;
             this.id = id;
@@ -94,7 +94,6 @@
             date.get_style_context ().add_class ("h3");
             date.margin_top = date.margin_bottom = 6;
             date.selectable = true;
-            set_time_label ();
 
             content.editable = false;
             content.cursor_visible = false;
@@ -241,7 +240,10 @@
             DataBase.get_default ().add_note (this);
         }
 
-        private void set_time_label () {
+        public string get_time_label (DateTime? dt) {
+            if (dt == null)
+                return "";
+                
             // If AM/PM doesn't exist, use 24h.
             string time_format;
             if (Posix.nl_langinfo (Posix.NLItem.AM_STR) == null || Posix.nl_langinfo (Posix.NLItem.AM_STR) == "") {
@@ -251,20 +253,15 @@
                 // If AM/PM exists, assume it is the default time format and check for format override.
                 var setting = new GLib.Settings ("org.gnome.desktop.interface");
                 var clockformat = setting.get_user_value ("clock-format");
-                if (clockformat == null) {
+                
+                if (clockformat == null || clockformat.get_string ().contains ("12h")) 
                     time_format = Granite.DateTime.get_default_time_format (true);
-                } else {
-
-                    if (clockformat.get_string ().contains ("12h")) {
-                        time_format = Granite.DateTime.get_default_time_format (true);
-                    } else {
-                        time_format = Granite.DateTime.get_default_time_format (false);
-                    }
-                }
+                else 
+                    time_format = Granite.DateTime.get_default_time_format (false);
             }
 
             var date_format = Granite.DateTime.get_default_date_format (false, true, true);
-            date.label = datetime.format (date_format + " - " + time_format);
+            return dt.format (date_format + " " + time_format);
         }
 
         public void save () {

=== modified file 'src/Widgets/NoteView.vala'
--- src/Widgets/NoteView.vala	2015-01-07 21:46:07 +0000
+++ src/Widgets/NoteView.vala	2015-01-08 20:03:55 +0000
@@ -21,7 +21,6 @@
     public class ActionMenu : Gtk.Revealer {
         
         public Gtk.Button export_button;
-        public Gtk.Button edit_button;
         public Gtk.Button delete_button;
         public Gtk.Button bookmarked_button;
         
@@ -32,10 +31,6 @@
             export_button.tooltip_text = _("Export");
             export_button.relief = Gtk.ReliefStyle.NONE;
             
-            edit_button = new Gtk.Button.from_icon_name ("edit-symbolic", Gtk.IconSize.BUTTON);
-            edit_button.tooltip_text = _("Edit");
-            edit_button.relief = Gtk.ReliefStyle.NONE;
-            
             delete_button = new Gtk.Button.from_icon_name ("edit-delete-symbolic", Gtk.IconSize.BUTTON);
             delete_button.tooltip_text = _("Delete");
             delete_button.relief = Gtk.ReliefStyle.NONE;
@@ -56,21 +51,18 @@
             
             var buttons = new Gtk.Grid ();
             buttons.orientation = orientation;
+            buttons.add (bookmarked_button);
+            buttons.add (export_button);
             buttons.add (delete_button);
-            buttons.add (export_button);
-            buttons.add (edit_button);
-            buttons.add (bookmarked_button);
-            
+
+            buttons.opacity = 0.5;
             this.transition_type = Gtk.RevealerTransitionType.CROSSFADE;
             this.add (buttons);
             
             /**
              * Events
              **/
-            /*ask the app to edit the note*/
-            edit_button.clicked.connect ( () => {
-                this.note.edit ();
-            });
+             
             /*export clicked, show contractor dialog*/
             export_button.clicked.connect ( () => {
                 var app = (Gtk.Application)GLib.Application.get_default ();
@@ -86,12 +78,14 @@
                     contr.run_selected ();
                 dialog.destroy ();
             });
+            
             /*delete note*/
             delete_button.clicked.connect ( () => {
                 this.note.is_trashed = true;
                 this.note.trashed ();
             });
 
+            /*bookmark note*/
             bookmarked_button.clicked.connect (() => {
                 this.note.bookmarked = !this.note.bookmarked;
                 this.note.bookmark (this.note.bookmarked);
@@ -199,8 +193,8 @@
         private Gtk.Paned           miller_paned;
         private Gtk.ListBox         miller_listbox;
         private Gtk.ScrolledWindow  miller_scroll;
-        public NoteViewer           miller_noteviewer;
-        private EditView            edit_view;
+        public EditView             miller_noteviewer;
+        private Gtk.ScrolledWindow  miller_view_scroll;
         private Gtk.ListBox         note_list;
         private Notebook            notebook;
         private Gtk.Stack           main_stack;
@@ -216,13 +210,11 @@
          * Constructor
          */
         public NoteView (FootnoteApp app, Notebook notebook) {
-
+            this.orientation = Gtk.Orientation.VERTICAL;
             this.app            = app;
             this.notebook       = notebook;
             this.filter         = "";
 
-            edit_view = new EditView (app);
-
             deletion_infobar = new Gtk.InfoBar ();
             deletion_infobar.message_type = Gtk.MessageType.INFO;
             deletion_infobar.no_show_all = true;
@@ -264,13 +256,13 @@
             });
             
             miller_listbox = new Gtk.ListBox ();
-            miller_noteviewer = new NoteViewer ();
+            miller_noteviewer = new EditView (app);
 
             miller_scroll = new Gtk.ScrolledWindow (null, null);
             miller_scroll.add (miller_noteviewer);
 
             miller_listbox.row_activated.connect ((row) => {
-                miller_noteviewer.open_note (((MillerRow)row).note);
+                open_note (((MillerRow)row).note);
             });
 
             miller_listbox.set_filter_func ((row) => {
@@ -281,18 +273,6 @@
                 return should_appear ((Note)row.get_child ());
             });
 
-            notebook.note_edit.connect ((note) => {
-                open_note (note);
-            });
-
-            edit_view.close.connect ( (reverse) => {
-                toggle_edit (false);
-                
-                Gtk.ListBoxRow selected_row = miller_listbox.get_selected_row ();
-                if (selected_row != null)
-                    selected_row.activate ();
-            });
-
             var empty_label = new Gtk.Label (_("Notebook \"%s\" is empty").printf (notebook.title));
             empty_label.expand = true;
             empty_label.halign = Gtk.Align.CENTER;
@@ -302,7 +282,7 @@
             empty_grid.expand = true;
             empty_grid.add (empty_label);
 
-            var miller_view_scroll = new Gtk.ScrolledWindow (null, null);
+            miller_view_scroll = new Gtk.ScrolledWindow (null, null);
             miller_view_scroll.add (miller_listbox);
             miller_view_scroll.hscrollbar_policy = Gtk.PolicyType.NEVER;
 
@@ -314,7 +294,6 @@
             main_stack.add_named (empty_grid, "empty");
             main_stack.add_named (list_scroll, "list");
             main_stack.add_named (miller_paned, "miller");
-            main_stack.add_named (edit_view, "editor");
 
             add (deletion_infobar);
             add (main_stack);
@@ -327,15 +306,9 @@
          **/
         public void toggle_edit (bool show) {
             if (show) {
-                main_stack.set_visible_child_name ("editor");
                 start_editing ();
             } else {
                 stop_editing ();
-                if (app.view_mode.selected == 1) {
-                    main_stack.set_visible_child_name ("miller");
-                } else {
-                    main_stack.set_visible_child_name ("list");
-                }
             }
         }
 
@@ -377,25 +350,19 @@
          * filter string (e.g. in title, text or as a tag).
          */
         public void update_view () {
-            /*switch view if necessary*/
-            if (main_stack.get_visible_child () == edit_view)
-                edit_view.close (true);
-
             if (notebook.is_empty ()) {
                 start_editing ();
                 main_stack.set_visible_child_name ("empty");
                 return;
             }
 
-            if (app.view_mode.selected == 1) {
-                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);
-                }
-            } else
-                main_stack.set_visible_child_name ("list");
+            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) {
@@ -441,9 +408,15 @@
         /**
          * Scroll to a certain note in the list.
          */
-        public void open_note (Footnote.Widgets.Note n) {
+        public void open_note (Footnote.Widgets.Note n, bool bookmarked = false) {
             toggle_edit (true);
-            edit_view.open_note (n);
+            
+            miller_noteviewer.open_note (n);
+            
+            if (bookmarked)
+                miller_view_scroll.hide ();
+            else
+                miller_view_scroll.show ();
         }
     }
     
@@ -467,28 +440,31 @@
             date_label.xalign = 0;
             date_label.opacity = 0.8;
             date_label.ellipsize = Pango.EllipsizeMode.END;
+            date_label.use_markup = true;
             date_label.halign = Gtk.Align.END;
+            date_label.margin_right = 6;
             
             summary_label = new Gtk.Label ("");
             summary_label.xalign = 0;
             summary_label.valign = Gtk.Align.START;
             summary_label.ellipsize = Pango.EllipsizeMode.END;
-            summary_label.expand = true;
-            summary_label.set_lines (5);
             summary_label.use_markup = true;
             summary_label.opacity = 0.8;
+            summary_label.margin_right = 6;
+            summary_label.expand = true;
+            
             var buttons_revealer = new ActionMenu (note, Gtk.Orientation.VERTICAL);
             
             var grid = new Gtk.Grid ();
             grid.margin_top = 6;
-            grid.row_spacing = 2;
+            grid.row_spacing = 4;
             grid.column_spacing = 2;
             grid.attach (buttons_revealer, 0, 0, 1, 2);
             grid.attach (title_label, 1, 0, 1, 1);
             grid.attach (date_label, 2, 0, 1, 1);
             grid.attach (summary_label, 1, 1, 2, 1);
             grid.attach (new Gtk.Separator (Gtk.Orientation.HORIZONTAL), 0, 3, 3, 1);
-            
+
             var event_box = new Gtk.EventBox ();
             event_box.add (grid);
             event_box.events |= Gdk.EventMask.ENTER_NOTIFY_MASK|Gdk.EventMask.LEAVE_NOTIFY_MASK;
@@ -504,7 +480,7 @@
                 buttons_revealer.set_reveal_child (false);
                 return false;
             });
-            
+
             add (event_box);
             this.show_all();
             update_labels ();
@@ -523,13 +499,20 @@
             string [] lines = note.content.buffer.text.split ("\n");
             
             var result = "";
-            
-            for (int i = 0; i < 5 && i < lines.length ; i++) {
-                result += lines [i] + "\n";
+            var result_lines = 0;
+            foreach (string line in lines) {
+                if (line.strip ().length == 0)
+                    continue;
+                    
+                result += line + "\n";
+                result_lines ++;
+                
+                if (result_lines == 3)
+                    break;
             }
             
-            summary_label.label =  "<span font_size=\"small\">" + result + "</span>";;
-            date_label.label = note.date.label;
+            summary_label.label =  "<span font_size=\"small\">" + result.strip () + "</span>";;
+            date_label.label = "<span font_size=\"small\">" + note.get_time_label (note.datetime) + "</span>";
             title_label.label = note.title.label;
         }
     }