Echo / InterlockingTool · Commits

Commit 868150165f22dbbaf49eb5561e0b699f992c3470

Authored by xiemeng
1 parent 770c71bc

UI优化

Inline Side-by-side
Showing 9 changed files with 41 additions and 28 deletions
@@ -222,7 +222,8 @@ void SNBase::UpdateUICountResult(WriteNvram_Status_e eWriteStatus) @@ -222,7 +222,8 @@ void SNBase::UpdateUICountResult(WriteNvram_Status_e eWriteStatus)
222 break; 222 break;
223 case CANCEL: 223 case CANCEL:
224 case NORMAL: 224 case NORMAL:
225 - g_pMainDlg->myctrlbit.ShowWindow(SW_HIDE); 225 + g_pMainDlg->myctrlbit.ShowWindow(SW_SHOW);
  226 + g_pMainDlg->myctrlbit.SetBitmap(g_pMainDlg->m_hBitmapnormal);
226 break; 227 break;
227 } 228 }
228 229
@@ -521,6 +521,10 @@ SOURCE=".\res\SN Writer.ico" @@ -521,6 +521,10 @@ SOURCE=".\res\SN Writer.ico"
521 521
522 SOURCE=".\SN Writer.rc" 522 SOURCE=".\SN Writer.rc"
523 # End Source File 523 # End Source File
  524 +# Begin Source File
  525 +
  526 +SOURCE=.\res\WAIT.bmp
  527 +# End Source File
524 # End Group 528 # End Group
525 # Begin Source File 529 # Begin Source File
526 530
@@ -212,38 +212,38 @@ CAPTION "SN Writer" @@ -212,38 +212,38 @@ CAPTION "SN Writer"
212 FONT 9, "΢ÈíÑźÚ" 212 FONT 9, "΢ÈíÑźÚ"
213 BEGIN 213 BEGIN
214 EDITTEXT IDC_IMEI1_FROM_SCAN,44,15,109,12,ES_AUTOHSCROLL 214 EDITTEXT IDC_IMEI1_FROM_SCAN,44,15,109,12,ES_AUTOHSCROLL
215 - EDITTEXT IDC_IMEI2_FROM_SCAN,44,33,109,12,ES_AUTOHSCROLL  
216 - DEFPUSHBUTTON "Start",IDC_BTN_START,173,20,99,25,BS_CENTER | 215 + EDITTEXT IDC_IMEI2_FROM_SCAN,44,30,109,12,ES_AUTOHSCROLL
  216 + DEFPUSHBUTTON "Start",IDC_BTN_START,173,21,99,24,BS_CENTER |
217 BS_VCENTER | NOT WS_TABSTOP 217 BS_VCENTER | NOT WS_TABSTOP
218 LISTBOX IDC_LOG_LIST,0,118,293,133,LBS_NOINTEGRALHEIGHT | 218 LISTBOX IDC_LOG_LIST,0,118,293,133,LBS_NOINTEGRALHEIGHT |
219 WS_VSCROLL | WS_HSCROLL 219 WS_VSCROLL | WS_HSCROLL
220 - LTEXT "",IDC_STATIC_IMEI1,46,65,109,12,SS_SUNKEN  
221 - LTEXT "",IDC_STATIC_IMEI2,46,84,109,12,SS_CENTERIMAGE | 220 + LTEXT "",IDC_STATIC_IMEI1,46,58,109,12,SS_SUNKEN
  221 + LTEXT "",IDC_STATIC_IMEI2,46,72,109,12,SS_CENTERIMAGE |
222 SS_SUNKEN 222 SS_SUNKEN
223 DEFPUSHBUTTON "",IDC_BTN_SYSCONFIG,262,62,9,8,NOT WS_VISIBLE | NOT 223 DEFPUSHBUTTON "",IDC_BTN_SYSCONFIG,262,62,9,8,NOT WS_VISIBLE | NOT
224 WS_TABSTOP 224 WS_TABSTOP
225 DEFPUSHBUTTON "",IDC_BTN_QUIT,262,71,9,8,NOT WS_VISIBLE | NOT 225 DEFPUSHBUTTON "",IDC_BTN_QUIT,262,71,9,8,NOT WS_VISIBLE | NOT
226 WS_TABSTOP 226 WS_TABSTOP
227 - LTEXT "Total:",IDC_STATIC,7,105,22,8  
228 - LTEXT "Pass:",IDC_STATIC_PASS,68,105,21,10  
229 - LTEXT "Fail:",IDC_STATIC,129,105,18,10 227 + LTEXT "Total:",IDC_STATIC,7,107,22,8
  228 + LTEXT "Pass:",IDC_STATIC_PASS,68,107,21,10
  229 + LTEXT "Fail:",IDC_STATIC,129,107,18,10
