Browse Source

4DKanKan_Setup_v1.1.7.0

xiewj 1 năm trước cách đây
mục cha
commit
60fd9d7127

BIN
AppCode/laser/app/laser_setup.nsi


BIN
AppCode/laser/app/laser_tool_prod.exe


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 1
AppCode/laser/app/licence.rtf


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
AppCode/laser/app/licence_en.rtf


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
AppCode/laser/app/licence_zh.rtf


BIN
AppCode/laser/app/skin.zip


+ 10 - 10
AppCode/laser/app/skin/configpage.xml

@@ -2,14 +2,14 @@
 <Windows>
    <!-- 安装目录 -->
    <VerticalLayout>
-   	<VerticalLayout width="480" height="250" roundcorner="5,5" bkimage="file='form\pic.png'">
+   	<VerticalLayout name="configPageTitle" width="480" height="250" roundcorner="5,5" bkimage="">
 	
 	</VerticalLayout>
 	<VerticalLayout bkimage="form\bk_down1.png"  >
 		
 	<VerticalLayout name="moreconfiginfo" bkimage="form\bk_down.png" visible="false" height="130">
 	  <Control height="25" />
-	  <Label font="5" textcolor="#FFFFFF" text="安装路径:" padding="40,0,30,0" />
+	  <Label font="5" name="configInstallPath" textcolor="#FFFFFF" text="" padding="40,0,30,0" />
 	  <HorizontalLayout height="32" padding="40,6,30,0">
       <RichEdit  name="editDir" text="" textcolor="#FFFFFF" inset="5,8,2,2" bkimage="public\edit\edit1.png" autohscroll="false" bordervisible="true"  bordersize="1" bordercolor="#1affffff" focusbordercolor="#1affffff" wantreturn="false" wantctrlreturn="false" multiline="false" width="360" />
       <Control width="10" />
@@ -17,18 +17,18 @@
       </HorizontalLayout>
 	  
 	 <HorizontalLayout height="23" padding="40,5,80,0">
-        <Label font="0" textcolor="#FF999999" width="150" text="所需空间:5.2GB" />
-		<Label font="0" name="local_space" width="150" textcolor="#FF999999"  />
+        <Label font="0" name="configUseSpace" textcolor="#FF999999" width="150" text="" />
+		<Label font="0" name="local_space" width="172" textcolor="#FF999999"  />
 		<Control />
      </HorizontalLayout>
 	</VerticalLayout>
 	<Control />
- 		<HorizontalLayout height="20" padding="95,25,0,0" >
-		<CheckBox name="chkAgree" width="125" heigh="20" font="7" text="我已经阅读并认可" textcolor="#0xffffffff" selected="false" valign="center" align="left" textpadding="20,0,0,0" normalimage="file='public/CheckBox/check_no.png' dest='0,2,16,18'" normalhotimage="file='public/CheckBox/check_no.png' dest='0,2,16,18'" selectedimage="file='public/CheckBox/check_yes.png' dest='0,2,16,18'" selectedhotimage="file='public/CheckBox/check_yes.png' dest='0,2,16,18'"/>
-		<Button name="btnAgreement" width="180" font="7" text="《软件许可及服务协议》" textpadding="0,0,0,0" textcolor="0xff00bb96" align="left" />
-		<Control />
-		</HorizontalLayout>	 
-		<Button name="btnInstall" padding="95,10,0,30" width="290" height="40" normalimage="form\btn_installation_normal.png" hotimage="form\btn_installation_hovered.png" pushedimage="form\btn_installation_pressed.png" disabledimage="form\btn_installation_disable.png" font="6" textcolor="0xffffffff" disabledtextcolor="0xffffffff" margin="0,10,0,0" text="一键安装" />
+		<HorizontalLayout height="20" padding="165,25,0,0" >
+			<CheckBox   align="left" name="chkAgree" width="171" heigh="20" font="7" text="" textcolor="#0xffffffff" selected="false" valign="center"  textpadding="20,0,0,0" normalimage="file='public/CheckBox/check_no.png' dest='0,2,16,18'" normalhotimage="file='public/CheckBox/check_no.png' dest='0,2,16,18'" selectedimage="file='public/CheckBox/check_yes.png' dest='0,2,16,18'" selectedhotimage="file='public/CheckBox/check_yes.png' dest='0,2,16,18'"/>
+		</HorizontalLayout>
+		<Button  margin="0,10,0,0"  padding="0,0,0,0" name="btnAgreement"  font="7" text="" textpadding="0,0,0,0" textcolor="0xff00bb96" align="center" />
+
+		<Button  name="btnInstall" padding="95,10,0,30" width="290" height="40" normalimage="form\btn_installation_normal.png" hotimage="form\btn_installation_hovered.png" pushedimage="form\btn_installation_pressed.png" disabledimage="form\btn_installation_disable.png" font="6" textcolor="0xffffffff" disabledtextcolor="0xffffffff" margin="0,10,0,0" text="" />
  
 	</VerticalLayout>
 	<Button float="true" inset="0,5,5,0" pos="220,230,260,270"  name="btnShowMore" width="40" height="40" normalimage="form\btn_down_normal.png" hotimage="form\btn_down_hovered.png" pushedimage="form\btn_down_pressed.png" />

