diff options
author | Guy Harris <guy@alum.mit.edu> | 2005-11-12 11:05:02 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2005-11-12 11:05:02 +0000 |
commit | 0dbf17b690f9f79960d67f5f8a58ad0b1e90965f (patch) | |
tree | f6374552ea26d82fdeba18a3587c5ee7e63554a1 /progress_dlg.h | |
parent | a78d2fbc63c42126d55b8b3871d19d25c4577761 (diff) |
Allow a progress dialog to have "Stop" or "Cancel" as the "terminate
button"; "Stop" should be used for operations that can only be stopped
(meaning that what it's already done isn't undone), not cancelled
(meaning that whatever it's already done *is* undone), for which
"Cancel" is used.
Allow the merging process to be cancelled.
Clean up indentation.
Update some comments.
svn path=/trunk/; revision=16489
Diffstat (limited to 'progress_dlg.h')
-rw-r--r-- | progress_dlg.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/progress_dlg.h b/progress_dlg.h index 158b491356..c4f1932c53 100644 --- a/progress_dlg.h +++ b/progress_dlg.h @@ -44,12 +44,15 @@ typedef struct progdlg progdlg_t; * * @param task_title the task to do, e.g. "Loading" * @param item_title the item to do, e.g. "capture.cap" + * @param terminate_is_stop TRUE if the operation can't be cancelled, just + * stopped (i.e., it has a "Stop" button and clicking it doesn't undo + * anything already done), FALSE if it can * @param stop_flag a pointer to a Boolean variable that will be * set to TRUE if the user hits that button * @return the newly created progress dialog */ progdlg_t *create_progress_dlg(const gchar *task_title, const gchar *item_title, - gboolean *stop_flag); + gboolean terminate_is_stop, gboolean *stop_flag); /** * Create a progress dialog, but only if it's not likely to disappear @@ -57,6 +60,9 @@ progdlg_t *create_progress_dlg(const gchar *task_title, const gchar *item_title, * * @param task_title the task to do, e.g. "Loading" * @param item_title the item to do, e.g. "capture.cap" + * @param terminate_is_stop TRUE if the operation can't be cancelled, just + * stopped (i.e., it has a "Stop" button and clicking it doesn't undo + * anything already done), FALSE if it can * @param stop_flag a pointer to a Boolean variable that will be * set to TRUE if the user hits that button * @param start_time a pointer to a GTimeVal structure which holds @@ -66,7 +72,8 @@ progdlg_t *create_progress_dlg(const gchar *task_title, const gchar *item_title, */ progdlg_t * delayed_create_progress_dlg(const gchar *task_title, const gchar *item_title, - gboolean *stop_flag, const GTimeVal *start_time, gfloat progress); + gboolean terminate_is_stop, gboolean *stop_flag, + const GTimeVal *start_time, gfloat progress); /** * Update the progress information of the progress dialog box. |