diff options
| author | Lars Henriksen <LarsHenriksen@get2net.dk> | 2018-08-26 14:45:58 +0200 |
|---|---|---|
| committer | Lukas Fleischer <lfleischer@calcurse.org> | 2018-10-21 20:01:34 +0200 |
| commit | 8b39637a628cba915e81f836aad74ec05bf0c285 (patch) | |
| tree | 6d4929f1af2a9b564083471f0860fb2c5d043355 /src/calcurse.h | |
| parent | d7777ed44e085ee809688379aef96dc05883b2fa (diff) | |
| download | calcurse-8b39637a628cba915e81f836aad74ec05bf0c285.tar.gz calcurse-8b39637a628cba915e81f836aad74ec05bf0c285.zip | |
Move user information after save/reload to the command level
Moving user information to calcurse.c makes it easier to perform the actual
save/reload operatons in io.c, e.g. it is possible to load instead of
reload after a merge in conflict resolving.
The save/reload operations are of such importance that the user should always be
informed of the result (it's a bit disquieting when there is no reaction to a
save or reload command). Hence, the save/reload status messages are no longer
conditioned by show_dialogs(). No confirmation is asked for, so a message stays
until the status bar is updated by another action.
Care is taken to inform about save/reload actions that result in no change.
Texts are kept concise because of the limited message area. When conflicts are
present, whether saving or reloading, the "continue/merge/cancel" pattern seems
easier to grasp.
Signed-off-by: Lars Henriksen <LarsHenriksen@get2net.dk>
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
Diffstat (limited to 'src/calcurse.h')
| -rw-r--r-- | src/calcurse.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/calcurse.h b/src/calcurse.h index ddeec21..bec2a93 100644 --- a/src/calcurse.h +++ b/src/calcurse.h @@ -658,7 +658,17 @@ enum getstr { enum { IO_SAVE_CTINUE, IO_SAVE_RELOAD, - IO_SAVE_CANCEL + IO_SAVE_CANCEL, + IO_SAVE_NOOP +}; + +/* Return codes for the io_reload_data() function. */ +enum { + IO_RELOAD_LOAD, + IO_RELOAD_CTINUE, + IO_RELOAD_MERGE, + IO_RELOAD_CANCEL, + IO_RELOAD_NOOP }; /* Week days. */ @@ -860,7 +870,7 @@ unsigned io_save_keys(void); 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 *, int); +int io_load_data(struct item_filter *, int); int io_reload_data(void); void io_load_keys(const char *); int io_check_dir(const char *); |