界面优化

xiemeng
1 parent 2c4c7d50
Showing 6 changed files with 57 additions and 55 deletions
Execute/SPexc.cpp
SN Writer.clw
SN Writer.rc
SN WriterDlg.cpp
res/FAIL.bmp
res/PASS.bmp
--- a/Execute/SPexc.cpp
View file @a3493b8
+++ b/Execute/SPexc.cpp
View file @a3493b8
@@ -310,7 +310,7 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
 					}
 					else 
 					{
-						g_pMainDlg->GetDlgItem(IDC_RSLT_WRITE_IMEI)->SetWindowText("Fail");
+						g_pMainDlg->GetDlgItem(IDC_RSLT_WRITE_IMEI)->SetWindowText("FAIL");
 						UpdateUIMsg("IMEI read fail");
 					}
@@ -320,7 +320,7 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
                 }
                 else
                 {
-					g_pMainDlg->GetDlgItem(IDC_RSLT_WRITE_IMEI)->SetWindowText("Fail");
+					g_pMainDlg->GetDlgItem(IDC_RSLT_WRITE_IMEI)->SetWindowText("FAIL");
                     UpdateUIMsg("IMEI read fail");
                     spNextStage = SP_END_STAGE;
                 }
@@ -3876,6 +3876,11 @@ void SmartPhoneSN::ThreadMainEntryPoint()
                 break;
         }
         iTestCount++;
+		g_pMainDlg->GetDlgItem(IDC_RSLT_SW)->SetWindowText("");
+		g_pMainDlg->GetDlgItem(IDC_RSLT_CFT)->SetWindowText("");
+		g_pMainDlg->GetDlgItem(IDC_RSLT_SMT)->SetWindowText("");
+		g_pMainDlg->GetDlgItem(IDC_RSLT_QC)->SetWindowText("");
+		g_pMainDlg->GetDlgItem(IDC_RSLT_WRITE_IMEI)->SetWindowText("");
 		g_pMainDlg->myloglist.ResetContent();
         DebugOnOff(true);
@@ -4036,7 +4041,7 @@ void SmartPhoneSN::ThreadMainEntryPoint()
 					UpdateUIMsg("QC1 test pass");
 				break;
 			default:
-				g_pMainDlg->myrslt_qc=_T("Fail");
+				g_pMainDlg->myrslt_qc=_T("FAIL");
 					UpdateUIMsg("QC1 test fail");
 				bAnyOperationFail = true;
 				break;
--- a/SN Writer.clw
View file @a3493b8
+++ b/SN Writer.clw
View file @a3493b8
@@ -15,16 +15,16 @@ Class3=CAboutDlg
 Class4=CSNWriterDlg
 ResourceCount=11
-Resource1=IDD_SNWRITER_DIALOG (English (U.S.))
-Resource2=IDD_SYSTEM_CONFIG_DIALOG (English (U.S.))
-Resource3=IDD_IDENTIFY_VERIFY_DIALOG (English (U.S.))
-Resource4=IDD_FILE_LOAD_DIALOG (English (U.S.))
-Resource5=IDD_AUTOGEN_DIALOG (English (U.S.))
-Resource6=IDD_CHANGE_PASSWD_DIALOG (English (U.S.))
-Resource7=IDD_ENCRYPTION_DIALOG (English (U.S.))
-Resource8=IDD_ABOUTSN_DIALOG (English (U.S.))
-Resource9=IDD_DIALOG_TIPS
-Resource10=IDD_SCANDATA_DIALOG (English (U.S.))
+Resource1=IDD_SCANDATA_DIALOG (English (U.S.))
+Resource2=IDD_ABOUTSN_DIALOG (English (U.S.))
+Resource3=IDD_DIALOG_TIPS
+Resource4=IDD_ENCRYPTION_DIALOG (English (U.S.))
+Resource5=IDD_SNWRITER_DIALOG (English (U.S.))
+Resource6=IDD_SYSTEM_CONFIG_DIALOG (English (U.S.))
+Resource7=IDD_IDENTIFY_VERIFY_DIALOG (English (U.S.))
+Resource8=IDD_AUTOGEN_DIALOG (English (U.S.))
+Resource9=IDD_CHANGE_PASSWD_DIALOG (English (U.S.))
+Resource10=IDD_FILE_LOAD_DIALOG (English (U.S.))
 Class5=Cdlg_tips
 Resource11=IDR_SN_MENU (English (U.S.))
--- a/SN Writer.rc
View file @a3493b8
+++ b/SN Writer.rc
View file @a3493b8
@@ -197,59 +197,59 @@ BEGIN
     LTEXT           "......",IDC_PWD_MSG,7,50,273,23
 END
-IDD_SNWRITER_DIALOG DIALOGEX 0, 0, 458, 205
+IDD_SNWRITER_DIALOG DIALOGEX 0, 0, 458, 195
 STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | 
     WS_SYSMENU
 EXSTYLE WS_EX_APPWINDOW
 CAPTION "c"
 FONT 9, "Î¢ÈíÑÅºÚ"
 BEGIN
