优化界面

修改图标以及主窗口标题

@@ -8,3 +8,66 @@
 /intex.PRI
 /intex.PS
 /intex.WK3
+/Debug/SN_Station.pch
+/Output/AUTH.obj
+/Output/AUTH.sbr
+/Output/AboutSNDlg.obj
+/Output/AboutSNDlg.sbr
+/Output/AtProcess.obj
+/Output/AtProcess.sbr
+/Output/BtnST.obj
+/Output/BtnST.sbr
+/Output/CeXDib.obj
+/Output/CeXDib.sbr
+/Output/ChgPasswdDlg.obj
+/Output/ChgPasswdDlg.sbr
+/Output/Common.obj
+/Output/Common.sbr
+/Output/Encryption.obj
+/Output/Encryption.sbr
+/Output/FPexc.obj
+/Output/FPexc.sbr
+/Output/SCERT.obj
+/Output/SCERT.sbr
+/Output/SLA.obj
+/Output/SLA.sbr
+/Output/SN Writer.exp
+/Output/SN Writer.ilk
+/Output/SN Writer.lib
+/Output/SN Writer.obj
+/Output/SN Writer.pdb
+/Output/SN Writer.res
+/Output/SN Writer.sbr
+/Output/SN WriterDlg.obj
+/Output/SN WriterDlg.sbr
+/Output/SNbase.obj
+/Output/SNbase.sbr
+/Output/SPexc.obj
+/Output/SPexc.sbr
+/Output/ScanData.obj
+/Output/ScanData.sbr
+/Output/ShadeButtonST.obj
+/Output/ShadeButtonST.sbr
+/Output/StdAfx.obj
+/Output/StdAfx.sbr
+/Output/SystemConfig.obj
+/Output/SystemConfig.sbr
+/Output/VerifyPasswdDlg.obj
+/Output/VerifyPasswdDlg.sbr
+/Output/autogendlg.obj
+/Output/autogendlg.sbr
+/Output/fileseldlg.obj
+/Output/fileseldlg.sbr
+/Output/rs232Module.obj
+/Output/rs232Module.sbr
+/Output/vc60.idb
+/Output/vc60.pdb
+/Output/xboot_debug.obj
+/Output/xboot_debug.sbr
+/Output/SN Writer.bsc
+/Output/chooseworkmode.obj
+/Output/chooseworkmode.sbr
+/SN Writer.aps
+/SN Writer.clw
+/SN Writer.ncb
+/SN Writer.plg

@@ -167,7 +167,8 @@ int SNBase::UpdateUIMsg(const char * strMsg, ...)
     iRet = vsprintf(szBuf, strMsg, varg);
     va_end(varg);
 
-    g_pMainDlg->SetDlgItemText(IDC_OPERATE_INFO, szBuf);
+//    g_pMainDlg->SetDlgItemText(IDC_OPERATE_INFO, szBuf);
+	g_pMainDlg->myloglist.SetCurSel(g_pMainDlg->myloglist.AddString(szBuf));
 
     return iRet;
 }

@@ -875,12 +875,13 @@ BOOL CSystemConfig::DestroyWindow()
         g_sMetaComm.sIMEIOption.bDualIMEI = true;
         g_sMetaComm.sIMEIOption.iImeiNums = DUAL_IMEI;
     }
-	if (myswversion == "")
+	if (myswversion == "" ||myswversion == "null" )
 	{
 		strcpy(g_sMetaComm.check_sw_ver,"null");
 	} 
 	else
 	{
+		memset(g_sMetaComm.check_sw_ver,0x0,sizeof(g_sMetaComm.check_sw_ver));
 		memcpy(g_sMetaComm.check_sw_ver,myswversion.GetBuffer(myswversion.GetLength()),myswversion.GetLength());
 	}
 

@@ -18,6 +18,7 @@
 #define IDB_BITMAP_LOGO                 148
 #define IDI_ICON1                       154
 #define IDD_ENCRYPTION_DIALOG           155
+#define IDB_BITMAP_NORMAL               162
 #define IDC_COUNT_TOTAL                 1000
 #define IDC_BTN_SYSCONFIG               1001
 #define IDC_BTN_START                   1002
