diff --git a/Model/Limpieza.cs b/Model/Limpieza.cs index e41f10f..77157ff 100644 --- a/Model/Limpieza.cs +++ b/Model/Limpieza.cs @@ -57,7 +57,7 @@ namespace OliviaAddInPro.Model if (Serv.ErrStr.Length > 0) msg = Serv.ErrStr; else - msg="Han ocurrido errores al comenzar la ejeción." + msg = "Han ocurrido errores al comenzar la ejeción."; HelperGlobal.ponMsg(msg); } } diff --git a/OliviaAddInPro.csproj b/OliviaAddInPro.csproj index 68331e0..356689b 100644 --- a/OliviaAddInPro.csproj +++ b/OliviaAddInPro.csproj @@ -137,8 +137,8 @@ - - + + @@ -146,10 +146,10 @@ - - - - + + + + DockPaneConfig.xaml @@ -160,26 +160,26 @@ PaneEjecutar.xaml - + PaneLimpiezaSub4.xaml - + PaneLimpiezaSub3.xaml - + PaneLimpiezaSub2.xaml - + PaneLimpiezaSub1.xaml - - + + PaneLimpieza.xaml - + DockpaneLimpieza.xaml - + DockpaneRecogida.xaml @@ -229,27 +229,27 @@ MSBuild:Compile Designer - + MSBuild:Compile Designer - + MSBuild:Compile Designer - + MSBuild:Compile Designer - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile diff --git a/View/DockpaneLimpieza.xaml b/View/Limpieza/DockpaneLimpieza.xaml similarity index 100% rename from View/DockpaneLimpieza.xaml rename to View/Limpieza/DockpaneLimpieza.xaml diff --git a/View/DockpaneLimpieza.xaml.cs b/View/Limpieza/DockpaneLimpieza.xaml.cs similarity index 100% rename from View/DockpaneLimpieza.xaml.cs rename to View/Limpieza/DockpaneLimpieza.xaml.cs diff --git a/View/PaneLimpieza.xaml b/View/Limpieza/PaneLimpieza.xaml similarity index 100% rename from View/PaneLimpieza.xaml rename to View/Limpieza/PaneLimpieza.xaml diff --git a/View/PaneLimpieza.xaml.cs b/View/Limpieza/PaneLimpieza.xaml.cs similarity index 100% rename from View/PaneLimpieza.xaml.cs rename to View/Limpieza/PaneLimpieza.xaml.cs diff --git a/View/PaneLimpiezaSub1.xaml b/View/Limpieza/PaneLimpiezaSub1.xaml similarity index 100% rename from View/PaneLimpiezaSub1.xaml rename to View/Limpieza/PaneLimpiezaSub1.xaml diff --git a/View/PaneLimpiezaSub1.xaml.cs b/View/Limpieza/PaneLimpiezaSub1.xaml.cs similarity index 100% rename from View/PaneLimpiezaSub1.xaml.cs rename to View/Limpieza/PaneLimpiezaSub1.xaml.cs diff --git a/View/PaneLimpiezaSub2.xaml b/View/Limpieza/PaneLimpiezaSub2.xaml similarity index 100% rename from View/PaneLimpiezaSub2.xaml rename to View/Limpieza/PaneLimpiezaSub2.xaml diff --git a/View/PaneLimpiezaSub2.xaml.cs b/View/Limpieza/PaneLimpiezaSub2.xaml.cs similarity index 100% rename from View/PaneLimpiezaSub2.xaml.cs rename to View/Limpieza/PaneLimpiezaSub2.xaml.cs diff --git a/View/PaneLimpiezaSub3.xaml b/View/Limpieza/PaneLimpiezaSub3.xaml similarity index 100% rename from View/PaneLimpiezaSub3.xaml rename to View/Limpieza/PaneLimpiezaSub3.xaml diff --git a/View/PaneLimpiezaSub3.xaml.cs b/View/Limpieza/PaneLimpiezaSub3.xaml.cs similarity index 100% rename from View/PaneLimpiezaSub3.xaml.cs rename to View/Limpieza/PaneLimpiezaSub3.xaml.cs diff --git a/View/PaneLimpiezaSub4.xaml b/View/Limpieza/PaneLimpiezaSub4.xaml similarity index 100% rename from View/PaneLimpiezaSub4.xaml rename to View/Limpieza/PaneLimpiezaSub4.xaml diff --git a/View/PaneLimpiezaSub4.xaml.cs b/View/Limpieza/PaneLimpiezaSub4.xaml.cs similarity index 100% rename from View/PaneLimpiezaSub4.xaml.cs rename to View/Limpieza/PaneLimpiezaSub4.xaml.cs diff --git a/ViewModel/Configuracion/PaneConfigViewModel.cs b/ViewModel/Configuracion/PaneConfigViewModel.cs index 225beea..0e18d9e 100644 --- a/ViewModel/Configuracion/PaneConfigViewModel.cs +++ b/ViewModel/Configuracion/PaneConfigViewModel.cs @@ -28,7 +28,7 @@ namespace OliviaAddInPro set { base.SetProperty(ref conf, value, () => conf); - ConfiguracioProperty.Update(); + //ConfiguracioProperty.Update(); } } diff --git a/ViewModel/DockpaneLimpiezaViewModel.cs b/ViewModel/Limpieza/DockpaneLimpiezaViewModel.cs similarity index 100% rename from ViewModel/DockpaneLimpiezaViewModel.cs rename to ViewModel/Limpieza/DockpaneLimpiezaViewModel.cs diff --git a/ViewModel/PaneLimpiezaSub1ViewModel.cs b/ViewModel/Limpieza/PaneLimpiezaSub1ViewModel.cs similarity index 100% rename from ViewModel/PaneLimpiezaSub1ViewModel.cs rename to ViewModel/Limpieza/PaneLimpiezaSub1ViewModel.cs diff --git a/ViewModel/PaneLimpiezaSub2ViewModel.cs b/ViewModel/Limpieza/PaneLimpiezaSub2ViewModel.cs similarity index 100% rename from ViewModel/PaneLimpiezaSub2ViewModel.cs rename to ViewModel/Limpieza/PaneLimpiezaSub2ViewModel.cs diff --git a/ViewModel/PaneLimpiezaSub3ViewModel.cs b/ViewModel/Limpieza/PaneLimpiezaSub3ViewModel.cs similarity index 100% rename from ViewModel/PaneLimpiezaSub3ViewModel.cs rename to ViewModel/Limpieza/PaneLimpiezaSub3ViewModel.cs diff --git a/ViewModel/PaneLimpiezaSub4ViewModel.cs b/ViewModel/Limpieza/PaneLimpiezaSub4ViewModel.cs similarity index 100% rename from ViewModel/PaneLimpiezaSub4ViewModel.cs rename to ViewModel/Limpieza/PaneLimpiezaSub4ViewModel.cs diff --git a/ViewModel/PaneLimpiezaViewModel.cs b/ViewModel/Limpieza/PaneLimpiezaViewModel.cs similarity index 100% rename from ViewModel/PaneLimpiezaViewModel.cs rename to ViewModel/Limpieza/PaneLimpiezaViewModel.cs