提交

ArchivesCenter4/MainWindow.xaml

@@ -25,23 +25,23 @@
             <Image Source="ms-appx:///Assets/icons8_omnichannel_32.png" Height="16" Grid.Column="0"/>
             <TextBlock Grid.Column="1" VerticalAlignment="Center">Archives Center 4</TextBlock>
         </Grid>
-        <NavigationView x:Name="nv" Grid.Row="1" SelectionChanged="nvSample_SelectionChanged" IsBackButtonVisible="Collapsed"
->
+        <NavigationView x:Name="nv" Grid.Row="1" SelectionChanged="nvSample_SelectionChanged" IsBackButtonVisible="Collapsed" IsSettingsVisible="False">
             <NavigationView.MenuItems>
-                <NavigationViewItem Icon="Home" Content="开始" Tag="NavigationViewItem_Start" Name="NavigationViewItem_Start" IsSelected="True"/>
-                <NavigationViewItem Icon="Find" Content="综合查询" Tag="NavigationViewItem_Search" Name="NavigationViewItem_Search">
+                <NavigationViewItem Icon="Home" Content="开始" IsSelected="True"/>
+                <NavigationViewItem Icon="Find" Content="综合查询">
                     <NavigationViewItem.MenuItems>
                         <NavigationViewItem Content="关系人档案查询" Icon="People"/>
                         <NavigationViewItem Content="日志查询" Icon="CalendarReply"/>
                     </NavigationViewItem.MenuItems>
                 </NavigationViewItem>
-                <NavigationViewItem Icon="People" Content="关系人档案" Tag="NavigationViewItem_People" Name="NavigationViewItem_People" />
-                <NavigationViewItem Icon="CalendarReply" Content="日志" Tag="NavigationViewItem_Log" Name="NavigationViewItem_Log" />
+                <NavigationViewItem Icon="People" Content="关系人档案"/>
+                <NavigationViewItem Icon="CalendarReply" Content="日志"/>
             </NavigationView.MenuItems>
             <NavigationView.FooterMenuItems>
                 <NavigationViewItem Content="账户" Icon="Contact" />
                 <NavigationViewItem Content="备份" Icon="Clock" />
                 <NavigationViewItem Content="帮助" Icon="Help" />
+                <NavigationViewItem Content="设置" Icon="Setting" />
             </NavigationView.FooterMenuItems>
             <Frame x:Name="contentFrame"/>
         </NavigationView>

ArchivesCenter4/MainWindow.xaml.cs

