准备开始拆分乐外卖版本

bin/Win32/Debug/zhipuzi_pos_windows/skin/login.xml

@@ -3,8 +3,7 @@
 	<Font shared="true" id="0" name="微软雅黑" size="20" />
 	<VerticalLayout bkimage="file='Dialog_BG2.png' corner='4,48,4,4'" >
 		<HorizontalLayout height="44">
-			<Label text="智铺子收银软件" width="90" height="44" valign="center" padding="10,0,0,0" textcolor="#FFFFFFFF"/>
-			<Label name="login_version" text="" width="120" height="44" valign="center" padding="10,0,0,0" textcolor="#FFFFFFFF"/>
+			<Label name="login_version" text="" height="44" valign="center" padding="10,0,0,0" textcolor="#FFFFFFFF"/>
 			<Control />
 			<Button name="closebtn" width="42" height="18" padding="0,6,0,0" tooltip="关闭收银软件" normalimage="file='frame_btn_close_normal.bmp' mask='#FFFF00FF'" hotimage="file='frame_btn_close_hot.bmp' mask='#FFFF00FF'" pushedimage="file='frame_btn_close_down.bmp' mask='#FFFF00FF'"/>
 		</HorizontalLayout>

bin/Win32/Debug/zhipuzi_pos_windows/skin/main.xml

@@ -13,7 +13,7 @@
     		<Control height="2" bkcolor="#FFD1EDFF" />
     		<HorizontalLayout height="90" bkcolor="#FF8DD3FF" bkcolor2="#FF60B1FE">
     			<VerticalLayout width="200">
-    				<Text text="智铺子收银软件V1.0" padding="5,5,0,0"/>
+    				<Label name="main_name_version" text="智铺子收银软件" padding="5,5,0,0"/>
     			</VerticalLayout>
     			<HorizontalLayout childpadding="20" inset="10,16,10,10" >    				
     				<Control />

bin/Win32/Debug/zhipuzi_pos_windows/skin/setting.xml

@@ -8,7 +8,7 @@
 					<Option name="setting_printer_switch" text="小票打印设置" group="setting_switch" align="center" height="38" normalimage="file='Btn_White.png' corner='5,5,5,5'" selectedimage="file='Btn_Green_Click.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" hottextcolor="#CC1010" selectedtextcolor="#FFFFFFFF" />
 					<Option name="setting_chufang_printer_switch" text="厨房打印设置" group="setting_switch" align="center" height="38" normalimage="file='Btn_White.png' corner='5,5,5,5'" selectedimage="file='Btn_Green_Click.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" hottextcolor="#CC1010" selectedtextcolor="#FFFFFFFF" />
 					<Option name="setting_system_switch" text="系统设置" group="setting_switch" align="center" height="38" normalimage="file='Btn_White.png' corner='5,5,5,5'" selectedimage="file='Btn_Green_Click.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" hottextcolor="#CC1010" selectedtextcolor="#FFFFFFFF" />
-					<Option name="setting_system_update" text="更新" group="setting_switch" align="center" height="38" normalimage="file='Btn_White.png' corner='5,5,5,5'" selectedimage="file='Btn_Green_Click.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" hottextcolor="#CC1010" selectedtextcolor="#FFFFFFFF" />
+					<Option name="setting_system_about" text="关于" group="setting_switch" align="center" height="38" normalimage="file='Btn_White.png' corner='5,5,5,5'" selectedimage="file='Btn_Green_Click.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" hottextcolor="#CC1010" selectedtextcolor="#FFFFFFFF" />
 
 					<Button name="setting_logout" padding="0,50,0,0" width="300" height="38" text="退出登陆" textcolor="#FFFFFFFF" normalimage="file='Btn_Red.png' corner='5,5,5,5'" hotimage="file='Btn_Red_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_Green_Click.png' corner='5,5,5,5'" />
 				</VerticalLayout>
@@ -92,13 +92,8 @@
 					<Control height="300" />
 					<Label text="智铺子收银软件" align="center">
 					</Label>
-					<Label name="setting_version" text="版本号：V1.0" align="center">
+					<Label name="setting_version" text="版本号：1.0.0.1" align="center">
 					</Label>
-					<HorizontalLayout align="center">
-						<Control />
-						<Button name="setting_update" align="center" width="200" height="38" text="更新" normalimage="file='Btn_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_White_Click.png' corner='5,5,5,5'" />
-						<Control />
-					</HorizontalLayout>
 				</VerticalLayout>
 			</TabLayout>
 		</HorizontalLayout>

zhipuzi_pos_windows/wnd/CLoginWnd.cpp

@@ -5,7 +5,7 @@
 void CLoginWnd::Init()
 {
 	CLabelUI* version = static_cast<CLabelUI*>(m_pm.FindControl(_T("login_version")));
-	version->SetText(CLewaimaiString::UTF8ToUnicode(CSystem::GetVersion()).c_str());
+	version->SetText((L"ÖÇÆÌ×ÓÊÕÒøÈí¼þ " + CLewaimaiString::UTF8ToUnicode(CSystem::GetVersion())).c_str());
 
 	std::map<string, string> users = CSetting::getUsers();
 

zhipuzi_pos_windows/wnd/CMainWnd.cpp

@@ -847,7 +847,7 @@ void CMainWnd::HandleSelectChangeMsg(TNotifyUI& msg)
         pControl->SelectItem(3);
     }
 
-    else if(name == _T("setting_system_update"))
+    else if(name == _T("setting_system_about"))
     {
         CTabLayoutUI* pControl = static_cast<CTabLayoutUI*>(m_pm.FindControl(_T("setting_switch")));
         pControl->SelectItem(4);
@@ -1246,6 +1246,9 @@ LRESULT CMainWnd::OnOrderlistRefresh(UINT uMsg, WPARAM wParam, LPARAM lParam, BO
 
 void CMainWnd::InitSettingStatus()
 {
+	CLabelUI* name_version = static_cast<CLabelUI*>(m_pm.FindControl(_T("main_name_version")));
+	name_version->SetText((L"智铺子收银软件 " + CLewaimaiString::UTF8ToUnicode(CSystem::GetVersion())).c_str());
+
 	CLabelUI* version = static_cast<CLabelUI*>(m_pm.FindControl(_T("setting_version")));
 	version->SetText((L"版本号：" + CLewaimaiString::UTF8ToUnicode(CSystem::GetVersion())).c_str());