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

Reload data after resolving save conflict (improved)

Browse Source 
After resolving a save conflict with the merge tool, a save operation has,
in effect, occurred, and data files must be reloaded to import the result of
the conflict resolution.

This is a replacement for commit 2fe9c7e. The operations concerned with the user
interface are kept out the io-operations (as in all other cases) and take place
at the command-level in calcurse.c. and not at the io-level (io.c).

Shorter, more concise prompt texts.

Signed-off-by: Lars Henriksen <LarsHenriksen@get2net.dk>
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lars Henriksen
2018-08-22 20:18:36 +02:00
committed by Lukas Fleischer
parent 8c2ccebe35
commit ab0fe68225
3 changed files with 51 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/calcurse.h
View File

@@ -652,6 +652,13 @@ enum getstr {
#define PARSE_DATETIME_HAS_DATE (1 << 0)
#define PARSE_DATETIME_HAS_TIME (1 << 1)
/* Return codes for the io_save_cal() function. */
enum {
IO_SAVE_CTINUE,
IO_SAVE_RELOAD,
IO_SAVE_CANCEL
};
/* Week days. */
enum wday {
SUNDAY,
@@ -848,7 +855,7 @@ unsigned io_save_apts(const char *);
void io_dump_todo(const char *);
unsigned io_save_todo(const char *);
unsigned io_save_keys(void);
void io_save_cal(enum save_display);
int io_save_cal(enum save_display);
void io_load_app(struct item_filter *);
void io_load_todo(struct item_filter *);
void io_load_data(struct item_filter *);