标签打印机可以打印了，格式还要再调一下

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

@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window size="520,410" caption="0,0,0,36" roundcorner="4,4" >
-	<Font shared="true" id="0" name="微软雅黑" size="20" />
-	<VerticalLayout bkimage="file='Dialog_BG2.png' corner='4,48,4,4'" >
-		<HorizontalLayout height="44">
-			<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'"/>
+	<Font id="0" name="微软雅黑" size="16" />
+	<Font id="1" name="微软雅黑" size="40" />
+	<Font id="2" name="微软雅黑" size="18" />
+	<Font id="3" name="微软雅黑" size="32" />
+	<VerticalLayout bkimage="file='Dialog_BG2.png' corner='4,48,4,4'" >		
+		<HorizontalLayout height="44" bkcolor="0xFF3CB371">
+			<Label name="login_version" text="" height="44" align="left" valign="center" padding="15,0,0,0" textcolor="#FFFFFFFF" font="0"/>
+			<Button name="closebtn" padding="0,13,15,0" width="16" height="16" tooltip="关闭" normalimage="file='close_normal.png'" hotimage="file='close_hover.png'" pushedimage="file='close_normal.png'"/>
 		</HorizontalLayout>
 		
-		<HorizontalLayout height="80">
+		<HorizontalLayout height="90">
 			<Control></Control>
-			<HorizontalLayout bkimage="file='logo_guanwang.png'" width="179" height="55" padding="0,18,0,0"></HorizontalLayout>
+			<HorizontalLayout bkimage="file='logo_guanwang.png'" width="179" height="55" padding="0,22,0,0"></HorizontalLayout>
 			<Control></Control>
 		</HorizontalLayout>
 		
@@ -38,9 +40,9 @@
 				<Control></Control>
 			</HorizontalLayout>
 			
-			<HorizontalLayout height="50">
+			<HorizontalLayout height="59">
 				<Control></Control>
-				<Button name="loginBtn" text="登录" height="38" width="270" padding="0,15,0,0" tooltip="点击这里登录" 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'" />
+				<Button name="loginBtn" text="登录" height="44" width="270" padding="0,15,0,0" tooltip="点击这里登录" 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></Control>
 			</HorizontalLayout>			
 		</VerticalLayout>

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

@@ -3,9 +3,10 @@
 	<Setting name="setting_page" bkcolor="#FFEFF6EE">
 		<HorizontalLayout>
 			<HorizontalLayout width="250" padding="20,20,20,0">
-				<VerticalLayout height="400" bkcolor="#FFFFFFFF" childpadding="15" inset="20,20,20,0">
+				<VerticalLayout height="440" bkcolor="#FFFFFFFF" childpadding="15" inset="20,20,20,0">
 					<Option name="setting_waimai_order_switch" selected="true" 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_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_biaoqian_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_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" />
@@ -62,8 +63,8 @@
 						</Combo>
 					</HorizontalLayout>
 					<HorizontalLayout height="44" name="setting_printer_usb_layout">
-						<Label text="usb打印设备选择" width="260"/>
-						<Combo name="setting_printer_usb" padding="0,9,0,0" width="800" height="26" tooltip="请点击这里选择您的打印机接口类型" normalimage="file='Setting_Combox_Normal.png' corner='2,2,24,2'" hotimage="file='Setting_Combox_Hover.png' corner='2,2,24,2'" pushedimage="Setting_Combox_Click.png' corner='2,2,24,2'" textpadding="10,1,1,1" >
+						<Label text="usb打印机端口选择" width="260"/>
+						<Combo name="setting_printer_usb" padding="0,9,0,0" width="800" height="26" tooltip="请点击这里选择您的打印机端口" normalimage="file='Setting_Combox_Normal.png' corner='2,2,24,2'" hotimage="file='Setting_Combox_Hover.png' corner='2,2,24,2'" pushedimage="Setting_Combox_Click.png' corner='2,2,24,2'" textpadding="10,1,1,1" >
 						</Combo>
 					</HorizontalLayout>
 					<HorizontalLayout height="56" name="setting_printer_wangkou_layout">
@@ -121,6 +122,19 @@
 						<CheckBox name="setting_printer_pay_big" width="72" height="45" normalimage="file='switchbutton.png' source='0,0,143,91'" selectedimage="file='switchbutton.png' source='0,182,143,273'"/>
 					</HorizontalLayout>
 				</VerticalLayout>
+				
+				<VerticalLayout bkcolor="#FFFFFFFF" padding="0,20,20,20" inset="15,15,15,15" vscrollbar="true">
+					<HorizontalLayout height="44">
+						<Label text="新订单自动打印标签纸" width="260" />
+						<CheckBox name="setting_is_new_waimai_biaoqian_printer" width="72" height="45" normalimage="file='switchbutton.png' source='0,0,143,91'" selectedimage="file='switchbutton.png' source='0,182,143,273'"/>
+					</HorizontalLayout>
+
+					<HorizontalLayout height="44" name="setting_printer_usb_layout">
+						<Label text="标签打印机usb端口选择" width="260"/>
+						<Combo name="setting_biaoqian_printer_usb" padding="0,9,0,0" width="800" height="26" tooltip="请点击这里选择您的标签打印机usb端口" normalimage="file='Setting_Combox_Normal.png' corner='2,2,24,2'" hotimage="file='Setting_Combox_Hover.png' corner='2,2,24,2'" pushedimage="Setting_Combox_Click.png' corner='2,2,24,2'" textpadding="10,1,1,1" >
+						</Combo>
+					</HorizontalLayout>
+				</VerticalLayout>
 
 				<VerticalLayout bkcolor="#FFFFFFFF" padding="0,20,20,20" inset="15,15,15,15">
 					<HorizontalLayout height="44">

bin/Win32/Debug/lewaimai_pos_windows/skin/waimaiorder_info.xml

@@ -57,6 +57,7 @@
 				<VerticalLayout name="waimai_order_info_page_layout_3" bkcolor="#FFFFFFFF" padding="0,0,0,20" inset="10,0,10,0">
 					<Label text="订单信息" height="30" />
 					<Control height="1" bkcolor="#FF708090" />
+					<Label name="waimai_order_info_page_shopname" height="30" text="店铺名字：" />
 					<Label name="waimai_order_info_page_status" height="30" text="订单状态：" />
 					<Label name="waimai_order_info_page_type" height="30" text="订单来源：" />
 					<Label name="waimai_order_info_page_pay_type" height="30" text="付款方式：" />