@@ -43,8 +43,6 @@ namespace ArchivesCenter4
         {
             var selecteditem = (NavigationViewItem)args.SelectedItem;
             string selected = selecteditem.Content.ToString();
-            if (selected != "×ۺϲéѯ")
-                nv.Header = selected;
             switch (selected)
             {
                 case "¿ªÊ¼":

ArchivesCenter4/account.xaml

@@ -6,10 +6,13 @@
     xmlns:local="using:ArchivesCenter4"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    mc:Ignorable="d">
 
     <Grid>
-
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <TextBlock Grid.Row="0" Style="{StaticResource TitleTextBlockStyle}" Text="账户" Margin="36,40,0,0"/>
     </Grid>
 </Page>

ArchivesCenter4/backup.xaml

@@ -10,25 +10,29 @@
 
     <Grid>
         <Grid.RowDefinitions>
+            <RowDefinition Height="auto"/>
             <RowDefinition Height="auto"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
+        <TextBlock Grid.Row="0" Style="{StaticResource TitleTextBlockStyle}" Text="备份" Margin="36,40,0,0"/>
 
-        <CommandBar Grid.Row="0" Background="Transparent" IsOpen="False" Margin="48,16,48,0" DefaultLabelPosition="Right">
+        <CommandBar Grid.Row="1" Background="Transparent" IsOpen="False" Margin="36,0,36,0" DefaultLabelPosition="Right">
             <AppBarButton Icon="NewFolder" Label="新建还原点" Click="AppBarButton_Click_2"/>
             <AppBarButton x:Name="BDel" Icon="Delete" Label="删除还原点" IsEnabled="False" Click="BDel_Click"/>
             <AppBarButton x:Name="BAllDel" Icon="SelectAll" Label="清空还原点" Click="BAllDel_Click"/>
             <AppBarButton Icon="Refresh" Label="刷新" Click="AppBarButton_Click"/>
         </CommandBar>
-        <ListView x:Name="BackupFilesListView" Grid.Row="1" Margin="48,16,48,0" SelectionChanged="BackupFilesListView_SelectionChanged">
-            <ListView.ItemTemplate>
-                <DataTemplate>
-                    <StackPanel>
-                        <TextBlock Text="{Binding FileName}" Style="{StaticResource BodyTextBlockStyle}"/>
-                        <TextBlock Text="{Binding FileSize}" Style="{StaticResource CaptionTextBlockStyle}"/>
-                    </StackPanel>
-                </DataTemplate>
-            </ListView.ItemTemplate>
-        </ListView>
+        <Grid Grid.Row="2" Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" Margin="36,16,36,16" BorderThickness="1" CornerRadius="{StaticResource ControlCornerRadius}" BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}">
+            <ListView x:Name="BackupFilesListView" Grid.Row="2" SelectionChanged="BackupFilesListView_SelectionChanged">
+                <ListView.ItemTemplate>
+                    <DataTemplate>
+                        <StackPanel>
+                            <TextBlock Text="{Binding FileName}" Style="{StaticResource BodyTextBlockStyle}"/>
+                            <TextBlock Text="{Binding FileSize}" Style="{StaticResource CaptionTextBlockStyle}"/>
+                        </StackPanel>
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+            </ListView>
+        </Grid>
     </Grid>
 </Page>

ArchivesCenter4/log.xaml

@@ -6,10 +6,13 @@
     xmlns:local="using:ArchivesCenter4"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    mc:Ignorable="d">
 
     <Grid>
-
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <TextBlock Grid.Row="0" Style="{StaticResource TitleTextBlockStyle}" Text="日志" Margin="36,40,0,0"/>
     </Grid>
 </Page>

ArchivesCenter4/people.xaml

@@ -9,7 +9,12 @@
     mc:Ignorable="d">
 
     <Grid>
-        <Pivot Margin="36,0,0,0">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <TextBlock Grid.Row="0" Style="{StaticResource TitleTextBlockStyle}" Text="关系人档案" Margin="36,40,0,0"/>
+        <Pivot Grid.Row="1" Margin="36,0,0,0">
             <PivotItem Header="列表">
                 <Grid>
                 </Grid>
@@ -21,7 +26,7 @@
                         <RowDefinition Height="auto"/>
                         <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
-                    <CommandBar Grid.ColumnSpan="100" Grid.Row="0" Background="Transparent" IsOpen="False" DefaultLabelPosition="Right" Margin="48,16,16,0">
+                    <CommandBar Grid.ColumnSpan="100" Grid.Row="0" Background="Transparent" IsOpen="False" DefaultLabelPosition="Right" Margin="36,0,36,0">
                         <AppBarButton Icon="NewWindow" Label="新建"/>
                         <AppBarButton Icon="Edit" Label="编辑" IsEnabled="False"/>
                         <AppBarButton Icon="Contact2" Label="更改照片" IsEnabled="False"/>
@@ -45,7 +50,7 @@
                         <TextBlock Grid.Column="1" Grid.Row="0" Margin="0,16,16,0" Style="{StaticResource HeaderTextBlockStyle}" Text="姓名" VerticalAlignment="Center"/>
                     </Grid>
 
-                    <ScrollViewer Grid.Row="2" VerticalScrollBarVisibility="Visible" Margin="0,16,0,0" >
+                    <ScrollViewer Grid.Row="2" VerticalScrollBarVisibility="Visible" Margin="0,16,0,0">
                         <Grid HorizontalAlignment="Stretch">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="auto"/>

ArchivesCenter4/setting.xaml

@@ -9,7 +9,12 @@
     mc:Ignorable="d">
 
     <Grid>
-        <ScrollViewer Margin="0,12,0,0">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <TextBlock Grid.Row="0" Style="{StaticResource TitleTextBlockStyle}" Text="设置" Margin="036,40,0,0"/>
+        <ScrollViewer Grid.Row="1" Margin="0,16,0,0">
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="auto"/>

ArchivesCenter4/sfl.xaml

@@ -6,10 +6,9 @@
     xmlns:local="using:ArchivesCenter4"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    mc:Ignorable="d">
 
     <Grid>
-
+        <TextBlock Style="{StaticResource TitleTextBlockStyle}" Text="日志查询" Margin="36,40,0,0"/>
     </Grid>
 </Page>

ArchivesCenter4/sfp.xaml

@@ -6,10 +6,9 @@
     xmlns:local="using:ArchivesCenter4"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    mc:Ignorable="d">
 
     <Grid>
-
+        <TextBlock Style="{StaticResource TitleTextBlockStyle}" Text="关系人档案查询" Margin="36,40,0,0"/>
     </Grid>
 </Page>

ArchivesCenter4/start.xaml

@@ -9,10 +9,6 @@
     mc:Ignorable="d">
 
     <Grid VerticalAlignment="Top" Margin="36">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="auto" />
-            <ColumnDefinition Width="*" />
-        </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
@@ -22,9 +18,8 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        <TextBlock x:Name="WelcomeTitle" Grid.Column="1" Grid.Row="2" Text="真实客观 有序推进" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="#0078d4" Style="{StaticResource SubtitleTextBlockStyle}" Margin="0,0,0,0"/>
-        <TextBlock x:Name="DatabaseName" Grid.Column="1" Grid.Row="3" Text="dbName0" VerticalAlignment="Center" HorizontalAlignment="Left" Style="{StaticResource BodyStrongTextBlockStyle}" Margin="0,12,0,0"/>
-        <TextBlock x:Name="DatabaseSubtitle" Grid.Column="1" Grid.Row="4" Text="dbName1" VerticalAlignment="Center" HorizontalAlignment="Left" Style="{StaticResource CaptionTextBlockStyle}" Margin="0,12,0,0"/>
-        <TextBlock Grid.Column="1" Grid.Row="6" Text="此数据库中所收集之信息皆应由合法渠道取得。注意保密！" VerticalAlignment="Center" HorizontalAlignment="Left" Style="{StaticResource BodyTextBlockStyle}" Margin="0,16,0,0"/>
+        <TextBlock x:Name="WelcomeTitle" Grid.Row="0" Text="真实客观 有序推进" HorizontalAlignment="Left" Style="{StaticResource DisplayTextBlockStyle}" Margin="36,40,0,0"/>
+        <TextBlock x:Name="DatabaseName" Grid.Row="1" Text="DatabaseName" HorizontalAlignment="Left" Style="{StaticResource TitleLargeTextBlockStyle}" Margin="36,16,0,0"/>
+        <TextBlock x:Name="DatabaseSubtitle" Grid.Row="2" Text="DatabaseSubtitle" VerticalAlignment="Center" HorizontalAlignment="Left" Style="{StaticResource TitleTextBlockStyle}" Margin="36,16,0,0"/>
     </Grid>
 </Page>

ArchivesCenter4/start.xaml.cs

@@ -26,6 +26,9 @@ namespace ArchivesCenter4
         public start()
         {
             this.InitializeComponent();
+            WelcomeTitle.Text = Settings.Default.welcomeTitle;
+            DatabaseName.Text = Settings.Default.dbName;
+            DatabaseSubtitle.Text = Settings.Default.dbSubName;
         }
     }
 }