mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-28 06:52:35 +01:00
Run tabspace.
This commit is contained in:
parent
f44470eec7
commit
cd29dad020
@ -792,12 +792,12 @@ namespace Nikse.SubtitleEdit.Controls
|
||||
|
||||
int curIdx = _subtitle.Paragraphs.IndexOf(_mouseDownParagraph);
|
||||
if (_mouseDownParagraphType == MouseDownParagraphType.Start)
|
||||
{
|
||||
{
|
||||
if (curIdx > 0)
|
||||
{
|
||||
var prev = _subtitle.Paragraphs[curIdx - 1];
|
||||
if (prev.EndTime.TotalMilliseconds + Configuration.Settings.General.MininumMillisecondsBetweenLines < milliseconds)
|
||||
_mouseDownParagraph.StartTime.TotalMilliseconds = milliseconds;
|
||||
_mouseDownParagraph.StartTime.TotalMilliseconds = milliseconds;
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -949,7 +949,7 @@ namespace Nikse.SubtitleEdit.Controls
|
||||
}
|
||||
}
|
||||
if (prev != null)
|
||||
_wholeParagraphMinMilliseconds = prev.EndTime.TotalMilliseconds + Configuration.Settings.General.MininumMillisecondsBetweenLines;
|
||||
_wholeParagraphMinMilliseconds = prev.EndTime.TotalMilliseconds + Configuration.Settings.General.MininumMillisecondsBetweenLines;
|
||||
if (next != null)
|
||||
_wholeParagraphMaxMilliseconds = next.StartTime.TotalMilliseconds - Configuration.Settings.General.MininumMillisecondsBetweenLines;
|
||||
}
|
||||
@ -1155,7 +1155,7 @@ namespace Nikse.SubtitleEdit.Controls
|
||||
{
|
||||
double seconds = XPositionToSeconds(e.X);
|
||||
int milliseconds = (int)(seconds * 1000.0);
|
||||
|
||||
|
||||
if (_firstMove && Math.Abs(oldMouseMoveLastX - e.X) < Configuration.Settings.General.MininumMillisecondsBetweenLines && GetParagraphAtMilliseconds(milliseconds) == null)
|
||||
return; // do not decide which paragraph to move yet
|
||||
|
||||
|
@ -7800,7 +7800,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
currentParagraph.Text += Environment.NewLine + nextParagraph.Text.Replace(Environment.NewLine, " ");
|
||||
currentParagraph.Text = ChangeAllLinesItalictoSingleItalic(currentParagraph.Text);
|
||||
|
||||
if (old1.Contains(Environment.NewLine) || old2.Contains(Environment.NewLine) ||
|
||||
if (old1.Contains(Environment.NewLine) || old2.Contains(Environment.NewLine) ||
|
||||
old1.Length > Configuration.Settings.General.SubtitleLineMaximumLength || old2.Length > Configuration.Settings.General.SubtitleLineMaximumLength)
|
||||
currentParagraph.Text = Utilities.AutoBreakLine(currentParagraph.Text);
|
||||
}
|
||||
|
@ -975,7 +975,7 @@
|
||||
public string PluginXExecuted { get; set; }
|
||||
public string NotAValidXSubFile { get; set; }
|
||||
public string BeforeMergeLinesWithSameText { get; set; }
|
||||
public string ImportTimeCodesDifferentNumberOfLinesWarning { get; set; }
|
||||
public string ImportTimeCodesDifferentNumberOfLinesWarning { get; set; }
|
||||
public string ParsingTransportStream { get; set; }
|
||||
public string ErrorLoadIdx { get; set; }
|
||||
public string ErrorLoadRar { get; set; }
|
||||
|
@ -7,7 +7,7 @@ namespace UpdateAssemblyInfo
|
||||
{
|
||||
|
||||
private static string GetGitPath()
|
||||
{
|
||||
{
|
||||
string p = Path.Combine(Environment.GetEnvironmentVariable("ProgramFiles"), @"Git\bin\git.exe");
|
||||
if (File.Exists(p))
|
||||
return p;
|
||||
@ -28,7 +28,7 @@ namespace UpdateAssemblyInfo
|
||||
if (File.Exists(p))
|
||||
return p;
|
||||
|
||||
return "git";
|
||||
return "git";
|
||||
}
|
||||
|
||||
private static void DoUpdateAssembly(string source, string gitHash, string template, string target)
|
||||
@ -80,7 +80,7 @@ namespace UpdateAssemblyInfo
|
||||
DoUpdateAssembly("[REVNO]", "0", target, target);
|
||||
}
|
||||
catch
|
||||
{
|
||||
{
|
||||
}
|
||||
|
||||
Console.WriteLine("Error running Git");
|
||||
@ -91,8 +91,8 @@ namespace UpdateAssemblyInfo
|
||||
" - template: " + template + Environment.NewLine +
|
||||
" - target: " + target);
|
||||
}
|
||||
return 1;
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -2,7 +2,7 @@
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
// General Information about an assembly is controlled through the following
|
||||
// General Information about an assembly is controlled through the following
|
||||
// set of attributes. Change these attribute values to modify the information
|
||||
// associated with an assembly.
|
||||
[assembly: AssemblyTitle("UpdateAssemblyDescription")]
|
||||
@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
// Setting ComVisible to false makes the types in this assembly not visible
|
||||
// to COM components. If you need to access a type in this assembly from
|
||||
// Setting ComVisible to false makes the types in this assembly not visible
|
||||
// to COM components. If you need to access a type in this assembly from
|
||||
// COM, set the ComVisible attribute to true on that type.
|
||||
[assembly: ComVisible(false)]
|
||||
|
||||
@ -25,11 +25,11 @@ using System.Runtime.InteropServices;
|
||||
// Version information for an assembly consists of the following four values:
|
||||
//
|
||||
// Major Version
|
||||
// Minor Version
|
||||
// Minor Version
|
||||
// Build Number
|
||||
// Revision
|
||||
//
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.0.0.0")]
|
||||
|
Loading…
Reference in New Issue
Block a user