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

Merge cut/delete

Browse Source 
Remove the cut function and merge it into the del-item command. This
allows for vim-style cutting/pasting.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer
2012-07-07 19:14:33 +02:00
parent 88588ad704
commit 13c21ac280
6 changed files with 85 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/help.c
View File

@@ -60,7 +60,7 @@ typedef enum {
HELP_GOTO,
HELP_DELETE,
HELP_ADD,
HELP_CUT_COPY_PASTE,
HELP_COPY_PASTE,
HELP_EDIT,
HELP_ENOTE,
HELP_VNOTE,
@@ -126,7 +126,6 @@ help_write_pad(struct window *win, char *title, char *text, enum key action)
case KEY_GENERIC_NEXT_YEAR:
case KEY_GENERIC_GOTO_TODAY:
case KEY_GENERIC_CREDITS:
case KEY_GENERIC_CUT:
case KEY_GENERIC_COPY:
case KEY_GENERIC_PASTE:
break;
@@ -262,10 +261,9 @@ static int wanted_page(int ch)
page = HELP_DELETE;
break;
case KEY_GENERIC_CUT:
case KEY_GENERIC_COPY:
case KEY_GENERIC_PASTE:
page = HELP_CUT_COPY_PASTE;
page = HELP_COPY_PASTE;
break;
case KEY_EDIT_ITEM:
@@ -538,22 +536,17 @@ void help_screen(void)
keys_action_firstkey(KEY_ADD_ITEM),
keys_action_firstkey(KEY_ADD_ITEM));
hscr[HELP_CUT_COPY_PASTE].title = _("Cut and Paste\n");
snprintf(hscr[HELP_CUT_COPY_PASTE].text, HELPTEXTSIZ,
hscr[HELP_COPY_PASTE].title = _("Copy and Paste\n");
snprintf(hscr[HELP_COPY_PASTE].text, HELPTEXTSIZ,
_
(
"Cut/copy and paste the currently selected item. This is useful to\n"
"quickly move or copy an item from one date to another.\n"
"To do so, one must first highlight the item that needs to be moved or\n"
"copied, then press '%s' to cut (or '%s' to copy) this item. Once the\n"
"new date is chosen in the calendar, the appointment panel must be\n"
"selected and the '%s' key must be pressed to paste the item. The item\n"
"will appear again in the appointment panel, assigned to the newly\n"
"selected date.\n\n"
"Be careful that if two cuts are performed successively without pasting\n"
"between them, the item that was cut at first will be lost, together\n"
"with its associated note if it had one."),
keys_action_firstkey(KEY_GENERIC_CUT),
"Copy and paste the currently selected item. This is useful to quickly\n"
"copy an item from one date to another. To do so, one must first\n"
"highlight the item that needs to be copied, then press '%s' to copy.\n"
"Once the new date is chosen in the calendar, the appointment panel must\n"
"be selected and the '%s' key must be pressed to paste the item. The item\n"
"will appear in the appointment panel, assigned to the newly selected\n"
"date.\n\n"),
keys_action_firstkey(KEY_GENERIC_COPY),
keys_action_firstkey(KEY_GENERIC_PASTE));