230 COMBOBOX IDC_COMBO_COMPORT,262,83,16,51,CBS_DROPDOWNLIST | 230 COMBOBOX IDC_COMBO_COMPORT,262,83,16,51,CBS_DROPDOWNLIST |
231 CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL 231 CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL
232 - CONTROL 133,IDC_BITMAP_RESAULT,"Static",SS_BITMAP,167,53,93,45 232 + CONTROL 133,IDC_BITMAP_RESAULT,"Static",SS_BITMAP,164,49,93,45
233 GROUPBOX "IMEI form Scan",IDC_STATIC,0,2,282,45 233 GROUPBOX "IMEI form Scan",IDC_STATIC,0,2,282,45
234 - LTEXT "",IDC_COUNT_TOTAL,32,105,29,8,SS_SUNKEN  
235 - LTEXT "",IDC_COUNT_PASS,90,105,32,8,SS_SUNKEN  
236 - LTEXT "",IDC_COUNT_FAIL,145,105,37,8,SS_SUNKEN 234 + LTEXT "",IDC_COUNT_TOTAL,32,107,29,8,SS_SUNKEN
  235 + LTEXT "",IDC_COUNT_PASS,90,107,32,8,SS_SUNKEN
  236 + LTEXT "",IDC_COUNT_FAIL,145,107,37,8,SS_SUNKEN
237 LTEXT "IMEI1",IDC_STATIC_1,8,15,20,12,SS_CENTERIMAGE 237 LTEXT "IMEI1",IDC_STATIC_1,8,15,20,12,SS_CENTERIMAGE
238 - LTEXT "IMEI2",IDC_STATIC_2,8,33,20,12,SS_CENTERIMAGE  
239 - GROUPBOX "IMEI from phone",IDC_STATIC,2,53,158,49  
240 - LTEXT "IMEI1",IDC_STATIC,10,65,20,12,SS_CENTERIMAGE  
241 - LTEXT "IMEI2",IDC_STATIC,10,84,20,12,SS_CENTERIMAGE 238 + LTEXT "IMEI2",IDC_STATIC_2,8,30,20,12,SS_CENTERIMAGE
  239 + GROUPBOX "IMEI from phone",IDC_STATIC,2,48,158,38
  240 + LTEXT "IMEI1",IDC_STATIC,10,58,20,12,SS_CENTERIMAGE
  241 + LTEXT "IMEI2",IDC_STATIC,10,72,20,12,SS_CENTERIMAGE
242 DEFPUSHBUTTON "",IDOK,270,69,9,8,NOT WS_VISIBLE | NOT WS_TABSTOP 242 DEFPUSHBUTTON "",IDOK,270,69,9,8,NOT WS_VISIBLE | NOT WS_TABSTOP
243 - CTEXT "Static",IDC_STATIC_TIMECOUNT,191,104,106,12,  
244 - SS_CENTERIMAGE 243 + CTEXT "",IDC_STATIC_TIMECOUNT,191,104,106,12,SS_CENTERIMAGE
245 CONTROL "Factory reset ",IDC_CHECK_RST,"Button",BS_AUTOCHECKBOX, 244 CONTROL "Factory reset ",IDC_CHECK_RST,"Button",BS_AUTOCHECKBOX,
246 170,8,98,10 245 170,8,98,10
  246 + LTEXT "",IDC_STATIC_FINAL_INFO,0,89,251,16,SS_CENTERIMAGE
247 END 247 END
248 248
249 IDD_SCANDATA_DIALOG DIALOGEX 0, 0, 236, 316 249 IDD_SCANDATA_DIALOG DIALOGEX 0, 0, 236, 316
@@ -577,7 +577,8 @@ END @@ -577,7 +577,8 @@ END
577 // 577 //
578 578
579 IDB_BITMAP_FAIL BITMAP MOVEABLE PURE "res\\FAIL.bmp" 579 IDB_BITMAP_FAIL BITMAP MOVEABLE PURE "res\\FAIL.bmp"
580 -IDB_BITMAP_PASS BITMAP MOVEABLE PURE "res\\PASS.bmp" 580 +IDB_BITMAP_NORMAL BITMAP DISCARDABLE "res\\WAIT.bmp"
  581 +IDB_BITMAP_PASS BITMAP DISCARDABLE "res\\PASS.bmp"