@@ -194,6 +195,7 @@
 #define IDC_STATIC_SWVER                1169
 #define IDC_COMBO2                      1172
 #define IDC_BUTTONAP                    1174
+#define IDC_LIST_LOG                    1175
 #define IDC_BUTTONBP                    1176
 #define IDR_OPTION_SWITCHTOOL           32772
 #define IDR_OPTION_EXTMODEM             32773
@@ -224,9 +226,9 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        161
+#define _APS_NEXT_RESOURCE_VALUE        163
 #define _APS_NEXT_COMMAND_VALUE         32798
-#define _APS_NEXT_CONTROL_VALUE         1175
+#define _APS_NEXT_CONTROL_VALUE         1176
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

@@ -539,6 +539,10 @@ SOURCE=.\res\manifest.xml
 # End Source File
 # Begin Source File
 
+SOURCE=.\res\NORMAL.bmp
+# End Source File
+# Begin Source File
+
 SOURCE=.\res\PASS.bmp
 # End Source File
 # Begin Source File

@@ -152,42 +152,42 @@ BEGIN
     LTEXT           "......",IDC_PWD_MSG,7,50,273,23
 END
 
-IDD_SNWRITER_DIALOG DIALOGEX 0, 0, 335, 231
+IDD_SNWRITER_DIALOG DIALOGEX 0, 0, 335, 193
 STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | 
     WS_SYSMENU
 EXSTYLE WS_EX_APPWINDOW
-CAPTION "SN Writer"
-FONT 10, "System", 0, 0, 0x1
+CAPTION "SN Writer(TOPWELL)"
+FONT 10, "System"
 BEGIN
     LTEXT           "ComPort:",IDC_STATIC,13,22,43,9,0,WS_EX_RIGHT
-    EDITTEXT        IDC_COUNT_TOTAL,213,18,100,13,ES_AUTOHSCROLL | 
-                    ES_READONLY
-    PUSHBUTTON      "System Config",IDC_BTN_SYSCONFIG,13,83,135,18
-    DEFPUSHBUTTON   "Start",IDC_BTN_START,244,123,80,35
-    PUSHBUTTON      "Quit",IDC_BTN_QUIT,9,123,80,35
-    EDITTEXT        IDC_COUNT_PASS,213,51,100,13,ES_AUTOHSCROLL | 
+    EDITTEXT        IDC_COUNT_TOTAL,33,122,22,13,ES_AUTOHSCROLL | 
                     ES_READONLY
-    EDITTEXT        IDC_COUNT_FAIL,213,86,100,13,ES_AUTOHSCROLL | 
-                    ES_READONLY
-    LTEXT           "Target Type:",IDC_STATIC,13,54,43,9,0,WS_EX_RIGHT
-    LTEXT           "Total:",IDC_STATIC,184,21,27,10
-    LTEXT           "Pass:",IDC_STATIC_PASS,184,54,27,10
+    PUSHBUTTON      "Config",IDC_BTN_SYSCONFIG,110,54,43,14
+    DEFPUSHBUTTON   "Start",IDC_BTN_START,14,54,43,14
+    PUSHBUTTON      "Quit",IDC_BTN_QUIT,62,54,43,14
+    EDITTEXT        IDC_COUNT_PASS,33,137,22,13,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_COUNT_FAIL,33,152,22,13,ES_AUTOHSCROLL | ES_READONLY
+    LTEXT           "Target Type:",IDC_STATIC,13,38,43,9,0,WS_EX_RIGHT
+    LTEXT           "Total:",IDC_STATIC,6,125,20,10
+    LTEXT           "Pass:",IDC_STATIC_PASS,6,140,21,10
     CONTROL         "Progress1",IDC_PROGRESS_SN,"msctls_progress32",