+ 2 - 2
AppCode/laser/app/skin/finishpage.xml

@@ -2,11 +2,11 @@
 <Windows>
 <!-- 完成 -->
  <VerticalLayout >
-    <VerticalLayout width="480" height="250" roundcorner="5,5" bkimage="file='form\pic.png'">
+    <VerticalLayout name="FinishPageTitle" width="480" height="250" roundcorner="5,5" bkimage="file='form\pic.png'">
 	
 	</VerticalLayout>
 	<VerticalLayout bkimage="form\bk_down1.png"  >	
-	<Button name="btnRun" padding="160,50,0,0" text="完成安装" font="2" bkimage="form\btn_installation_normal.png"  textcolor="#FFFFFF"  borderround="4,4" height="50" width="160" />
+	<Button name="btnRun" padding="160,50,0,0" text="" font="2" bkimage="form\btn_installation_normal.png"  textcolor="#FFFFFF"  borderround="4,4" height="50" width="160" />
 
 	</VerticalLayout>
  </VerticalLayout>

+ 2 - 2
AppCode/laser/app/skin/installingpage.xml

@@ -2,14 +2,14 @@
 <Windows>
 <!-- 进度 -->
   <VerticalLayout >
-    <VerticalLayout width="480" height="250" roundcorner="5,5" bkimage="file='form\pic.png'">
+    <VerticalLayout name="InstallingTitle" width="480" height="250" roundcorner="5,5" bkimage="file='form\pic.png'">
 	
 	</VerticalLayout>
 	<VerticalLayout bkimage="form\bk_down1.png" >   
 	<Control height="60" />
 	<Slider name="slrProgress" padding="30,0,30,0" height="3" mouse="false" foreimage="form\fg.png" bkimage="form\bg.png" thumbsize="0,0" bkcolor="#FFD8D8D8"  />
 	<HorizontalLayout height="20" padding="30,5,0,0">
-	<Label font="0" name="progress_tip" width="100" textcolor="#FFFFFF"  />
+	<Label font="0" name="progress_tip" width="150" textcolor="#FFFFFF"  />
 	<Control />
 	<Label font="0" name="progress_pos" width="60" textalign="right" textcolor="#FFFFFF" />
 	</HorizontalLayout>

+ 1 - 1
AppCode/laser/app/skin/licensepage.xml

@@ -10,7 +10,7 @@
         
         <HorizontalLayout height="34">
         	<Control />
