Commit cce3af5b by Pascal Bigot

--no commit message

parent db9fb3c5
......@@ -43,6 +43,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CtrlCnxManager", "CtrlCnxMa
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CtrlDataComp", "CtrlDataComp\CtrlDataComp.csproj", "{355EAEA7-3E28-40C6-8086-817ACDE4F1FD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SmartAppUpdater", "SmartAppUpdater\SmartAppUpdater.csproj", "{A3DF3670-EF60-48AD-A28D-3DABE0655844}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
BuildLang|Any CPU = BuildLang|Any CPU
......@@ -587,6 +589,31 @@ Global
{355EAEA7-3E28-40C6-8086-817ACDE4F1FD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{355EAEA7-3E28-40C6-8086-817ACDE4F1FD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{355EAEA7-3E28-40C6-8086-817ACDE4F1FD}.Release|Win32.ActiveCfg = Release|Any CPU
{A3DF3670-EF60-48AD-A28D-3DABE0655844}.BuildLang|Any CPU.ActiveCfg = Release|Any CPU
{A3DF3670-EF60-48AD-A28D-3DABE0655844}.BuildLang|Any CPU.Build.0 = Release|Any CPU
{A3DF3670-EF60-48AD-A28D-3DABE0655844}.BuildLang|Mixed Platforms.ActiveCfg = Release|Any CPU
{A3DF3670-EF60-48AD-A28D-3DABE0655844}.BuildLang|Mixed Platforms.Build.0 = Release|Any CPU
{A3DF3670-EF60-48AD-A28D-3DABE0655844}.BuildLang|Win32.ActiveCfg = Release|Any CPU
{A3DF3670-EF60-48AD-A28D-3DABE0655844}.Debug Cmd|Any CPU.ActiveCfg = Debug|Any CPU
{A3DF3670-EF60-48AD-A28D-3DABE0655844}.Debug Cmd|Any CPU.Build.0 = Debug|Any CPU
{A3DF3670-EF60-48AD-A28D-3DABE0655844}.Debug Cmd|Mixed Platforms.ActiveCfg = Debug|Any CPU
{A3DF3670-EF60-48AD-A28D-3DABE0655844}.Debug Cmd|Mixed Platforms.Build.0 = Debug|Any CPU
{A3DF3670-EF60-48AD-A28D-3DABE0655844}.Debug Cmd|Win32.ActiveCfg = Debug|Any CPU
{A3DF3670-EF60-48AD-A28D-3DABE0655844}.Debug Test|Any CPU.ActiveCfg = Debug|Any CPU
{A3DF3670-EF60-48AD-A28D-3DABE0655844}.Debug Test|Any CPU.Build.0 = Debug|Any CPU
{A3DF3670-EF60-48AD-A28D-3DABE0655844}.Debug Test|Mixed Platforms.ActiveCfg = Debug|Any CPU
{A3DF3670-EF60-48AD-A28D-3DABE0655844}.Debug Test|Mixed Platforms.Build.0 = Debug|Any CPU
{A3DF3670-EF60-48AD-A28D-3DABE0655844}.Debug Test|Win32.ActiveCfg = Debug|Any CPU
{A3DF3670-EF60-48AD-A28D-3DABE0655844}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A3DF3670-EF60-48AD-A28D-3DABE0655844}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A3DF3670-EF60-48AD-A28D-3DABE0655844}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{A3DF3670-EF60-48AD-A28D-3DABE0655844}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{A3DF3670-EF60-48AD-A28D-3DABE0655844}.Debug|Win32.ActiveCfg = Debug|Any CPU
{A3DF3670-EF60-48AD-A28D-3DABE0655844}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A3DF3670-EF60-48AD-A28D-3DABE0655844}.Release|Any CPU.Build.0 = Release|Any CPU
{A3DF3670-EF60-48AD-A28D-3DABE0655844}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{A3DF3670-EF60-48AD-A28D-3DABE0655844}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{A3DF3670-EF60-48AD-A28D-3DABE0655844}.Release|Win32.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......
......@@ -283,7 +283,7 @@ namespace CommonLib
case DATA_SIZE.DATA_SIZE_1B:
m_numUDMax.Maximum = 1;
m_numUDMax.Minimum = 0;
m_numUDMax.Maximum = 1;
m_numUDMin.Maximum = 1;
m_numUDMin.Minimum = 0;
m_numUDDefault.Maximum = 1;
m_numUDDefault.Minimum = 0;
......@@ -294,7 +294,7 @@ namespace CommonLib
case DATA_SIZE.DATA_SIZE_2B:
m_numUDMax.Maximum = 3;
m_numUDMax.Minimum = 0;
m_numUDMax.Maximum = 3;
m_numUDMin.Maximum = 3;
m_numUDMin.Minimum = 0;
m_numUDDefault.Maximum = 3;
m_numUDDefault.Minimum = 0;
......@@ -305,7 +305,7 @@ namespace CommonLib
case DATA_SIZE.DATA_SIZE_4B:
m_numUDMax.Maximum = 15;
m_numUDMax.Minimum = 0;
m_numUDMax.Maximum = 15;
m_numUDMin.Maximum = 15;
m_numUDMin.Minimum = 0;
m_numUDDefault.Maximum = 15;
m_numUDDefault.Minimum = 0;
......@@ -316,7 +316,7 @@ namespace CommonLib
case DATA_SIZE.DATA_SIZE_8B:
m_numUDMax.Maximum = 255;
m_numUDMax.Minimum = 0;
m_numUDMax.Maximum = 255;
m_numUDMin.Maximum = 255;
m_numUDMin.Minimum = 0;
m_numUDDefault.Maximum = 255;
m_numUDDefault.Minimum = 0;
......@@ -327,7 +327,7 @@ namespace CommonLib
case DATA_SIZE.DATA_SIZE_16B:
m_numUDMax.Maximum = 32767;
m_numUDMax.Minimum = -32768;
m_numUDMax.Maximum = 32767;
m_numUDMin.Maximum = 32767;
m_numUDMin.Minimum = -32768;
m_numUDDefault.Maximum = 32767;
m_numUDDefault.Minimum = -32768;
......@@ -338,7 +338,7 @@ namespace CommonLib
case DATA_SIZE.DATA_SIZE_16BU:
m_numUDMax.Maximum = 0xFFFF;
m_numUDMax.Minimum = 0;
m_numUDMax.Maximum = 0xFFFF;
m_numUDMin.Maximum = 0xFFFF;
m_numUDMin.Minimum = 0;
m_numUDDefault.Maximum = 0xFFFF;
m_numUDDefault.Minimum = 0;
......@@ -348,7 +348,7 @@ namespace CommonLib
case DATA_SIZE.DATA_SIZE_32B:
m_numUDMax.Maximum = int.MaxValue;
m_numUDMax.Minimum = int.MinValue;
m_numUDMax.Maximum = int.MaxValue;
m_numUDMin.Maximum = int.MaxValue;
m_numUDMin.Minimum = int.MinValue;
m_numUDDefault.Maximum = int.MaxValue;
m_numUDDefault.Minimum = int.MinValue;
......
......@@ -1086,6 +1086,9 @@
<Content Include="SmartAppSln.ico">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Include="postUpdateCopy.bat">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<Content Include="ToDo.txt" />
</ItemGroup>
<ItemGroup>
......
......@@ -233,7 +233,7 @@ namespace SmartApp.Ihm
/// affiche une message box à l'utilisateur demandant la sauvegarde
/// si la solution à été modifiée
/// </summary>
private void SolutionAskUserToSaveIfIsModified()
private bool SolutionAskUserToSaveIfIsModified()
{
if (m_GestSolution != null)
{
......@@ -244,13 +244,15 @@ namespace SmartApp.Ihm
{
SolutionSave(false);
UpdateTitle();
return true;
}
if (res == DialogResult.Cancel)
{
return;
return false;
}
}
}
return true;
}
/// <summary>
......@@ -402,10 +404,12 @@ namespace SmartApp.Ihm
}
else
{
SolutionAskUserToSaveIfIsModified();
SolutionClose();
SolutionOpen(filename);
m_mruStripMenu.SetFirstFile(number);
if (SolutionAskUserToSaveIfIsModified())
{
SolutionClose();
SolutionOpen(filename);
m_mruStripMenu.SetFirstFile(number);
}
}
}
#endregion
......@@ -876,9 +880,11 @@ namespace SmartApp.Ihm
private void menuItemOpenSolution_Click(object sender, EventArgs e)
{
SolutionAskUserToSaveIfIsModified();
SolutionClose();
this.SolutionOpen(null);
if (SolutionAskUserToSaveIfIsModified())
{
SolutionClose();
this.SolutionOpen(null);
}
}
private void menuItemAddProj_emptyProject_Click(object sender, EventArgs e)
......@@ -934,9 +940,11 @@ namespace SmartApp.Ihm
private void toolBarItemOpenSolution_Click(object sender, EventArgs e)
{
SolutionAskUserToSaveIfIsModified();
SolutionClose();
SolutionOpen(null);
if (SolutionAskUserToSaveIfIsModified())
{
SolutionClose();
SolutionOpen(null);
}
}
private void toolBarItemSaveAll_Click(object sender, EventArgs e)
......
......@@ -6,7 +6,7 @@
<ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{A3DF3670-EF60-48AD-A28D-3DABE0655844}</ProjectGuid>
<OutputType>WinExe</OutputType>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SmartAppUpdater</RootNamespace>
<AssemblyName>SmartAppUpdater</AssemblyName>
......@@ -54,4 +54,7 @@
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PostBuildEvent>$(TargetPath) -GenerateVersFile</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
@echo off
set /a count = 0
:boucle
set /a count = count + 1
if %count%==10000 goto finboucle
goto boucle
:finboucle
FORFILES /p "%CD%\tmpUpdate" /C "cmd /c copy @path %CD%\@file"
FORFILES /p "%CD%\tmpUpdate" /C "cmd /c del @path"
@echo on
@echo OK
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment