Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-02-28 05:20:21 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-02-28 05:21:25 +0300
commite735894070ac3097628b36984a14654bf1c9bd57 (patch)
tree3967ea5b0b17e5786d485a53b901f0413d7fd40a /source/blender
parentd7baf8e7e7c26bbd577abe5d71a0da2e796cb6ae (diff)
UI: rename Quit Prompt to Save Prompt
Eventually this should be used to prompt when loading a new file too.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/blenkernel/intern/blender.c2
-rw-r--r--source/blender/makesdna/DNA_userdef_types.h2
-rw-r--r--source/blender/makesrna/intern/rna_userdef.c6
-rw-r--r--source/blender/windowmanager/intern/wm_operators.c2
-rw-r--r--source/blender/windowmanager/intern/wm_window.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index 2aa585b8080..a5c80ab05a0 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -305,7 +305,7 @@ void BKE_blender_userdef_app_template_data_swap(UserDef *userdef_a, UserDef *use
DATA_SWAP(app_flag);
/* We could add others. */
- FLAG_SWAP(uiflag, int, USER_QUIT_PROMPT);
+ FLAG_SWAP(uiflag, int, USER_SAVE_PROMPT);
#undef SWAP_TYPELESS
#undef DATA_SWAP
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index d80c0683c08..932377fa718 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -890,7 +890,7 @@ typedef enum eUserpref_UI_Flag {
USER_SPLASH_DISABLE = (1 << 27),
USER_HIDE_RECENT = (1 << 28),
USER_SHOW_THUMBNAILS = (1 << 29),
- USER_QUIT_PROMPT = (1 << 30),
+ USER_SAVE_PROMPT = (1 << 30),
USER_HIDE_SYSTEM_BOOKMARKS = (1u << 31),
} eUserpref_UI_Flag;
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index b12852220a2..cf79e4eec4b 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -3843,9 +3843,9 @@ static void rna_def_userdef_view(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Confirm Threshold",
"Distance threshold after which selection is made (zero to disable)");
- prop = RNA_def_property(srna, "use_quit_dialog", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_QUIT_PROMPT);
- RNA_def_property_ui_text(prop, "Prompt Quit",
+ prop = RNA_def_property(srna, "use_save_prompt", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_SAVE_PROMPT);
+ RNA_def_property_ui_text(prop, "Save Prompt",
"Ask for confirmation when quitting with unsaved changes");
prop = RNA_def_property(srna, "show_column_layout", PROP_BOOLEAN, PROP_NONE);
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 55c257038ad..d047057759e 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -1810,7 +1810,7 @@ static int wm_exit_blender_exec(bContext *C, wmOperator *UNUSED(op))
static int wm_exit_blender_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *UNUSED(event))
{
- if (U.uiflag & USER_QUIT_PROMPT) {
+ if (U.uiflag & USER_SAVE_PROMPT) {
wm_quit_with_optional_confirmation_prompt(C, CTX_wm_window(C));
}
else {
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index f41ac7807e2..613f5c58f85 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -473,7 +473,7 @@ void wm_quit_with_optional_confirmation_prompt(bContext *C, wmWindow *win)
* here (this function gets called outside of normal event handling loop). */
CTX_wm_window_set(C, win);
- if (U.uiflag & USER_QUIT_PROMPT) {
+ if (U.uiflag & USER_SAVE_PROMPT) {
if (!wm->file_saved && !G.background) {
wm_confirm_quit(C);
}