-                    WS_BORDER,9,171,315,10
-    GROUPBOX        "",IDC_STATIC,177,7,147,98
-    LTEXT           "Fail:",IDC_STATIC,184,89,27,10
-    GROUPBOX        "",IDC_STATIC,9,7,147,98
+                    WS_BORDER,9,171,166,10
+    LTEXT           "Fail:",IDC_STATIC,6,155,18,10
+    GROUPBOX        "config",IDC_STATIC,0,0,178,95
     COMBOBOX        IDC_COMBO_COMPORT,61,19,87,51,CBS_DROPDOWNLIST | 
                     CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_COMBO_TARGET_TYPE,61,51,87,63,CBS_DROPDOWNLIST | 
+    COMBOBOX        IDC_COMBO_TARGET_TYPE,61,35,87,63,CBS_DROPDOWNLIST | 
                     CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "...",IDC_OPERATE_INFO,9,185,225,35
-    PUSHBUTTON      "Button1",IDC_BTN_INDITE,123,123,87,35,BS_BITMAP
+    PUSHBUTTON      "Button1",IDC_BTN_INDITE,68,116,108,50,BS_BITMAP | 
+                    BS_FLAT
     CONTROL         "°C",IDC_MAINUI_TEMP2,"Static",SS_LEFTNOWORDWRAP | 
-                    WS_GROUP,298,185,35,35
+                    WS_GROUP,42,108,16,9
     CONTROL         "temp",IDC_MAINUI_TEMP1,"Static",SS_LEFTNOWORDWRAP | 
-                    WS_GROUP,239,185,56,35,WS_EX_RIGHT
-    LTEXT           "Static",IDC_STATIC_SWVER,15,110,289,11
+                    WS_GROUP,7,108,32,9,WS_EX_RIGHT
+    LTEXT           "Static",IDC_STATIC_SWVER,6,74,166,11,0,WS_EX_STATICEDGE
+    LISTBOX         IDC_LIST_LOG,180,4,152,168,LBS_NOINTEGRALHEIGHT | 
+                    WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Result",IDC_STATIC,0,101,177,92
 END
 
 IDD_SCANDATA_DIALOG DIALOGEX 0, 0, 236, 316
@@ -249,8 +249,6 @@ BEGIN
                     10,162,8
     LTEXT           "Meta DLL 1340.01",IDC_METADLL_VERSION,42,27,104,8
     LTEXT           "SPMeta DLL 1345.01",IDC_SPMETADLL_VERSION,42,40,104,8
-    LTEXT           "Copyright(C) 2004-2010 MediaTek Inc. All rights reserved.",
-                    IDC_STATIC,42,58,170,8
     ICON            IDR_MAINFRAME,IDC_STATIC,13,12,20,20
 END
 
@@ -530,6 +528,7 @@ IDR_MAINFRAME           ICON    DISCARDABLE     "res\\SN Writer.ico"
 
 IDB_BITMAP_FAIL         BITMAP  MOVEABLE PURE   "res\\FAIL.bmp"
 IDB_BITMAP_PASS         BITMAP  MOVEABLE PURE   "res\\PASS.bmp"
+IDB_BITMAP_NORMAL       BITMAP  DISCARDABLE     "res\\NORMAL.bmp"
 
 /////////////////////////////////////////////////////////////////////////////
 //

@@ -31,7 +31,7 @@ static char THIS_FILE[] = __FILE__;
 unsigned short g_iTotalComPort = MAX_COMPORT_COUNT;
 unsigned short g_iComportArray[MAX_COMPORT_COUNT] = {0};
 byte g_QC_value_from_phone;//  ´ÓÊÖ»úÖжÁµ½µÄQCÖµ
-const char *g_strToolVersion = "SN Writer V1.1728.00";
+const char *g_strToolVersion = "SN Writer (TOPWELL)";
 TOPWELL_TOOL_WORK_MODE g_topwell_workmode;
 
 
