Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion IAGrim/UI/Popups/ImportExport/ImportExportContainer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,13 @@ namespace IAGrim.UI.Popups.ImportExport {
partial class ImportExportContainer : Form {
private readonly GDTransferFile[] _modFilter;
private readonly IPlayerItemDao _playerItemDao;
private readonly Action _itemViewUpdateTrigger;

public ImportExportContainer(GDTransferFile[] modFilter, IPlayerItemDao playerItemDao) {
public ImportExportContainer(GDTransferFile[] modFilter, IPlayerItemDao playerItemDao, Action itemViewUpdateTrigger) {
InitializeComponent();
this._modFilter = modFilter;
this._playerItemDao = playerItemDao;
this._itemViewUpdateTrigger = itemViewUpdateTrigger;
}

private void ImportExportContainer_Load(object sender, EventArgs e) {
Expand All @@ -31,6 +33,7 @@ private void ImportExportContainer_Load(object sender, EventArgs e) {
_modFilter,
_playerItemDao,
contentPanel.Controls,
_itemViewUpdateTrigger,
() => this.Close()
), contentPanel);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,26 @@ partial class ImportExportModePicker : Form {
private readonly Control.ControlCollection parentContainer;
private readonly IPlayerItemDao playerItemDao;
private readonly GDTransferFile[] modFilter;
private readonly Action itemViewUpdateTrigger;
private readonly Action onClose;

public ImportExportModePicker(
GDTransferFile[] modFilter,
IPlayerItemDao playerItemDao,
Control.ControlCollection parentContainer,
Action itemViewUpdateTrigger,
Action onClose
) {
InitializeComponent();
this.modFilter = modFilter;
this.playerItemDao = playerItemDao;
this.parentContainer = parentContainer;
this.itemViewUpdateTrigger = itemViewUpdateTrigger;
this.onClose = onClose;
}

private void buttonImport_Click(object sender, EventArgs e) {
var form = new ImportMode(modFilter, playerItemDao) { TopLevel = false };
var form = new ImportMode(modFilter, playerItemDao, itemViewUpdateTrigger, onClose) { TopLevel = false };
parentContainer.Add(form);
parentContainer.Remove(this);
form.Show();
Expand Down
8 changes: 7 additions & 1 deletion IAGrim/UI/Popups/ImportExport/Panels/ImportMode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,17 @@ partial class ImportMode : Form {
private static readonly ILog Logger = LogManager.GetLogger(typeof(ImportMode));
private readonly GDTransferFile[] _modSelection;
private readonly IPlayerItemDao _playerItemDao;
private readonly Action _itemViewUpdateTrigger;
private readonly Action _onClose;
private string? _filename;
private volatile bool isLocked = false;

public ImportMode(GDTransferFile[] modSelection, IPlayerItemDao playerItemDao) {
public ImportMode(GDTransferFile[] modSelection, IPlayerItemDao playerItemDao, Action itemViewUpdateTrigger, Action onClose) {
InitializeComponent();
this._modSelection = modSelection;
this._playerItemDao = playerItemDao;
this._itemViewUpdateTrigger = itemViewUpdateTrigger;
this._onClose = onClose;
}

private void ImportMode_Load(object sender, EventArgs e) {
Expand Down Expand Up @@ -155,6 +159,8 @@ private void buttonImport_Click(object sender, EventArgs e) {
MessageBoxButtons.OK,
MessageBoxIcon.Information
);
_itemViewUpdateTrigger?.Invoke();
_onClose();
});

t.Start();
Expand Down
2 changes: 1 addition & 1 deletion IAGrim/UI/Tabs/SettingsWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ private void buttonLanguageSelect_Click(object sender, EventArgs e) {


private void buttonImportExport_Click(object sender, EventArgs e) {
new Popups.ImportExport.ImportExportContainer(_modFilter, _playerItemDao)
new Popups.ImportExport.ImportExportContainer(_modFilter, _playerItemDao, _itemViewUpdateTrigger)
.ShowDialog();
}

Expand Down