-			<Button name="btnAgree" width="80" height="30" normalimage="form\btn_installation_normal.png" hotimage="form\btn_installation_hovered.png" pushedimage="form\btn_installation_pressed.png" disabledimage="form\btn_installation_disable.png" font="6" textcolor="0xffffffff" disabledtextcolor="0xffffffff" margin="0,10,0,0" text="我知道了" />
+			<Button name="btnAgree" width="80" height="30" normalimage="form\btn_installation_normal.png" hotimage="form\btn_installation_hovered.png" pushedimage="form\btn_installation_pressed.png" disabledimage="form\btn_installation_disable.png" font="6" textcolor="0xffffffff" disabledtextcolor="0xffffffff" margin="0,10,0,0" text="" />
             <Control width="20" />
         </HorizontalLayout>
                 

+ 3 - 8
AppCode/laser/app/skin/msgBox.xml

@@ -5,7 +5,7 @@
 	<Font id="1" name="微软雅黑" size="14" bold="true" shared="true" />
   <VerticalLayout width="408" height="287" bkimage="file='form\bk_down2.png'" inset="1,1,1,1" >
   	<HorizontalLayout height="30"   bkimage="file='form\bk_down.png'">
-  		<Label name="lblTitle" textpadding="5,0,0,0" text="警告" textcolor="#FFFFFFFF"/>
+  		<Label name="lblTitle" textpadding="5,0,0,0" text="" textcolor="#FFFFFFFF"/>
       <HorizontalLayout width="67">
       	<Container />
 		
@@ -18,11 +18,6 @@
   	
   	<HorizontalLayout height="80" >
   		<Container width="40" />
-  		<VerticalLayout width="40" >
-					<Container  />
-					<Label bkimage="msgWarning.png"  height="40"  />
-					<Container />
-			</VerticalLayout>
 			<Container width="10" />
 			<Text name="lblMsg" valign="vcenter" align="left" textcolor="#FFFFFFFF" showhtml="true"/>
 			<Container width="20" />
@@ -30,11 +25,11 @@
   	
   	<Container />
 	<HorizontalLayout padding="220,45,0,0" height="50" >
-      <Button name="btnOK" font="1" text="确 定"  textcolor="#FFFFFFFF" normalimage="file='form/cancel_uninstall_normal.png' " hotimage="file='form/cancel_uninstall_hotimage.png'" pushedimage="file='form/cancel_uninstall_normal.png'" width="80" height="30" />
+      <Button name="btnOK" font="1" text=""  textcolor="#FFFFFFFF" normalimage="file='form/cancel_uninstall_normal.png' " hotimage="file='form/cancel_uninstall_hotimage.png'" pushedimage="file='form/cancel_uninstall_normal.png'" width="80" height="30" />
 
 	  <Control width="10" />
 	  <HorizontalLayout name="hlCancel" visible="false">
-	  <Button name="btnCancel" font="1" text="取 消"  textcolor="#FFFFFFFF" normalimage="file='form/cancel_uninstall_normal.png' " hotimage="file='form/cancel_uninstall_hotimage.png'" pushedimage="file='form/cancel_uninstall_normal.png'" width="80" height="30"  />
+	  <Button name="btnCancel" font="1" text=""  textcolor="#FFFFFFFF" normalimage="file='form/cancel_uninstall_normal.png' " hotimage="file='form/cancel_uninstall_hotimage.png'" pushedimage="file='form/cancel_uninstall_normal.png'" width="80" height="30"  />
 	  </HorizontalLayout>
 	<Control width="20" />
      </HorizontalLayout>

+ 1 - 6
AppCode/laser/app/skin/msgBox_backup.xml

@@ -5,7 +5,7 @@
 	<Font id="1" name="微软雅黑" size="14" bold="true" shared="true" />
   <VerticalLayout width="408" height="287" bkimage="file='form\bk_down2.png'" inset="1,1,1,1" >
   	<HorizontalLayout height="30"   bkimage="file='form\bk_down.png'">
-  		<Label name="lblTitle" textpadding="5,0,0,0" text="警告" textcolor="#FFFFFFFF"/>
+  		<Label name="lblTitle" textpadding="5,0,0,0" text="" textcolor="#FFFFFFFF"/>
       <HorizontalLayout width="67">
       	<Container />
 		
