diff --git a/osrepodbmgr.Eto/ChangeLog b/osrepodbmgr.Eto/ChangeLog index cb02985..4127a9c 100644 --- a/osrepodbmgr.Eto/ChangeLog +++ b/osrepodbmgr.Eto/ChangeLog @@ -1,3 +1,9 @@ +2017-05-19 Natalia Portillo + + * dlgAdd.xeto.cs: + * frmMain.xeto.cs: + Corrected delegate. + 2017-05-19 Natalia Portillo * dlgAdd.xeto: diff --git a/osrepodbmgr.Eto/dlgAdd.xeto.cs b/osrepodbmgr.Eto/dlgAdd.xeto.cs index 9fecc01..61de022 100644 --- a/osrepodbmgr.Eto/dlgAdd.xeto.cs +++ b/osrepodbmgr.Eto/dlgAdd.xeto.cs @@ -100,7 +100,7 @@ namespace osrepodbmgr.Eto #pragma warning restore 0649 #endregion XAML UI elements - public delegate void OnAddedOSDelegate(DBEntry os, bool existsInRepo, string pathInRepo); + public delegate void OnAddedOSDelegate(DBEntry os); public event OnAddedOSDelegate OnAddedOS; public dlgAdd() @@ -850,13 +850,7 @@ namespace osrepodbmgr.Eto // TODO: Update OS table if(OnAddedOS != null) - OnAddedOS(Context.dbInfo, true, System.IO.Path.Combine(osrepodbmgr.Core.Settings.Current.RepositoryPath, - Context.dbInfo.mdid[0].ToString(), - Context.dbInfo.mdid[1].ToString(), - Context.dbInfo.mdid[2].ToString(), - Context.dbInfo.mdid[3].ToString(), - Context.dbInfo.mdid[4].ToString(), - Context.dbInfo.mdid) + ".zip"); + OnAddedOS(Context.dbInfo); lblProgress.Visible = false; prgProgress.Visible = false; diff --git a/osrepodbmgr.Eto/frmMain.xeto.cs b/osrepodbmgr.Eto/frmMain.xeto.cs index e93b913..1f344c8 100644 --- a/osrepodbmgr.Eto/frmMain.xeto.cs +++ b/osrepodbmgr.Eto/frmMain.xeto.cs @@ -336,7 +336,7 @@ namespace osrepodbmgr.Eto protected void OnBtnAddClicked(object sender, EventArgs e) { dlgAdd _dlgAdd = new dlgAdd(); - _dlgAdd.OnAddedOS += (os, existsInRepo, pathInRepo) => + _dlgAdd.OnAddedOS += (os) => { lstOSes.Add(new DBEntryForEto(os)); }; diff --git a/osrepodbmgr/ChangeLog b/osrepodbmgr/ChangeLog index bc5eda1..c0e3efe 100644 --- a/osrepodbmgr/ChangeLog +++ b/osrepodbmgr/ChangeLog @@ -1,3 +1,9 @@ +2017-05-19 Natalia Portillo + + * dlgAdd.cs: + * frmMain.cs: + Corrected delegate. + 2017-05-19 Natalia Portillo * dlgAdd.cs: diff --git a/osrepodbmgr/dlgAdd.cs b/osrepodbmgr/dlgAdd.cs index 1445cf3..f595240 100644 --- a/osrepodbmgr/dlgAdd.cs +++ b/osrepodbmgr/dlgAdd.cs @@ -52,7 +52,7 @@ public partial class dlgAdd : Dialog ListStore osView; int knownFiles; - public delegate void OnAddedOSDelegate(DBEntry os, bool existsInRepo, string pathInRepo); + public delegate void OnAddedOSDelegate(DBEntry os); public event OnAddedOSDelegate OnAddedOS; public dlgAdd() @@ -828,13 +828,7 @@ public partial class dlgAdd : Dialog // TODO: Update OS table if(OnAddedOS != null) - OnAddedOS(Context.dbInfo, true, System.IO.Path.Combine(osrepodbmgr.Core.Settings.Current.RepositoryPath, - Context.dbInfo.mdid[0].ToString(), - Context.dbInfo.mdid[1].ToString(), - Context.dbInfo.mdid[2].ToString(), - Context.dbInfo.mdid[3].ToString(), - Context.dbInfo.mdid[4].ToString(), - Context.dbInfo.mdid) + ".zip"); + OnAddedOS(Context.dbInfo); prgProgress.Visible = false; btnClose.Sensitive = true; diff --git a/osrepodbmgr/frmMain.cs b/osrepodbmgr/frmMain.cs index c8a1aab..3bd7738 100644 --- a/osrepodbmgr/frmMain.cs +++ b/osrepodbmgr/frmMain.cs @@ -259,9 +259,8 @@ namespace osrepodbmgr protected void OnBtnAddClicked(object sender, EventArgs e) { dlgAdd _dlgAdd = new dlgAdd(); - _dlgAdd.OnAddedOS += (os, existsInRepo, pathInRepo) => + _dlgAdd.OnAddedOS += (os) => { - string color = existsInRepo ? "green" : "red"; osView.AppendValues(os.developer, os.product, os.version, os.languages, os.architecture, os.machine, os.format, os.description, os.oem, os.upgrade, os.update, os.source, os.files, os.netinstall, os.id, os.mdid);