xiemeng / xiemeng_intex_write_tool · Commits

Commit 97edcd4702737a31e71501ccd164cb039c30a7e0

Authored by xiemeng
1 parent f492da73

增加版本号输入项

Inline Side-by-side
Showing 4 changed files with 72 additions and 66 deletions
@@ -122,6 +122,8 @@ void CSystemConfig::DoDataExchange(CDataExchange* pDX) @@ -122,6 +122,8 @@ void CSystemConfig::DoDataExchange(CDataExchange* pDX)
122 DDX_Text(pDX, IDC_SERIAL_NO_HEADER_STR, m_strSerialNoHD); 122 DDX_Text(pDX, IDC_SERIAL_NO_HEADER_STR, m_strSerialNoHD);
123 // DDX_Check(pDX, IDC_EXTERN_MD_DOWNLOAD, m_bExternMDDownload); 123 // DDX_Check(pDX, IDC_EXTERN_MD_DOWNLOAD, m_bExternMDDownload);
124 DDV_MaxChars(pDX, m_strSerialNoHD, 8); 124 DDV_MaxChars(pDX, m_strSerialNoHD, 8);
  125 + DDX_Text(pDX, IDC_STR_SWVERSION, myswversion);
  126 +
125 //}}AFX_DATA_MAP 127 //}}AFX_DATA_MAP
126 128
127 DDX_Check(pDX, IDC_APDB_FROM_DUT_CHECK, m_bAPDBFromDUT); 129 DDX_Check(pDX, IDC_APDB_FROM_DUT_CHECK, m_bAPDBFromDUT);
@@ -25,6 +25,7 @@ public: @@ -25,6 +25,7 @@ public:
25 //************C2K PARA START************// 25 //************C2K PARA START************//
26 CString m_strMeidHD; 26 CString m_strMeidHD;
27 CString m_strEsnHD; 27 CString m_strEsnHD;
  28 + CString myswversion;
28 BOOL m_bCheckMeidHD; 29 BOOL m_bCheckMeidHD;
29 BOOL m_bCheckEsnHD; 30 BOOL m_bCheckEsnHD;
30 BOOL m_bWriteMeid; 31 BOOL m_bWriteMeid;
@@ -191,6 +191,7 @@ @@ -191,6 +191,7 @@
191 #define IDC_LOG_DIR 1164 191 #define IDC_LOG_DIR 1164
192 #define IDC_BTN_LOG 1165 192 #define IDC_BTN_LOG 1165
193 #define IDC_LOCK_OTP 1166 193 #define IDC_LOCK_OTP 1166
  194 +#define IDC_STR_SWVERSION 1167
