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

Reintroduce key bindings in configuration menus

Browse Source 
The key bindings display in the status bar was removed from the general
options menu in bd182fb (Use generic list box for general options,
2014-05-13) and from the notification options menu in 5eea05a (Use
generic list box for notification options, 2014-05-13). Display the new
key bindings to use for navigation.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer
2014-07-17 09:03:49 +02:00
parent 6792a2e204
commit 7920e761c9
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/custom.c
View File

@@ -771,6 +771,11 @@ static void general_option_edit(int i)
/* General configuration. */ /* General configuration. */
void custom_general_config(void) void custom_general_config(void)
{ {
struct binding quit = { _("Quit"), KEY_GENERIC_QUIT };
struct binding up = { _("Up"), KEY_MOVE_UP };
struct binding down = { _("Down"), KEY_MOVE_DOWN };
struct binding edit = { _("Edit Itm"), KEY_EDIT_ITEM };
struct binding *bindings[] = { &quit, &up, &down, &edit };
struct listbox lb; struct listbox lb;
int ch; int ch;
@@ -780,8 +785,12 @@ void custom_general_config(void)
general_option_height, print_general_option); general_option_height, print_general_option);
listbox_load_items(&lb, 10); listbox_load_items(&lb, 10);
listbox_draw_deco(&lb, 0); listbox_draw_deco(&lb, 0);
status_mesg("", "");
listbox_display(&lb); listbox_display(&lb);
wins_set_bindings(bindings, ARRAY_SIZE(bindings));
wins_status_bar();
wnoutrefresh(win[STA].p);
wmove(win[STA].p, 0, 0);
wins_doupdate();
while ((ch = keys_getch(win[KEY].p, NULL, NULL)) != KEY_GENERIC_QUIT) { while ((ch = keys_getch(win[KEY].p, NULL, NULL)) != KEY_GENERIC_QUIT) {
switch (ch) { switch (ch) {
@@ -810,8 +819,11 @@ void custom_general_config(void)
} }
} }
status_mesg("", "");
listbox_display(&lb); listbox_display(&lb);
wins_status_bar();
wnoutrefresh(win[STA].p);
wmove(win[STA].p, 0, 0);
wins_doupdate();
} }
listbox_delete(&lb); listbox_delete(&lb);

16
src/notify.c
View File

@@ -775,6 +775,11 @@ static void config_option_edit(int i)
/* Notify-bar configuration. */ /* Notify-bar configuration. */
void notify_config_bar(void) void notify_config_bar(void)
{ {
struct binding quit = { _("Quit"), KEY_GENERIC_QUIT };
struct binding up = { _("Up"), KEY_MOVE_UP };
struct binding down = { _("Down"), KEY_MOVE_DOWN };
struct binding edit = { _("Edit Itm"), KEY_EDIT_ITEM };
struct binding *bindings[] = { &quit, &up, &down, &edit };
struct listbox lb; struct listbox lb;
int ch; int ch;
@@ -784,8 +789,12 @@ void notify_config_bar(void)
config_option_height, print_config_option); config_option_height, print_config_option);
listbox_load_items(&lb, 8); listbox_load_items(&lb, 8);
listbox_draw_deco(&lb, 0); listbox_draw_deco(&lb, 0);
status_mesg("", "");
listbox_display(&lb); listbox_display(&lb);
wins_set_bindings(bindings, ARRAY_SIZE(bindings));
wins_status_bar();
wnoutrefresh(win[STA].p);
wmove(win[STA].p, 0, 0);
wins_doupdate();
while ((ch = keys_getch(win[KEY].p, NULL, NULL)) != KEY_GENERIC_QUIT) { while ((ch = keys_getch(win[KEY].p, NULL, NULL)) != KEY_GENERIC_QUIT) {
switch (ch) { switch (ch) {
@@ -818,8 +827,11 @@ void notify_config_bar(void)
clearok(curscr, TRUE); clearok(curscr, TRUE);
} }
status_mesg("", "");
listbox_display(&lb); listbox_display(&lb);
wins_status_bar();
wnoutrefresh(win[STA].p);
wmove(win[STA].p, 0, 0);
wins_doupdate();
} }
listbox_delete(&lb); listbox_delete(&lb);