581 582
582 ///////////////////////////////////////////////////////////////////////////// 583 /////////////////////////////////////////////////////////////////////////////
583 // 584 //
@@ -215,13 +215,15 @@ BOOL CSNWriterDlg::OnInitDialog() @@ -215,13 +215,15 @@ BOOL CSNWriterDlg::OnInitDialog()
215 #ifdef __TOPWELL_QCTEST__ 215 #ifdef __TOPWELL_QCTEST__
216 g_sMetaComm.bCheckQCFlag = true; 216 g_sMetaComm.bCheckQCFlag = true;
217 #endif 217 #endif
218 - m_font.CreatePointFont(380, "Arial"); 218 + m_font.CreatePointFont(200, "Arial");
  219 + GetDlgItem(IDC_STATIC_FINAL_INFO)->SetFont(&m_font);
219 220
220 //m_hSNMenu = LoadMenu(AfxGetInstanceHandle(),MAKEINTRESOURCE(IDR_SN_MENU)); 221 //m_hSNMenu = LoadMenu(AfxGetInstanceHandle(),MAKEINTRESOURCE(IDR_SN_MENU));
221 ::SetMenu(this->GetSafeHwnd(),m_hSNMenu); 222 ::SetMenu(this->GetSafeHwnd(),m_hSNMenu);
222 223
223 m_hBitmapFail = ::LoadBitmap(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDB_BITMAP_FAIL)); 224 m_hBitmapFail = ::LoadBitmap(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDB_BITMAP_FAIL));
224 m_hBitmapPass = ::LoadBitmap(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDB_BITMAP_PASS)); 225 m_hBitmapPass = ::LoadBitmap(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDB_BITMAP_PASS));
  226 + m_hBitmapnormal = ::LoadBitmap(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDB_BITMAP_NORMAL));
225 // ((CWnd*)GetDlgItem(IDC_BTN_INDITE))->ShowWindow(SW_HIDE); 227 // ((CWnd*)GetDlgItem(IDC_BTN_INDITE))->ShowWindow(SW_HIDE);
226 228
227 229
@@ -239,7 +241,7 @@ BOOL CSNWriterDlg::OnInitDialog() @@ -239,7 +241,7 @@ BOOL CSNWriterDlg::OnInitDialog()
239 { 241 {
240 CDialog::OnCancel(); 242 CDialog::OnCancel();
241 } 243 }
242 - myctrlbit.ShowWindow(SW_HIDE); 244 + myctrlbit.SetBitmap(m_hBitmapnormal);
243 m_cComPortBox.ShowWindow(SW_HIDE); 245 m_cComPortBox.ShowWindow(SW_HIDE);
244 246
245 return TRUE; // return TRUE unless you set the focus to a control 247 return TRUE; // return TRUE unless you set the focus to a control
@@ -472,11 +474,12 @@ void CSNWriterDlg::UpdateOperateResult(WriteNvram_Status_e eWriteStatus) @@ -472,11 +474,12 @@ void CSNWriterDlg::UpdateOperateResult(WriteNvram_Status_e eWriteStatus)
472 break; 474 break;
473 475
474 case NORMAL: 476 case NORMAL:
475 - myctrlbit.ShowWindow(SW_HIDE); 477 + myctrlbit.SetBitmap(m_hBitmapnormal);
476 break; 478 break;
477 479
478 case CANCEL: 480 case CANCEL:
479 default: 481 default:
  482 + myctrlbit.SetBitmap(m_hBitmapnormal);
480 //Do nothing 483 //Do nothing
481 break; 484 break;
482 } 485 }
@@ -611,6 +614,8 @@ void CSNWriterDlg::OnBtnStart() @@ -611,6 +614,8 @@ void CSNWriterDlg::OnBtnStart()
611 myloglist.ResetContent(); 614 myloglist.ResetContent();
612 GetDlgItem(IDC_STATIC_IMEI1)->SetWindowText(""); 615 GetDlgItem(IDC_STATIC_IMEI1)->SetWindowText("");
613 GetDlgItem(IDC_STATIC_IMEI2)->SetWindowText(""); 616 GetDlgItem(IDC_STATIC_IMEI2)->SetWindowText("");
  617 + GetDlgItem(IDC_STATIC_FINAL_INFO)->SetWindowText("");
  618 + myctrlbit.SetBitmap(m_hBitmapnormal);
