Commit cf153888a65e7de387133588eabc8d61da26404e
1 parent
111c3051
bugfix<central_clearing_system>:修复快捷键可能导致客户端崩溃的问题
对于下单和支付分别建立快捷键对应表,否则会有异常。
Showing
4 changed files
with
16 additions
and
13 deletions
central_clearing_system/ETradeClient.rc
... | ... | @@ -145,15 +145,19 @@ END |
145 | 145 | |
146 | 146 | IDR_ACCELERATOR_ORDER ACCELERATORS |
147 | 147 | BEGIN |
148 | - "A", ID_ACCELERATOR_A, VIRTKEY, NOINVERT | |
149 | 148 | VK_DOWN, ID_ACCELERATOR_DOWN, VIRTKEY, NOINVERT |
150 | 149 | VK_RETURN, ID_ACCELERATOR_ENTER, VIRTKEY, NOINVERT |
151 | - "F", ID_ACCELERATOR_F, VIRTKEY, NOINVERT | |
152 | 150 | VK_F11, ID_ACCELERATOR_F11, VIRTKEY, NOINVERT |
153 | 151 | "S", ID_ACCELERATOR_S, VIRTKEY, NOINVERT |
154 | 152 | VK_TAB, ID_ACCELERATOR_TAB, VIRTKEY, NOINVERT |
155 | 153 | VK_UP, ID_ACCELERATOR_UP, VIRTKEY, NOINVERT |
154 | +END | |
155 | + | |
156 | +IDR_ACCELERATOR_PAY ACCELERATORS | |
157 | +BEGIN | |
156 | 158 | "X", ID_ACCELERATOR_X, VIRTKEY, NOINVERT |
159 | + "F", ID_ACCELERATOR_F, VIRTKEY, NOINVERT | |
160 | + "S", ID_ACCELERATOR_S, VIRTKEY, NOINVERT | |
157 | 161 | END |
158 | 162 | |
159 | 163 | |
... | ... | @@ -276,8 +280,8 @@ END |
276 | 280 | // |
277 | 281 | |
278 | 282 | VS_VERSION_INFO VERSIONINFO |
279 | - FILEVERSION 2,0,0,4 | |
280 | - PRODUCTVERSION 2,0,0,3 | |
283 | + FILEVERSION 2,0,0,5 | |
284 | + PRODUCTVERSION 2,0,0,5 | |
281 | 285 | FILEFLAGSMASK 0x3fL |
282 | 286 | #ifdef _DEBUG |
283 | 287 | FILEFLAGS 0x1L |
... | ... | @@ -294,12 +298,12 @@ BEGIN |
294 | 298 | BEGIN |
295 | 299 | VALUE "CompanyName", "地利集团【DILI GROUP】" |
296 | 300 | VALUE "FileDescription", "电子交易结算综合业务系统" |
297 | - VALUE "FileVersion", "2.0.0.4" | |
298 | - VALUE "InternalName", "Central-Clearing-System_2.0.4.181030_beta" | |
301 | + VALUE "FileVersion", "2.0.0.5" | |
302 | + VALUE "InternalName", "Central-Clearing-System_2.0.5.181031_beta" | |
299 | 303 | VALUE "LegalCopyright", "(C) 地利集团。 保留所有权利。" |
300 | 304 | VALUE "OriginalFilename", "Central-Clearing-System_2.0.4.181030_beta" |
301 | 305 | VALUE "ProductName", "Central-Clearing-System_2.0.4.181030_beta" |
302 | - VALUE "ProductVersion", "2.0.0.4" | |
306 | + VALUE "ProductVersion", "2.0.0.5" | |
303 | 307 | END |
304 | 308 | END |
305 | 309 | BLOCK "VarFileInfo" |
... | ... | @@ -340,14 +344,12 @@ BEGIN |
340 | 344 | |
341 | 345 | IDD_DIALOG_PLACE_ORDER, DIALOG |
342 | 346 | BEGIN |
343 | - MOCKUP, 1, 50, -25, -30, "C:\Users\WangGY\Desktop\TIM图片20180918183513.png" | |
344 | 347 | RIGHTMARGIN, 337 |
345 | 348 | HORZGUIDE, 67 |
346 | 349 | END |
347 | 350 | |
348 | 351 | IDD_DIALOG_PAY, DIALOG |
349 | 352 | BEGIN |
350 | - MOCKUP, 1, 50, -5, -34, "C:\Users\WangGY\Desktop\无标题.png" | |
351 | 353 | LEFTMARGIN, 7 |
352 | 354 | RIGHTMARGIN, 222 |
353 | 355 | TOPMARGIN, 7 |
... | ... |
central_clearing_system/ETradeClient/mfc_ui/pay_dlg.cpp
... | ... | @@ -88,7 +88,7 @@ BOOL PayDlg::OnInitDialog() |
88 | 88 | password_button_.ShowWindow(SW_SHOW); |
89 | 89 | } |
90 | 90 | |
91 | - acce_ = LoadAccelerators(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDR_ACCELERATOR_ORDER)); | |
91 | + acce_ = LoadAccelerators(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDR_ACCELERATOR_PAY)); | |
92 | 92 | |
93 | 93 | return TRUE; // return TRUE unless you set the focus to a control |
94 | 94 | // Òì³£: OCX ÊôÐÔÒ³Ó¦·µ»Ø FALSE |
... | ... |
central_clearing_system/ETradeClient/mfc_ui/place_order_dlg.cpp
central_clearing_system/Resource.h
... | ... | @@ -16,6 +16,7 @@ |
16 | 16 | #define IDR_MENU1 329 |
17 | 17 | #define IDR_ACCELERATOR_ORDER 330 |
18 | 18 | #define IDD_DIALOG_PAY 331 |
19 | +#define IDR_ACCELERATOR_PAY 332 | |
19 | 20 | #define IDC_USERNAME 1000 |
20 | 21 | #define IDC_PWD 1001 |
21 | 22 | #define IDC_ACCOUNT_EDIT 1002 |
... | ... | @@ -88,7 +89,6 @@ |
88 | 89 | #define ID_ACCELERATOR_F11 32857 |
89 | 90 | #define ID_ACCELERATOR_S 32883 |
90 | 91 | #define ID_ACCELERATOR_ALT_S 32884 |
91 | -#define ID_ACCELERATOR_A 32885 | |
92 | 92 | #define ID_ACCELERATOR_F 32886 |
93 | 93 | #define ID_ACCELERATOR_X 32887 |
94 | 94 | #define ID_POINT_RULE 40001 |
... | ... | @@ -105,8 +105,8 @@ |
105 | 105 | // |
106 | 106 | #ifdef APSTUDIO_INVOKED |
107 | 107 | #ifndef APSTUDIO_READONLY_SYMBOLS |
108 | -#define _APS_NEXT_RESOURCE_VALUE 332 | |
109 | -#define _APS_NEXT_COMMAND_VALUE 32889 | |
108 | +#define _APS_NEXT_RESOURCE_VALUE 333 | |
109 | +#define _APS_NEXT_COMMAND_VALUE 32895 | |
110 | 110 | #define _APS_NEXT_CONTROL_VALUE 1055 |
111 | 111 | #define _APS_NEXT_SYMED_VALUE 311 |
112 | 112 | #endif |
... | ... |