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

ASSA style manager: jump to current line style - thx Leon :)

Browse Source 
Fix #5194
This commit is contained in:
niksedk 2021-07-11 22:31:32 +02:00
parent d655a4f8f7
commit 314f10dd8a
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/ui/Forms/Assa/Styles.cs
View File

@ -56,7 +56,7 @@ namespace Nikse.SubtitleEdit.Forms.Assa
private ListView ActiveListView => _fileStyleActive ? listViewStyles : listViewStorage;
public Styles(Subtitle subtitle, SubtitleFormat format, Main mainForm)
public Styles(Subtitle subtitle, SubtitleFormat format, Main mainForm, string currentStyleName)
{
UiUtil.PreInitialize(this);
InitializeComponent();
@ -296,7 +296,7 @@ namespace Nikse.SubtitleEdit.Forms.Assa
buttonOK.Text = LanguageSettings.Current.General.Ok;
buttonCancel.Text = LanguageSettings.Current.General.Cancel;
InitializeStylesListView();
InitializeStylesListView(currentStyleName);
listViewStorage_SelectedIndexChanged(this, EventArgs.Empty);
UiUtil.FixLargeFonts(this, buttonCancel);
@ -638,7 +638,7 @@ namespace Nikse.SubtitleEdit.Forms.Assa
privateFontCollection.Dispose();
}
private void InitializeStylesListView()
private void InitializeStylesListView(string currentStyleName)
{
if (_currentFileStyles.Count == 0)
{
@ -646,12 +646,22 @@ namespace Nikse.SubtitleEdit.Forms.Assa
}
listViewStyles.Items.Clear();
var selectionSet = false;
foreach (var style in _currentFileStyles)
{
AddStyle(listViewStyles, style, _subtitle, _isSubStationAlpha);
if (style.Name == currentStyleName)
{
listViewStyles.Items[listViewStyles.Items.Count - 1].Selected = true;
selectionSet = true;
}
else
{
listViewStyles.Items[listViewStyles.Items.Count - 1].Selected = false;
}
}
if (listViewStyles.Items.Count > 0)
if (listViewStyles.Items.Count > 0 && !selectionSet)
{
listViewStyles.Items[0].Selected = true;
}
@ -1466,7 +1476,7 @@ namespace Nikse.SubtitleEdit.Forms.Assa
if (listViewStyles.Items.Count == 0)
{
InitializeStylesListView();
InitializeStylesListView(string.Empty);
}
UpdateSelectedIndices(listViewStyles);
@ -1486,7 +1496,7 @@ namespace Nikse.SubtitleEdit.Forms.Assa
listViewStyles.Items.Clear();
_currentFileStyles.Clear();
InitializeStylesListView();
InitializeStylesListView(string.Empty);
UpdateSelectedIndices(listViewStyles);
}

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

@ -27934,7 +27934,9 @@ namespace Nikse.SubtitleEdit.Forms
var formatType = format.GetType();
if (formatType == typeof(AdvancedSubStationAlpha))
{
using (var assaStyles = new Assa.Styles(_subtitle, format, this))
var p = _subtitle.GetParagraphOrDefault(FirstSelectedIndex);
var currentStyleName = p == null ? string.Empty : p.Extra;
using (var assaStyles = new Assa.Styles(_subtitle, format, this, currentStyleName))
{
if (assaStyles.ShowDialog(this) == DialogResult.OK)
{