@@ -18,11 +18,6 @@
   	
   	<HorizontalLayout height="80" >
   		<Container width="40" />
-  		<VerticalLayout width="40" >
-					<Container  />
-					<Label bkimage="msgWarning.png"  height="40"  />
-					<Container />
-			</VerticalLayout>
 			<Container width="10" />
 			<Text name="lblMsg" valign="vcenter" align="left" textcolor="#FFFFFFFF" showhtml="true"/>
 			<Container width="20" />

+ 8 - 8
AppCode/laser/app/skin/regpage.xml

@@ -2,25 +2,25 @@
 <Windows>
     <!-- 完成 -->
     <VerticalLayout >
-        <VerticalLayout width="480" height="32" roundcorner="5,5" bkimage="file='form\pic_reg.png'"></VerticalLayout>
+        <VerticalLayout name="reg_title" width="480" height="32" roundcorner="5,5" bkimage=""></VerticalLayout>
         <VerticalLayout bkimage="form\reg_bg.png"  >
             <Control height="10" />
 
-            <Label font="9" textcolor="#FFFFFF" align="center" text="请先进行安装验证" height="20" />
+            <Label font="9" textcolor="#FFFFFF" align="center" name="install_info" text="" height="20" />
 
-            <Label font="5" textcolor="#FFFFFF" text="机器码" padding="40,15,30,0" />
+            <Label font="5" name="machineCode" textcolor="#FFFFFF" text="" padding="40,15,30,0" />
             <HorizontalLayout height="44" padding="40,6,0,0">
-                <RichEdit name="reg_machine_info" text="自动获取显示" readonly="true" width="310" height="34" textcolor="#FFFFFF" inset="5,5,5,5" bkimage="public\edit\edit1.png"  autovscroll="true" autohscroll="false" bordervisible="true"  bordersize="1" bordercolor="#1affffff" focusbordercolor="#1affffff" wantreturn="false" wantctrlreturn="false" multiline="true" />
+                <RichEdit name="reg_machine_info" text="" readonly="true" width="310" height="34" textcolor="#FFFFFF" inset="5,5,5,5" bkimage="public\edit\edit1.png"  autovscroll="true" autohscroll="false" bordervisible="true"  bordersize="1" bordercolor="#1affffff" focusbordercolor="#1affffff" wantreturn="false" wantctrlreturn="false" multiline="true" />
                 <Control width="10" />
-                <Button name="btnCopyMachineinfo" padding="8,2,0,0" width="72" height="30" font="6" text="复 制"  textcolor="#00C8AF"  bkcolor="#252526"  normalimage="file='form/confim_uninstall_normal.png' " hotimage="file='form/confim_uninstall_hotimage.png'" pushedimage="file='form/button/confim_uninstall_normal.png'" />
+                <Button name="btnCopyMachineinfo" padding="8,2,0,0" width="72" height="30" font="6" text=""  textcolor="#00C8AF"  bkcolor="#252526"  normalimage="file='form/confim_uninstall_normal.png' " hotimage="file='form/confim_uninstall_hotimage.png'" pushedimage="file='form/button/confim_uninstall_normal.png'" />
             </HorizontalLayout>
-            <Label font="5" textcolor="#FFFFFF" text="安装key" padding="40,0,30,0" />
+            <Label name="installKey" font="5" textcolor="#FFFFFF" text="" padding="40,0,30,0" />
             <HorizontalLayout height="78" padding="40,6,2,0">
                 <RichEdit name="reg_reg_info" text="" width="400" height="78" textcolor="#FFFFFF" inset="5,5,5,5" bkimage="public\edit\edit1.png"  autovscroll="true" autohscroll="false" bordervisible="true"  bordersize="1" bordercolor="#1affffff" focusbordercolor="#1affffff" wantreturn="false" wantctrlreturn="false" multiline="true" />
             </HorizontalLayout>
