Commit a7e1dee08707c12c46a4c95a63073e16808077d9

Authored by xiemeng
1 parent 7f690dd4

config 界面优化

Showing 2 changed files with 67 additions and 73 deletions
... ... @@ -26,10 +26,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
26 26 // Dialog
27 27 //
28 28
29   -IDD_SYSTEM_CONFIG_DIALOG DIALOGEX 0, 0, 285, 379
  29 +IDD_SYSTEM_CONFIG_DIALOG DIALOGEX 0, 0, 404, 258
30 30 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
31 31 CAPTION "System Config"
32   -FONT 4, "System", 0, 0, 0x1
  32 +FONT 4, "System"
33 33 BEGIN
34 34 GROUPBOX "Write Option",IDC_STATIC,8,3,100,117
35 35 CONTROL "Barcode",IDC_WRITE_BARC_CHECK,"Button",BS_AUTOCHECKBOX |
... ... @@ -50,94 +50,93 @@ BEGIN
50 50 WS_TABSTOP,13,96,88,8
51 51 CONTROL "Serial No.",IDC_WRITE_SERIAL_NO_CHECK,"Button",
52 52 BS_AUTOCHECKBOX | WS_TABSTOP,13,108,88,8
53   - GROUPBOX "IMEI Option",IDC_STATIC,7,123,100,113
  53 + GROUPBOX "IMEI Option",IDC_STATIC,114,5,100,113
54 54 CONTROL "IMEI CheckSum",IDC_IMEI_CHECKSUM,"Button",
55   - BS_AUTOCHECKBOX | WS_TABSTOP,12,131,88,11
  55 + BS_AUTOCHECKBOX | WS_TABSTOP,119,13,88,11
56 56 CONTROL "IMEI Lock",IDC_IMEI_LOCK,"Button",BS_AUTOCHECKBOX |
57   - WS_TABSTOP,12,142,88,11
  57 + WS_TABSTOP,119,24,88,11
58 58 CONTROL "Dual IMEI",IDC_DUAL_IMEI,"Button",BS_AUTOCHECKBOX |
59   - WS_TABSTOP,12,153,88,11
  59 + WS_TABSTOP,119,35,88,11
60 60 CONTROL "DualIMEI Same",IDC_DUAL_IMEI_SAME,"Button",
61   - BS_AUTOCHECKBOX | WS_TABSTOP,29,164,65,11
  61 + BS_AUTOCHECKBOX | WS_TABSTOP,136,46,65,11
62 62 CONTROL "Three IMEI",IDC_THREE_IMEI,"Button",BS_AUTOCHECKBOX |
63   - WS_TABSTOP,12,175,88,11
  63 + WS_TABSTOP,119,57,88,11
64 64 CONTROL "Four IMEI",IDC_FOUR_IMEI,"Button",BS_AUTOCHECKBOX |
65   - WS_TABSTOP,12,186,88,11
  65 + WS_TABSTOP,119,68,88,11
66 66 CONTROL "CurTemperature",IDC_CURRENT_TEMPERATURE,"Button",
67   - BS_AUTOCHECKBOX | WS_TABSTOP,12,197,63,11
68   - EDITTEXT IDC_TEMPERATURE,33,209,19,12,ES_AUTOHSCROLL
69   - LTEXT "°C",IDC_STATIC,56,210,19,8
  67 + BS_AUTOCHECKBOX | WS_TABSTOP,119,79,63,11
  68 + EDITTEXT IDC_TEMPERATURE,140,91,19,12,ES_AUTOHSCROLL
  69 + LTEXT "°C",IDC_STATIC,163,92,19,8
70 70 CONTROL "Lock OTP",IDC_LOCK_OTP,"Button",BS_AUTOCHECKBOX |
71   - WS_TABSTOP,12,223,88,11
72   - GROUPBOX "Header Option",IDC_STATIC,110,3,166,233
73   - LTEXT "Barc Header:",IDC_STATIC,115,20,55,8,0,WS_EX_RIGHT
74   - EDITTEXT IDC_BARC_HEADER_STR,178,18,50,12,ES_AUTOHSCROLL
  71 + WS_TABSTOP,119,105,88,11
  72 + GROUPBOX "Header Option",IDC_STATIC,238,0,166,233
  73 + LTEXT "Barc Header:",IDC_STATIC,243,17,55,8,0,WS_EX_RIGHT
  74 + EDITTEXT IDC_BARC_HEADER_STR,306,15,50,12,ES_AUTOHSCROLL