614 if (myflag_reset) 619 if (myflag_reset)
615 { 620 {
616 if (myscanimei1 == "" || myscanimei2 == "") 621 if (myscanimei1 == "" || myscanimei2 == "")
@@ -737,11 +742,10 @@ HBRUSH CSNWriterDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor) @@ -737,11 +742,10 @@ HBRUSH CSNWriterDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
737 { 742 {
738 HBRUSH hbr = CDialog::OnCtlColor(pDC, pWnd, nCtlColor); 743 HBRUSH hbr = CDialog::OnCtlColor(pDC, pWnd, nCtlColor);
739 744
740 - // TODO: Change any attributes of the DC here  
741 -// if((IDC_MAINUI_TEMP1 == pWnd->GetDlgCtrlID())||(IDC_MAINUI_TEMP2 == pWnd->GetDlgCtrlID()))  
742 -// {  
743 -// pDC->SetTextColor(RGB(255,0,0));  
744 -// } 745 + if((IDC_STATIC_FINAL_INFO == pWnd->GetDlgCtrlID())||(IDC_STATIC_TIMECOUNT == pWnd->GetDlgCtrlID()))
  746 + {
  747 + pDC->SetTextColor(RGB(255,0,0));
  748 + }
745 749
746 // TODO: Return a different brush if the default is not desired 750 // TODO: Return a different brush if the default is not desired
747 return hbr; 751 return hbr;
@@ -129,6 +129,7 @@ private: @@ -129,6 +129,7 @@ private:
129 public: 129 public:
130 HBITMAP m_hBitmapPass; 130 HBITMAP m_hBitmapPass;
131 HBITMAP m_hBitmapFail; 131 HBITMAP m_hBitmapFail;
  132 + HBITMAP m_hBitmapnormal;
132 CFont m_font; 133 CFont m_font;
133 int mytime_count; 134 int mytime_count;
134 }; 135 };
No preview for this file type
No preview for this file type
No preview for this file type
@@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
20 #define IDI_ICON1 154 20 #define IDI_ICON1 154
21 #define IDD_ENCRYPTION_DIALOG 155 21 #define IDD_ENCRYPTION_DIALOG 155
22 #define IDD_FIRST_CHOOSE_DB 158 22 #define IDD_FIRST_CHOOSE_DB 158
  23 +#define IDB_BITMAP_NORMAL 160
23 #define IDC_COUNT_TOTAL 1000 24 #define IDC_COUNT_TOTAL 1000
24 #define IDC_BTN_SYSCONFIG 1001 25 #define IDC_BTN_SYSCONFIG 1001
25 #define IDC_BTN_START 1002 26 #define IDC_BTN_START 1002
@@ -225,6 +226,7 @@ @@ -225,6 +226,7 @@
225 #define IDC_CHECK_RST 1180 226 #define IDC_CHECK_RST 1180
226 #define IDC_STATIC_1 1181 227 #define IDC_STATIC_1 1181
227 #define IDC_STATIC_2 1182 228 #define IDC_STATIC_2 1182
  229 +#define IDC_STATIC_FINAL_INFO 1183
228 #define IDR_OPTION_SWITCHTOOL 32772 230 #define IDR_OPTION_SWITCHTOOL 32772
229 #define IDR_OPTION_EXTMODEM 32773 231 #define IDR_OPTION_EXTMODEM 32773
230 #define IDR_OPTION_SECURITY_USB 32774 232 #define IDR_OPTION_SECURITY_USB 32774
@@ -254,7 +256,7 @@ @@ -254,7 +256,7 @@
254 // 256 //
255 #ifdef APSTUDIO_INVOKED 257 #ifdef APSTUDIO_INVOKED
256 #ifndef APSTUDIO_READONLY_SYMBOLS 258 #ifndef APSTUDIO_READONLY_SYMBOLS
257 -#define _APS_NEXT_RESOURCE_VALUE 160 259 +#define _APS_NEXT_RESOURCE_VALUE 162
258 #define _APS_NEXT_COMMAND_VALUE 32798 260 #define _APS_NEXT_COMMAND_VALUE 32798
259 #define _APS_NEXT_CONTROL_VALUE 1183 261 #define _APS_NEXT_CONTROL_VALUE 1183
260 #define _APS_NEXT_SYMED_VALUE 101 262 #define _APS_NEXT_SYMED_VALUE 101
Please register or login to post a comment