TODO list updated

status bar updated to display the new 'N' (edit note) and '>' (view note)
keybindings
online help pages added for 'N' and '>' keybindings

5 files changed, 64 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 37f0ef4..d7ed9f6 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+11 Feb 2008:
+	TODO list updated
+	status bar updated to display the new 'N' (edit note) and '>'
+	(view note) keybindings
+	online help pages added for 'N' and '>' keybindings
+	
 10 Feb 2008:
 	manuals updated to make use of css style sheet
 	memory leak fixed in notify_thread_app()
diff --git a/TODO b/TODO
index 9be6df2..7582beb 100755
--- a/TODO
+++ b/TODO
@@ -11,7 +11,6 @@ this list.
 
 High
 ----
-  o  Add the possibility to attach notes to events, todos and appointments
   o  Add import capabilities to read ical files inside calcurse
   o  Create external calendars which would contain hollydays and such (in ics
      format)
@@ -26,11 +25,9 @@ Average
      make the date format user configurable
   o  Make keys user configurable
   o  Add searching capabilities with support for regex
-  o  Allow the creation of sub-todos (divide todos into different tasks)
 
 
 Low
 ---
   o  Add 't' alias for 'g - Enter'
   o  All status bars should be terminal-size dependant (config_bar is not)
-  o  Make use of CSS for html documentation 
diff --git a/src/help.c b/src/help.c
index 7b588b5..5bd7f83 100755
--- a/src/help.c
+++ b/src/help.c
@@ -1,4 +1,4 @@
-/*	$calcurse: help.c,v 1.20 2007/10/21 13:37:30 culot Exp $	*/
+/*	$calcurse: help.c,v 1.21 2008/02/11 21:26:00 culot Exp $	*/
 
 /*
  * Calcurse - text-based organizer
@@ -46,6 +46,8 @@ typedef enum {
 	HELP_DELETE,
 	HELP_ADD,
 	HELP_EDIT,
+	HELP_ENOTE,
+	HELP_VNOTE,
 	HELP_PRIORITY,
 	HELP_REPEAT,
 	HELP_FLAG,
@@ -201,6 +203,14 @@ wanted_page(int ch)
 		page = HELP_EDIT;
 		break;
 
+	case 'n':
+		page = HELP_ENOTE;
+		break;
+
+	case '>':
+		page = HELP_VNOTE;
+		break;
+
 	case 'c':
 		page = HELP_CONFIG;
 		break;
@@ -400,6 +410,43 @@ help_screen(void)
     "       o do not forget to save the calendar data to retrieve the\n"
     "         modified properties next time you launch Calcurse.");
 
+	hscr[HELP_ENOTE].title = _("EditNote:\n");
+	hscr[HELP_ENOTE].text  =
+    _("Pressing 'N' allows you to attach a note to any type of item, or to\n"
+    "edit an already existing note.\n"
+    "This feature is useful if you do not have enough space to store all\n"
+    "of your item description, or if you would like to add sub-tasks to an\n"
+    "already existing todo item for example.\n"
+    "Before pressing the 'N' key, you first need to highlight the item you\n"
+    "want the note to be attached to. Then you will be driven to an\n"
+    "external editor to edit your note. This editor is chosen the following\n"
+    "way:\n"
+    "       o if the 'VISUAL' environment variable is set, then this will be\n"
+    "         the default editor to be called.\n"
+    "       o if 'VISUAL' is not set, then the 'EDITOR' environment variable\n"
+    "         will be used as the default editor.\n"
+    "       o if none of the above environment variables is set, then\n"
+    "         '/usr/bin/vi' will be used.\n"
+    "\nOnce the item note is edited and saved, quit your favorite editor.\n"
+    "You will then go back to Calcurse, and the '>' sign will appear in front\n"
+    "of the highlighted item, meaning there is a note attached to it.");
+
+	hscr[HELP_VNOTE].title = _("ViewNote:\n");
+	hscr[HELP_VNOTE].text  =
+    _("Pressing the '>' key allows you to view a note which was previously\n"
+    "attached to an item (an item which owns a note has a '>' sign in front\n"
+    "of it). This command only permits to view the note, not to\n"
+    "edit it (to do so, use the 'EditNote' command, using the 'N' key).\n"
+    "Once you highlighted an item with a note attached to it, and the 'N' key\n"
+    "was pressed, you will be driven to an external pager to view that note.\n"
+    "The default pager is chosen the following way:\n"
+    "       o if the 'PAGER' environment variable is set, then this will be\n"
+    "         the default viewer to be called.\n"
+    "       o if the above environment variable is not set, then\n"
+    "         '/usr/bin/less' will be used.\n"
+    "As for the 'N' key, quit the pager and you will be driven back to\n"
+    "Calcurse.");
+
 	hscr[HELP_PRIORITY].title = _("Priority:\n");
 	hscr[HELP_PRIORITY].text  =
     _("Pressing '+' or '-' allows you to change the priority of the currently\n"
diff --git a/src/utils.c b/src/utils.c
index 6cdc246..d7a9b36 100755
--- a/src/utils.c
+++ b/src/utils.c
@@ -1,4 +1,4 @@
-/*	$calcurse: utils.c,v 1.42 2008/02/10 16:29:50 culot Exp $	*/
+/*	$calcurse: utils.c,v 1.43 2008/02/11 21:26:01 culot Exp $	*/
 
 /*
  * Calcurse - text-based organizer
@@ -417,6 +417,8 @@ status_bar(void)
 	binding_t draw   = { " ^R", _("Redraw") };
 	binding_t appt   = { " ^A", _("Add Appt") };
 	binding_t todo   = { " ^T", _("Add Todo") };
+	binding_t enote  = { "  N", _("EditNote") };
+	binding_t vnote  = { "  >", _("ViewNote") };
 	binding_t eday   = { "^HL", _("-+1 Day") };
 	binding_t ewek   = { "^KJ", _("-+1 Week") };
 	binding_t othr   = { "  O", _("OtherCmd") }; 
@@ -427,12 +429,12 @@ status_bar(void)
 		&todo, &conf, &othr, &eday, &ewek, &draw, &othr, 
 	/* appointment keys */
 		&help, &quit, &save, &export, &add, &del, &edit, &view, &rept, 