194 #define IDR_OPTION_SWITCHTOOL 32772 195 #define IDR_OPTION_SWITCHTOOL 32772
195 #define IDR_OPTION_EXTMODEM 32773 196 #define IDR_OPTION_EXTMODEM 32773
196 #define IDR_OPTION_SECURITY_USB 32774 197 #define IDR_OPTION_SECURITY_USB 32774
@@ -217,12 +218,12 @@ @@ -217,12 +218,12 @@
217 #define IDR_OPTION_ALREADYINMETA 32797 218 #define IDR_OPTION_ALREADYINMETA 32797
218 219
219 // Next default values for new objects 220 // Next default values for new objects
220 -// 221 +//
221 #ifdef APSTUDIO_INVOKED 222 #ifdef APSTUDIO_INVOKED
222 #ifndef APSTUDIO_READONLY_SYMBOLS 223 #ifndef APSTUDIO_READONLY_SYMBOLS
223 #define _APS_NEXT_RESOURCE_VALUE 157 224 #define _APS_NEXT_RESOURCE_VALUE 157
224 #define _APS_NEXT_COMMAND_VALUE 32798 225 #define _APS_NEXT_COMMAND_VALUE 32798
225 -#define _APS_NEXT_CONTROL_VALUE 1167 226 +#define _APS_NEXT_CONTROL_VALUE 1168
226 #define _APS_NEXT_SYMED_VALUE 101 227 #define _APS_NEXT_SYMED_VALUE 101
227 #endif 228 #endif
228 #endif 229 #endif
@@ -27,18 +27,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US @@ -27,18 +27,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
27 // TEXTINCLUDE 27 // TEXTINCLUDE
28 // 28 //
29 29
30 -1 TEXTINCLUDE MOVEABLE PURE 30 +1 TEXTINCLUDE MOVEABLE PURE
31 BEGIN 31 BEGIN
32 "resource.h\0" 32 "resource.h\0"
33 END 33 END
34 34
35 -2 TEXTINCLUDE MOVEABLE PURE 35 +2 TEXTINCLUDE MOVEABLE PURE
36 BEGIN 36 BEGIN
37 "#include ""afxres.h""\r\n" 37 "#include ""afxres.h""\r\n"
38 "\0" 38 "\0"
39 END 39 END
40 40
41 -3 TEXTINCLUDE MOVEABLE PURE 41 +3 TEXTINCLUDE MOVEABLE PURE
42 BEGIN 42 BEGIN
43 "#define _AFX_NO_SPLITTER_RESOURCES\r\n" 43 "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
44 "#define _AFX_NO_OLE_RESOURCES\r\n" 44 "#define _AFX_NO_OLE_RESOURCES\r\n"
@@ -80,7 +80,7 @@ IDB_BITMAP_PASS BITMAP MOVEABLE PURE "res\\PASS.bmp" @@ -80,7 +80,7 @@ IDB_BITMAP_PASS BITMAP MOVEABLE PURE "res\\PASS.bmp"
80 // Menu 80 // Menu
81 // 81 //
82 82
83 -IDR_SN_MENU MENU DISCARDABLE 83 +IDR_SN_MENU MENU DISCARDABLE
84 BEGIN 84 BEGIN
85 POPUP "&File" 85 POPUP "&File"
86 BEGIN 86 BEGIN
@@ -144,17 +144,17 @@ END @@ -144,17 +144,17 @@ END
144 // Dialog 144 // Dialog
145 // 145 //
146 146
147 -IDD_SYSTEM_CONFIG_DIALOG DIALOGEX 0, 0, 285, 352 147 +IDD_SYSTEM_CONFIG_DIALOG DIALOGEX 0, 0, 285, 379
148 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU 148 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
149 CAPTION "System Config" 149 CAPTION "System Config"
150 FONT 4, "System" 150 FONT 4, "System"
151 BEGIN 151 BEGIN
152 GROUPBOX "Write Option",IDC_STATIC,8,3,100,117 152 GROUPBOX "Write Option",IDC_STATIC,8,3,100,117
153 - CONTROL "Barcode",IDC_WRITE_BARC_CHECK,"Button",BS_AUTOCHECKBOX | 153 + CONTROL "Barcode",IDC_WRITE_BARC_CHECK,"Button",BS_AUTOCHECKBOX |
154 WS_TABSTOP,13,12,88,8 154 WS_TABSTOP,13,12,88,8
155 - CONTROL "IMEI",IDC_WRITE_IMEI_CHECK,"Button",BS_AUTOCHECKBOX | 155 + CONTROL "IMEI",IDC_WRITE_IMEI_CHECK,"Button",BS_AUTOCHECKBOX |
156 WS_TABSTOP,13,24,88,8 156 WS_TABSTOP,13,24,88,8
157 - CONTROL "BT Address",IDC_WRITE_BT_CHECK,"Button",BS_AUTOCHECKBOX | 157 + CONTROL "BT Address",IDC_WRITE_BT_CHECK,"Button",BS_AUTOCHECKBOX |
158 WS_TABSTOP,13,36,88,8 158 WS_TABSTOP,13,36,88,8
159 CONTROL "Wifi Address",IDC_WRITE_WIFI_CHECK,"Button", 159 CONTROL "Wifi Address",IDC_WRITE_WIFI_CHECK,"Button",
160 BS_AUTOCHECKBOX | WS_TABSTOP,13,48,88,8 160 BS_AUTOCHECKBOX | WS_TABSTOP,13,48,88,8
@@ -162,43 +162,43 @@ BEGIN @@ -162,43 +162,43 @@ BEGIN
162 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,60,88,8 162 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,60,88,8
163 CONTROL "DRMkey MCID",IDC_WRITE_DRMKEY_MCID_CHECK,"Button", 163 CONTROL "DRMkey MCID",IDC_WRITE_DRMKEY_MCID_CHECK,"Button",
164 BS_AUTOCHECKBOX | WS_TABSTOP,13,72,88,8 164 BS_AUTOCHECKBOX | WS_TABSTOP,13,72,88,8
165 - CONTROL "MEID",IDC_WRITE_MEID_CHECK,"Button",BS_AUTOCHECKBOX | 165 + CONTROL "MEID",IDC_WRITE_MEID_CHECK,"Button",BS_AUTOCHECKBOX |
166 WS_TABSTOP,13,84,88,8 166 WS_TABSTOP,13,84,88,8
167 - CONTROL "ESN",IDC_WRITE_ESN_CHECK,"Button",BS_AUTOCHECKBOX | 167 + CONTROL "ESN",IDC_WRITE_ESN_CHECK,"Button",BS_AUTOCHECKBOX |
168 WS_TABSTOP,13,96,88,8 168 WS_TABSTOP,13,96,88,8
169 CONTROL "Serial No.",IDC_WRITE_SERIAL_NO_CHECK,"Button", 169 CONTROL "Serial No.",IDC_WRITE_SERIAL_NO_CHECK,"Button",
170 BS_AUTOCHECKBOX | WS_TABSTOP,13,108,88,8 170 BS_AUTOCHECKBOX | WS_TABSTOP,13,108,88,8
171 GROUPBOX "IMEI Option",IDC_STATIC,7,123,100,113 171 GROUPBOX "IMEI Option",IDC_STATIC,7,123,100,113
172 CONTROL "IMEI CheckSum",IDC_IMEI_CHECKSUM,"Button", 172 CONTROL "IMEI CheckSum",IDC_IMEI_CHECKSUM,"Button",
173 BS_AUTOCHECKBOX | WS_TABSTOP,12,131,88,11 173 BS_AUTOCHECKBOX | WS_TABSTOP,12,131,88,11
174 - CONTROL "IMEI Lock",IDC_IMEI_LOCK,"Button",BS_AUTOCHECKBOX | 174 + CONTROL "IMEI Lock",IDC_IMEI_LOCK,"Button",BS_AUTOCHECKBOX |
175 WS_TABSTOP,12,142,88,11 175 WS_TABSTOP,12,142,88,11
176 - CONTROL "Dual IMEI",IDC_DUAL_IMEI,"Button",BS_AUTOCHECKBOX | 176 + CONTROL "Dual IMEI",IDC_DUAL_IMEI,"Button",BS_AUTOCHECKBOX |
177 WS_TABSTOP,12,153,88,11 177 WS_TABSTOP,12,153,88,11
178 CONTROL "DualIMEI Same",IDC_DUAL_IMEI_SAME,"Button", 178 CONTROL "DualIMEI Same",IDC_DUAL_IMEI_SAME,"Button",
179 BS_AUTOCHECKBOX | WS_TABSTOP,29,164,65,11 179 BS_AUTOCHECKBOX | WS_TABSTOP,29,164,65,11
180 - CONTROL "Three IMEI",IDC_THREE_IMEI,"Button",BS_AUTOCHECKBOX | 180 + CONTROL "Three IMEI",IDC_THREE_IMEI,"Button",BS_AUTOCHECKBOX |
181 WS_TABSTOP,12,175,88,11 181 WS_TABSTOP,12,175,88,11
182 - CONTROL "Four IMEI",IDC_FOUR_IMEI,"Button",BS_AUTOCHECKBOX | 182 + CONTROL "Four IMEI",IDC_FOUR_IMEI,"Button",BS_AUTOCHECKBOX |
183 WS_TABSTOP,12,186,88,11 183 WS_TABSTOP,12,186,88,11
184 CONTROL "CurTemperature",IDC_CURRENT_TEMPERATURE,"Button", 184 CONTROL "CurTemperature",IDC_CURRENT_TEMPERATURE,"Button",
185 BS_AUTOCHECKBOX | WS_TABSTOP,12,197,63,11 185 BS_AUTOCHECKBOX | WS_TABSTOP,12,197,63,11
186 EDITTEXT IDC_TEMPERATURE,33,209,19,12,ES_AUTOHSCROLL 186 EDITTEXT IDC_TEMPERATURE,33,209,19,12,ES_AUTOHSCROLL
187 LTEXT "°C",IDC_STATIC,56,210,19,8 187 LTEXT "°C",IDC_STATIC,56,210,19,8
188 - CONTROL "Lock OTP",IDC_LOCK_OTP,"Button",BS_AUTOCHECKBOX | 188 + CONTROL "Lock OTP",IDC_LOCK_OTP,"Button",BS_AUTOCHECKBOX |
189 WS_TABSTOP,12,223,88,11 189 WS_TABSTOP,12,223,88,11
190 GROUPBOX "Header Option",IDC_STATIC,110,3,166,233 190 GROUPBOX "Header Option",IDC_STATIC,110,3,166,233
191 LTEXT "Barc Header:",IDC_STATIC,115,20,55,8,0,WS_EX_RIGHT 191 LTEXT "Barc Header:",IDC_STATIC,115,20,55,8,0,WS_EX_RIGHT
192 EDITTEXT IDC_BARC_HEADER_STR,178,18,50,12,ES_AUTOHSCROLL 192 EDITTEXT IDC_BARC_HEADER_STR,178,18,50,12,ES_AUTOHSCROLL
193 - CONTROL "On/Off",IDC_BARC_HEADER_CHECK,"Button",BS_AUTOCHECKBOX | 193 + CONTROL "On/Off",IDC_BARC_HEADER_CHECK,"Button",BS_AUTOCHECKBOX |
194 WS_TABSTOP,237,20,32,8 194 WS_TABSTOP,237,20,32,8
195 LTEXT "BT Header:",IDC_STATIC,115,38,55,8,0,WS_EX_RIGHT 195 LTEXT "BT Header:",IDC_STATIC,115,38,55,8,0,WS_EX_RIGHT
196 EDITTEXT IDC_BT_HEADER_STR,178,36,50,12,ES_AUTOHSCROLL 196 EDITTEXT IDC_BT_HEADER_STR,178,36,50,12,ES_AUTOHSCROLL
197 - CONTROL "On/Off",IDC_BT_HEADER_CHECK,"Button",BS_AUTOCHECKBOX | 197 + CONTROL "On/Off",IDC_BT_HEADER_CHECK,"Button",BS_AUTOCHECKBOX |
198 WS_TABSTOP,237,38,32,8 198 WS_TABSTOP,237,38,32,8
199 LTEXT "Wifi Header:",IDC_STATIC,115,56,55,8,0,WS_EX_RIGHT 199 LTEXT "Wifi Header:",IDC_STATIC,115,56,55,8,0,WS_EX_RIGHT
200 EDITTEXT IDC_WIFI_HEADER_STR,178,54,50,12,ES_AUTOHSCROLL 200 EDITTEXT IDC_WIFI_HEADER_STR,178,54,50,12,ES_AUTOHSCROLL
201 - CONTROL "On/Off",IDC_WIFI_HEADER_CHECK,"Button",BS_AUTOCHECKBOX | 201 + CONTROL "On/Off",IDC_WIFI_HEADER_CHECK,"Button",BS_AUTOCHECKBOX |
202 WS_TABSTOP,237,56,32,8 202 WS_TABSTOP,237,56,32,8
203 LTEXT "IMEI_1 Header:",IDC_STATIC,115,74,55,8,0,WS_EX_RIGHT 203 LTEXT "IMEI_1 Header:",IDC_STATIC,115,74,55,8,0,WS_EX_RIGHT
204 EDITTEXT IDC_IMEI_1_HEADER_STR,178,72,50,12,ES_AUTOHSCROLL 204 EDITTEXT IDC_IMEI_1_HEADER_STR,178,72,50,12,ES_AUTOHSCROLL
@@ -230,30 +230,32 @@ BEGIN @@ -230,30 +230,32 @@ BEGIN
230 BS_AUTOCHECKBOX | WS_TABSTOP,237,182,32,8 230 BS_AUTOCHECKBOX | WS_TABSTOP,237,182,32,8
231 LTEXT "MEID:",IDC_STATIC,115,200,55,8,0,WS_EX_RIGHT 231 LTEXT "MEID:",IDC_STATIC,115,200,55,8,0,WS_EX_RIGHT
232 EDITTEXT IDC_MEID_HEADER_STR,178,198,50,12,ES_AUTOHSCROLL 232 EDITTEXT IDC_MEID_HEADER_STR,178,198,50,12,ES_AUTOHSCROLL
233 - CONTROL "On/Off",IDC_MEID_HEADER_CHECK,"Button",BS_AUTOCHECKBOX | 233 + CONTROL "On/Off",IDC_MEID_HEADER_CHECK,"Button",BS_AUTOCHECKBOX |
234 WS_TABSTOP,237,200,32,8 234 WS_TABSTOP,237,200,32,8
235 LTEXT "MSN:",IDC_STATIC,115,218,55,8,0,WS_EX_RIGHT 235 LTEXT "MSN:",IDC_STATIC,115,218,55,8,0,WS_EX_RIGHT
236 EDITTEXT IDC_ESN_HEADER_STR,178,216,50,12,ES_AUTOHSCROLL 236 EDITTEXT IDC_ESN_HEADER_STR,178,216,50,12,ES_AUTOHSCROLL
237 - CONTROL "On/Off",IDC_ESN_HEADER_CHECK,"Button",BS_AUTOCHECKBOX | 237 + CONTROL "On/Off",IDC_ESN_HEADER_CHECK,"Button",BS_AUTOCHECKBOX |
238 WS_TABSTOP,237,218,32,8 238 WS_TABSTOP,237,218,32,8
239 - GROUPBOX "DataBase File",IDC_STATIC,7,239,269,70 239 + GROUPBOX "DataBase File",IDC_STATIC,7,265,269,70
240 CONTROL "Load AP DB from DUT",IDC_APDB_FROM_DUT_CHECK,"Button", 240 CONTROL "Load AP DB from DUT",IDC_APDB_FROM_DUT_CHECK,"Button",
241 - BS_AUTOCHECKBOX | WS_TABSTOP,15,248,103,10 241 + BS_AUTOCHECKBOX | WS_TABSTOP,15,274,103,10
242 CONTROL "Load Modem DB from DUT",IDC_MDDB_FROM_DUT_CHECK,"Button", 242 CONTROL "Load Modem DB from DUT",IDC_MDDB_FROM_DUT_CHECK,"Button",
243 - BS_AUTOCHECKBOX | WS_TABSTOP,128,248,103,10  
244 - EDITTEXT IDC_MD_1_DBFILE_PATH,12,261,225,12,ES_AUTOHSCROLL | 243 + BS_AUTOCHECKBOX | WS_TABSTOP,128,274,103,10
  244 + EDITTEXT IDC_MD_1_DBFILE_PATH,12,287,225,12,ES_AUTOHSCROLL |