-    EDITTEXT        IDC_EDT_VERSION,56,10,160,13,ES_AUTOHSCROLL
-    PUSHBUTTON      "Save",IDC_BT_SAVE_SWVER,223,10,44,15
-    PUSHBUTTON      "Select",IDC_BTN_AP_PATH,222,40,44,12,NOT WS_TABSTOP
-    PUSHBUTTON      "Select",IDC_BTN_BP_PATH,222,55,44,12,NOT WS_TABSTOP
-    DEFPUSHBUTTON   "Start",IDC_BTN_START,7,179,30,12
-    DEFPUSHBUTTON   "Config",IDC_BTN_SYSCONFIG,9,196,6,6,NOT WS_VISIBLE
-    DEFPUSHBUTTON   "Quit",IDC_BTN_QUIT,47,179,30,12
-    LTEXT           "Total:",IDC_STATIC,6,160,27,10
-    LTEXT           "Pass:",IDC_STATIC_PASS,88,160,27,10
-    LTEXT           "Fail:",IDC_STATIC,166,160,27,10
-    COMBOBOX        IDC_COMBO_COMPORT,37,193,34,51,CBS_DROPDOWNLIST | 
+    EDITTEXT        IDC_EDT_VERSION,56,0,160,13,ES_AUTOHSCROLL
+    PUSHBUTTON      "Save",IDC_BT_SAVE_SWVER,223,0,44,15
+    PUSHBUTTON      "Select",IDC_BTN_AP_PATH,222,26,44,12,NOT WS_TABSTOP
+    PUSHBUTTON      "Select",IDC_BTN_BP_PATH,222,41,44,12,NOT WS_TABSTOP
+    DEFPUSHBUTTON   "Start",IDC_BTN_START,8,147,101,22
+    DEFPUSHBUTTON   "Config",IDC_BTN_SYSCONFIG,9,186,6,6,NOT WS_VISIBLE
+    DEFPUSHBUTTON   "Quit",IDC_BTN_QUIT,161,147,101,22
+    LTEXT           "Total:",IDC_STATIC,6,126,27,10
+    LTEXT           "Pass:",IDC_STATIC_PASS,88,126,27,10
+    LTEXT           "Fail:",IDC_STATIC,166,126,27,10
+    COMBOBOX        IDC_COMBO_COMPORT,37,183,34,51,CBS_DROPDOWNLIST | 
                     CBS_SORT | WS_VSCROLL
-    LTEXT           "SW Version",IDC_STATIC,6,12,48,9
-    LTEXT           "BP DB",IDC_STATIC,14,55,20,9
-    LTEXT           "AP DB",IDC_STATIC,14,41,20,9
-    EDITTEXT        IDC_STR_AP_PATH,38,38,179,13,ES_AUTOHSCROLL | 
+    LTEXT           "SW Version",IDC_STATIC,6,2,48,9
+    LTEXT           "BP DB",IDC_STATIC,14,41,20,9
+    LTEXT           "AP DB",IDC_STATIC,14,27,20,9
+    EDITTEXT        IDC_STR_AP_PATH,38,24,179,13,ES_AUTOHSCROLL | 
                     ES_READONLY | NOT WS_TABSTOP
-    EDITTEXT        IDC_STR_BP_PATH,38,54,179,13,ES_AUTOHSCROLL | 
+    EDITTEXT        IDC_STR_BP_PATH,38,40,179,13,ES_AUTOHSCROLL | 
                     ES_READONLY | NOT WS_TABSTOP
-    GROUPBOX        "",IDC_STATIC,6,28,264,44
-    CONTROL         133,IDC_BITMAP_RESAULT,"Static",SS_BITMAP,158,107,93,45
-    LTEXT           "SW",IDC_STATIC,6,91,11,9
-    LTEXT           "CFT",IDC_STATIC,5,115,12,9
-    LTEXT           "MMI",IDC_STATIC,73,115,17,9
-    LTEXT           "IMEI",IDC_STATIC,73,143,22,9
-    LTEXT           "QC1",IDC_STATIC,5,142,13,9
-    EDITTEXT        IDC_RSLT_CFT,29,115,37,12,ES_AUTOHSCROLL | ES_READONLY | 
+    GROUPBOX        "DB file path",IDC_STATIC,6,14,264,44
+    CONTROL         133,IDC_BITMAP_RESAULT,"Static",SS_BITMAP,157,86,91,38
+    LTEXT           "SW",IDC_STATIC,6,73,11,9
+    LTEXT           "CFT",IDC_STATIC,5,90,12,9
+    LTEXT           "MMI",IDC_STATIC,73,90,17,9
+    LTEXT           "IMEI",IDC_STATIC,73,111,22,9
+    LTEXT           "QC1",IDC_STATIC,5,110,13,9
+    EDITTEXT        IDC_RSLT_CFT,29,90,37,12,ES_AUTOHSCROLL | ES_READONLY | 
                     NOT WS_TABSTOP