-		&updn, &flag, &othr, &conf, &togo, &appt, &todo, &eday, &ewek, 
-		&tab, &draw, &othr,
+		&updn, &flag, &othr, &enote, &vnote, &appt, &todo, &eday, &ewek, 
+		&conf, &togo, &tab, &draw, &othr,
 	/* todo keys */
 		&help, &quit, &save, &export, &add, &del, &edit, &view, &prio, 
-		&updn, &tab, &othr, &conf, &togo, &appt, &todo, &eday, &ewek, 
-		&draw, &othr 
+		&updn, &tab, &othr, &enote, &vnote, &appt, &todo, &eday, &ewek, 
+		&conf, &togo, &draw, &othr 
 	};
 		
 	/* Total length of a command. */
diff --git a/src/utils.h b/src/utils.h
index a52deb8..051dc4b 100755
--- a/src/utils.h
+++ b/src/utils.h
@@ -1,4 +1,4 @@
-/*	$calcurse: utils.h,v 1.26 2008/01/20 10:45:39 culot Exp $	*/
+/*	$calcurse: utils.h,v 1.27 2008/02/11 21:26:01 culot Exp $	*/
 
 /*
  * Calcurse - text-based organizer
@@ -39,8 +39,8 @@
 #define SPC		32 /* ASCII code for white space */
 
 #define NB_CAL_CMDS	16 /* number of commands while in cal view */
-#define NB_APP_CMDS	21 /* same thing while in appointment view */ 
-#define NB_TOD_CMDS	20 /* same thing while in todo view */
+#define NB_APP_CMDS	23 /* same thing while in appointment view */ 
+#define NB_TOD_CMDS	22 /* same thing while in todo view */
 #define TOTAL_CMDS	NB_CAL_CMDS + NB_APP_CMDS + NB_TOD_CMDS
 #define NB_PANELS	3  /* 3 panels: CALENDAR, APPOINTMENT, TODO */
 #define CMDS_PER_LINE	6  /* max number of commands per line */