show_setting_ui 接口调整
This commit is contained in:
parent
d3c9c55e79
commit
3728253810
|
@ -343,7 +343,7 @@ namespace callback
|
||||||
// SANE_EVENT_IMAGE_OK - void* unused, be NULL, flag - unused, be 0
|
// SANE_EVENT_IMAGE_OK - void* unused, be NULL, flag - unused, be 0
|
||||||
int (*choose_scanner)(const std::vector<DEVQUEUI>& devs) = NULL; // blocked. return selected DEVQUE::id or -1 if user cancelled
|
int (*choose_scanner)(const std::vector<DEVQUEUI>& devs) = NULL; // blocked. return selected DEVQUE::id or -1 if user cancelled
|
||||||
int (*apply_current_config)(const char* dev_name, SANE_Handle device, LPSANEAPI api) = NULL; // 应用设备的当前配置
|
int (*apply_current_config)(const char* dev_name, SANE_Handle device, LPSANEAPI api) = NULL; // 应用设备的当前配置
|
||||||
int (*show_setting_ui)(SANE_Handle device, HWND parent, LPSANEAPI api, bool with_scan) = NULL;
|
int (*show_setting_ui)(SANE_Handle device, HWND parent, LPSANEAPI api, const char* devname, bool with_scan) = NULL;
|
||||||
int (*show_progress_ui)(HWND parent, std::function<void(ui_result)> callback, std::function<void(int/*event*/, void*/*msg*/, int/*flag*/)>* notify) = NULL;
|
int (*show_progress_ui)(HWND parent, std::function<void(ui_result)> callback, std::function<void(int/*event*/, void*/*msg*/, int/*flag*/)>* notify) = NULL;
|
||||||
|
|
||||||
//std::function<void(ui_result)> ui_result_callback;
|
//std::function<void(ui_result)> ui_result_callback;
|
||||||
|
@ -2947,7 +2947,7 @@ COM_API_IMPLEMENT(scanner, bool, ui_show_setting(HWND parent, bool with_scan, bo
|
||||||
// break;
|
// break;
|
||||||
// }
|
// }
|
||||||
//};
|
//};
|
||||||
int res = callback::show_setting_ui(handle_, parent, &sane_api_, with_scan);
|
int res = callback::show_setting_ui(handle_, parent, &sane_api_, local_trans::u2a(scanner_name_.c_str(), CP_UTF8).c_str(),with_scan);
|
||||||
if (res == ui_result::UI_RESULT_CLOSE_NORMAL)
|
if (res == ui_result::UI_RESULT_CLOSE_NORMAL)
|
||||||
{
|
{
|
||||||
int ev = SANE_EVENT_UI_CLOSE_NORMAL;
|
int ev = SANE_EVENT_UI_CLOSE_NORMAL;
|
||||||
|
|
Loading…
Reference in New Issue