-    EDITTEXT        IDC_RSLT_SMT,102,115,37,12,ES_AUTOHSCROLL | ES_READONLY | 
+    EDITTEXT        IDC_RSLT_SMT,102,90,37,12,ES_AUTOHSCROLL | ES_READONLY | 
                     NOT WS_TABSTOP
-    EDITTEXT        IDC_RSLT_QC,29,141,37,12,ES_AUTOHSCROLL | ES_READONLY | 
+    EDITTEXT        IDC_RSLT_QC,29,109,37,12,ES_AUTOHSCROLL | ES_READONLY | 
                     NOT WS_TABSTOP
-    EDITTEXT        IDC_RSLT_WRITE_IMEI,102,141,37,12,ES_AUTOHSCROLL | 
+    EDITTEXT        IDC_RSLT_WRITE_IMEI,102,109,37,12,ES_AUTOHSCROLL | 
                     ES_READONLY | NOT WS_TABSTOP
-    GROUPBOX        "Test Result",IDC_STATIC,2,78,266,96
-    LISTBOX         IDC_LOG_LIST,270,0,187,174,LBS_NOINTEGRALHEIGHT | 
+    GROUPBOX        "Test Result",IDC_STATIC,2,60,266,83
+    LISTBOX         IDC_LOG_LIST,275,0,182,174,LBS_NOINTEGRALHEIGHT | 
                     WS_VSCROLL
     CONTROL         "",IDC_COUNT_TOTAL,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,
-                    44,160,30,8,WS_EX_STATICEDGE
+                    44,126,30,8,WS_EX_STATICEDGE
     CONTROL         "",IDC_COUNT_PASS,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,
-                    115,160,29,8,WS_EX_STATICEDGE
+                    115,126,29,8,WS_EX_STATICEDGE
     CONTROL         "",IDC_COUNT_FAIL,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,
-                    193,160,36,8,WS_EX_STATICEDGE
-    CTEXT           "",IDC_RSLT_SW,35,91,228,11,SS_CENTERIMAGE,
+                    193,126,36,8,WS_EX_STATICEDGE
+    CTEXT           "",IDC_RSLT_SW,35,73,228,11,SS_CENTERIMAGE,
                     WS_EX_STATICEDGE
-    CTEXT           "",IDC_STATIC_TIMECOUNT,115,179,41,12,SS_CENTERIMAGE,
+    CTEXT           "",IDC_STATIC_TIMECOUNT,114,152,41,12,SS_CENTERIMAGE,
                     WS_EX_STATICEDGE
 END
@@ -489,7 +489,7 @@ BEGIN
     BEGIN
         RIGHTMARGIN, 150
         TOPMARGIN, 7
-        BOTTOMMARGIN, 193
+        BOTTOMMARGIN, 183
     END
     IDD_SCANDATA_DIALOG, DIALOG
--- a/SN WriterDlg.cpp
View file @a3493b8
+++ b/SN WriterDlg.cpp
View file @a3493b8
@@ -217,13 +217,15 @@ BOOL CSNWriterDlg::OnInitDialog()
 #ifdef __TOPWELL_QCTEST__
 	g_sMetaComm.bCheckQCFlag = true;
 #endif
-    m_font.CreatePointFont(380, "Arial");
+    m_font.CreatePointFont(250, "Arial");
     //m_hSNMenu = LoadMenu(AfxGetInstanceHandle(),MAKEINTRESOURCE(IDR_SN_MENU));
     ::SetMenu(this->GetSafeHwnd(),m_hSNMenu);
     m_hBitmapFail = ::LoadBitmap(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDB_BITMAP_FAIL));
     m_hBitmapPass = ::LoadBitmap(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDB_BITMAP_PASS));
+	GetDlgItem(IDC_BTN_START)->SetFont(&m_font);
+	GetDlgItem(IDC_BTN_QUIT)->SetFont(&m_font);
 //    ((CWnd*)GetDlgItem(IDC_BTN_INDITE))->ShowWindow(SW_HIDE);
@@ -618,11 +620,6 @@ void CSNWriterDlg::OnBtnStart()
     CString strText;
     ((CWnd*)GetDlgItem(IDC_BTN_START))->GetWindowText(strText);
-	GetDlgItem(IDC_RSLT_SW)->SetWindowText("");
-	GetDlgItem(IDC_RSLT_CFT)->SetWindowText("");
-	GetDlgItem(IDC_RSLT_SMT)->SetWindowText("");
-	GetDlgItem(IDC_RSLT_QC)->SetWindowText("");
-	GetDlgItem(IDC_RSLT_WRITE_IMEI)->SetWindowText("");
     if (strText == "Start")
     {
--- a/res/FAIL.bmp
View file @a3493b8
+++ b/res/FAIL.bmp
View file @a3493b8
--- a/res/PASS.bmp
View file @a3493b8
+++ b/res/PASS.bmp
View file @a3493b8