Merge branch 'dev' of http://git.kdan.cc:8865/Windows/PDFOffice_Windows_exe into dev

PDF Office/Themes/Generic.xaml

@@ -52,6 +52,7 @@
         <Setter Property="Height" Value="32" />
         <Setter Property="Padding" Value="3,0" />
         <Setter Property="CornerRadius" Value="4" />
+        <Setter Property="AcceptsReturn" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type cus:TextBoxEx}">