Skip to content

Commit

Permalink
Merge branch 'release/2.33.33.33'
Browse files Browse the repository at this point in the history
  • Loading branch information
tautcony committed Mar 23, 2019
2 parents 6e75092 + f0889f5 commit 5965774
Show file tree
Hide file tree
Showing 64 changed files with 2,595 additions and 2,236 deletions.
4 changes: 4 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -361,3 +361,7 @@
## [2.33.33.32]
- 改进DVD章节读取
- 输出无BOM的QPF文件

## [2.33.33.33]
- 我始终致力于开发新功能、错误修正及效能改进。请即时更新至最新版本以取得最佳的验证体验
- 增加时间与帧数编辑功能
8 changes: 4 additions & 4 deletions Time_Shift/ChapterData/IData.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using ChapterTool.Util;

namespace ChapterTool.ChapterData
namespace ChapterTool.ChapterData
{
using ChapterTool.Util;

public interface IData// : IEnumerable<ChapterInfo>
{
int Count { get; }
Expand All @@ -10,6 +10,6 @@ public interface IData// : IEnumerable<ChapterInfo>

string ChapterType { get; }

//event Action<string> OnLog;
// event Action<string> OnLog;
}
}
19 changes: 10 additions & 9 deletions Time_Shift/Controls/HiLightTextBox.cs
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
using System;
using System.Drawing;
using System.Windows.Forms;
using System.ComponentModel;
using System.Collections.Generic;
using System.Text.RegularExpressions;

namespace ChapterTool.Controls
namespace ChapterTool.Controls
{
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Text.RegularExpressions;
using System.Windows.Forms;

public struct Pattern
{
public Regex PatRegex { set; get; }

public Color PatColor { set; get; }

public Pattern(string pat, Color color)
Expand Down Expand Up @@ -58,7 +59,7 @@ private void HighLight(object sender, DoWorkEventArgs e)
};
text.SelectionLength = text.Text.Length;
text.SelectionColor = OriginalColor;
text.SelectionFont = Font;// new Font("Consolas", 9, FontStyle.Regular);
text.SelectionFont = Font; // new Font("Consolas", 9, FontStyle.Regular);

foreach (var pattern in _patterns)
{
Expand Down
9 changes: 3 additions & 6 deletions Time_Shift/Controls/cTextBox.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// ****************************************************************************
using System;
using System.Windows.Forms;

namespace ChapterTool.Controls
{
using System;
using System.Windows.Forms;

public class cTextBox : TextBox
{
// Methods
Expand Down Expand Up @@ -57,7 +57,4 @@ protected override void OnKeyDown(KeyEventArgs e)
}
}
}



}
97 changes: 47 additions & 50 deletions Time_Shift/Forms/Form1.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 5965774

Please sign in to comment.