Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-28 06:52:35 +01:00
Code Issues Projects Releases Wiki Activity

Work on layout

Browse Source
This commit is contained in:
niksedk 2023-09-16 11:42:57 +02:00
parent adf4691b93
commit 92ffb1dd35
4 changed files with 41 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/libse/Common/Settings.cs
View File

@ -1862,6 +1862,22 @@ $HorzAlign = Center
ContinuationStyle = ContinuationStyle.OnlyTrailingEllipsis,
});
profiles.Add(new RulesProfile
{
Name = "TikTok/YouTube-shorts (9:16)",
SubtitleLineMaximumLength = 20,
MaxNumberOfLines = 2,
MergeLinesShorterThan = 0,
SubtitleMaximumCharactersPerSeconds = 25,
SubtitleOptimalCharactersPerSeconds = 18,
SubtitleMaximumDisplayMilliseconds = 5000,
SubtitleMinimumDisplayMilliseconds = 700,
SubtitleMaximumWordsPerMinute = 300,
CpsLineLengthStrategy = string.Empty,
MinimumMillisecondsBetweenLines = 0,
DialogStyle = DialogType.DashBothLinesWithSpace,
ContinuationStyle = ContinuationStyle.None
});
profiles.Add(new RulesProfile
{
Name = "Arte (German/English)",
SubtitleLineMaximumLength = 40,
@ -2085,22 +2101,6 @@ $HorzAlign = Center
DialogStyle = DialogType.DashBothLinesWithSpace,
ContinuationStyle = ContinuationStyle.None
});
profiles.Add(new RulesProfile
{
Name = "TikTok/YouTube-shorts (9:16)",
SubtitleLineMaximumLength = 20,
MaxNumberOfLines = 2,
MergeLinesShorterThan = 0,
SubtitleMaximumCharactersPerSeconds = 25,
SubtitleOptimalCharactersPerSeconds = 18,
SubtitleMaximumDisplayMilliseconds = 5000,
SubtitleMinimumDisplayMilliseconds = 700,
SubtitleMaximumWordsPerMinute = 300,
CpsLineLengthStrategy = string.Empty,
MinimumMillisecondsBetweenLines = 0,
DialogStyle = DialogType.DashBothLinesWithSpace,
ContinuationStyle = ContinuationStyle.None
});
}
}

14
src/ui/Forms/Main.cs
View File

@ -18686,7 +18686,7 @@ namespace Nikse.SubtitleEdit.Forms
{
SuspendLayout();
splitContainerMain.Hide();
_layout = LayoutManager.ToggleLayout(_layout, Controls, mediaPlayer, SubtitleListview1, groupBoxVideo, groupBoxEdit);
_layout = LayoutManager.ToggleLayout(_layout, Controls, panelVideoPlayer, SubtitleListview1, groupBoxVideo, groupBoxEdit);
ResumeLayout();
}
}
@ -28574,16 +28574,10 @@ namespace Nikse.SubtitleEdit.Forms
Configuration.Settings.General.UndockedVideoPosition = _videoPlayerUndocked.Left + @";" + _videoPlayerUndocked.Top + @";" + _videoPlayerUndocked.Width + @";" + _videoPlayerUndocked.Height;
}
Control control;
if (splitContainer1.Panel2.Controls.Count == 0)
Control control = panelVideoPlayer;
if (control.Parent != null)
{
control = panelVideoPlayer;
groupBoxVideo.Controls.Remove(control);
}
else
{
control = panelVideoPlayer;
splitContainer1.Panel2.Controls.Clear();
control.Parent.Controls.Remove(control);
}
if (control != null)

4
src/ui/Forms/Options/Settings.Designer.cs generated
View File

@ -932,7 +932,7 @@
this.comboBoxRulesProfileName.ButtonForeColor = System.Drawing.SystemColors.ControlText;
this.comboBoxRulesProfileName.ButtonForeColorDown = System.Drawing.Color.Orange;
this.comboBoxRulesProfileName.ButtonForeColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(120)))), ((int)(((byte)(215)))));
this.comboBoxRulesProfileName.DropDownHeight = 400;
this.comboBoxRulesProfileName.DropDownHeight = 420;
this.comboBoxRulesProfileName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBoxRulesProfileName.DropDownWidth = 238;
this.comboBoxRulesProfileName.FormattingEnabled = true;
@ -6564,8 +6564,8 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1092, 574);
this.Controls.Add(this.labelUpdateFileTypeAssociationsStatus);
this.Controls.Add(this.panelSubtitleFormats);
this.Controls.Add(this.panelGeneral);
this.Controls.Add(this.panelSubtitleFormats);
this.Controls.Add(this.panelWaveform);
this.Controls.Add(this.panelShortcuts);
this.Controls.Add(this.panelVideoPlayer);