-            <Label font="1" text="请联系四维时代官方销售渠道,以获取安装Key" textcolor="#878787" padding="40,10,0,0"/>
+            <Label font="1" name="regPrompt" text="" textcolor="#878787" padding="40,10,0,0"/>
             <Label font="1" name="reg_space" normaltextcolor="lightcolor" padding="40,10,0,0"/>
-            <Button name="btnRegConfirm" font="6" padding="210,10,0,0" text="验 证"   textcolor="#FFFFFF" normalimage="file='form/cancel_uninstall_normal.png' " hotimage="file='form/cancel_uninstall_hotimage.png'" pushedimage="file='form/cancel_uninstall_normal.png'" width="85" height="30"/>
+            <Button name="btnRegConfirm" font="6" padding="210,10,0,0" text=""   textcolor="#FFFFFF" normalimage="file='form/cancel_uninstall_normal.png' " hotimage="file='form/cancel_uninstall_hotimage.png'" pushedimage="file='form/cancel_uninstall_normal.png'" width="85" height="30"/>
         </VerticalLayout>
     </VerticalLayout>
 </Windows>

+ 5 - 5
AppCode/laser/app/skin/uninstallfinishpage.xml

@@ -2,17 +2,17 @@
 <Windows>
 <!-- 完成 -->
   <VerticalLayout >
-	<VerticalLayout width="480" height="250" roundcorner="5,5" bkimage="file='form\unnstall_pic.png'">
+	<VerticalLayout name="unInstallFinishTitle" width="480" height="250" roundcorner="5,5" bkimage="file='form\unnstall_pic.png'">
 
 	</VerticalLayout>
-	<VerticalLayout bkimage="form\bk_down1.png"  >   
-	<Label font="7" width="430" height="25" padding="30,30,0,0" textcolor="#FFFFFF" text="四维看看本地版已卸载,请重启计算机清理残余数据。" /> 
+	<VerticalLayout bkimage="form\bk_down1.png"  >
+	<Label name="unInstallFinishPrompt" font="7" width="430" height="25" padding="30,30,0,0" textcolor="#FFFFFF" text="" />
 	<HorizontalLayout padding="30,45,0,0" height="30" >
 	  <Control width="260"  />     
-	  <Button name="btnUninstalled" font="6" text="稍 后 重 启"  textcolor="#00C8AF"  bkcolor="#252526"  normalimage="file='form/confim_uninstall_normal.png' " hotimage="file='form/confim_uninstall_hotimage.png'" pushedimage="file='form/button/confim_uninstall_normal.png'" width="80" height="30"/>
+	  <Button name="btnUninstalled" font="6" text=""  textcolor="#00C8AF"  bkcolor="#252526"  normalimage="file='form/confim_uninstall_normal.png' " hotimage="file='form/confim_uninstall_hotimage.png'" pushedimage="file='form/button/confim_uninstall_normal.png'" width="80" height="30"/>
 
 	  <Control width="10" />
-	  <Button name="btnUninstalledReboot" font="6" text="现 在 重 启"  textcolor="#FFFFFF" normalimage="file='form/cancel_uninstall_normal.png' " hotimage="file='form/cancel_uninstall_hotimage.png'" pushedimage="file='form/cancel_uninstall_normal.png'" width="80" height="30"/>
+	  <Button name="btnUninstalledReboot" font="6" text=""  textcolor="#FFFFFF" normalimage="file='form/cancel_uninstall_normal.png' " hotimage="file='form/cancel_uninstall_hotimage.png'" pushedimage="file='form/cancel_uninstall_normal.png'" width="80" height="30"/>
       <Control width="20" />
      </HorizontalLayout>	
 	 

+ 1 - 1
AppCode/laser/app/skin/uninstallingpage.xml

@@ -3,7 +3,7 @@
 <!-- 进度 -->
   <VerticalLayout >
   
