修复了深色主题的一些显示问题

Planshit · Oct 10, 2020 · c802c24 · c802c24
1 parent 3cfd23c
commit c802c24
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/src/Local/ProjectEye/Properties/AssemblyInfo.cs b/src/Local/ProjectEye/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.3")]
+[assembly: AssemblyVersion("1.3.4")]
 [assembly: AssemblyFileVersion("1.0.0.1")]
diff --git a/src/Local/ProjectEye/Resources/Language/en.xaml b/src/Local/ProjectEye/Resources/Language/en.xaml
@@ -199,5 +199,6 @@
     <sys:String x:Key="Lang_TomatoEnd">End</sys:String>
     <sys:String x:Key="Lang_TomatoWorkfinishTip3">Ready go,focus on your job,i will remind you at the end,are you ready?</sys:String>
     <sys:String x:Key="Lang_Remainingtime">Remaining time</sys:String>
+    <sys:String x:Key="Lang_Tomatodescription2">The Pomodoro Technique is a time management method developed by Francesco Cirillo in the late 1980s.The technique uses a timer to break down work into intervals, traditionally 25 minutes in length, separated by short breaks. Each interval is known as a pomodoro, from the Italian word for 'tomato', after the tomato-shaped kitchen timer that Cirillo used as a university student.</sys:String>
 
 </ResourceDictionary>
diff --git a/src/Local/ProjectEye/Resources/Language/zh.xaml b/src/Local/ProjectEye/Resources/Language/zh.xaml
@@ -205,6 +205,7 @@
     <sys:String x:Key="Lang_TomatoEnd">结束</sys:String>
     <sys:String x:Key="Lang_TomatoWorkfinishTip3">准备开始，请保持专注工作，我会在结束时提醒你，准备好了吗？</sys:String>
     <sys:String x:Key="Lang_Remainingtime">剩余时间</sys:String>
+    <sys:String x:Key="Lang_Tomatodescription2">番茄工作法（Pomodoro Technique）是一种时间管理法，在1980年代由Francesco Cirillo创立。该方法使用一个定时器来分割出一个一般为25分钟的工作时间和5分钟的休息时间，而那些时间段被称为pomodoros，为意大利语单词 pomodoro（中文：番茄）之复数。</sys:String>
 
 
 </ResourceDictionary>
diff --git a/src/Local/ProjectEye/Resources/Themes/Dark/Chart/ChartItem.xaml b/src/Local/ProjectEye/Resources/Themes/Dark/Chart/ChartItem.xaml
@@ -8,7 +8,7 @@
     <Color x:Key="hoverForeground">#4f6bed</Color>-->
     <Style TargetType="{x:Type controls:ChartItem}">
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Width" Value="20" />
+        <Setter Property="Width" Value="30" />
         <Setter Property="Cursor" Value="Hand" />
         <Setter Property="ItemColor" Value="#4f6bed"/>
         <Setter Property="Foreground" Value="#9e9ea7"/>

diff --git a/src/Local/ProjectEye/Resources/Themes/Dark/DatePicker/DatePicker.xaml b/src/Local/ProjectEye/Resources/Themes/Dark/DatePicker/DatePicker.xaml
@@ -42,14 +42,14 @@
                                     </Grid.ColumnDefinitions>
                                     <Grid>
                                         <StackPanel>
-                                            <TextBlock Text="年份" FontWeight="Bold" FontSize="14" Foreground="{DynamicResource FontBrush}"/>
+                                            <TextBlock Text="{DynamicResource Lang_Year}" FontWeight="Bold" FontSize="14" Foreground="{DynamicResource FontBrush}"/>
                                             <controls:ItemList x:Name="YearsList" Margin="0,5,0,0"/>
                                         </StackPanel>
 
                                     </Grid>
                                     <Grid Grid.Column="1">
                                         <StackPanel>
-                                            <TextBlock Text="月份" FontWeight="Bold" FontSize="14" Foreground="{DynamicResource FontBrush}"/>
+                                            <TextBlock Text="{DynamicResource Lang_Monthly}" FontWeight="Bold" FontSize="14" Foreground="{DynamicResource FontBrush}"/>
                                             <controls:ItemList x:Name="MonthsList" Margin="0,5,0,0"/>
                                         </StackPanel>
 
@@ -78,7 +78,7 @@
                             <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
                                 <TextBlock FontFamily="/Project1.UI;component/Assets/IconFonts/#Fabric External MDL2 Assets" Text="&#xEE93;" VerticalAlignment="Center"  FontSize="14" TextAlignment="Center" Foreground="#37363d"/>
                                 <TextBlock Margin="5,0,0,0" VerticalAlignment="Center" FontSize="14" FontWeight="Bold" Grid.Column="1" Foreground="#37363d">
-                                <Run Text="{TemplateBinding SelectedYear,Converter={StaticResource StringConverter}}"/><Run Text="年"/> <Run Text="{TemplateBinding SelectedMonth,Converter={StaticResource StringConverter}}"/><Run Text="月"/>
+                                <Run Text="{TemplateBinding SelectedYear,Converter={StaticResource StringConverter}}"/> <Run Text="/"/> <Run Text="{TemplateBinding SelectedMonth,Converter={StaticResource StringConverter}}"/>
                                 </TextBlock>
                             </StackPanel>
 

diff --git a/src/Local/ProjectEye/Views/OptionsWindow.xaml b/src/Local/ProjectEye/Views/OptionsWindow.xaml
@@ -603,10 +603,10 @@
                          <Run Text="{DynamicResource Lang_Feedback}"/> <Hyperlink  Command="{Binding openurlCommand}"
                                       CommandParameter="https://github.com/Planshit/ProjectEye/issues">https://github.com/Planshit/ProjectEye/issues</Hyperlink>
                         </TextBlock>
-                        <TextBlock TextWrapping="Wrap" Margin="0,10,0,0">
+                        <!--<TextBlock TextWrapping="Wrap" Margin="0,10,0,0">
                          <Run Text="{DynamicResource Lang_Developers}"/> <Hyperlink  Command="{Binding openurlCommand}"
                                       CommandParameter="http://thelittlepandaisbehind.com">http://thelittlepandaisbehind.com</Hyperlink>
-                        </TextBlock>
+                        </TextBlock>-->
                     </StackPanel>
                 </ScrollViewer>
             </TabItem>

diff --git a/src/Local/ProjectEye/Views/StatisticWindow.xaml b/src/Local/ProjectEye/Views/StatisticWindow.xaml
@@ -341,7 +341,7 @@
                                     </Grid>
                                 </Border>
 
-                                <TextBlock Text="番茄工作法（Pomodoro Technique）是一种时间管理法，在1980年代由Francesco Cirillo创立。该方法使用一个定时器来分割出一个一般为25分钟的工作时间和5分钟的休息时间，而那些时间段被称为pomodoros，为意大利语单词 pomodoro（中文：番茄）之复数。" TextWrapping="Wrap" Margin="0,20,0,0" />
+                                <TextBlock Text="{DynamicResource Lang_Tomatodescription2}" TextWrapping="Wrap" Margin="0,20,0,0" />
                             </StackPanel>
                         </ScrollViewer>
                     </Grid>