75 75 CONTROL "On/Off",IDC_BARC_HEADER_CHECK,"Button",BS_AUTOCHECKBOX |
76   - WS_TABSTOP,237,20,32,8
77   - LTEXT "BT Header:",IDC_STATIC,115,38,55,8,0,WS_EX_RIGHT
78   - EDITTEXT IDC_BT_HEADER_STR,178,36,50,12,ES_AUTOHSCROLL
  76 + WS_TABSTOP,365,17,32,8
  77 + LTEXT "BT Header:",IDC_STATIC,243,35,55,8,0,WS_EX_RIGHT
  78 + EDITTEXT IDC_BT_HEADER_STR,306,33,50,12,ES_AUTOHSCROLL
79 79 CONTROL "On/Off",IDC_BT_HEADER_CHECK,"Button",BS_AUTOCHECKBOX |
80   - WS_TABSTOP,237,38,32,8
81   - LTEXT "Wifi Header:",IDC_STATIC,115,56,55,8,0,WS_EX_RIGHT
82   - EDITTEXT IDC_WIFI_HEADER_STR,178,54,50,12,ES_AUTOHSCROLL
  80 + WS_TABSTOP,365,35,32,8
  81 + LTEXT "Wifi Header:",IDC_STATIC,243,53,55,8,0,WS_EX_RIGHT
  82 + EDITTEXT IDC_WIFI_HEADER_STR,306,51,50,12,ES_AUTOHSCROLL
83 83 CONTROL "On/Off",IDC_WIFI_HEADER_CHECK,"Button",BS_AUTOCHECKBOX |
84   - WS_TABSTOP,237,56,32,8
85   - LTEXT "IMEI_1 Header:",IDC_STATIC,115,74,55,8,0,WS_EX_RIGHT
86   - EDITTEXT IDC_IMEI_1_HEADER_STR,178,72,50,12,ES_AUTOHSCROLL
  84 + WS_TABSTOP,365,53,32,8
  85 + LTEXT "IMEI_1 Header:",IDC_STATIC,243,71,55,8,0,WS_EX_RIGHT
  86 + EDITTEXT IDC_IMEI_1_HEADER_STR,306,69,50,12,ES_AUTOHSCROLL
87 87 CONTROL "On/Off",IDC_IMEI_1_HEADER_CHECK,"Button",
88   - BS_AUTOCHECKBOX | WS_TABSTOP,237,74,32,8
89   - LTEXT "IMEI_2 Header:",IDC_STATIC,115,92,55,8,0,WS_EX_RIGHT
90   - EDITTEXT IDC_IMEI_2_HEADER_STR,178,90,50,12,ES_AUTOHSCROLL
  88 + BS_AUTOCHECKBOX | WS_TABSTOP,365,71,32,8
  89 + LTEXT "IMEI_2 Header:",IDC_STATIC,243,89,55,8,0,WS_EX_RIGHT
  90 + EDITTEXT IDC_IMEI_2_HEADER_STR,306,87,50,12,ES_AUTOHSCROLL
91 91 CONTROL "On/Off",IDC_IMEI_2_HEADER_CHECK,"Button",
92   - BS_AUTOCHECKBOX | WS_TABSTOP,237,92,32,8
93   - LTEXT "IMEI_3 Header:",IDC_STATIC,115,110,55,8,0,WS_EX_RIGHT
94   - EDITTEXT IDC_IMEI_3_HEADER_STR,178,108,50,12,ES_AUTOHSCROLL
  92 + BS_AUTOCHECKBOX | WS_TABSTOP,365,89,32,8
  93 + LTEXT "IMEI_3 Header:",IDC_STATIC,243,107,55,8,0,WS_EX_RIGHT
  94 + EDITTEXT IDC_IMEI_3_HEADER_STR,306,105,50,12,ES_AUTOHSCROLL
95 95 CONTROL "On/Off",IDC_IMEI_3_HEADER_CHECK,"Button",
96   - BS_AUTOCHECKBOX | WS_TABSTOP,237,110,32,8
97   - LTEXT "IMEI_4 Header:",IDC_STATIC,115,128,55,8,0,WS_EX_RIGHT
98   - EDITTEXT IDC_IMEI_4_HEADER_STR,178,126,50,12,ES_AUTOHSCROLL
  96 + BS_AUTOCHECKBOX | WS_TABSTOP,365,107,32,8
  97 + LTEXT "IMEI_4 Header:",IDC_STATIC,243,125,55,8,0,WS_EX_RIGHT
  98 + EDITTEXT IDC_IMEI_4_HEADER_STR,306,123,50,12,ES_AUTOHSCROLL
