From 3ffab39ccf494599664232b7672b16d12d854fcc Mon Sep 17 00:00:00 2001
From: Frederic Culot <calcurse@culot.org>
Date: Sun, 3 Sep 2006 17:53:26 +0000
Subject: layout_config() improved, and new layout configurations added

---
 src/custom.c | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

(limited to 'src/custom.c')

diff --git a/src/custom.c b/src/custom.c
index 4a2ea72..bd19429 100755
--- a/src/custom.c
+++ b/src/custom.c
@@ -1,4 +1,4 @@
-/*	$calcurse: custom.c,v 1.1 2006/07/31 21:00:02 culot Exp $	*/
+/*	$calcurse: custom.c,v 1.2 2006/09/03 17:53:26 culot Exp $	*/
 
 /*
  * Calcurse - text-based organizer
@@ -108,9 +108,11 @@ int layout_config(int layout, int colr)
 {
 	int ch, old_layout;
 	char *layout_mesg = _("Pick the desired layout on next screen [press ENTER]");
-	char *choice_mesg = _("('A'= Appointment panel, 'c'= calendar panel, 't'= todo panel)");
-	char *layout_up_mesg   = _("   |Ac|      |At|      |cA|      |tA|");
-	char *layout_down_mesg = _("[1]|At|   [2]|Ac|   [3]|tA|   [4]|cA|");
+	char *choice_mesg = _("('A'= Appointment panel, 'C'= calendar panel, 'T'= todo panel)");
+	char *layout_up_mesg   = 
+	_("    AC       AT       CA       TA       TC       TA       CT       AT");
+	char *layout_down_mesg = 
+	_(" [1]AT    [2]AC    [3]TA    [4]CA    [5]TA    [6]TC    [7]AT    [8]CT");
 
 	old_layout = layout;
 	status_mesg(layout_mesg, choice_mesg);
@@ -119,18 +121,8 @@ int layout_config(int layout, int colr)
 	wnoutrefresh(swin);
 	doupdate();
 	while ((ch = wgetch(swin)) != 'q') {
-		switch (ch) {
-		case '1':
-			layout = 1;
-			return layout;
-		case '2':
-			layout = 2;
-			return layout;
-		case '3':
-			layout = 3;
-			return layout;
-		case '4':
-			layout = 4;
+		if ( ch <= '8' && ch >= '1' ) {
+			layout = ch - '0';
 			return layout;
 		}
 	}
-- 
cgit v1.2.3-54-g00ecf