Merge branch 'release/2.33.33.2'

.travis.yml

@@ -0,0 +1,5 @@
+language: csharp
+solution: Time_Shift.sln
+install:
+    - nuget restore Time_Shift.sln
+

ChangeLog.md

@@ -339,3 +339,10 @@
 - mpls增加追加功能
 - 低版本.Net运行时增加更新提示
 - 新增flac parser可获得更多flac相关信息（虽然是ATI用的
+
+## [2.33.33.2]
+- 错误修正与效能提升
+- 修正内封cue的读取
+- 增加json输出格式
+- 增加对高分屏的支持
+- 增加对UHD原盘基础支持

Time_Shift/App.config

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
+    </startup>
+    <appSettings>
+        <add key="EnableWindowsFormsHighDpiAutoResizing" value="true"/>
+    </appSettings>
+</configuration>

Time_Shift/ChapterData/IData.cs

@@ -1,4 +1,5 @@
-using ChapterTool.Util;
+using System;
+using ChapterTool.Util;
 
 namespace ChapterTool.ChapterData
 {
@@ -9,5 +10,7 @@ public interface IData// : IEnumerable<ChapterInfo>
         ChapterInfo this[int index] { get; }
 
         string ChapterType { get; }
+
+        //event Action<string> OnLog;
     }
 }

Time_Shift/Controls/HiLightTextBox.cs

@@ -39,7 +39,7 @@ public void AddPattern(Pattern pattern)
 
         protected override void OnTextChanged(EventArgs e)
         {
-            BackgroundWorker worker = new BackgroundWorker();
+            var worker = new BackgroundWorker();
             worker.DoWork += HighLight;
             worker.RunWorkerAsync(Rtf);
             worker.RunWorkerCompleted += (sender, args) => Rtf = args.Result as string;
@@ -51,7 +51,7 @@ private void HighLight(object sender, DoWorkEventArgs e)
         {
             try
             {
-                RichTextBox text = new RichTextBox
+                var text = new RichTextBox
                 {
                     Rtf = e.Argument as string,
                     SelectionStart = 0

Time_Shift/Controls/cTextBox.cs

@@ -45,8 +45,8 @@ protected override void OnKeyDown(KeyEventArgs e)
                 }
                 else if (e.Alt && e.KeyCode == Keys.A)
                 {
-                    int totalLine = GetLineFromCharIndex(Text.Length);
-                    int charIndex = GetFirstCharIndexFromLine(totalLine / 2);
+                    var totalLine = GetLineFromCharIndex(Text.Length);
+                    var charIndex = GetFirstCharIndexFromLine(totalLine / 2);
                     Select(charIndex, Text.Length);
                 }
                 e.Handled = true;