99 99 CONTROL "On/Off",IDC_IMEI_4_HEADER_CHECK,"Button",
100   - BS_AUTOCHECKBOX | WS_TABSTOP,237,128,32,8
101   - LTEXT "Serial Header:",IDC_STATIC,115,146,55,8,0,WS_EX_RIGHT
102   - EDITTEXT IDC_SERIAL_NO_HEADER_STR,178,144,50,12,ES_AUTOHSCROLL
  100 + BS_AUTOCHECKBOX | WS_TABSTOP,365,125,32,8
  101 + LTEXT "Serial Header:",IDC_STATIC,243,143,55,8,0,WS_EX_RIGHT
  102 + EDITTEXT IDC_SERIAL_NO_HEADER_STR,306,141,50,12,ES_AUTOHSCROLL
103 103 CONTROL "On/Off",IDC_SERIAL_NO_HEADER_CHECK,"Button",
104   - BS_AUTOCHECKBOX | WS_TABSTOP,237,146,32,8
105   - LTEXT "Ethernet Header:",IDC_STATIC,115,164,55,8,0,WS_EX_RIGHT
106   - EDITTEXT IDC_ETHERNET_HEADER_STR,178,162,50,12,ES_AUTOHSCROLL
  104 + BS_AUTOCHECKBOX | WS_TABSTOP,365,143,32,8
  105 + LTEXT "Ethernet Header:",IDC_STATIC,243,161,55,8,0,WS_EX_RIGHT
  106 + EDITTEXT IDC_ETHERNET_HEADER_STR,306,159,50,12,ES_AUTOHSCROLL
107 107 CONTROL "On/Off",IDC_ETHERNET_HEADER_CHECK,"Button",
108   - BS_AUTOCHECKBOX | WS_TABSTOP,237,164,32,8
109   - LTEXT "MCID Header:",IDC_STATIC,115,182,55,8,0,WS_EX_RIGHT
110   - EDITTEXT IDC_DRMKEY_MCID_HEADER_STR,178,180,50,12,ES_AUTOHSCROLL
  108 + BS_AUTOCHECKBOX | WS_TABSTOP,365,161,32,8
  109 + LTEXT "MCID Header:",IDC_STATIC,243,179,55,8,0,WS_EX_RIGHT
  110 + EDITTEXT IDC_DRMKEY_MCID_HEADER_STR,306,177,50,12,ES_AUTOHSCROLL
111 111 CONTROL "On/Off",IDC_DRMKEY_MCID_HEADER_CHECK,"Button",
112   - BS_AUTOCHECKBOX | WS_TABSTOP,237,182,32,8
113   - LTEXT "MEID:",IDC_STATIC,115,200,55,8,0,WS_EX_RIGHT
114   - EDITTEXT IDC_MEID_HEADER_STR,178,198,50,12,ES_AUTOHSCROLL
  112 + BS_AUTOCHECKBOX | WS_TABSTOP,365,179,32,8
  113 + LTEXT "MEID:",IDC_STATIC,243,197,55,8,0,WS_EX_RIGHT
  114 + EDITTEXT IDC_MEID_HEADER_STR,306,195,50,12,ES_AUTOHSCROLL
115 115 CONTROL "On/Off",IDC_MEID_HEADER_CHECK,"Button",BS_AUTOCHECKBOX |
116   - WS_TABSTOP,237,200,32,8
117   - LTEXT "MSN:",IDC_STATIC,115,218,55,8,0,WS_EX_RIGHT
118   - EDITTEXT IDC_ESN_HEADER_STR,178,216,50,12,ES_AUTOHSCROLL
  116 + WS_TABSTOP,365,197,32,8
  117 + LTEXT "MSN:",IDC_STATIC,243,215,55,8,0,WS_EX_RIGHT
  118 + EDITTEXT IDC_ESN_HEADER_STR,306,213,50,12,ES_AUTOHSCROLL
119 119 CONTROL "On/Off",IDC_ESN_HEADER_CHECK,"Button",BS_AUTOCHECKBOX |
120   - WS_TABSTOP,237,218,32,8
121   - GROUPBOX "DataBase File",IDC_STATIC,7,265,269,70
  120 + WS_TABSTOP,365,215,32,8
  121 + GROUPBOX "DataBase File",IDC_STATIC,0,144,233,70
122 122 CONTROL "Load AP DB from DUT",IDC_APDB_FROM_DUT_CHECK,"Button",
123   - BS_AUTOCHECKBOX | WS_TABSTOP,15,274,103,10
  123 + BS_AUTOCHECKBOX | WS_TABSTOP,6,152,103,10
