Added general notes and space for next 30 days summary

diff --git a/README b/README
index b29ca875478e7eaf2c17143c0b43d7646c52dd51..1adfde0da2bf3d2f742ccacfbbbc8a92cd449129 100644 (file)
--- a/README
+++ b/README
@@ -152,8 +152,7 @@ TODO list / wish list
  http://git.freesmartphone.org/?p=specs.git;a=blob_plain;f=html/index.html;hb=HEAD
 
  * Features to add:
- - zavai calendar: show month notes ~/.zavai/cal/YYYY/MM/00.txt
- - zavai calendar: show global notes ~/.zavai/cal/notes.txt
+ - calendar: show preview of next 30 days
  - contacts: show as a fancy focus+context list (see prefuse)
  - GSM power and network
     - link to open SHR-dialer

diff --git a/src/widgets/calendar.vala b/src/widgets/calendar.vala
index f9046bfaefa9d18242cece8af24a4e0b8539a74c..bfa1f3dbf11a91ef56ddc4acff1a08b7177d1f1d 100644 (file)
--- a/src/widgets/calendar.vala
+++ b/src/widgets/calendar.vala
@@ -108,6 +108,7 @@ public class Calendar : Gtk.VBox
        protected Gtk.Notebook notebook;
        protected FileNotes month_notes;
        protected FileNotes day_notes;
+       protected FileNotes general_notes;
        protected int cur_year;
        protected int cur_month;
        protected int cur_day;
@@ -123,9 +124,13 @@ public class Calendar : Gtk.VBox
                notebook = new Gtk.Notebook();
 
                day_notes = new FileNotes();
-               notebook.append_page(day_notes, new Gtk.Label("Day notes"));
+               notebook.append_page(day_notes, new Gtk.Label("Day"));
                month_notes = new FileNotes();
-               notebook.append_page(month_notes, new Gtk.Label("Month notes"));
+               notebook.append_page(month_notes, new Gtk.Label("Month"));
+               general_notes = new FileNotes();
+               general_notes.load(zavai.config.homedir + "/cal/notes.txt");
+               notebook.append_page(general_notes, new Gtk.Label("General"));
+               notebook.append_page(new Gtk.Label("TODO"), new Gtk.Label("Next 30"));
 
                pack_start(notebook, true, true, 0);
 
@@ -185,6 +190,7 @@ public class Calendar : Gtk.VBox
        {
                day_notes.save();
                month_notes.save();
+               general_notes.save();
        }
 
        public void show_today()