mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 22:42:38 +01:00
whitespace cleanup
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@705 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
parent
a0d8750eb1
commit
c1331c286a
@ -102,7 +102,7 @@ namespace Nikse.SubtitleEdit.Logic
|
|||||||
Instance._dataDir = BaseDirectory;
|
Instance._dataDir = BaseDirectory;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
string installerPath = GetInstallerPath();
|
string installerPath = GetInstallerPath();
|
||||||
string pf = System.Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles).TrimEnd('\\');
|
string pf = System.Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles).TrimEnd('\\');
|
||||||
string appDataRoamingPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Subtitle Edit");
|
string appDataRoamingPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Subtitle Edit");
|
||||||
|
@ -36,7 +36,7 @@ namespace Nikse.SubtitleEdit.Logic
|
|||||||
|
|
||||||
info = TryReadVideoInfoViaMp4(fileName);
|
info = TryReadVideoInfoViaMp4(fileName);
|
||||||
if (info.Success)
|
if (info.Success)
|
||||||
return info;
|
return info;
|
||||||
|
|
||||||
return new VideoInfo { VideoCodec = "Unknown" };
|
return new VideoInfo { VideoCodec = "Unknown" };
|
||||||
}
|
}
|
||||||
@ -530,7 +530,7 @@ namespace Nikse.SubtitleEdit.Logic
|
|||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Will try to determine if buffer is utf-8 encoded or not.
|
/// Will try to determine if buffer is utf-8 encoded or not.
|
||||||
/// If any non-utf8 sequences are found then false is returned, if no utf8 multibytes sequences are found then false is returned.
|
/// If any non-utf8 sequences are found then false is returned, if no utf8 multibytes sequences are found then false is returned.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private static bool IsUtf8(byte[] buffer)
|
private static bool IsUtf8(byte[] buffer)
|
||||||
{
|
{
|
||||||
@ -567,7 +567,7 @@ namespace Nikse.SubtitleEdit.Logic
|
|||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
if (utf8Count == 0)
|
if (utf8Count == 0)
|
||||||
return false; // not utf-8
|
return false; // not utf-8
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -1096,7 +1096,7 @@ namespace Nikse.SubtitleEdit.Logic
|
|||||||
sb.Append("*.mp4;"); // mp4 video files (can contain subtitles)
|
sb.Append("*.mp4;"); // mp4 video files (can contain subtitles)
|
||||||
sb.Append("*.m4v;"); // mp4 video files (can contain subtitles)
|
sb.Append("*.m4v;"); // mp4 video files (can contain subtitles)
|
||||||
sb.Append("*.mkv;"); // matroska files (can contain subtitles)
|
sb.Append("*.mkv;"); // matroska files (can contain subtitles)
|
||||||
sb.Append("*.sup;"); // blu-ray sup
|
sb.Append("*.sup;"); // blu-ray sup
|
||||||
sb.Append("*.son"); // SON text/tif
|
sb.Append("*.son"); // SON text/tif
|
||||||
sb.Append("|" + Configuration.Settings.Language.General.AllFiles + "|*.*");
|
sb.Append("|" + Configuration.Settings.Language.General.AllFiles + "|*.*");
|
||||||
return sb.ToString();
|
return sb.ToString();
|
||||||
@ -1295,7 +1295,7 @@ namespace Nikse.SubtitleEdit.Logic
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
catch (ArgumentException)
|
catch (ArgumentException)
|
||||||
{ // BAD PATTERN: Syntax error
|
{ // BAD PATTERN: Syntax error
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
@ -2047,7 +2047,7 @@ namespace Nikse.SubtitleEdit.Logic
|
|||||||
break;
|
break;
|
||||||
case "":
|
case "":
|
||||||
sb.Append("");
|
sb.Append("");
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
code = code.TrimStart('#');
|
code = code.TrimStart('#');
|
||||||
if (code.StartsWith("x") || code.StartsWith("X"))
|
if (code.StartsWith("x") || code.StartsWith("X"))
|
||||||
@ -2060,7 +2060,7 @@ namespace Nikse.SubtitleEdit.Logic
|
|||||||
sb.Append(Convert.ToChar(value));
|
sb.Append(Convert.ToChar(value));
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (IsInteger(code))
|
else if (IsInteger(code))
|
||||||
@ -2100,7 +2100,7 @@ namespace Nikse.SubtitleEdit.Logic
|
|||||||
|
|
||||||
internal static bool IsWordInUserPhrases(List<string> userPhraseList, int index, string[] words)
|
internal static bool IsWordInUserPhrases(List<string> userPhraseList, int index, string[] words)
|
||||||
{
|
{
|
||||||
string current = words[index];
|
string current = words[index];
|
||||||
string prev = "-";
|
string prev = "-";
|
||||||
if (index > 0)
|
if (index > 0)
|
||||||
prev = words[index-1];
|
prev = words[index-1];
|
||||||
@ -2169,6 +2169,6 @@ namespace Nikse.SubtitleEdit.Logic
|
|||||||
|
|
||||||
return resultKeys;
|
return resultKeys;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -41,4 +41,4 @@
|
|||||||
<dpiAware>true</dpiAware>
|
<dpiAware>true</dpiAware>
|
||||||
</asmv3:windowsSettings>
|
</asmv3:windowsSettings>
|
||||||
</asmv3:application>
|
</asmv3:application>
|
||||||
</assembly>
|
</assembly>
|
@ -1173,7 +1173,7 @@ COPY /Y /V "$(ProjectDir)Dlls\Hunspellx64.dll" "$(TargetDir)"
|
|||||||
COPY /Y /V "$(ProjectDir)Dlls\Interop.QuartzTypeLib.dll" "$(TargetDir)"
|
COPY /Y /V "$(ProjectDir)Dlls\Interop.QuartzTypeLib.dll" "$(TargetDir)"
|
||||||
</PostBuildEvent>
|
</PostBuildEvent>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||||
Other similar extension points exist, see Microsoft.Common.targets.
|
Other similar extension points exist, see Microsoft.Common.targets.
|
||||||
<Target Name="BeforeBuild">
|
<Target Name="BeforeBuild">
|
||||||
</Target>
|
</Target>
|
||||||
|
@ -74,7 +74,7 @@
|
|||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||||
Other similar extension points exist, see Microsoft.Common.targets.
|
Other similar extension points exist, see Microsoft.Common.targets.
|
||||||
<Target Name="BeforeBuild">
|
<Target Name="BeforeBuild">
|
||||||
</Target>
|
</Target>
|
||||||
|
Loading…
Reference in New Issue
Block a user