245 ES_READONLY 245 ES_READONLY
246 - PUSHBUTTON "MD1_DB",IDC_BTN_MD1,240,261,32,12  
247 - EDITTEXT IDC_MD_2_DBFILE_PATH,12,277,225,12,ES_AUTOHSCROLL | 246 + PUSHBUTTON "MD1_DB",IDC_BTN_MD1,240,287,32,12
  247 + EDITTEXT IDC_MD_2_DBFILE_PATH,12,303,225,12,ES_AUTOHSCROLL |
248 ES_READONLY 248 ES_READONLY
249 - PUSHBUTTON "MD2_DB",IDC_BTN_MD2,240,277,32,12  
250 - EDITTEXT IDC_AP_DBFILE_PATH,12,292,225,12,ES_AUTOHSCROLL | 249 + PUSHBUTTON "MD2_DB",IDC_BTN_MD2,240,303,32,12
  250 + EDITTEXT IDC_AP_DBFILE_PATH,12,318,225,12,ES_AUTOHSCROLL |
251 ES_READONLY 251 ES_READONLY
252 - PUSHBUTTON "AP_DB",IDC_BTN_AP,240,292,32,12  
253 - LTEXT "Log Dir",IDC_STATIC,7,314,29,8  
254 - EDITTEXT IDC_LOG_DIR,36,313,226,12,ES_AUTOHSCROLL | ES_READONLY  
255 - PUSHBUTTON "...",IDC_BTN_LOG,262,313,14,12  
256 - PUSHBUTTON "Save",IDC_BTN_SAVE,72,329,140,17 252 + PUSHBUTTON "AP_DB",IDC_BTN_AP,240,318,32,12
  253 + LTEXT "Log Dir",IDC_STATIC,7,340,29,8
  254 + EDITTEXT IDC_LOG_DIR,36,339,226,12,ES_AUTOHSCROLL | ES_READONLY
  255 + PUSHBUTTON "...",IDC_BTN_LOG,262,339,14,12
  256 + PUSHBUTTON "Save",IDC_BTN_SAVE,72,356,140,17
  257 + LTEXT "SW version",IDC_STATIC,15,247,39,8
  258 + EDITTEXT IDC_STR_SWVERSION,62,245,203,14,ES_AUTOHSCROLL
