diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-02-09 05:28:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-09 05:32:20 +0400 |
| commit | b105d2ac7fbccd3998c9a01c297edc8ef9fce4cb (patch) | |
| tree | 6f3127ea83327bfe7ad9550a60309191b9d610b3 /source/blender/windowmanager | |
| parent | 873f901e5a3d0d10c4cca579ce1f2aaed852b1e8 (diff) | |
UI: replace uiPupMenuOkee & uiPupMenuSaveOver with WM_operator_confirm
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/WM_api.h | 6 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 13 |
2 files changed, 14 insertions, 5 deletions
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index c9ed198d0cf..8a13decea42 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -205,7 +205,11 @@ int WM_operator_props_dialog_popup(struct bContext *C, struct wmOperator *op, int WM_operator_redo_popup (struct bContext *C, struct wmOperator *op); int WM_operator_ui_popup (struct bContext *C, struct wmOperator *op, int width, int height); -int WM_operator_confirm_message(struct bContext *C, struct wmOperator *op, const char *message); +int WM_operator_confirm_message_ex(struct bContext *C, struct wmOperator *op, + const char *title, const int icon, + const char *message); +int WM_operator_confirm_message(struct bContext *C, struct wmOperator *op, + const char *message); /* operator api */ void WM_operator_free (struct wmOperator *op); diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 4e39394b1bc..45cfd2ca61c 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -1107,7 +1107,9 @@ int WM_enum_search_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(eve } /* Can't be used as an invoke directly, needs message arg (can be NULL) */ -int WM_operator_confirm_message(bContext *C, wmOperator *op, const char *message) +int WM_operator_confirm_message_ex(bContext *C, wmOperator *op, + const char *title, const int icon, + const char *message) { uiPopupMenu *pup; uiLayout *layout; @@ -1118,7 +1120,7 @@ int WM_operator_confirm_message(bContext *C, wmOperator *op, const char *message else properties = NULL; - pup = uiPupMenuBegin(C, IFACE_("OK?"), ICON_QUESTION); + pup = uiPupMenuBegin(C, title, icon); layout = uiPupMenuLayout(pup); uiItemFullO_ptr(layout, op->type, message, ICON_NONE, properties, WM_OP_EXEC_REGION_WIN, 0); uiPupMenuEnd(C, pup); @@ -1126,6 +1128,10 @@ int WM_operator_confirm_message(bContext *C, wmOperator *op, const char *message return OPERATOR_CANCELLED; } +int WM_operator_confirm_message(bContext *C, wmOperator *op, const char *message) +{ + return WM_operator_confirm_message_ex(C, op, IFACE_("OK?"), ICON_QUESTION, message); +} int WM_operator_confirm(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) { @@ -2796,8 +2802,7 @@ static int wm_save_mainfile_invoke(bContext *C, wmOperator *op, const wmEvent *U if (G.save_over) { if (BLI_exists(name)) { - uiPupMenuSaveOver(C, op, name); - ret = OPERATOR_RUNNING_MODAL; + ret = WM_operator_confirm_message_ex(C, op, IFACE_("Save Over?"), ICON_QUESTION, name); } else { ret = wm_save_as_mainfile_exec(C, op); |