fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

layout_config() updated to use wins_set_layout()

Browse Source
This commit is contained in:
Frederic Culot 2007-08-15 15:37:53 +00:00
parent 77d047d033
commit e5eed3759b
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/custom.c
View File

@ -1,4 +1,4 @@
/* $calcurse: custom.c,v 1.15 2007/07/28 13:11:42 culot Exp $ */ /* $calcurse: custom.c,v 1.16 2007/08/15 15:37:53 culot Exp $ */
/* /*
* Calcurse - text-based organizer * Calcurse - text-based organizer
@ -262,7 +262,7 @@ custom_load_conf(conf_t *conf, int background)
var = 0; var = 0;
break; break;
case CUSTOM_CONF_LAYOUT: case CUSTOM_CONF_LAYOUT:
conf->layout = atoi(e_conf); wins_set_layout(atoi(e_conf));
var = 0; var = 0;
break; break;
case CUSTOM_CONF_NOTIFYBARSHOW: case CUSTOM_CONF_NOTIFYBARSHOW:
@ -352,10 +352,10 @@ config_bar(void)
} }
/* Choose the layout */ /* Choose the layout */
int void
layout_config(int layout) layout_config(void)
{ {
int ch, old_layout; int ch;
char *layout_mesg = _("Pick the desired layout on next screen [press ENTER]"); 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 *choice_mesg = _("('A'= Appointment panel, 'C'= calendar panel, 'T'= todo panel)");
char *layout_up_mesg = char *layout_up_mesg =
@ -363,7 +363,6 @@ layout_config(int layout)
char *layout_down_mesg = char *layout_down_mesg =
_(" [1]AT [2]AC [3]TA [4]CA [5]TA [6]TC [7]AT [8]CT"); _(" [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); status_mesg(layout_mesg, choice_mesg);
wgetch(swin); wgetch(swin);
status_mesg(layout_up_mesg, layout_down_mesg); status_mesg(layout_up_mesg, layout_down_mesg);
@ -371,12 +370,10 @@ layout_config(int layout)
doupdate(); doupdate();
while ((ch = wgetch(swin)) != 'q') { while ((ch = wgetch(swin)) != 'q') {
if ( ch <= '8' && ch >= '1' ) { if ( ch <= '8' && ch >= '1' ) {
layout = ch - '0'; wins_set_layout(ch - '0');
return layout; return;
} }
} }
layout = old_layout;
return layout;
} }
/* Color theme configuration. */ /* Color theme configuration. */

4
src/custom.h
View File

@ -1,4 +1,4 @@
/* $calcurse: custom.h,v 1.8 2007/07/28 13:11:42 culot Exp $ */ /* $calcurse: custom.h,v 1.9 2007/08/15 15:37:53 culot Exp $ */
/* /*
* Calcurse - text-based organizer * Calcurse - text-based organizer
@ -71,7 +71,7 @@ void custom_apply_attr(WINDOW *, int);
void custom_remove_attr(WINDOW *, int); void custom_remove_attr(WINDOW *, int);
void custom_load_conf(conf_t *, int); void custom_load_conf(conf_t *, int);
void config_bar(void); void config_bar(void);
int layout_config(int); void layout_config(void);
void custom_color_config(int); void custom_color_config(int);
void custom_color_theme_name(char *); void custom_color_theme_name(char *);
void custom_general_config(conf_t *); void custom_general_config(conf_t *);