优化设置中心

.gitignore

@@ -1,27 +1,3 @@
-/lewaimai_dispatch/bin
-/lewaimai_dispatch/obj
-/pathplanning_server/obj
-/pathplanning_server/bin
-/.vs
 /logs
 /temp
-/bin/x64/Debug/lewaimai_dispatch_windows/lewaimai_dispatch_windows.exe
-/bin/x64/Debug/lewaimai_pathplanning_windows/lewaimai_pathplanning_windows.exe
-/lewaimai_dispatch/temp
-/lewaimai_pathplanning/temp
-/lewaimai_pathplanning/bin
-/bin/x64/Release/lewaimai_dispatch_windows/lewaimai_dispatch_windows.exe
-/bin/x64/Release/lewaimai_pathplanning_windows/lewaimai_pathplanning_windows.exe
-/bin
-/bin/Win32/Debug/zhipuzi_pos_windows/log
-/bin/Win32/Debug/zhipuzi_pos_windows_server/zhipuzi_pos_windows_server.exe
-/bin/Win32/Debug/zhipuzi_pos_windows_server/aliyun-mns.dll
-/bin/Win32/Debug/zhipuzi_pos_windows_server/DuiLib_ud.dll
-/bin/Win32/Debug/zhipuzi_pos_windows_server/libcrypto-1_1.dll
-/bin/Win32/Debug/zhipuzi_pos_windows_server/libcurl.dll
-/bin/Win32/Debug/zhipuzi_pos_windows_server/libssl-1_1.dll
-/bin/Win32/Debug/zhipuzi_pos_windows_server/log4cplusUD.dll
-/bin/Win32/Debug/zhipuzi_pos_windows_server/msvcp140_1d.dll
-/bin/Win32/Debug/zhipuzi_pos_windows_server/msvcp140_2d.dll
-/bin/Win32/Debug/zhipuzi_pos_windows_server/msvcp140d.dll
-/bin/Win32/Debug/zhipuzi_pos_windows_server/vcruntime140d.dll
+/.vs

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

@@ -4,28 +4,96 @@
 		<HorizontalLayout>
 			<HorizontalLayout width="250" padding="20,20,20,0">
 				<VerticalLayout height="400" bkcolor="#FFFFFFFF" childpadding="15" inset="20,20,20,0">
-					<Option name="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_Red_Click.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" hottextcolor="#CC1010" selectedtextcolor="#FFFFFFFF" />
-					<Option name="printer_switch" text="小票打印设置" group="setting_switch" align="center" height="38" normalimage="file='Btn_White.png' corner='5,5,5,5'" selectedimage="file='Btn_Red_Click.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" hottextcolor="#CC1010" selectedtextcolor="#FFFFFFFF" />
-					<Option name="chufang_printer_switch" text="厨房打印设置" group="setting_switch" align="center" height="38" normalimage="file='Btn_White.png' corner='5,5,5,5'" selectedimage="file='Btn_Red_Click.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" hottextcolor="#CC1010" selectedtextcolor="#FFFFFFFF" />
-					<Option name="system_switch" text="系统设置" group="setting_switch" align="center" height="38" normalimage="file='Btn_White.png' corner='5,5,5,5'" selectedimage="file='Btn_Red_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_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_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" />
+					
+					<Button name="waimai_order_info_page_disagree" 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>
 			</HorizontalLayout>
 			
 			<TabLayout name="setting_switch">
 				<VerticalLayout bkcolor="#FFFFFFFF" padding="0,20,20,20" inset="15,15,15,15">
 					<HorizontalLayout height="44">
-						<Label text="是否开启新订单语音通知" width="260" />
+						<Label text="新订单语音通知" width="260" />
 						<CheckBox name="setting_is_new_waimai_voice" 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">
-						<Label text="新订单是否自动接单" width="260"/>
+						<Label text="新订单自动接单" width="260"/>
 						<CheckBox name="setting_is_new_waimai_autoconfirm" 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">
-						<Label text="新订单是否右下角弹框提醒" width="260"/>
+						<Label text="新订单右下角弹框提醒" width="260"/>
 						<CheckBox name="setting_is_new_waimai_dialog" 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">
+					<HorizontalLayout height="44">
+						<Label text="新订单自动打印" width="260" />
+						<CheckBox name="setting_is_new_waimai_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">
+						<Label text="打印机规格" width="260"/>
+						<Combo name="setting_printer_guige" padding="0,9,0,0" width="140" 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" >
+							<ListLabelElement text="58mm" selected="true" />
+							<ListLabelElement text="80mm" />
+						</Combo>
+					</HorizontalLayout>
+					<HorizontalLayout height="44">
+						<Label text="打印联数" width="260"/>
+						<Combo name="setting_printer_lianshu" padding="0,9,0,0" width="140" 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" >
+							<ListLabelElement text="1联" selected="true" />
+							<ListLabelElement text="2联" />
+							<ListLabelElement text="3联" />
+							<ListLabelElement text="4联" />
+						</Combo>
+					</HorizontalLayout>
+				</VerticalLayout>
+				
+				<VerticalLayout bkcolor="#FFFFFFFF" padding="0,20,20,20" inset="15,15,15,15">
+					<HorizontalLayout height="44">
+						<Label text="新订单自动厨房打印" width="260" />
+						<CheckBox name="setting_is_new_waimai_chufang_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">
+						<Label text="厨房打印机规格" width="260"/>
+						<Combo name="setting_chufang_printer_guige" padding="0,9,0,0" width="140" 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" >
+							<ListLabelElement text="58mm" selected="true" />
+							<ListLabelElement text="80mm" />
+						</Combo>
+					</HorizontalLayout>
+				</VerticalLayout>
+				
+				<VerticalLayout bkcolor="#FFFFFFFF" padding="0,20,20,20" inset="15,15,15,15">
+					<HorizontalLayout height="44">
+						<Label text="开机自动启动" width="260" />
+						<CheckBox name="setting_is_auto_start" 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">
+						<Label text="启动时自动登录" width="260" />
+						<CheckBox name="setting_is_auto_login" 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">
+						<Label text="关闭主面板时，最小化到任务栏" width="260" />
+						<CheckBox name="setting_is_close_min" 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">
+					<Control height="300" />
+					<Label text="智铺子收银软件" align="center">
+					</Label>
+					<Label text="版本号：V1.0" 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>
 	</Setting>