@@ -102,7 +102,7 @@ void CSNWriterDlg::DoDataExchange(CDataExchange* pDX)
 {
     CDialog::DoDataExchange(pDX);
     //{{AFX_DATA_MAP(CSNWriterDlg)
-
+	DDX_Control(pDX, IDC_LIST_LOG, myloglist);
     DDX_Control(pDX, IDC_COMBO_TARGET_TYPE, m_cTargetTypeBox);
     DDX_Control(pDX, IDC_COMBO_COMPORT, m_cComPortBox);
     DDX_Control(pDX, IDC_PROGRESS_SN, m_ProgressSN);
@@ -110,7 +110,7 @@ void CSNWriterDlg::DoDataExchange(CDataExchange* pDX)
     DDX_Text(pDX, IDC_COUNT_PASS, m_strPass);
     DDX_Text(pDX, IDC_COUNT_FAIL, m_strFail);
     DDX_Text(pDX,IDC_MAINUI_TEMP1,m_MainUIT1);
-    //}}AFX_DATA_MAP
+	//}}AFX_DATA_MAP
 
 #ifdef _BITMAP_BTN_
     DDX_Control(pDX, IDC_BTN_INDITE, m_InditeBTN);
@@ -217,10 +217,11 @@ BOOL CSNWriterDlg::OnInitDialog()
 
     m_hBitmapFail = ::LoadBitmap(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDB_BITMAP_FAIL));
     m_hBitmapPass = ::LoadBitmap(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDB_BITMAP_PASS));
-    ((CWnd*)GetDlgItem(IDC_BTN_INDITE))->ShowWindow(SW_HIDE);
+    m_hBitmapnormal = ::LoadBitmap(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDB_BITMAP_NORMAL));
+    //((CWnd*)GetDlgItem(IDC_BTN_INDITE))->ShowWindow(SW_HIDE);
 
 #ifdef _BITMAP_BTN_
-    m_InditeBTN.SetBitmap(m_hBitmapPass);
+    m_InditeBTN.SetBitmap(m_hBitmapnormal);
 #else
     m_InditeBTN.SetShade(CShadeButtonST::SHS_METAL);
 #endif
@@ -465,7 +466,8 @@ void CSNWriterDlg::UpdateOperateResult(WriteNvram_Status_e eWriteStatus)
         break;
 
     case NORMAL:
-        ((CWnd*)GetDlgItem(IDC_BTN_INDITE))->ShowWindow(SW_HIDE);
+        ((CWnd*)GetDlgItem(IDC_BTN_INDITE))->ShowWindow(SW_SHOW);
+        m_InditeBTN.SetBitmap(m_hBitmapnormal);
         break;
 
     case CANCEL:
@@ -587,8 +589,8 @@ void CSNWriterDlg::ShowTemperatureOnUI()
     m_MainUIT1.Format("%s", g_sMetaComm.sIMEIOption.Temp_Option.strTemperatureData);
     GetDlgItem(IDC_MAINUI_TEMP1)->SetWindowText(m_MainUIT1);
 
-    GetDlgItem(IDC_MAINUI_TEMP1)->SetFont(&m_font);
-    GetDlgItem(IDC_MAINUI_TEMP2)->SetFont(&m_font);
+    //GetDlgItem(IDC_MAINUI_TEMP1)->SetFont(&m_font);
+    //GetDlgItem(IDC_MAINUI_TEMP2)->SetFont(&m_font);
     //m_font.DeleteObject();
 }
 
@@ -667,7 +669,7 @@ void CSNWriterDlg::OnBtnSysconfig()
     // TODO: Add your control notification handler code here
     CSystemConfig dlg;
     dlg.DoModal();
-	if (dlg.myswversion == "")
+	if (dlg.myswversion == "" ||dlg.myswversion == "null")
 	{
 		SetDlgItemText(IDC_STATIC_SWVER,"The version number is empty!!!");
 	} 

@@ -26,7 +26,8 @@ public:
 
 // Dialog Data
 	//{{AFX_DATA(CSNWriterDlg)
-	enum { IDD = IDD_SNWRITER_DIALOG };	
+	enum { IDD = IDD_SNWRITER_DIALOG };
+	CListBox	myloglist;
 	CComboBox	m_cTargetTypeBox;
 	CComboBox	m_cComPortBox;
 	CProgressCtrl	m_ProgressSN;
@@ -121,6 +122,7 @@ private:
 public:
     HBITMAP m_hBitmapPass;
     HBITMAP m_hBitmapFail;
+    HBITMAP m_hBitmapnormal;
 	CFont m_font;
 };