ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow editing subtitles and comments from PlayMovie 

also resolve a TODO in regards to TasMovie disposing
This commit is contained in:
Morilli 2024-06-10 03:48:32 +02:00
parent efc6674215
commit 0165b5f286
5 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/BizHawk.Client.EmuHawk/movie/EditCommentsForm.Designer.cs generated
View File

@ -109,6 +109,7 @@
this.Name = "EditCommentsForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Edit Comments";
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.OnClosed);
this.Load += new System.EventHandler(this.EditCommentsForm_Load);
((System.ComponentModel.ISupportInitialize)(this.CommentGrid)).EndInit();
this.ResumeLayout(false);

12
src/BizHawk.Client.EmuHawk/movie/EditCommentsForm.cs
View File

@ -12,13 +12,15 @@ namespace BizHawk.Client.EmuHawk
private readonly bool _readOnly;
private string _lastHeaderClicked;
private bool _sortReverse;
private readonly bool _dispose;
public EditCommentsForm(IMovie movie, bool readOnly)
public EditCommentsForm(IMovie movie, bool readOnly, bool disposeOnClose = false)
{
_movie = movie;
_readOnly = readOnly;
_lastHeaderClicked = "";
_sortReverse = false;
_dispose = disposeOnClose;
InitializeComponent();
Icon = Properties.Resources.TAStudioIcon;
@ -99,5 +101,13 @@ namespace BizHawk.Client.EmuHawk
_sortReverse = !_sortReverse;
CommentGrid.Refresh();
}
private void OnClosed(object sender, FormClosedEventArgs e)
{
if (_dispose && _movie is ITasMovie tasMovie)
{
tasMovie.Dispose();
}
}
}
}

1
src/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.Designer.cs generated
View File

@ -199,6 +199,7 @@
this.Name = "EditSubtitlesForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Edit Subtitles";
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.OnClosed);
this.Load += new System.EventHandler(this.EditSubtitlesForm_Load);
((System.ComponentModel.ISupportInitialize)(this.SubGrid)).EndInit();
this.ResumeLayout(false);

12
src/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.cs
View File

@ -17,14 +17,16 @@ namespace BizHawk.Client.EmuHawk
private readonly IMovie _selectedMovie;
private readonly bool _readOnly;
private readonly bool _dispose;
public IDialogController DialogController { get; }
public EditSubtitlesForm(IDialogController dialogController, IMovie movie, PathEntryCollection pathEntries, bool readOnly)
public EditSubtitlesForm(IDialogController dialogController, IMovie movie, PathEntryCollection pathEntries, bool readOnly, bool disposeOnClose = false)
{
_pathEntries = pathEntries;
_selectedMovie = movie;
_readOnly = readOnly;
_dispose = disposeOnClose;
DialogController = dialogController;
InitializeComponent();
Icon = Properties.Resources.TAStudioIcon;
@ -271,5 +273,13 @@ namespace BizHawk.Client.EmuHawk
}
}
}
private void OnClosed(object sender, FormClosedEventArgs e)
{
if (_dispose && _selectedMovie is ITasMovie tasMovie)
{
tasMovie.Dispose();
}
}
}
}

6
src/BizHawk.Client.EmuHawk/movie/PlayMovie.cs
View File

@ -525,8 +525,7 @@ namespace BizHawk.Client.EmuHawk
// TODO this will allocate unnecessary memory when this movie is a TasMovie due to TasStateManager
var movie = _movieSession.Get(_movieList[MovieView.SelectedIndices[0]].Filename);
movie.Load();
// TODO movie should be disposed if movie is ITasMovie
var form = new EditCommentsForm(movie, _movieSession.ReadOnly);
var form = new EditCommentsForm(movie, readOnly: false, disposeOnClose: true);
form.Show();
}
}
@ -539,8 +538,7 @@ namespace BizHawk.Client.EmuHawk
// TODO this will allocate unnecessary memory when this movie is a TasMovie due to TasStateManager
var movie = _movieSession.Get(_movieList[MovieView.SelectedIndices[0]].Filename);
movie.Load();
// TODO movie should be disposed if movie is ITasMovie
var form = new EditSubtitlesForm(DialogController, movie, _config.PathEntries, readOnly: true);
var form = new EditSubtitlesForm(DialogController, movie, _config.PathEntries, readOnly: false, disposeOnClose: true);
form.Show();
}
}