124 124 CONTROL "Load Modem DB from DUT",IDC_MDDB_FROM_DUT_CHECK,"Button",
125   - BS_AUTOCHECKBOX | WS_TABSTOP,128,274,103,10
126   - EDITTEXT IDC_MD_1_DBFILE_PATH,12,287,225,12,ES_AUTOHSCROLL |
  125 + BS_AUTOCHECKBOX | WS_TABSTOP,119,152,103,10
  126 + EDITTEXT IDC_MD_1_DBFILE_PATH,3,165,187,12,ES_AUTOHSCROLL |
127 127 ES_READONLY
128   - PUSHBUTTON "MD1_DB",IDC_BTN_MD1,240,287,32,12
129   - EDITTEXT IDC_MD_2_DBFILE_PATH,12,303,225,12,ES_AUTOHSCROLL |
  128 + PUSHBUTTON "MD1_DB",IDC_BTN_MD1,192,165,32,12
  129 + EDITTEXT IDC_MD_2_DBFILE_PATH,3,181,187,12,ES_AUTOHSCROLL |
130 130 ES_READONLY
131   - PUSHBUTTON "MD2_DB",IDC_BTN_MD2,240,303,32,12
132   - EDITTEXT IDC_AP_DBFILE_PATH,12,318,225,12,ES_AUTOHSCROLL |
  131 + PUSHBUTTON "MD2_DB",IDC_BTN_MD2,192,181,32,12
  132 + EDITTEXT IDC_AP_DBFILE_PATH,3,196,187,12,ES_AUTOHSCROLL |
133 133 ES_READONLY
134   - PUSHBUTTON "AP_DB",IDC_BTN_AP,240,318,32,12
135   - LTEXT "Log Dir",IDC_STATIC,7,340,29,8
136   - EDITTEXT IDC_LOG_DIR,36,339,226,12,ES_AUTOHSCROLL | ES_READONLY
137   - PUSHBUTTON "...",IDC_BTN_LOG,262,339,14,12
138   - PUSHBUTTON "Save",IDC_BTN_SAVE,72,356,140,17
139   - LTEXT "SW version",IDC_STATIC,15,247,39,8
140   - EDITTEXT IDC_STR_SWVERSION,62,245,203,14,ES_AUTOHSCROLL
  134 + PUSHBUTTON "AP_DB",IDC_BTN_AP,192,196,32,12
  135 + EDITTEXT IDC_LOG_DIR,0,217,164,12,ES_AUTOHSCROLL | ES_READONLY
  136 + PUSHBUTTON "LOG Dir",IDC_BTN_LOG,170,218,54,12
  137 + PUSHBUTTON "Save",IDC_BTN_SAVE,132,233,140,17
  138 + LTEXT "SW version",IDC_STATIC,0,126,39,8
  139 + EDITTEXT IDC_STR_SWVERSION,45,124,183,14,ES_AUTOHSCROLL
141 140 END
142 141
143 142 IDD_ENCRYPTION_DIALOG DIALOG DISCARDABLE 0, 0, 287, 111
... ... @@ -157,7 +156,7 @@ STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
157 156 WS_SYSMENU
158 157 EXSTYLE WS_EX_APPWINDOW
159 158 CAPTION "SN Writer(TOPWELL)"
160   -FONT 10, "System"
  159 +FONT 10, "System", 0, 0, 0x1
161 160 BEGIN
162 161 LTEXT "ComPort:",IDC_STATIC,13,22,43,9,0,WS_EX_RIGHT
163 162 EDITTEXT IDC_COUNT_TOTAL,33,122,22,13,ES_AUTOHSCROLL |
... ... @@ -404,9 +403,9 @@ BEGIN
404 403 IDD_SYSTEM_CONFIG_DIALOG, DIALOG
405 404 BEGIN
406 405 LEFTMARGIN, 7
407   - RIGHTMARGIN, 276
  406 + RIGHTMARGIN, 395
408 407 TOPMARGIN, 3
409   - BOTTOMMARGIN, 373
  408 + BOTTOMMARGIN, 252
410 409 END
411 410
412 411 IDD_ENCRYPTION_DIALOG, DIALOG
... ...
... ... @@ -199,11 +199,6 @@ BOOL CSNWriterDlg::OnInitDialog()
199 199
200 200 // TODO: Add extra initialization here
201 201 //g_MainDlgHandle = (DWORD)this;
202   -
203   -
204   -
205   -
206   -
207 202 m_SNMenu.LoadMenu(IDR_SN_MENU);
208 203 m_hSNMenu = m_SNMenu.GetSafeHmenu();
209 204
... ...
Please register or login to post a comment