-    <VerticalLayout width="480" height="250" roundcorner="5,5" bkimage="file='form\unnstall_pic.png'">
+    <VerticalLayout name="unInstallingTitle" width="480" height="250" roundcorner="5,5" bkimage="">
 	
 	</VerticalLayout>
 	<VerticalLayout bkimage="form\bk_down1.png" >   

+ 5 - 5
AppCode/laser/app/skin/uninstallpage.xml

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Windows>
    <VerticalLayout >
-    <VerticalLayout width="480" height="250" roundcorner="5,5" bkimage="file='form\unnstall_pic.png'">
+    <VerticalLayout name="unInstallTitle" width="480" height="250" roundcorner="5,5" bkimage="">
 	
 	</VerticalLayout>
 	<VerticalLayout bkimage="form\bk_down1.png"  >   
 	
-	<Label font="8" width="350" height="25" padding="30,30,0,0" textcolor="#FFFFFF" text="确定要卸载四维看看本地版?" /> 
+	<Label name="unInstallPrompt" font="8" width="400" height="25" padding="30,30,0,0" textcolor="#FFFFFF" text="" />
 	<HorizontalLayout padding="30,45,0,0" height="30" >
-      <CheckBox name="chkbox_userdata" width="130" heigh="20" padding="0,6,0,0" font="7" text="保留本地场景" textcolor="#FFFFFF" selected="true" valign="center" align="left" textpadding="20,-3,0,0" normalimage="file='public/CheckBox/check_no.png' dest='0,2,16,18'" normalhotimage="file='public/CheckBox/check_no.png' dest='0,2,16,18'" selectedimage="file='public/CheckBox/check_yes.png' dest='0,2,16,18'" selectedhotimage="file='public/CheckBox/check_yes.png' dest='0,2,16,18'"/>
+      <CheckBox  name="chkbox_userdata" width="200" heigh="20" padding="0,6,0,0" font="7" text="" textcolor="#FFFFFF" selected="true" valign="center" align="left" textpadding="20,-3,0,0" normalimage="file='public/CheckBox/check_no.png' dest='0,2,16,18'" normalhotimage="file='public/CheckBox/check_no.png' dest='0,2,16,18'" selectedimage="file='public/CheckBox/check_yes.png' dest='0,2,16,18'" selectedhotimage="file='public/CheckBox/check_yes.png' dest='0,2,16,18'"/>
 	  <Control />     
-	  <Button name="btnUnInstall" font="6" text="确 定"  textcolor="#00C8AF"  bkcolor="#252526"  normalimage="file='form/confim_uninstall_normal.png' " hotimage="file='form/confim_uninstall_hotimage.png'" pushedimage="file='form/button/confim_uninstall_normal.png'" width="80" height="30"/>
+	  <Button name="btnUnInstall" font="6" text=""  textcolor="#00C8AF"  bkcolor="#252526"  normalimage="file='form/confim_uninstall_normal.png' " hotimage="file='form/confim_uninstall_hotimage.png'" pushedimage="file='form/button/confim_uninstall_normal.png'" width="80" height="30"/>
 
 	  <Control width="10" />
-	  <Button name="btnClose" font="6" text="取 消"  textcolor="#FFFFFF" normalimage="file='form/cancel_uninstall_normal.png' " hotimage="file='form/cancel_uninstall_hotimage.png'" pushedimage="file='form/cancel_uninstall_normal.png'" width="80" height="30"/>
+	  <Button name="btnUnClose" font="6" text=""  textcolor="#FFFFFF" normalimage="file='form/cancel_uninstall_normal.png' " hotimage="file='form/cancel_uninstall_hotimage.png'" pushedimage="file='form/cancel_uninstall_normal.png'" width="80" height="30"/>
       <Control width="20" />
      </HorizontalLayout>
 	 <Control height="10" />

BIN
AppCode/laser/app/ui_laser_lang.nsi


BIN
AppCode/laser/app/ui_laser_setup.nsh


BIN
AppCode/laser/commonfunc.nsh


BIN
AppCode/laser/skin.zip