38
src/ui/Logic/LayoutManager.cs
View File

@ -6,7 +6,7 @@ namespace Nikse.SubtitleEdit.Logic
{
public static class LayoutManager
{
public static int ToggleLayout(int layout, Control.ControlCollection controls, VideoPlayerContainer videoPlayerContainer, SubtitleListView subtitleListView, GroupBox groupBoxWaveform, GroupBox groupBoxEdit)
public static int ToggleLayout(int layout, Control.ControlCollection controls, Control videoPlayer, SubtitleListView subtitleListView, GroupBox groupBoxWaveform, GroupBox groupBoxEdit)
{
layout++;
if (layout > 7 || layout < 0)
@ -14,11 +14,11 @@ namespace Nikse.SubtitleEdit.Logic
layout = 0;
}
SetLayout(layout, controls, videoPlayerContainer, subtitleListView, groupBoxWaveform, groupBoxEdit);
SetLayout(layout, controls, videoPlayer, subtitleListView, groupBoxWaveform, groupBoxEdit);
return layout;
}
public static void SetLayout(int layout, Control.ControlCollection controls, VideoPlayerContainer videoPlayerContainer, SubtitleListView subtitleListView, GroupBox groupBoxWaveform, GroupBox groupBoxEdit)
public static void SetLayout(int layout, Control.ControlCollection controls, Control videoPlayer, SubtitleListView subtitleListView, GroupBox groupBoxWaveform, GroupBox groupBoxEdit)
{
if (layout > 7 || layout < 0)
{
@ -28,33 +28,33 @@ namespace Nikse.SubtitleEdit.Logic
switch (layout)
{
case 0:
SetLayout0(controls, videoPlayerContainer, subtitleListView, groupBoxWaveform, groupBoxEdit);
SetLayout0(controls, videoPlayer, subtitleListView, groupBoxWaveform, groupBoxEdit);
break;
case 1:
SetLayout1(controls, videoPlayerContainer, subtitleListView, groupBoxWaveform, groupBoxEdit);
SetLayout1(controls, videoPlayer, subtitleListView, groupBoxWaveform, groupBoxEdit);
break;
case 2:
SetLayout2(controls, videoPlayerContainer, subtitleListView, groupBoxWaveform, groupBoxEdit);
SetLayout2(controls, videoPlayer, subtitleListView, groupBoxWaveform, groupBoxEdit);
break;
case 3:
SetLayout3(controls, videoPlayerContainer, subtitleListView, groupBoxWaveform, groupBoxEdit);
SetLayout3(controls, videoPlayer, subtitleListView, groupBoxWaveform, groupBoxEdit);
break;
case 4:
SetLayout4(controls, videoPlayerContainer, subtitleListView, groupBoxWaveform, groupBoxEdit);
SetLayout4(controls, videoPlayer, subtitleListView, groupBoxWaveform, groupBoxEdit);
break;
case 5:
SetLayout5(controls, videoPlayerContainer, subtitleListView, groupBoxWaveform, groupBoxEdit);
SetLayout5(controls, videoPlayer, subtitleListView, groupBoxWaveform, groupBoxEdit);
break;
case 6:
SetLayout6(controls, videoPlayerContainer, subtitleListView, groupBoxWaveform, groupBoxEdit);
SetLayout6(controls, videoPlayer, subtitleListView, groupBoxWaveform, groupBoxEdit);
break;
case 7:
SetLayout7(controls, videoPlayerContainer, subtitleListView, groupBoxWaveform, groupBoxEdit);
SetLayout7(controls, videoPlayer, subtitleListView, groupBoxWaveform, groupBoxEdit);
break;
}
}
public static void SetLayout0(Control.ControlCollection controls, VideoPlayerContainer videoPlayerContainer, SubtitleListView subtitleListView, GroupBox groupBoxWaveform, GroupBox groupBoxEdit)
public static void SetLayout0(Control.ControlCollection controls, Control videoPlayerContainer, SubtitleListView subtitleListView, GroupBox groupBoxWaveform, GroupBox groupBoxEdit)
{
var spMain = new SplitContainer();
spMain.Orientation = Orientation.Horizontal;
@ -90,7 +90,7 @@ namespace Nikse.SubtitleEdit.Logic
spMain.BringToFront();
}
public static void SetLayout1(Control.ControlCollection controls, VideoPlayerContainer videoPlayerContainer, SubtitleListView subtitleListView, GroupBox groupBoxWaveform, GroupBox groupBoxEdit)
public static void SetLayout1(Control.ControlCollection controls, Control videoPlayerContainer, SubtitleListView subtitleListView, GroupBox groupBoxWaveform, GroupBox groupBoxEdit)
{
var spMain = new SplitContainer();
spMain.Orientation = Orientation.Horizontal;
@ -126,7 +126,7 @@ namespace Nikse.SubtitleEdit.Logic
spMain.BringToFront();
}
public static void SetLayout2(Control.ControlCollection controls, VideoPlayerContainer videoPlayerContainer, SubtitleListView subtitleListView, GroupBox groupBoxWaveform, GroupBox groupBoxEdit)
public static void SetLayout2(Control.ControlCollection controls, Control videoPlayerContainer, SubtitleListView subtitleListView, GroupBox groupBoxWaveform, GroupBox groupBoxEdit)
{
var spMain = new SplitContainer();
spMain.Orientation = Orientation.Vertical;
@ -164,7 +164,7 @@ namespace Nikse.SubtitleEdit.Logic
spMain.BringToFront();
}
public static void SetLayout3(Control.ControlCollection controls, VideoPlayerContainer videoPlayerContainer, SubtitleListView subtitleListView, GroupBox groupBoxWaveform, GroupBox groupBoxEdit)
public static void SetLayout3(Control.ControlCollection controls, Control videoPlayerContainer, SubtitleListView subtitleListView, GroupBox groupBoxWaveform, GroupBox groupBoxEdit)
{
var spMain = new SplitContainer();
spMain.Orientation = Orientation.Vertical;
@ -202,7 +202,7 @@ namespace Nikse.SubtitleEdit.Logic
spMain.BringToFront();
}
public static void SetLayout4(Control.ControlCollection controls, VideoPlayerContainer videoPlayerContainer, SubtitleListView subtitleListView, GroupBox groupBoxWaveform, GroupBox groupBoxEdit)
public static void SetLayout4(Control.ControlCollection controls, Control videoPlayerContainer, SubtitleListView subtitleListView, GroupBox groupBoxWaveform, GroupBox groupBoxEdit)
{
var spMain = new SplitContainer();
spMain.Orientation = Orientation.Horizontal;
@ -244,7 +244,7 @@ namespace Nikse.SubtitleEdit.Logic
}
// no video player
public static void SetLayout5(Control.ControlCollection controls, VideoPlayerContainer videoPlayerContainer, SubtitleListView subtitleListView, GroupBox groupBoxWaveform, GroupBox groupBoxEdit)
public static void SetLayout5(Control.ControlCollection controls, Control videoPlayerContainer, SubtitleListView subtitleListView, GroupBox groupBoxWaveform, GroupBox groupBoxEdit)
{
var spMain = new SplitContainer();
spMain.Orientation = Orientation.Horizontal;
@ -274,7 +274,7 @@ namespace Nikse.SubtitleEdit.Logic
}
// no waveform
public static void SetLayout6(Control.ControlCollection controls, VideoPlayerContainer videoPlayerContainer, SubtitleListView subtitleListView, GroupBox groupBoxWaveform, GroupBox groupBoxEdit)
public static void SetLayout6(Control.ControlCollection controls, Control videoPlayerContainer, SubtitleListView subtitleListView, GroupBox groupBoxWaveform, GroupBox groupBoxEdit)
{
var spMain = new SplitContainer();
spMain.Orientation = Orientation.Vertical;
@ -302,7 +302,7 @@ namespace Nikse.SubtitleEdit.Logic
}
// no video or waveform
public static void SetLayout7(Control.ControlCollection controls, VideoPlayerContainer videoPlayerContainer, SubtitleListView subtitleListView, GroupBox groupBoxWaveform, GroupBox groupBoxEdit)
public static void SetLayout7(Control.ControlCollection controls, Control videoPlayerContainer, SubtitleListView subtitleListView, GroupBox groupBoxWaveform, GroupBox groupBoxEdit)
{
var spMain = new SplitContainer();
spMain.Orientation = Orientation.Horizontal;