Narvaling
/
OliviaAddInPro
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Arreglos comenzar ejecución

Elena/develop
Elena 2022-02-17 00:14:36 +01:00
parent 1c1e4c95aa
commit 04cc22e6f4
4 changed files with 45 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Model/OliviaGlob.cs
View File

@ -120,11 +120,11 @@ namespace OliviaAddInPro.Model
{
HelperGlobal.ponMsg(resp.Error.First());
}
/*resp = comprueba_dlls();
resp = comprueba_dlls();
if (!resp.Value && resp.HasError)
{
HelperGlobal.ponMsg(resp.Error.First());
}*/
}
}
public static bool IsLimp()
@ -282,8 +282,13 @@ namespace OliviaAddInPro.Model
//comprueba utiles.dll
dll = "utiles.dll";
//path_dll_dest = Path.Combine(System.IO.Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName), dll);
path_dll_dest = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, dll);
//path_dll_dest = Path.Combine(System.IO.Path.GetDirectoryName(System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName), dll);
//path_dll_dest = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, dll);
//path_dll_dest = Path.Combine(System.Reflection.Assembly.GetExecutingAssembly().Location, dll);
//path_dll_dest = Path.Combine(System.Windows.Application.Current.StartupUri.AbsoluteUri, dll);
//path_dll_dest=System.Reflection.Assembly.GetEntryAssembly().CodeBase;
//path_dll_dest = System.Reflection.AssemblyName.GetAssemblyName();
path_dll_dest = Path.Combine(System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location), dll);
if (!File.Exists(path_dll_dest))
{
resp.Error.Add("No se encuentran las librerías necesarias, compruebe la instalación");
@ -301,6 +306,33 @@ namespace OliviaAddInPro.Model
}
}
public static void finEjecuta(OliviaAddInPro.Model.ComunDef.TareaRes res)
{
progrDialog.Hide();
if (res.Errores)
{
HelperGlobal.ponMsg(res.msg);
}
else
{
HelperGlobal.ponMsg(Resource1.String_exito);
}
//tiene que hacer delegate finEjecuta2()
}
public static void finEjecuta2()
{
//muestra la ventana
ShowHidePane(true);
//importa resultados
//borra los archivos que le toca borrar
//pone modo config2
}
/**
* Inicializa los nombres por defecto de las variables, para debug por si no hay instalador
*/

6
ViewModel/Limpieza/PaneLimpiezaViewModel.cs
View File

@ -178,7 +178,9 @@ namespace OliviaAddInPro
string err = "";
OliviaGlob.progrDialog.Show();
OliviaGlob.progrDialog.Show();
//oculta la ventana
OliviaGlob.ShowHidePane(false);
if (!Lee(out err))
{
@ -186,7 +188,7 @@ namespace OliviaAddInPro
return;
}
Action<TareaRes> ac = finEjecuta;
Action<TareaRes> ac = OliviaGlob.finEjecuta;
OliviaGlob.Limp.EjecutaAsync(modo, ac);
}
}

13
ViewModel/PanelViewModelBase.cs
View File

@ -125,19 +125,6 @@ namespace OliviaAddInPro
return true;
}
public void finEjecuta(OliviaAddInPro.Model.ComunDef.TareaRes res)
{
OliviaGlob.progrDialog.Hide();
if (res.Errores)
{
HelperGlobal.ponMsg(res.msg);
}
else
{
HelperGlobal.ponMsg(Resource1.String_exito);
}
}
}
//******************************************************

7
ViewModel/Recogida/PaneRecogidaViewModel.cs
View File

@ -224,14 +224,17 @@ namespace OliviaAddInPro
public void Ejecuta(OliviaAddInPro.Services.ModosEjec modo)
{
string err = "";
OliviaGlob.progrDialog.Show();
OliviaGlob.progrDialog.Show();
//oculta la ventana
OliviaGlob.ShowHidePane(false);
if (!Lee(out err))
{
HelperGlobal.ponMsg(err);
return;
}
Action<TareaRes> ac = finEjecuta;
Action<TareaRes> ac = OliviaGlob.finEjecuta;
OliviaGlob.Reco.EjecutaAsync(modo, ac);
}
}