Merge branch 'Gerardo/Arreglos_compilacion' into develop
commit
3d1d41036a
|
|
@ -57,7 +57,7 @@ namespace OliviaAddInPro.Model
|
||||||
if (Serv.ErrStr.Length > 0)
|
if (Serv.ErrStr.Length > 0)
|
||||||
msg = Serv.ErrStr;
|
msg = Serv.ErrStr;
|
||||||
else
|
else
|
||||||
msg="Han ocurrido errores al comenzar la ejeción."
|
msg = "Han ocurrido errores al comenzar la ejeción.";
|
||||||
HelperGlobal.ponMsg(msg);
|
HelperGlobal.ponMsg(msg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -146,10 +146,10 @@
|
||||||
<Compile Include="ViewModel\Configuracion\PaneConfigViewModel.cs" />
|
<Compile Include="ViewModel\Configuracion\PaneConfigViewModel.cs" />
|
||||||
<Compile Include="ViewModel\OptionsMenuItem.cs" />
|
<Compile Include="ViewModel\OptionsMenuItem.cs" />
|
||||||
<Compile Include="ViewModel\PaneEjecutarViewModel.cs" />
|
<Compile Include="ViewModel\PaneEjecutarViewModel.cs" />
|
||||||
<Compile Include="ViewModel\PaneLimpiezaSub4ViewModel.cs" />
|
<Compile Include="ViewModel\Limpieza\PaneLimpiezaSub4ViewModel.cs" />
|
||||||
<Compile Include="ViewModel\PaneLimpiezaSub3ViewModel.cs" />
|
<Compile Include="ViewModel\Limpieza\PaneLimpiezaSub3ViewModel.cs" />
|
||||||
<Compile Include="ViewModel\PaneLimpiezaSub2ViewModel.cs" />
|
<Compile Include="ViewModel\Limpieza\PaneLimpiezaSub2ViewModel.cs" />
|
||||||
<Compile Include="ViewModel\PaneLimpiezaViewModel.cs" />
|
<Compile Include="ViewModel\Limpieza\PaneLimpiezaViewModel.cs" />
|
||||||
<Compile Include="ViewModel\PanelViewModelBase.cs" />
|
<Compile Include="ViewModel\PanelViewModelBase.cs" />
|
||||||
<Compile Include="View\Configuracion\DockPaneConfig.xaml.cs">
|
<Compile Include="View\Configuracion\DockPaneConfig.xaml.cs">
|
||||||
<DependentUpon>DockPaneConfig.xaml</DependentUpon>
|
<DependentUpon>DockPaneConfig.xaml</DependentUpon>
|
||||||
|
|
@ -160,26 +160,26 @@
|
||||||
<Compile Include="View\PaneEjecutar.xaml.cs">
|
<Compile Include="View\PaneEjecutar.xaml.cs">
|
||||||
<DependentUpon>PaneEjecutar.xaml</DependentUpon>
|
<DependentUpon>PaneEjecutar.xaml</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="View\PaneLimpiezaSub4.xaml.cs">
|
<Compile Include="View\Limpieza\PaneLimpiezaSub4.xaml.cs">
|
||||||
<DependentUpon>PaneLimpiezaSub4.xaml</DependentUpon>
|
<DependentUpon>PaneLimpiezaSub4.xaml</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="View\PaneLimpiezaSub3.xaml.cs">
|
<Compile Include="View\Limpieza\PaneLimpiezaSub3.xaml.cs">
|
||||||
<DependentUpon>PaneLimpiezaSub3.xaml</DependentUpon>
|
<DependentUpon>PaneLimpiezaSub3.xaml</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="View\PaneLimpiezaSub2.xaml.cs">
|
<Compile Include="View\Limpieza\PaneLimpiezaSub2.xaml.cs">
|
||||||
<DependentUpon>PaneLimpiezaSub2.xaml</DependentUpon>
|
<DependentUpon>PaneLimpiezaSub2.xaml</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="View\PaneLimpiezaSub1.xaml.cs">
|
<Compile Include="View\Limpieza\PaneLimpiezaSub1.xaml.cs">
|
||||||
<DependentUpon>PaneLimpiezaSub1.xaml</DependentUpon>
|
<DependentUpon>PaneLimpiezaSub1.xaml</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="ViewModel\PaneLimpiezaSub1ViewModel.cs" />
|
<Compile Include="ViewModel\Limpieza\PaneLimpiezaSub1ViewModel.cs" />
|
||||||
<Compile Include="View\PaneLimpieza.xaml.cs">
|
<Compile Include="View\Limpieza\PaneLimpieza.xaml.cs">
|
||||||
<DependentUpon>PaneLimpieza.xaml</DependentUpon>
|
<DependentUpon>PaneLimpieza.xaml</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="View\DockpaneLimpieza.xaml.cs">
|
<Compile Include="View\Limpieza\DockpaneLimpieza.xaml.cs">
|
||||||
<DependentUpon>DockpaneLimpieza.xaml</DependentUpon>
|
<DependentUpon>DockpaneLimpieza.xaml</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="ViewModel\DockpaneLimpiezaViewModel.cs" />
|
<Compile Include="ViewModel\Limpieza\DockpaneLimpiezaViewModel.cs" />
|
||||||
<Compile Include="View\DockpaneRecogida.xaml.cs">
|
<Compile Include="View\DockpaneRecogida.xaml.cs">
|
||||||
<DependentUpon>DockpaneRecogida.xaml</DependentUpon>
|
<DependentUpon>DockpaneRecogida.xaml</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
|
@ -229,27 +229,27 @@
|
||||||
<Generator>MSBuild:Compile</Generator>
|
<Generator>MSBuild:Compile</Generator>
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
</Page>
|
</Page>
|
||||||
<Page Include="View\PaneLimpiezaSub4.xaml">
|
<Page Include="View\Limpieza\PaneLimpiezaSub4.xaml">
|
||||||
<Generator>MSBuild:Compile</Generator>
|
<Generator>MSBuild:Compile</Generator>
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
</Page>
|
</Page>
|
||||||
<Page Include="View\PaneLimpiezaSub3.xaml">
|
<Page Include="View\Limpieza\PaneLimpiezaSub3.xaml">
|
||||||
<Generator>MSBuild:Compile</Generator>
|
<Generator>MSBuild:Compile</Generator>
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
</Page>
|
</Page>
|
||||||
<Page Include="View\PaneLimpiezaSub2.xaml">
|
<Page Include="View\Limpieza\PaneLimpiezaSub2.xaml">
|
||||||
<Generator>MSBuild:Compile</Generator>
|
<Generator>MSBuild:Compile</Generator>
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
</Page>
|
</Page>
|
||||||
<Page Include="View\PaneLimpiezaSub1.xaml">
|
<Page Include="View\Limpieza\PaneLimpiezaSub1.xaml">
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
<Generator>MSBuild:Compile</Generator>
|
<Generator>MSBuild:Compile</Generator>
|
||||||
</Page>
|
</Page>
|
||||||
<Page Include="View\PaneLimpieza.xaml">
|
<Page Include="View\Limpieza\PaneLimpieza.xaml">
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
<Generator>MSBuild:Compile</Generator>
|
<Generator>MSBuild:Compile</Generator>
|
||||||
</Page>
|
</Page>
|
||||||
<Page Include="View\DockpaneLimpieza.xaml">
|
<Page Include="View\Limpieza\DockpaneLimpieza.xaml">
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
<Generator>MSBuild:Compile</Generator>
|
<Generator>MSBuild:Compile</Generator>
|
||||||
</Page>
|
</Page>
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@ namespace OliviaAddInPro
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
base.SetProperty(ref conf, value, () => conf);
|
base.SetProperty(ref conf, value, () => conf);
|
||||||
ConfiguracioProperty.Update();
|
//ConfiguracioProperty.Update();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue