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