Modify preferences

+ Modifed related backgrounds
+ Modified loading page
- Removed old resources

WpfTest1/App.xaml.cs

@@ -15,7 +15,7 @@ namespace WpfTest1
     {
         protected override void OnStartup(StartupEventArgs e)
         {
-            SplashScreen s = new SplashScreen("Resources/load.jpg");
+            SplashScreen s = new SplashScreen("Resources/jdmedlogo.jpg");
             s.Show(false);
             s.Close(new TimeSpan(0, 0, 1));
             base.OnStartup(e);

WpfTest1/MainWindow.xaml

@@ -180,7 +180,8 @@
                             </DataTemplate>
                         </Button.ContentTemplate>
                     </Button>
-                    <Label x:Name="labelHomepageCversion" Content="编译版本：20200301" HorizontalAlignment="Left" Margin="594,109,0,0" VerticalAlignment="Top" Foreground="White"/>
+                    <Label x:Name="labelSoftwareName" Content="欢迎使用劳拉" FontSize="32" HorizontalAlignment="Center" Margin="0,61,0,0" VerticalAlignment="Top" Foreground="White"/>
+                    <Label x:Name="labelHomepageCversion" Content="编译版本：20200301" HorizontalAlignment="Center" Margin="0,109,0,0" VerticalAlignment="Top" Foreground="White"/>
                 </Grid>
             </TabItem>
             <TabItem Header="用户管理" Style="{StaticResource smallHeader}" >
@@ -196,7 +197,7 @@
                 </TabControl>
             </TabItem>
             <!--快筛-->
-            <TabItem Header="筛查" Style="{StaticResource smallHeader}" >
+            <TabItem Header="快速筛查" Style="{StaticResource smallHeader}" >
                 <TabControl x:Name="tabFilter" HorizontalAlignment="Left" Height="645" Width="1338" Margin="10,-5,0,0" VerticalAlignment="Top" >
                     <TabItem  Header="选择用户" Style="{StaticResource smallerHeader}"  IsEnabled="False" >
                         <Grid Background="White" Margin="0,0,0,0">
@@ -231,7 +232,7 @@
 
             </TabItem>
             <!--评估-->
-            <TabItem Header="评估" Style="{StaticResource smallHeader}" >
+            <TabItem Header="详细评估" Style="{StaticResource smallHeader}" >
                 <TabControl x:Name="tabEvaluation" HorizontalAlignment="Left" Height="645" Width="1338" Margin="10,-5,0,0" VerticalAlignment="Top" >
                     <TabItem  Header="选择用户" Style="{StaticResource smallerHeader}"  IsEnabled="False" >
                         <Grid Background="White" Margin="0,0,0,0">
@@ -337,6 +338,7 @@
                     </TabItem>
                 </TabControl>
             </TabItem>
+            
 
 
         </TabControl>

WpfTest1/MainWindow.xaml.cs

@@ -83,7 +83,9 @@ namespace WpfTest1
             loadQuestionaire(filterQuestionaire, "filter");
             loadQuestionaire(evaluationQuestionaire, "evaluation");
             labelHomepageCversion.Content = "编译日期：" + Toolkits.Constants.compileDate;
-            
+            labelSoftwareName.Content = String.Format("欢迎使用{0}", Constants.softwareName);
+
+
         }
 
         private void loadQuestionaire(List<QuestionAnswerPair> oneQuestionaire, string type = "filter")

WpfTest1/Resources/pubkey.xml

@@ -1,4 +0,0 @@
-<RSAKeyValue>
-  <Modulus>xurCz3Zxeb0AqCtkMqlVYdWDlCuVyDp7HoKlSHeyhpsUWAu6hcS8gnaOofe9jQb7C7V1GszlY8QuN8GRUusHuXOOvQq3H6ZRNQ+OEynz/g3caD6aqbbzi0J179EcUiddocuSRxveQVJ8F6SlT1us2+lEumrWej9imgsU3+NVDTE=</Modulus>
-  <Exponent>AQAB</Exponent>
-</RSAKeyValue>

WpfTest1/SmallDialogs/AboutBox.xaml

@@ -7,16 +7,16 @@
         mc:Ignorable="d"
         Title="关于" Height="300" Width="400">
     <Grid>
-        <Label x:Name="label" Content="关于系统" FontSize="18" HorizontalAlignment="Left" Margin="156,5,0,0" VerticalAlignment="Top"/>
+        <Label x:Name="labelTitle" Content="关于系统" FontSize="18" HorizontalAlignment="Center" Margin="0,5,0,0" VerticalAlignment="Top"/>
         
-        <Label x:Name="label1" Content="北京君德医疗有限公司  版权所有© 2006-2020" HorizontalAlignment="Left" Margin="69,33,0,0" VerticalAlignment="Top"/>
-        <TextBlock x:Name="textBlock" HorizontalAlignment="Left" Margin="29,63,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="344">
+        <Label x:Name="label1" Content="北京君德医疗设备有限公司  版权所有© 2006-2020" HorizontalAlignment="Center" Margin="0,33,0,0" VerticalAlignment="Top"/>
+        <TextBlock x:Name="textBlock" HorizontalAlignment="Center" Margin="0,63,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="344">
              &#x0020;&#x0020;&#x0020;&#x0020;君德集团是集医疗器械研发生产、医疗器械销售、康复中心整体解决方案、妇幼关爱解决方案为一体的综合医疗服务商。君德医疗秉承"让科技温暖生命"的理念，提供更具人文关怀的产品及专业的服务。君德医疗联合新加坡南洋理工大学、韩国延世大学、清华大学、北航等知名科研院校分别于新加坡、首尔、北京及深圳成立技术研发平台。目前公司与中国人民解放军总医院、青岛大学附属医院等多家医疗机构打造产学研一体的转化医学平台，为客户提供人性化的专业康复体验。详情请访问：
             https://jdhealthcare.cn
         </TextBlock>
         <Label x:Name="label1_Copy" Content="版本号：" HorizontalAlignment="Left" Margin="243,227,0,0" VerticalAlignment="Top"/>
         <Label x:Name="labelVersion" Content="XXXXXX" HorizontalAlignment="Left" Margin="301,227,0,0" VerticalAlignment="Top"/>
-        <Button x:Name="buttonClose" Content="关闭窗口" HorizontalAlignment="Left" Margin="156,216,0,0" VerticalAlignment="Top" Width="75" Click="buttonClose_Click"/>
+        <Button x:Name="buttonClose" Content="关闭窗口" HorizontalAlignment="Center" Margin="0,216,0,0" VerticalAlignment="Top" Width="75" Click="buttonClose_Click"/>
 
     </Grid>
 </Window>

WpfTest1/SmallDialogs/AboutBox.xaml.cs

@@ -23,6 +23,7 @@ namespace WpfTest1.SmallDialogs
         {
             InitializeComponent();
             labelVersion.Content = Toolkits.Constants.version;
+            labelTitle.Content = Toolkits.Constants.softwareName;
         }
 
         private void buttonClose_Click(object sender, RoutedEventArgs e)

WpfTest1/SmallDialogs/LoginWindow.xaml

@@ -15,6 +15,10 @@
         <Grid.Background>
             <ImageBrush ImageSource="/WpfTest1;component/Resources/loginpage.jpg" />
         </Grid.Background>
+        <Label x:Name="labelSoftwareName" Content="欢迎使用劳拉" FontSize="32" HorizontalAlignment="Center" Margin="0,61,0,0" VerticalAlignment="Top" Foreground="White"/>
+        <Label x:Name="labelHomepageCversion" Content="当前版本：V1.2.3.4" HorizontalAlignment="Center" Margin="0,550,0,0" VerticalAlignment="Top" Foreground="White"/>
+
+
         <TextBox x:Name="textBoxUsername" HorizontalAlignment="Left" Height="29" Margin="850,313,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="220" Background="#BDC7D3"/>
         <PasswordBox x:Name="textBoxPassword" HorizontalAlignment="Left" Height="29" Margin="851,364,0,0" VerticalAlignment="Top" Width="220" Background="#BDC7D3"  KeyDown="textBoxPassword_KeyDown"/>
         <Button x:Name="buttonLogin" Content="登陆" HorizontalAlignment="Left" Margin="813,420,0,0" VerticalAlignment="Top" Width="261" Height="33" BorderBrush="Black" FontFamily="Microsoft YaHei UI Light" Click="buttonLogin_Click" Foreground="White" Custom:ButtonHelper.CornerRadius="-2" >

WpfTest1/SmallDialogs/LoginWindow.xaml.cs

@@ -24,6 +24,8 @@ namespace WpfTest1.SmallDialogs
         {
             InitializeComponent();
             this.mw = mw;
+            labelHomepageCversion.Content = "当前版本：" + Toolkits.Constants.version;
+            labelSoftwareName.Content = String.Format("欢迎使用{0}", Toolkits.Constants.softwareName);
         }
 
         private void buttonLogin_Click(object sender, RoutedEventArgs e)

WpfTest1/Toolkits/Constants.cs

@@ -9,6 +9,8 @@ namespace WpfTest1.Toolkits
     //各种系统需要使用的常值
     public class Constants
     {
+        //软件名称
+        public static string softwareName = "劳拉系统";
         //编译版本
         public static string version = "0.1.0.0";
         //编译日期

WpfTest1/WpTest.csproj

@@ -34,6 +34,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>jdmed_logo.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
       <HintPath>..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
@@ -325,11 +328,10 @@
     <Resource Include="Resources\Entypo-license.txt" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Resources\RPStandard.jpg" />
-    <Resource Include="Resources\pubkey.xml" />
-    <Resource Include="Resources\load.jpg" />
     <Resource Include="Resources\loginpage.jpg" />
     <Resource Include="Resources\homepage.jpg" />
+    <Resource Include="Resources\jdmedlogo.jpg" />
+    <Resource Include="jdmed_logo.ico" />
     <Content Include="SQLite\System.Data.SQLite.dll" />
   </ItemGroup>
   <ItemGroup>