257 END 259 END
258 260
259 IDD_ENCRYPTION_DIALOG DIALOG DISCARDABLE 0, 0, 287, 111 261 IDD_ENCRYPTION_DIALOG DIALOG DISCARDABLE 0, 0, 287, 111
@@ -269,21 +271,21 @@ BEGIN @@ -269,21 +271,21 @@ BEGIN
269 END 271 END
270 272
271 IDD_SNWRITER_DIALOG DIALOGEX 0, 0, 335, 231 273 IDD_SNWRITER_DIALOG DIALOGEX 0, 0, 335, 231
272 -STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | 274 +STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
273 WS_SYSMENU 275 WS_SYSMENU
274 EXSTYLE WS_EX_APPWINDOW 276 EXSTYLE WS_EX_APPWINDOW
275 CAPTION "SN Writer" 277 CAPTION "SN Writer"
276 FONT 10, "System", 0, 0, 0x1 278 FONT 10, "System", 0, 0, 0x1
277 BEGIN 279 BEGIN
278 LTEXT "ComPort:",IDC_STATIC,13,22,43,9,0,WS_EX_RIGHT 280 LTEXT "ComPort:",IDC_STATIC,13,22,43,9,0,WS_EX_RIGHT
279 - EDITTEXT IDC_COUNT_TOTAL,213,18,100,13,ES_AUTOHSCROLL | 281 + EDITTEXT IDC_COUNT_TOTAL,213,18,100,13,ES_AUTOHSCROLL |
280 ES_READONLY 282 ES_READONLY
281 PUSHBUTTON "System Config",IDC_BTN_SYSCONFIG,13,83,135,18 283 PUSHBUTTON "System Config",IDC_BTN_SYSCONFIG,13,83,135,18
282 DEFPUSHBUTTON "Start",IDC_BTN_START,244,123,80,35 284 DEFPUSHBUTTON "Start",IDC_BTN_START,244,123,80,35
283 PUSHBUTTON "Quit",IDC_BTN_QUIT,9,123,80,35 285 PUSHBUTTON "Quit",IDC_BTN_QUIT,9,123,80,35
284 - EDITTEXT IDC_COUNT_PASS,213,51,100,13,ES_AUTOHSCROLL | 286 + EDITTEXT IDC_COUNT_PASS,213,51,100,13,ES_AUTOHSCROLL |
285 ES_READONLY 287 ES_READONLY
286 - EDITTEXT IDC_COUNT_FAIL,213,86,100,13,ES_AUTOHSCROLL | 288 + EDITTEXT IDC_COUNT_FAIL,213,86,100,13,ES_AUTOHSCROLL |
287 ES_READONLY 289 ES_READONLY
288 LTEXT "Target Type:",IDC_STATIC,13,54,43,9,0,WS_EX_RIGHT 290 LTEXT "Target Type:",IDC_STATIC,13,54,43,9,0,WS_EX_RIGHT
289 LTEXT "Total:",IDC_STATIC,184,21,27,10 291 LTEXT "Total:",IDC_STATIC,184,21,27,10
@@ -293,15 +295,15 @@ BEGIN @@ -293,15 +295,15 @@ BEGIN
293 GROUPBOX "",IDC_STATIC,177,7,147,98 295 GROUPBOX "",IDC_STATIC,177,7,147,98
294 LTEXT "Fail:",IDC_STATIC,184,89,27,10 296 LTEXT "Fail:",IDC_STATIC,184,89,27,10
295 GROUPBOX "",IDC_STATIC,9,7,147,98 297 GROUPBOX "",IDC_STATIC,9,7,147,98
296 - COMBOBOX IDC_COMBO_COMPORT,61,19,87,51,CBS_DROPDOWNLIST | 298 + COMBOBOX IDC_COMBO_COMPORT,61,19,87,51,CBS_DROPDOWNLIST |
297 CBS_SORT | WS_VSCROLL | WS_TABSTOP 299 CBS_SORT | WS_VSCROLL | WS_TABSTOP
298 - COMBOBOX IDC_COMBO_TARGET_TYPE,61,51,87,63,CBS_DROPDOWNLIST | 300 + COMBOBOX IDC_COMBO_TARGET_TYPE,61,51,87,63,CBS_DROPDOWNLIST |
299 CBS_SORT | WS_VSCROLL | WS_TABSTOP 301 CBS_SORT | WS_VSCROLL | WS_TABSTOP
300 LTEXT "...",IDC_OPERATE_INFO,9,185,225,35 302 LTEXT "...",IDC_OPERATE_INFO,9,185,225,35
301 PUSHBUTTON "Button1",IDC_BTN_INDITE,123,123,87,35,BS_BITMAP 303 PUSHBUTTON "Button1",IDC_BTN_INDITE,123,123,87,35,BS_BITMAP
302 - CONTROL "°C",IDC_MAINUI_TEMP2,"Static",SS_LEFTNOWORDWRAP | 304 + CONTROL "°C",IDC_MAINUI_TEMP2,"Static",SS_LEFTNOWORDWRAP |
303 WS_GROUP,298,185,35,35 305 WS_GROUP,298,185,35,35
304 - CONTROL "temp",IDC_MAINUI_TEMP1,"Static",SS_LEFTNOWORDWRAP | 306 + CONTROL "temp",IDC_MAINUI_TEMP1,"Static",SS_LEFTNOWORDWRAP |
305 WS_GROUP,239,185,56,35,WS_EX_RIGHT 307 WS_GROUP,239,185,56,35,WS_EX_RIGHT
306 END 308 END
307 309
@@ -377,7 +379,7 @@ BEGIN @@ -377,7 +379,7 @@ BEGIN
377 DEFPUSHBUTTON "OK",ID_BTN_VERIFY_OK,123,35,50,14 379 DEFPUSHBUTTON "OK",ID_BTN_VERIFY_OK,123,35,50,14
378 PUSHBUTTON "Cancel",ID_BTN_VERIFY_CANCEL,14,35,50,14 380 PUSHBUTTON "Cancel",ID_BTN_VERIFY_CANCEL,14,35,50,14
379 LTEXT "Passwd:",IDC_STATIC,9,14,29,8 381 LTEXT "Passwd:",IDC_STATIC,9,14,29,8
380 - EDITTEXT IDC_EDIT_VERIFY_PASSWD,43,12,137,12,ES_PASSWORD | 382 + EDITTEXT IDC_EDIT_VERIFY_PASSWD,43,12,137,12,ES_PASSWORD |
381 ES_AUTOHSCROLL 383 ES_AUTOHSCROLL
382 END 384 END
383 385
@@ -391,11 +393,11 @@ BEGIN @@ -391,11 +393,11 @@ BEGIN
391 LTEXT "Old passwd:",IDC_STATIC,13,9,45,10,0,WS_EX_RIGHT 393 LTEXT "Old passwd:",IDC_STATIC,13,9,45,10,0,WS_EX_RIGHT
392 LTEXT "New passwd:",IDC_STATIC,13,29,45,10,0,WS_EX_RIGHT 394 LTEXT "New passwd:",IDC_STATIC,13,29,45,10,0,WS_EX_RIGHT
393 LTEXT "Confirm Passwd:",IDC_STATIC,0,49,58,10,0,WS_EX_RIGHT 395 LTEXT "Confirm Passwd:",IDC_STATIC,0,49,58,10,0,WS_EX_RIGHT
394 - EDITTEXT IDC_EDIT_OLD_PASSWD,60,7,141,12,ES_PASSWORD | 396 + EDITTEXT IDC_EDIT_OLD_PASSWD,60,7,141,12,ES_PASSWORD |
395 ES_AUTOHSCROLL 397 ES_AUTOHSCROLL
396 - EDITTEXT IDC_EDIT_NEW_PASSWD,60,27,141,12,ES_PASSWORD | 398 + EDITTEXT IDC_EDIT_NEW_PASSWD,60,27,141,12,ES_PASSWORD |
397 ES_AUTOHSCROLL 399 ES_AUTOHSCROLL
398 - EDITTEXT IDC_EDIT_CONFIRM_PASSWD,60,47,141,12,ES_PASSWORD | 400 + EDITTEXT IDC_EDIT_CONFIRM_PASSWD,60,47,141,12,ES_PASSWORD |
399 ES_AUTOHSCROLL 401 ES_AUTOHSCROLL
400 END 402 END
401 403
@@ -406,17 +408,17 @@ FONT 10, "System" @@ -406,17 +408,17 @@ FONT 10, "System"
406 BEGIN 408 BEGIN
407 DEFPUSHBUTTON "OK",IDC_BTN_FILE_SEL_OK,217,139,61,23 409 DEFPUSHBUTTON "OK",IDC_BTN_FILE_SEL_OK,217,139,61,23
408 PUSHBUTTON "Cancel",IDC_BTN_FILE_SEL_CANCEL,55,139,61,23 410 PUSHBUTTON "Cancel",IDC_BTN_FILE_SEL_CANCEL,55,139,61,23
409 - EDITTEXT IDC_FP_AUTH_FIEL_PATH,7,12,270,12,ES_AUTOHSCROLL | 411 + EDITTEXT IDC_FP_AUTH_FIEL_PATH,7,12,270,12,ES_AUTOHSCROLL |
410 ES_READONLY 412 ES_READONLY
411 - EDITTEXT IDC_SP_AUTH_FIEL_PATH,7,33,270,12,ES_AUTOHSCROLL | 413 + EDITTEXT IDC_SP_AUTH_FIEL_PATH,7,33,270,12,ES_AUTOHSCROLL |
412 ES_READONLY 414 ES_READONLY
413 - EDITTEXT IDC_DRMKEY_FIEL_PATH,7,75,270,12,ES_AUTOHSCROLL | 415 + EDITTEXT IDC_DRMKEY_FIEL_PATH,7,75,270,12,ES_AUTOHSCROLL |
414 ES_READONLY 416 ES_READONLY
415 - EDITTEXT IDC_HDCP_BIN_FIEL_PATH,7,54,270,12,ES_AUTOHSCROLL | 417 + EDITTEXT IDC_HDCP_BIN_FIEL_PATH,7,54,270,12,ES_AUTOHSCROLL |
416 ES_READONLY 418 ES_READONLY
417 - EDITTEXT IDC_HDCP_DATA_FIEL_PATH,7,96,270,12,ES_AUTOHSCROLL | 419 + EDITTEXT IDC_HDCP_DATA_FIEL_PATH,7,96,270,12,ES_AUTOHSCROLL |
418 ES_READONLY 420 ES_READONLY
419 - EDITTEXT IDC_HDCP_CEK_FIEL_PATH,7,117,270,12,ES_AUTOHSCROLL | 421 + EDITTEXT IDC_HDCP_CEK_FIEL_PATH,7,117,270,12,ES_AUTOHSCROLL |
420 ES_READONLY 422 ES_READONLY
421 PUSHBUTTON "FPAuth File",IDC_BTN_SEL_FP_AUTH_FILE,283,13,54,12 423 PUSHBUTTON "FPAuth File",IDC_BTN_SEL_FP_AUTH_FILE,283,13,54,12
422 PUSHBUTTON "SPAuth File",IDC_BTN_SEL_SP_AUTH_FILE,283,34,54,12 424 PUSHBUTTON "SPAuth File",IDC_BTN_SEL_SP_AUTH_FILE,283,34,54,12
@@ -433,11 +435,11 @@ FONT 10, "System" @@ -433,11 +435,11 @@ FONT 10, "System"
433 BEGIN 435 BEGIN
434 CONTROL "Barcode",IDC_AUTOGEN_BARC_CHECK,"Button", 436 CONTROL "Barcode",IDC_AUTOGEN_BARC_CHECK,"Button",
435 BS_AUTOCHECKBOX | WS_TABSTOP,17,20,36,8 437 BS_AUTOCHECKBOX | WS_TABSTOP,17,20,36,8
436 - CONTROL "IMEI",IDC_AUTOGEN_IMEI_CHECK,"Button",BS_AUTOCHECKBOX | 438 + CONTROL "IMEI",IDC_AUTOGEN_IMEI_CHECK,"Button",BS_AUTOCHECKBOX |
437 WS_TABSTOP,64,20,36,8 439 WS_TABSTOP,64,20,36,8
438 - CONTROL "Wifi",IDC_AUTOGEN_WIFI_CHECK,"Button",BS_AUTOCHECKBOX | 440 + CONTROL "Wifi",IDC_AUTOGEN_WIFI_CHECK,"Button",BS_AUTOCHECKBOX |
439 WS_TABSTOP,158,20,36,8 441 WS_TABSTOP,158,20,36,8
440 - CONTROL "BT",IDC_AUTOGEN_BT_CHECK,"Button",BS_AUTOCHECKBOX | 442 + CONTROL "BT",IDC_AUTOGEN_BT_CHECK,"Button",BS_AUTOCHECKBOX |
441 WS_TABSTOP,111,20,36,8 443 WS_TABSTOP,111,20,36,8
442 EDITTEXT IDC_BARC_START_STR,43,50,110,12,ES_AUTOHSCROLL 444 EDITTEXT IDC_BARC_START_STR,43,50,110,12,ES_AUTOHSCROLL
443 EDITTEXT IDC_BARC_END_STR,43,72,110,12,ES_AUTOHSCROLL 445 EDITTEXT IDC_BARC_END_STR,43,72,110,12,ES_AUTOHSCROLL
@@ -462,25 +464,25 @@ BEGIN @@ -462,25 +464,25 @@ BEGIN
462 LTEXT "End:",IDC_STATIC,17,75,22,8 464 LTEXT "End:",IDC_STATIC,17,75,22,8
463 LTEXT "Next:",IDC_STATIC,17,98,22,8 465 LTEXT "Next:",IDC_STATIC,17,98,22,8
464 LTEXT "Step:",IDC_STATIC,17,121,22,8 466 LTEXT "Step:",IDC_STATIC,17,121,22,8
465 - COMBOBOX IDC_BARC_AUTOGEN_STEP,43,116,23,31,CBS_DROPDOWN | 467 + COMBOBOX IDC_BARC_AUTOGEN_STEP,43,116,23,31,CBS_DROPDOWN |
466 CBS_SORT | WS_VSCROLL | WS_TABSTOP 468 CBS_SORT | WS_VSCROLL | WS_TABSTOP
467 LTEXT "Start:",IDC_STATIC,179,56,22,8 469 LTEXT "Start:",IDC_STATIC,179,56,22,8
468 LTEXT "End:",IDC_STATIC,179,78,22,8 470 LTEXT "End:",IDC_STATIC,179,78,22,8
469 LTEXT "Next:",IDC_STATIC,179,99,22,8 471 LTEXT "Next:",IDC_STATIC,179,99,22,8
470 LTEXT "Step:",IDC_STATIC,179,121,22,8 472 LTEXT "Step:",IDC_STATIC,179,121,22,8
471 - COMBOBOX IDC_IMEI_AUTOGEN_STEP,203,117,23,30,CBS_DROPDOWN | 473 + COMBOBOX IDC_IMEI_AUTOGEN_STEP,203,117,23,30,CBS_DROPDOWN |
472 CBS_SORT | WS_VSCROLL | WS_TABSTOP 474 CBS_SORT | WS_VSCROLL | WS_TABSTOP
473 LTEXT "Start:",IDC_STATIC,17,160,22,8 475 LTEXT "Start:",IDC_STATIC,17,160,22,8
474 LTEXT "End:",IDC_STATIC,17,182,22,8 476 LTEXT "End:",IDC_STATIC,17,182,22,8
475 LTEXT "Next:",IDC_STATIC,17,203,22,8 477 LTEXT "Next:",IDC_STATIC,17,203,22,8
476 LTEXT "Step:",IDC_STATIC,17,225,22,8 478 LTEXT "Step:",IDC_STATIC,17,225,22,8
477 - COMBOBOX IDC_BT_AUTOGEN_STEP,43,221,23,31,CBS_DROPDOWN | CBS_SORT | 479 + COMBOBOX IDC_BT_AUTOGEN_STEP,43,221,23,31,CBS_DROPDOWN | CBS_SORT |
478 WS_VSCROLL | WS_TABSTOP 480 WS_VSCROLL | WS_TABSTOP
479 LTEXT "Start:",IDC_STATIC,179,160,22,8 481 LTEXT "Start:",IDC_STATIC,179,160,22,8
480 LTEXT "End:",IDC_STATIC,179,182,22,8 482 LTEXT "End:",IDC_STATIC,179,182,22,8
481 LTEXT "Next:",IDC_STATIC,179,203,22,8 483 LTEXT "Next:",IDC_STATIC,179,203,22,8
482 LTEXT "Step:",IDC_STATIC,179,225,22,8 484 LTEXT "Step:",IDC_STATIC,179,225,22,8
483 - COMBOBOX IDC_WIFI_AUTOGEN_STEP,203,221,23,32,CBS_DROPDOWN | 485 + COMBOBOX IDC_WIFI_AUTOGEN_STEP,203,221,23,32,CBS_DROPDOWN |
484 CBS_SORT | WS_VSCROLL | WS_TABSTOP 486 CBS_SORT | WS_VSCROLL | WS_TABSTOP
485 EDITTEXT IDC_ETHERNET_START_STR,43,254,110,12,ES_AUTOHSCROLL 487 EDITTEXT IDC_ETHERNET_START_STR,43,254,110,12,ES_AUTOHSCROLL
486 EDITTEXT IDC_ETHERNET_END_STR,43,275,110,12,ES_AUTOHSCROLL 488 EDITTEXT IDC_ETHERNET_END_STR,43,275,110,12,ES_AUTOHSCROLL
@@ -490,7 +492,7 @@ BEGIN @@ -490,7 +492,7 @@ BEGIN
490 LTEXT "End:",IDC_STATIC,17,278,22,8 492 LTEXT "End:",IDC_STATIC,17,278,22,8
491 LTEXT "Next:",IDC_STATIC,17,299,22,8 493 LTEXT "Next:",IDC_STATIC,17,299,22,8
492 LTEXT "Step:",IDC_STATIC,17,321,22,8 494 LTEXT "Step:",IDC_STATIC,17,321,22,8
493 - COMBOBOX IDC_ETHERNET_AUTOGEN_STEP,43,317,23,31,CBS_DROPDOWN | 495 + COMBOBOX IDC_ETHERNET_AUTOGEN_STEP,43,317,23,31,CBS_DROPDOWN |
494 CBS_SORT | WS_VSCROLL | WS_TABSTOP 496 CBS_SORT | WS_VSCROLL | WS_TABSTOP
495 CONTROL "Ethernet",IDC_AUTOGEN_ETHERNET_CHECK,"Button", 497 CONTROL "Ethernet",IDC_AUTOGEN_ETHERNET_CHECK,"Button",
496 BS_AUTOCHECKBOX | WS_TABSTOP,205,20,40,8 498 BS_AUTOCHECKBOX | WS_TABSTOP,205,20,40,8
@@ -502,11 +504,11 @@ BEGIN @@ -502,11 +504,11 @@ BEGIN
502 LTEXT "End:",IDC_STATIC,179,278,22,8 504 LTEXT "End:",IDC_STATIC,179,278,22,8
503 LTEXT "Next:",IDC_STATIC,179,299,22,8 505 LTEXT "Next:",IDC_STATIC,179,299,22,8
504 LTEXT "Step:",IDC_STATIC,179,321,22,8 506 LTEXT "Step:",IDC_STATIC,179,321,22,8
505 - COMBOBOX IDC_DRMKEY_MCID_AUTOGEN_STEP,203,317,23,31,CBS_DROPDOWN | 507 + COMBOBOX IDC_DRMKEY_MCID_AUTOGEN_STEP,203,317,23,31,CBS_DROPDOWN |
506 CBS_SORT | WS_VSCROLL | WS_TABSTOP 508 CBS_SORT | WS_VSCROLL | WS_TABSTOP
507 CONTROL "DRMKey MCID",IDC_AUTOGEN_DRMKEY_MCID_CHECK,"Button", 509 CONTROL "DRMKey MCID",IDC_AUTOGEN_DRMKEY_MCID_CHECK,"Button",
508 BS_AUTOCHECKBOX | WS_TABSTOP,256,20,59,8 510 BS_AUTOCHECKBOX | WS_TABSTOP,256,20,59,8
509 - CONTROL "Denary",IDC_DENARY_INCREASE,"Button",BS_AUTORADIOBUTTON | 511 + CONTROL "Denary",IDC_DENARY_INCREASE,"Button",BS_AUTORADIOBUTTON |
510 WS_GROUP,94,117,59,8 512 WS_GROUP,94,117,59,8
511 CONTROL "Hexadecimal",IDC_HEX_INCREASE,"Button", 513 CONTROL "Hexadecimal",IDC_HEX_INCREASE,"Button",
512 BS_AUTORADIOBUTTON,94,130,59,8 514 BS_AUTORADIOBUTTON,94,130,59,8
@@ -520,14 +522,14 @@ END @@ -520,14 +522,14 @@ END
520 // 522 //
521 523
522 #ifdef APSTUDIO_INVOKED 524 #ifdef APSTUDIO_INVOKED
523 -GUIDELINES DESIGNINFO MOVEABLE PURE 525 +GUIDELINES DESIGNINFO MOVEABLE PURE
524 BEGIN 526 BEGIN
525 IDD_SYSTEM_CONFIG_DIALOG, DIALOG 527 IDD_SYSTEM_CONFIG_DIALOG, DIALOG
526 BEGIN 528 BEGIN
527 LEFTMARGIN, 7 529 LEFTMARGIN, 7
528 RIGHTMARGIN, 276 530 RIGHTMARGIN, 276
529 TOPMARGIN, 3 531 TOPMARGIN, 3
530 - BOTTOMMARGIN, 346 532 + BOTTOMMARGIN, 373
531 END 533 END
532 534
533 IDD_ENCRYPTION_DIALOG, DIALOG 535 IDD_ENCRYPTION_DIALOG, DIALOG
@@ -650,7 +652,7 @@ END @@ -650,7 +652,7 @@ END
650 // String Table 652 // String Table
651 // 653 //
652 654
653 -STRINGTABLE DISCARDABLE 655 +STRINGTABLE DISCARDABLE
654 BEGIN 656 BEGIN
655 IDS_ABOUTBOX "&About SN Writer..." 657 IDS_ABOUTBOX "&About SN Writer..."
656 END 658 END
Please register or login to post a comment