Menu
▾
▴
cinnamon-commit — Source Code Commits
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
(3) |
Apr
|
May
(4) |
Jun
(15) |
Jul
(10) |
Aug
(24) |
Sep
(68) |
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(115) |
Feb
(18) |
Mar
(38) |
Apr
(43) |
May
(132) |
Jun
(66) |
Jul
(134) |
Aug
(88) |
Sep
(109) |
Oct
(127) |
Nov
(104) |
Dec
(50) |
| 2010 |
Jan
(168) |
Feb
(127) |
Mar
(123) |
Apr
(107) |
May
(23) |
Jun
(79) |
Jul
(49) |
Aug
(10) |
Sep
(38) |
Oct
(38) |
Nov
(18) |
Dec
(21) |
| 2011 |
Jan
(51) |
Feb
(26) |
Mar
(104) |
Apr
(64) |
May
(69) |
Jun
(5) |
Jul
(82) |
Aug
(151) |
Sep
(46) |
Oct
(6) |
Nov
(78) |
Dec
(51) |
| 2012 |
Jan
(27) |
Feb
(31) |
Mar
(24) |
Apr
(19) |
May
(16) |
Jun
(13) |
Jul
(14) |
Aug
(8) |
Sep
(29) |
Oct
(34) |
Nov
(24) |
Dec
(8) |
| 2013 |
Jan
(6) |
Feb
(9) |
Mar
(4) |
Apr
(12) |
May
(7) |
Jun
(3) |
Jul
(2) |
Aug
(5) |
Sep
(2) |
Oct
(3) |
Nov
(2) |
Dec
(3) |
| 2014 |
Jan
(2) |
Feb
(3) |
Mar
(3) |
Apr
(1) |
May
(7) |
Jun
|
Jul
(4) |
Aug
(4) |
Sep
(4) |
Oct
(1) |
Nov
(2) |
Dec
(2) |
| 2015 |
Jan
(3) |
Feb
(1) |
Mar
(1) |
Apr
|
May
(3) |
Jun
(2) |
Jul
|
Aug
|
Sep
(2) |
Oct
(1) |
Nov
(3) |
Dec
(1) |
| 2016 |
Jan
(5) |
Feb
(2) |
Mar
(2) |
Apr
(2) |
May
(1) |
Jun
(4) |
Jul
(1) |
Aug
(3) |
Sep
(1) |
Oct
|
Nov
(3) |
Dec
(6) |
| 2017 |
Jan
(3) |
Feb
|
Mar
(4) |
Apr
(6) |
May
(3) |
Jun
(7) |
Jul
(5) |
Aug
(7) |
Sep
(5) |
Oct
(2) |
Nov
(3) |
Dec
(1) |
| 2018 |
Jan
(6) |
Feb
(1) |
Mar
(4) |
Apr
(3) |
May
(1) |
Jun
(5) |
Jul
(2) |
Aug
(2) |
Sep
(13) |
Oct
(11) |
Nov
(7) |
Dec
(3) |
| 2019 |
Jan
(9) |
Feb
(8) |
Mar
(6) |
Apr
(3) |
May
(3) |
Jun
(6) |
Jul
(9) |
Aug
(7) |
Sep
(6) |
Oct
(5) |
Nov
(6) |
Dec
(10) |
| 2020 |
Jan
(2) |
Feb
(5) |
Mar
(9) |
Apr
(9) |
May
(9) |
Jun
(5) |
Jul
(7) |
Aug
(9) |
Sep
(2) |
Oct
(2) |
Nov
(8) |
Dec
(1) |
| 2021 |
Jan
(1) |
Feb
(4) |
Mar
(6) |
Apr
(5) |
May
(7) |
Jun
(1) |
Jul
(3) |
Aug
|
Sep
(5) |
Oct
(9) |
Nov
(5) |
Dec
(5) |
| 2022 |
Jan
(2) |
Feb
(3) |
Mar
(10) |
Apr
(3) |
May
(14) |
Jun
(8) |
Jul
(8) |
Aug
(15) |
Sep
(5) |
Oct
(7) |
Nov
(9) |
Dec
|
| 2023 |
Jan
|
Feb
(4) |
Mar
(14) |
Apr
(2) |
May
(9) |
Jun
(5) |
Jul
(7) |
Aug
(1) |
Sep
(4) |
Oct
(2) |
Nov
(5) |
Dec
(5) |
| 2024 |
Jan
(3) |
Feb
(18) |
Mar
(7) |
Apr
(10) |
May
(8) |
Jun
(14) |
Jul
(8) |
Aug
(16) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
|
From: <bh...@us...> - 2024-09-06 14:51:28
|
Revision: 3804
http://sourceforge.net/p/cinnamon/code/3804
Author: bhorner
Date: 2024-09-06 14:51:26 +0000 (Fri, 06 Sep 2024)
Log Message:
-----------
Important Notice: PROJECTS_MOVED_TO_GITHUB
Added Paths:
-----------
Client/PROJECTS_MOVED_TO_GITHUB.txt
Added: Client/PROJECTS_MOVED_TO_GITHUB.txt
===================================================================
--- Client/PROJECTS_MOVED_TO_GITHUB.txt (rev 0)
+++ Client/PROJECTS_MOVED_TO_GITHUB.txt 2024-09-06 14:51:26 UTC (rev 3804)
@@ -0,0 +1,6 @@
+IMPORTANT NOTICE!
+=================
+
+Cinnamon 4 client software at SourceForge is no longer maintained.
+The code was moved to: https://github.com/boris-horner/cinnamon4-clients.git
+Please use the repository at GitHub.
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2024-08-29 06:57:43
|
Revision: 3803
http://sourceforge.net/p/cinnamon/code/3803
Author: bhorner
Date: 2024-08-29 06:57:42 +0000 (Thu, 29 Aug 2024)
Log Message:
-----------
Simplified code
Modified Paths:
--------------
Client/trunk/Cinnamon4/CAELib/TaskDefinitions/SummaryWriter.cs
Modified: Client/trunk/Cinnamon4/CAELib/TaskDefinitions/SummaryWriter.cs
===================================================================
--- Client/trunk/Cinnamon4/CAELib/TaskDefinitions/SummaryWriter.cs 2024-08-27 13:08:31 UTC (rev 3802)
+++ Client/trunk/Cinnamon4/CAELib/TaskDefinitions/SummaryWriter.cs 2024-08-29 06:57:42 UTC (rev 3803)
@@ -46,7 +46,7 @@
foreach(C4Metaset ms in meta.MetasetsByTypeId[(long)msType.Id])
{
field.SetAttribute("name", fieldEl.GetAttribute("name"));
- foreach (XmlNode fieldValueN in meta.MetasetsByTypeId[(long)msType.Id].First().Content.SelectSingleNode(fieldEl.InnerText))
+ foreach (XmlNode fieldValueN in ms.Content.SelectSingleNode(fieldEl.InnerText))
{
XmlElement value = (XmlElement)field.AppendChild(summary.CreateElement("value"));
value.InnerText = fieldValueN.InnerText;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2024-08-27 13:08:36
|
Revision: 3802
http://sourceforge.net/p/cinnamon/code/3802
Author: bhorner
Date: 2024-08-27 13:08:31 +0000 (Tue, 27 Aug 2024)
Log Message:
-----------
Fixed query generation to work with Cinnamon 4
Modified Paths:
--------------
Client/trunk/Cinnamon4/CDCplusLib/TabControls/SearchEditorNodes/SearchTermIntegerGui.cs
Modified: Client/trunk/Cinnamon4/CDCplusLib/TabControls/SearchEditorNodes/SearchTermIntegerGui.cs
===================================================================
--- Client/trunk/Cinnamon4/CDCplusLib/TabControls/SearchEditorNodes/SearchTermIntegerGui.cs 2024-08-27 11:47:03 UTC (rev 3801)
+++ Client/trunk/Cinnamon4/CDCplusLib/TabControls/SearchEditorNodes/SearchTermIntegerGui.cs 2024-08-27 13:08:31 UTC (rev 3802)
@@ -130,11 +130,11 @@
if (AnyValue)
{
- XmlElement avRqEl = (XmlElement)directParentClauseEl.AppendChild(directParentClauseEl.OwnerDocument.CreateElement("RangeQuery"));
+ XmlElement avRqEl = (XmlElement)directParentClauseEl.AppendChild(directParentClauseEl.OwnerDocument.CreateElement("PointRangeQuery"));
avRqEl.SetAttribute("fieldName", FieldName);
avRqEl.SetAttribute("type", "long");
- avRqEl.SetAttribute("lowerValue", long.MinValue.ToString());
- avRqEl.SetAttribute("upperValue", long.MaxValue.ToString());
+ avRqEl.SetAttribute("lowerTerm", long.MinValue.ToString());
+ avRqEl.SetAttribute("upperTerm", long.MaxValue.ToString());
avRqEl.SetAttribute("lowerInclusive", "true");
avRqEl.SetAttribute("upperInclusive", "true");
}
@@ -152,11 +152,11 @@
}
case SearchEditor.Operators.Less:
{
- XmlElement rqEl = (XmlElement)directParentClauseEl.AppendChild(directParentClauseEl.OwnerDocument.CreateElement("RangeQuery"));
+ XmlElement rqEl = (XmlElement)directParentClauseEl.AppendChild(directParentClauseEl.OwnerDocument.CreateElement("PointRangeQuery"));
rqEl.SetAttribute("fieldName", FieldName);
rqEl.SetAttribute("type", "long");
- rqEl.SetAttribute("lowerValue", long.MinValue.ToString());
- rqEl.SetAttribute("upperValue", long.Parse(vtxtInteger.Text).ToString());
+ rqEl.SetAttribute("lowerTerm", long.MinValue.ToString());
+ rqEl.SetAttribute("upperTerm", long.Parse(vtxtInteger.Text).ToString());
rqEl.SetAttribute("lowerInclusive", "true");
rqEl.SetAttribute("upperInclusive", "false");
break;
@@ -163,11 +163,11 @@
}
case SearchEditor.Operators.LessOrEqual:
{
- XmlElement rqEl = (XmlElement)directParentClauseEl.AppendChild(directParentClauseEl.OwnerDocument.CreateElement("RangeQuery"));
+ XmlElement rqEl = (XmlElement)directParentClauseEl.AppendChild(directParentClauseEl.OwnerDocument.CreateElement("PointRangeQuery"));
rqEl.SetAttribute("fieldName", FieldName);
rqEl.SetAttribute("type", "long");
- rqEl.SetAttribute("lowerValue", long.MinValue.ToString());
- rqEl.SetAttribute("upperValue", long.Parse(vtxtInteger.Text).ToString());
+ rqEl.SetAttribute("lowerTerm", long.MinValue.ToString());
+ rqEl.SetAttribute("upperTerm", long.Parse(vtxtInteger.Text).ToString());
rqEl.SetAttribute("lowerInclusive", "true");
rqEl.SetAttribute("upperInclusive", "true");
break;
@@ -174,11 +174,11 @@
}
case SearchEditor.Operators.Greater:
{
- XmlElement rqEl = (XmlElement)directParentClauseEl.AppendChild(directParentClauseEl.OwnerDocument.CreateElement("RangeQuery"));
+ XmlElement rqEl = (XmlElement)directParentClauseEl.AppendChild(directParentClauseEl.OwnerDocument.CreateElement("PointRangeQuery"));
rqEl.SetAttribute("fieldName", FieldName);
rqEl.SetAttribute("type", "long");
- rqEl.SetAttribute("lowerValue", long.Parse(vtxtInteger.Text).ToString());
- rqEl.SetAttribute("upperValue", long.MaxValue.ToString());
+ rqEl.SetAttribute("lowerTerm", long.Parse(vtxtInteger.Text).ToString());
+ rqEl.SetAttribute("upperTerm", long.MaxValue.ToString());
rqEl.SetAttribute("lowerInclusive", "false");
rqEl.SetAttribute("upperInclusive", "true");
break;
@@ -185,13 +185,13 @@
}
case SearchEditor.Operators.GreaterOrEqual:
{
- XmlElement rqEl = (XmlElement)directParentClauseEl.AppendChild(directParentClauseEl.OwnerDocument.CreateElement("RangeQuery"));
+ XmlElement rqEl = (XmlElement)directParentClauseEl.AppendChild(directParentClauseEl.OwnerDocument.CreateElement("PointRangeQuery"));
rqEl.SetAttribute("fieldName", FieldName);
rqEl.SetAttribute("type", "long");
- rqEl.SetAttribute("lowerValue", long.Parse(vtxtInteger.Text).ToString());
- //rqEl.SetAttribute("upperValue", long.MaxValue.ToString());
+ rqEl.SetAttribute("lowerTerm", long.Parse(vtxtInteger.Text).ToString());
+ rqEl.SetAttribute("upperTerm", long.MaxValue.ToString());
rqEl.SetAttribute("lowerInclusive", "true");
- //rqEl.SetAttribute("upperInclusive", "true");
+ rqEl.SetAttribute("upperInclusive", "true");
break;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2024-08-27 11:47:09
|
Revision: 3801
http://sourceforge.net/p/cinnamon/code/3801
Author: bhorner
Date: 2024-08-27 11:47:03 +0000 (Tue, 27 Aug 2024)
Log Message:
-----------
Integer exact point query fixed (range still missing)
Modified Paths:
--------------
Client/trunk/Cinnamon4/CDCplus/CDCplus.csproj
Client/trunk/Cinnamon4/CDCplusLib/TabControls/SearchEditorNodes/SearchTermIntegerGui.cs
Modified: Client/trunk/Cinnamon4/CDCplus/CDCplus.csproj
===================================================================
--- Client/trunk/Cinnamon4/CDCplus/CDCplus.csproj 2024-08-27 10:14:44 UTC (rev 3800)
+++ Client/trunk/Cinnamon4/CDCplus/CDCplus.csproj 2024-08-27 11:47:03 UTC (rev 3801)
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
+ <TargetFramework>net8.0-windows7.0</TargetFramework>
<LangVersion>latest</LangVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWindowsForms>true</UseWindowsForms>
@@ -20,7 +20,7 @@
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>cinnamon.ico</ApplicationIcon>
- <SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion>
+ <SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Config\**" />
Modified: Client/trunk/Cinnamon4/CDCplusLib/TabControls/SearchEditorNodes/SearchTermIntegerGui.cs
===================================================================
--- Client/trunk/Cinnamon4/CDCplusLib/TabControls/SearchEditorNodes/SearchTermIntegerGui.cs 2024-08-27 10:14:44 UTC (rev 3800)
+++ Client/trunk/Cinnamon4/CDCplusLib/TabControls/SearchEditorNodes/SearchTermIntegerGui.cs 2024-08-27 11:47:03 UTC (rev 3801)
@@ -132,10 +132,11 @@
{
XmlElement avRqEl = (XmlElement)directParentClauseEl.AppendChild(directParentClauseEl.OwnerDocument.CreateElement("RangeQuery"));
avRqEl.SetAttribute("fieldName", FieldName);
- avRqEl.SetAttribute("lowerTerm", "!");
- avRqEl.SetAttribute("upperTerm", new String('\uff80', 20));
- avRqEl.SetAttribute("includeLower", "true");
- avRqEl.SetAttribute("includeUpper", "true");
+ avRqEl.SetAttribute("type", "long");
+ avRqEl.SetAttribute("lowerValue", long.MinValue.ToString());
+ avRqEl.SetAttribute("upperValue", long.MaxValue.ToString());
+ avRqEl.SetAttribute("lowerInclusive", "true");
+ avRqEl.SetAttribute("upperInclusive", "true");
}
else
{
@@ -143,9 +144,10 @@
{
case SearchEditor.Operators.Equals:
{
- XmlElement tqEl = (XmlElement)directParentClauseEl.AppendChild(directParentClauseEl.OwnerDocument.CreateElement("TermQuery"));
+ XmlElement tqEl = (XmlElement)directParentClauseEl.AppendChild(directParentClauseEl.OwnerDocument.CreateElement("ExactPointQuery"));
tqEl.SetAttribute("fieldName", FieldName);
- tqEl.InnerText = int.Parse(vtxtInteger.Text).ToString();
+ tqEl.SetAttribute("type", "long");
+ tqEl.SetAttribute("value", long.Parse(vtxtInteger.Text).ToString());
break;
}
case SearchEditor.Operators.Less:
@@ -152,10 +154,11 @@
{
XmlElement rqEl = (XmlElement)directParentClauseEl.AppendChild(directParentClauseEl.OwnerDocument.CreateElement("RangeQuery"));
rqEl.SetAttribute("fieldName", FieldName);
- rqEl.SetAttribute("lowerTerm", "00000000000000000000");
- rqEl.SetAttribute("upperTerm", int.Parse(vtxtInteger.Text).ToString());
- rqEl.SetAttribute("includeLower", "true");
- rqEl.SetAttribute("includeUpper", "false");
+ rqEl.SetAttribute("type", "long");
+ rqEl.SetAttribute("lowerValue", long.MinValue.ToString());
+ rqEl.SetAttribute("upperValue", long.Parse(vtxtInteger.Text).ToString());
+ rqEl.SetAttribute("lowerInclusive", "true");
+ rqEl.SetAttribute("upperInclusive", "false");
break;
}
case SearchEditor.Operators.LessOrEqual:
@@ -162,10 +165,11 @@
{
XmlElement rqEl = (XmlElement)directParentClauseEl.AppendChild(directParentClauseEl.OwnerDocument.CreateElement("RangeQuery"));
rqEl.SetAttribute("fieldName", FieldName);
- rqEl.SetAttribute("lowerTerm", "00000000000000000000");
- rqEl.SetAttribute("upperTerm", int.Parse(vtxtInteger.Text).ToString());
- rqEl.SetAttribute("includeLower", "true");
- rqEl.SetAttribute("includeUpper", "true");
+ rqEl.SetAttribute("type", "long");
+ rqEl.SetAttribute("lowerValue", long.MinValue.ToString());
+ rqEl.SetAttribute("upperValue", long.Parse(vtxtInteger.Text).ToString());
+ rqEl.SetAttribute("lowerInclusive", "true");
+ rqEl.SetAttribute("upperInclusive", "true");
break;
}
case SearchEditor.Operators.Greater:
@@ -172,10 +176,11 @@
{
XmlElement rqEl = (XmlElement)directParentClauseEl.AppendChild(directParentClauseEl.OwnerDocument.CreateElement("RangeQuery"));
rqEl.SetAttribute("fieldName", FieldName);
- rqEl.SetAttribute("lowerTerm", int.Parse(vtxtInteger.Text).ToString());
- rqEl.SetAttribute("upperTerm", "99999999999999999999");
- rqEl.SetAttribute("includeLower", "false");
- rqEl.SetAttribute("includeUpper", "true");
+ rqEl.SetAttribute("type", "long");
+ rqEl.SetAttribute("lowerValue", long.Parse(vtxtInteger.Text).ToString());
+ rqEl.SetAttribute("upperValue", long.MaxValue.ToString());
+ rqEl.SetAttribute("lowerInclusive", "false");
+ rqEl.SetAttribute("upperInclusive", "true");
break;
}
case SearchEditor.Operators.GreaterOrEqual:
@@ -182,10 +187,11 @@
{
XmlElement rqEl = (XmlElement)directParentClauseEl.AppendChild(directParentClauseEl.OwnerDocument.CreateElement("RangeQuery"));
rqEl.SetAttribute("fieldName", FieldName);
- rqEl.SetAttribute("lowerTerm", int.Parse(vtxtInteger.Text).ToString());
- rqEl.SetAttribute("upperTerm", "99999999999999999999");
- rqEl.SetAttribute("includeLower", "true");
- rqEl.SetAttribute("includeUpper", "true");
+ rqEl.SetAttribute("type", "long");
+ rqEl.SetAttribute("lowerValue", long.Parse(vtxtInteger.Text).ToString());
+ //rqEl.SetAttribute("upperValue", long.MaxValue.ToString());
+ rqEl.SetAttribute("lowerInclusive", "true");
+ //rqEl.SetAttribute("upperInclusive", "true");
break;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2024-08-27 10:14:46
|
Revision: 3800
http://sourceforge.net/p/cinnamon/code/3800
Author: bhorner
Date: 2024-08-27 10:14:44 +0000 (Tue, 27 Aug 2024)
Log Message:
-----------
Set supported OS to Win10 +
Modified Paths:
--------------
Client/trunk/Cinnamon4/CDCplus/CDCplus.csproj
Modified: Client/trunk/Cinnamon4/CDCplus/CDCplus.csproj
===================================================================
--- Client/trunk/Cinnamon4/CDCplus/CDCplus.csproj 2024-08-23 10:37:19 UTC (rev 3799)
+++ Client/trunk/Cinnamon4/CDCplus/CDCplus.csproj 2024-08-27 10:14:44 UTC (rev 3800)
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net8.0-windows7.0</TargetFramework>
+ <TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
<LangVersion>latest</LangVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWindowsForms>true</UseWindowsForms>
@@ -20,6 +20,7 @@
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>cinnamon.ico</ApplicationIcon>
+ <SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Config\**" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2024-08-23 10:37:25
|
Revision: 3799
http://sourceforge.net/p/cinnamon/code/3799
Author: bhorner
Date: 2024-08-23 10:37:19 +0000 (Fri, 23 Aug 2024)
Log Message:
-----------
.net 8 update
Fix in ACL display without write ACL permission
Modified Paths:
--------------
Client/trunk/Cinnamon4/C4Admin/C4Admin.csproj
Client/trunk/Cinnamon4/C4GeneralGui/C4GeneralGui.csproj
Client/trunk/Cinnamon4/C4ObjectApi/C4ObjectApi.csproj
Client/trunk/Cinnamon4/C4ServerConnector/C4ServerConnector.csproj
Client/trunk/Cinnamon4/CAE/CAE.csproj
Client/trunk/Cinnamon4/CAELib/CAELib.csproj
Client/trunk/Cinnamon4/CDCplus/CDCplus.csproj
Client/trunk/Cinnamon4/CDCplusLib/CDCplusLib.csproj
Client/trunk/Cinnamon4/CDCplusLib/TabControls/PermissionsTabControl.cs
Client/trunk/Cinnamon4/ChangeTrigger/ChangeTrigger.csproj
Client/trunk/Cinnamon4/ChangeTriggerLib/ChangeTriggerLib.csproj
Client/trunk/Cinnamon4/ContentAwareness/ContentAwareness.csproj
Modified: Client/trunk/Cinnamon4/C4Admin/C4Admin.csproj
===================================================================
--- Client/trunk/Cinnamon4/C4Admin/C4Admin.csproj 2024-08-22 10:44:12 UTC (rev 3798)
+++ Client/trunk/Cinnamon4/C4Admin/C4Admin.csproj 2024-08-23 10:37:19 UTC (rev 3799)
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net7.0-windows</TargetFramework>
+ <TargetFramework>net8.0-windows7.0</TargetFramework>
<Nullable>enable</Nullable>
<UseWindowsForms>true</UseWindowsForms>
<ImplicitUsings>enable</ImplicitUsings>
Modified: Client/trunk/Cinnamon4/C4GeneralGui/C4GeneralGui.csproj
===================================================================
--- Client/trunk/Cinnamon4/C4GeneralGui/C4GeneralGui.csproj 2024-08-22 10:44:12 UTC (rev 3798)
+++ Client/trunk/Cinnamon4/C4GeneralGui/C4GeneralGui.csproj 2024-08-23 10:37:19 UTC (rev 3799)
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net7.0-windows</TargetFramework>
+ <TargetFramework>net8.0-windows7.0</TargetFramework>
<LangVersion>latest</LangVersion>
<OutputType>Library</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
Modified: Client/trunk/Cinnamon4/C4ObjectApi/C4ObjectApi.csproj
===================================================================
--- Client/trunk/Cinnamon4/C4ObjectApi/C4ObjectApi.csproj 2024-08-22 10:44:12 UTC (rev 3798)
+++ Client/trunk/Cinnamon4/C4ObjectApi/C4ObjectApi.csproj 2024-08-23 10:37:19 UTC (rev 3799)
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net7.0-windows</TargetFramework>
+ <TargetFramework>net8.0-windows7.0</TargetFramework>
<LangVersion>latest</LangVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWindowsForms>true</UseWindowsForms>
Modified: Client/trunk/Cinnamon4/C4ServerConnector/C4ServerConnector.csproj
===================================================================
--- Client/trunk/Cinnamon4/C4ServerConnector/C4ServerConnector.csproj 2024-08-22 10:44:12 UTC (rev 3798)
+++ Client/trunk/Cinnamon4/C4ServerConnector/C4ServerConnector.csproj 2024-08-23 10:37:19 UTC (rev 3799)
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<LangVersion>latest</LangVersion>
<OutputType>Library</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
Modified: Client/trunk/Cinnamon4/CAE/CAE.csproj
===================================================================
--- Client/trunk/Cinnamon4/CAE/CAE.csproj 2024-08-22 10:44:12 UTC (rev 3798)
+++ Client/trunk/Cinnamon4/CAE/CAE.csproj 2024-08-23 10:37:19 UTC (rev 3799)
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Platforms>AnyCPU;x64</Platforms>
Modified: Client/trunk/Cinnamon4/CAELib/CAELib.csproj
===================================================================
--- Client/trunk/Cinnamon4/CAELib/CAELib.csproj 2024-08-22 10:44:12 UTC (rev 3798)
+++ Client/trunk/Cinnamon4/CAELib/CAELib.csproj 2024-08-23 10:37:19 UTC (rev 3799)
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Platforms>AnyCPU;x64</Platforms>
Modified: Client/trunk/Cinnamon4/CDCplus/CDCplus.csproj
===================================================================
--- Client/trunk/Cinnamon4/CDCplus/CDCplus.csproj 2024-08-22 10:44:12 UTC (rev 3798)
+++ Client/trunk/Cinnamon4/CDCplus/CDCplus.csproj 2024-08-23 10:37:19 UTC (rev 3799)
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net7.0-windows</TargetFramework>
+ <TargetFramework>net8.0-windows7.0</TargetFramework>
<LangVersion>latest</LangVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWindowsForms>true</UseWindowsForms>
Modified: Client/trunk/Cinnamon4/CDCplusLib/CDCplusLib.csproj
===================================================================
--- Client/trunk/Cinnamon4/CDCplusLib/CDCplusLib.csproj 2024-08-22 10:44:12 UTC (rev 3798)
+++ Client/trunk/Cinnamon4/CDCplusLib/CDCplusLib.csproj 2024-08-23 10:37:19 UTC (rev 3799)
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net7.0-windows</TargetFramework>
+ <TargetFramework>net8.0-windows7.0</TargetFramework>
<Nullable>enable</Nullable>
<UseWindowsForms>true</UseWindowsForms>
<ImplicitUsings>enable</ImplicitUsings>
Modified: Client/trunk/Cinnamon4/CDCplusLib/TabControls/PermissionsTabControl.cs
===================================================================
--- Client/trunk/Cinnamon4/CDCplusLib/TabControls/PermissionsTabControl.cs 2024-08-22 10:44:12 UTC (rev 3798)
+++ Client/trunk/Cinnamon4/CDCplusLib/TabControls/PermissionsTabControl.cs 2024-08-23 10:37:19 UTC (rev 3799)
@@ -136,6 +136,7 @@
}
public void Init(Dictionary<long, IRepositoryNode> dict, IClientMessage msg)
{
+ _initCompleted = false;
_dict = dict;
SetCurrentPermissions();
if (msg!=null) MessageReceived(msg);
@@ -209,7 +210,10 @@
// link
lvwCurrentPermissions.Items["Link_Target_Write"].ImageKey = ow.Permissions.Link_Target_Write ? "active" : "inactive";
- cboAcl.SelectedItem = ow.Acl;
+ bool cboAclEnabled = cboAcl.Enabled;
+ cboAcl.Enabled = true;
+ cboAcl.SelectedItem = ow.Acl;
+ cboAcl.Enabled = cboAclEnabled;
}
private void AddString(StringBuilder sb, string text)
Modified: Client/trunk/Cinnamon4/ChangeTrigger/ChangeTrigger.csproj
===================================================================
--- Client/trunk/Cinnamon4/ChangeTrigger/ChangeTrigger.csproj 2024-08-22 10:44:12 UTC (rev 3798)
+++ Client/trunk/Cinnamon4/ChangeTrigger/ChangeTrigger.csproj 2024-08-23 10:37:19 UTC (rev 3799)
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
Modified: Client/trunk/Cinnamon4/ChangeTriggerLib/ChangeTriggerLib.csproj
===================================================================
--- Client/trunk/Cinnamon4/ChangeTriggerLib/ChangeTriggerLib.csproj 2024-08-22 10:44:12 UTC (rev 3798)
+++ Client/trunk/Cinnamon4/ChangeTriggerLib/ChangeTriggerLib.csproj 2024-08-23 10:37:19 UTC (rev 3799)
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Modified: Client/trunk/Cinnamon4/ContentAwareness/ContentAwareness.csproj
===================================================================
--- Client/trunk/Cinnamon4/ContentAwareness/ContentAwareness.csproj 2024-08-22 10:44:12 UTC (rev 3798)
+++ Client/trunk/Cinnamon4/ContentAwareness/ContentAwareness.csproj 2024-08-23 10:37:19 UTC (rev 3799)
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<LangVersion>latest</LangVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<Platforms>AnyCPU;x64</Platforms>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2024-08-22 10:44:13
|
Revision: 3798
http://sourceforge.net/p/cinnamon/code/3798
Author: bhorner
Date: 2024-08-22 10:44:12 +0000 (Thu, 22 Aug 2024)
Log Message:
-----------
Fixed relation metadata assignment
Modified Paths:
--------------
Client/trunk/Cinnamon4/CDCplusLib/ContextFunctions/VersionObject.cs
Modified: Client/trunk/Cinnamon4/CDCplusLib/ContextFunctions/VersionObject.cs
===================================================================
--- Client/trunk/Cinnamon4/CDCplusLib/ContextFunctions/VersionObject.cs 2024-08-16 08:35:16 UTC (rev 3797)
+++ Client/trunk/Cinnamon4/CDCplusLib/ContextFunctions/VersionObject.cs 2024-08-22 10:44:12 UTC (rev 3798)
@@ -96,7 +96,7 @@
if (relsToKeep.Count > 0)
{
HashSet<C4Relation> relations = new HashSet<C4Relation>();
- foreach (C4Relation rel in relsToKeep.Values) relations.Add(new C4Relation(rel.TypeId, newVersion.Id, rel.RightId, null));
+ foreach (C4Relation rel in relsToKeep.Values) relations.Add(new C4Relation(rel.TypeId, newVersion.Id, rel.RightId, rel.Metadata));
o.Session.CommandSession.CreateRelations(relations);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2024-08-16 08:35:18
|
Revision: 3797
http://sourceforge.net/p/cinnamon/code/3797
Author: bhorner
Date: 2024-08-16 08:35:16 +0000 (Fri, 16 Aug 2024)
Log Message:
-----------
Set default outgoing http connection limit from 100 to 20
Modified Paths:
--------------
Client/trunk/Cinnamon4/CDCplus/Program.cs
Modified: Client/trunk/Cinnamon4/CDCplus/Program.cs
===================================================================
--- Client/trunk/Cinnamon4/CDCplus/Program.cs 2024-08-15 12:26:12 UTC (rev 3796)
+++ Client/trunk/Cinnamon4/CDCplus/Program.cs 2024-08-16 08:35:16 UTC (rev 3797)
@@ -12,7 +12,7 @@
[STAThread]
static void Main()
{
- ServicePointManager.DefaultConnectionLimit = 100;
+ ServicePointManager.DefaultConnectionLimit = 20;
Application.EnableVisualStyles();
Application.SetHighDpiMode(HighDpiMode.PerMonitorV2);
//Application.SetHighDpiMode(HighDpiMode.SystemAware);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2024-08-15 12:26:15
|
Revision: 3796
http://sourceforge.net/p/cinnamon/code/3796
Author: bhorner
Date: 2024-08-15 12:26:12 +0000 (Thu, 15 Aug 2024)
Log Message:
-----------
Just comments
Modified Paths:
--------------
Client/trunk/Cinnamon4/CDCplusLib/ContextFunctions/PasteItems.cs
Client/trunk/Cinnamon4/CDCplusLib/ContextFunctions/VersionObject.cs
Modified: Client/trunk/Cinnamon4/CDCplusLib/ContextFunctions/PasteItems.cs
===================================================================
--- Client/trunk/Cinnamon4/CDCplusLib/ContextFunctions/PasteItems.cs 2024-08-15 10:28:25 UTC (rev 3795)
+++ Client/trunk/Cinnamon4/CDCplusLib/ContextFunctions/PasteItems.cs 2024-08-15 12:26:12 UTC (rev 3796)
@@ -384,6 +384,7 @@
}
else
{
+ // Default State ID must be set for all lifecycles
curO.LifecycleState = curO.Session.SessionConfig.C4Sc.LifecycleStatesById[(long)versionO.Session.SessionConfig.C4Sc.LifecyclesById[versionO.LifecycleState.LifecycleId].DefaultStateId];
}
curO.Unlock();
Modified: Client/trunk/Cinnamon4/CDCplusLib/ContextFunctions/VersionObject.cs
===================================================================
--- Client/trunk/Cinnamon4/CDCplusLib/ContextFunctions/VersionObject.cs 2024-08-15 10:28:25 UTC (rev 3795)
+++ Client/trunk/Cinnamon4/CDCplusLib/ContextFunctions/VersionObject.cs 2024-08-15 12:26:12 UTC (rev 3796)
@@ -77,6 +77,10 @@
try
{
CmnObject newVersion = o.VersionCmd(null, null, o.Name);
+ //if(newVersion.LifecycleState!=null)
+ //{
+ // newVersion.LifecycleState = o.LifecycleState;
+ //}
// Assign previous metadata
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2024-08-15 10:28:32
|
Revision: 3795
http://sourceforge.net/p/cinnamon/code/3795
Author: bhorner
Date: 2024-08-15 10:28:25 +0000 (Thu, 15 Aug 2024)
Log Message:
-----------
Timeout for server get command configurable
Increased number of outgoing http connections
Modified Paths:
--------------
Client/trunk/Cinnamon4/C4ObjectApi/Repository/CmnServer.cs
Client/trunk/Cinnamon4/C4ServerConnector/C4Session.cs
Client/trunk/Cinnamon4/CDCplus/Controls/ServerEntry.cs
Client/trunk/Cinnamon4/CDCplus/Program.cs
Client/trunk/Cinnamon4/CDCplus/ServerHub.cs
Modified: Client/trunk/Cinnamon4/C4ObjectApi/Repository/CmnServer.cs
===================================================================
--- Client/trunk/Cinnamon4/C4ObjectApi/Repository/CmnServer.cs 2024-08-15 08:21:40 UTC (rev 3794)
+++ Client/trunk/Cinnamon4/C4ObjectApi/Repository/CmnServer.cs 2024-08-15 10:28:25 UTC (rev 3795)
@@ -16,7 +16,7 @@
public string LocalCertFile { get; }
public Dictionary<string, string> LocalSettings { get; }
- public CmnServer(string url, string localRoot, string name, string id, string cdnUri, string localCertFile, Dictionary<string, string> localSettings, string namedUserConfig = null)
+ public CmnServer(string url, string localRoot, string name, string id, string cdnUri, string localCertFile, Dictionary<string, string> localSettings, int getTimeout, string namedUserConfig = null)
{
Url = url;
CdnUrl = cdnUri;
@@ -28,14 +28,14 @@
LocalCertFile = localCertFile;
LocalSettings = localSettings;
InitHost();
- GetServerResponse();
+ GetServerResponse(getTimeout);
}
- private void GetServerResponse()
+ private void GetServerResponse(int getTimeout)
{
try
{
ServerResponse = new XmlDocument();
- string resp = C4Session.GetRequest(string.Concat(Url, "/cinnamon/info"), LocalCertFile);
+ string resp = C4Session.GetRequest(string.Concat(Url, "/cinnamon/info"), LocalCertFile, getTimeout);
ServerResponse.LoadXml(resp);
Modified: Client/trunk/Cinnamon4/C4ServerConnector/C4Session.cs
===================================================================
--- Client/trunk/Cinnamon4/C4ServerConnector/C4Session.cs 2024-08-15 08:21:40 UTC (rev 3794)
+++ Client/trunk/Cinnamon4/C4ServerConnector/C4Session.cs 2024-08-15 10:28:25 UTC (rev 3795)
@@ -52,9 +52,9 @@
CdnUri = cdnUri;
AllPermissions = ListPermissions();
}
- public static string GetRequest(string baseUrl, string localCertFile)
+ public static string GetRequest(string baseUrl, string localCertFile, int timeout)
{
- HttpInterface http = new HttpInterface(localCertFile, null, false, 10, 300, Path.GetTempPath());
+ HttpInterface http = new HttpInterface(localCertFile, null, false, timeout, 300, Path.GetTempPath());
string httpResult = http.GetCommand(baseUrl);
return httpResult;
}
Modified: Client/trunk/Cinnamon4/CDCplus/Controls/ServerEntry.cs
===================================================================
--- Client/trunk/Cinnamon4/CDCplus/Controls/ServerEntry.cs 2024-08-15 08:21:40 UTC (rev 3794)
+++ Client/trunk/Cinnamon4/CDCplus/Controls/ServerEntry.cs 2024-08-15 10:28:25 UTC (rev 3795)
@@ -41,6 +41,7 @@
Server.CdnUrl,
ucN != null ? ucN.InnerText : null,
Server.LocalSettings,
+ _timeout,
Server.LocalCertFile);
gbServer.Text = Server.Name;
lblVersionBuild.Text = string.Format(Resources.lblVersionBuild, Server.Version, Server.Build);
Modified: Client/trunk/Cinnamon4/CDCplus/Program.cs
===================================================================
--- Client/trunk/Cinnamon4/CDCplus/Program.cs 2024-08-15 08:21:40 UTC (rev 3794)
+++ Client/trunk/Cinnamon4/CDCplus/Program.cs 2024-08-15 10:28:25 UTC (rev 3795)
@@ -1,4 +1,5 @@
using System;
+using System.Net;
using System.Windows.Forms;
namespace CDCplus
@@ -11,6 +12,7 @@
[STAThread]
static void Main()
{
+ ServicePointManager.DefaultConnectionLimit = 100;
Application.EnableVisualStyles();
Application.SetHighDpiMode(HighDpiMode.PerMonitorV2);
//Application.SetHighDpiMode(HighDpiMode.SystemAware);
Modified: Client/trunk/Cinnamon4/CDCplus/ServerHub.cs
===================================================================
--- Client/trunk/Cinnamon4/CDCplus/ServerHub.cs 2024-08-15 08:21:40 UTC (rev 3794)
+++ Client/trunk/Cinnamon4/CDCplus/ServerHub.cs 2024-08-15 10:28:25 UTC (rev 3795)
@@ -38,7 +38,7 @@
CmnServer svr = null;
try
{
- int timeout = svrEl.HasAttribute("timeout") ? int.Parse(svrEl.GetAttribute("timeout")) : 10000;
+ int getTimeout = svrEl.HasAttribute("get_timeout") ? int.Parse(svrEl.GetAttribute("get_timeout")) : 10000;
XmlNode localCertFileN = svrEl.SelectSingleNode("local_cert_file");
string localCertFile = (localCertFileN == null ? null : Path.Combine(Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath), localCertFileN.InnerText));
Dictionary<string, string> localSettings = new Dictionary<string, string>();
@@ -53,6 +53,7 @@
cdnUrl,
localCertFile,
localSettings,
+ getTimeout,
ucN != null ? ucN.InnerText : null);
}
catch (Exception ex)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2024-08-15 08:21:45
|
Revision: 3794
http://sourceforge.net/p/cinnamon/code/3794
Author: bhorner
Date: 2024-08-15 08:21:40 +0000 (Thu, 15 Aug 2024)
Log Message:
-----------
Removed the feature again - did not help solving issue
Modified Paths:
--------------
Client/trunk/Cinnamon4/CDCplus/Controls/ServerEntry.cs
Client/trunk/Cinnamon4/CDCplus/ServerHub.cs
Modified: Client/trunk/Cinnamon4/CDCplus/Controls/ServerEntry.cs
===================================================================
--- Client/trunk/Cinnamon4/CDCplus/Controls/ServerEntry.cs 2024-08-15 07:42:17 UTC (rev 3793)
+++ Client/trunk/Cinnamon4/CDCplus/Controls/ServerEntry.cs 2024-08-15 08:21:40 UTC (rev 3794)
@@ -16,7 +16,6 @@
private Form _serverHubForm;
private XmlElement _svrEl;
private GlobalApplicationData _gad;
- private bool _alwaysEnableConnect;
private int _timeout;
//private string _localCertFile;
private int _baseHeight;
@@ -54,16 +53,14 @@
DoAutologin();
ResizeControl();
}
- else cmdConnect.Enabled = _alwaysEnableConnect;
}
- public void InitServerEntry(string serverName, string serverUrl, CmnServer svr, XmlElement svrEl, GlobalApplicationData gad, Form serverHubForm, string logFn, bool alwaysEnableConnect)
+ public void InitServerEntry(string serverName, string serverUrl, CmnServer svr, XmlElement svrEl, GlobalApplicationData gad, Form serverHubForm, string logFn)
{
_serverHubForm = serverHubForm;
Server = svr;
_svrEl = svrEl;
_gad = gad;
- _alwaysEnableConnect = alwaysEnableConnect;
_logFn = logFn;
_baseHeight = Height;
File.AppendAllText(_logFn, " Base server entry height: " + _baseHeight.ToString() + "\n");
@@ -78,7 +75,7 @@
{
pbOnline.Visible = false;
pbOffline.Visible = true;
- cmdConnect.Enabled = _alwaysEnableConnect;
+ cmdConnect.Enabled = false;
}
else
{
Modified: Client/trunk/Cinnamon4/CDCplus/ServerHub.cs
===================================================================
--- Client/trunk/Cinnamon4/CDCplus/ServerHub.cs 2024-08-15 07:42:17 UTC (rev 3793)
+++ Client/trunk/Cinnamon4/CDCplus/ServerHub.cs 2024-08-15 08:21:40 UTC (rev 3794)
@@ -61,9 +61,7 @@
}
ServerEntry se = new ServerEntry();
se.Resized += se_Resized;
- XmlNode aecN = svrEl.SelectSingleNode("always_enable_connect/@enabled");
- bool alwaysEnableConnect = aecN != null && aecN.InnerText == "true";
- se.InitServerEntry(svrEl.GetAttribute("label"), svrEl.GetAttribute("url"), svr, svrEl, _gad, this, _logFn, alwaysEnableConnect);
+ se.InitServerEntry(svrEl.GetAttribute("label"), svrEl.GetAttribute("url"), svr, svrEl, _gad, this, _logFn);
se.Dock = DockStyle.Bottom;
pEntries.Controls.Add(se);
ShowInTaskbar = true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2024-08-15 07:42:20
|
Revision: 3793
http://sourceforge.net/p/cinnamon/code/3793
Author: bhorner
Date: 2024-08-15 07:42:17 +0000 (Thu, 15 Aug 2024)
Log Message:
-----------
Allows connecting when server returned no get response for debugging
Modified Paths:
--------------
Client/trunk/Cinnamon4/C4ServerConnector/C4Session.cs
Client/trunk/Cinnamon4/CDCplus/Controls/ServerEntry.cs
Client/trunk/Cinnamon4/CDCplus/ServerHub.cs
Modified: Client/trunk/Cinnamon4/C4ServerConnector/C4Session.cs
===================================================================
--- Client/trunk/Cinnamon4/C4ServerConnector/C4Session.cs 2024-08-14 13:45:44 UTC (rev 3792)
+++ Client/trunk/Cinnamon4/C4ServerConnector/C4Session.cs 2024-08-15 07:42:17 UTC (rev 3793)
@@ -54,7 +54,9 @@
}
public static string GetRequest(string baseUrl, string localCertFile)
{
- return (new HttpInterface(localCertFile, null, false, 10, 300, Path.GetTempPath())).GetCommand(baseUrl);
+ HttpInterface http = new HttpInterface(localCertFile, null, false, 10, 300, Path.GetTempPath());
+ string httpResult = http.GetCommand(baseUrl);
+ return httpResult;
}
public XmlDocument Echo(XmlDocument requestBody=null)
{
Modified: Client/trunk/Cinnamon4/CDCplus/Controls/ServerEntry.cs
===================================================================
--- Client/trunk/Cinnamon4/CDCplus/Controls/ServerEntry.cs 2024-08-14 13:45:44 UTC (rev 3792)
+++ Client/trunk/Cinnamon4/CDCplus/Controls/ServerEntry.cs 2024-08-15 07:42:17 UTC (rev 3793)
@@ -16,6 +16,7 @@
private Form _serverHubForm;
private XmlElement _svrEl;
private GlobalApplicationData _gad;
+ private bool _alwaysEnableConnect;
private int _timeout;
//private string _localCertFile;
private int _baseHeight;
@@ -44,7 +45,8 @@
Server.LocalCertFile);
gbServer.Text = Server.Name;
lblVersionBuild.Text = string.Format(Resources.lblVersionBuild, Server.Version, Server.Build);
- if (Server.ServerResponse != null)
+
+ if (Server.ServerResponse != null)
{
pbOnline.Visible = true;
pbOffline.Visible = false;
@@ -52,13 +54,16 @@
DoAutologin();
ResizeControl();
}
- }
- public void InitServerEntry(string serverName, string serverUrl, CmnServer svr, XmlElement svrEl, GlobalApplicationData gad, Form serverHubForm, string logFn)
+ else cmdConnect.Enabled = _alwaysEnableConnect;
+
+ }
+ public void InitServerEntry(string serverName, string serverUrl, CmnServer svr, XmlElement svrEl, GlobalApplicationData gad, Form serverHubForm, string logFn, bool alwaysEnableConnect)
{
_serverHubForm = serverHubForm;
Server = svr;
_svrEl = svrEl;
_gad = gad;
+ _alwaysEnableConnect = alwaysEnableConnect;
_logFn = logFn;
_baseHeight = Height;
File.AppendAllText(_logFn, " Base server entry height: " + _baseHeight.ToString() + "\n");
@@ -73,7 +78,7 @@
{
pbOnline.Visible = false;
pbOffline.Visible = true;
- cmdConnect.Enabled = false;
+ cmdConnect.Enabled = _alwaysEnableConnect;
}
else
{
Modified: Client/trunk/Cinnamon4/CDCplus/ServerHub.cs
===================================================================
--- Client/trunk/Cinnamon4/CDCplus/ServerHub.cs 2024-08-14 13:45:44 UTC (rev 3792)
+++ Client/trunk/Cinnamon4/CDCplus/ServerHub.cs 2024-08-15 07:42:17 UTC (rev 3793)
@@ -61,7 +61,9 @@
}
ServerEntry se = new ServerEntry();
se.Resized += se_Resized;
- se.InitServerEntry(svrEl.GetAttribute("label"), svrEl.GetAttribute("url"), svr, svrEl, _gad, this, _logFn);
+ XmlNode aecN = svrEl.SelectSingleNode("always_enable_connect/@enabled");
+ bool alwaysEnableConnect = aecN != null && aecN.InnerText == "true";
+ se.InitServerEntry(svrEl.GetAttribute("label"), svrEl.GetAttribute("url"), svr, svrEl, _gad, this, _logFn, alwaysEnableConnect);
se.Dock = DockStyle.Bottom;
pEntries.Controls.Add(se);
ShowInTaskbar = true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2024-08-14 13:45:46
|
Revision: 3792
http://sourceforge.net/p/cinnamon/code/3792
Author: bhorner
Date: 2024-08-14 13:45:44 +0000 (Wed, 14 Aug 2024)
Log Message:
-----------
Fixed issue in combined permissions (owner-awareness)
Modified Paths:
--------------
Client/trunk/Cinnamon4/C4ObjectApi/Repository/CmnSessionConfiguration.cs
Modified: Client/trunk/Cinnamon4/C4ObjectApi/Repository/CmnSessionConfiguration.cs
===================================================================
--- Client/trunk/Cinnamon4/C4ObjectApi/Repository/CmnSessionConfiguration.cs 2024-08-09 10:45:08 UTC (rev 3791)
+++ Client/trunk/Cinnamon4/C4ObjectApi/Repository/CmnSessionConfiguration.cs 2024-08-14 13:45:44 UTC (rev 3792)
@@ -55,7 +55,8 @@
break;
}
_ownerPermissionsByAclId.Add((long)acl.Id, ownerAclGroup!=null ? ownerAclGroup.Permissions : new C4Permissions(false, _allPermissions));
- foreach (long permissionId in _permissionsByAclId[(long)acl.Id].PermissionNamesById.Keys) if (!_ownerPermissionsByAclId[(long)acl.Id].PermissionNamesById.ContainsKey(permissionId)) _ownerPermissionsByAclId[(long)acl.Id].SetPermission(_permissionsByAclId[(long)acl.Id].PermissionNamesById[permissionId], true);
+ //foreach (long permissionId in _permissionsByAclId[(long)acl.Id].PermissionNamesById.Keys)
+ // if (!_ownerPermissionsByAclId[(long)acl.Id].PermissionNamesById.ContainsKey(permissionId)) _ownerPermissionsByAclId[(long)acl.Id].SetPermission(_permissionsByAclId[(long)acl.Id].PermissionNamesById[permissionId], true);
}
return owner? _ownerPermissionsByAclId[(long)acl.Id] : _permissionsByAclId[(long)acl.Id];
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2024-08-09 10:45:11
|
Revision: 3791
http://sourceforge.net/p/cinnamon/code/3791
Author: bhorner
Date: 2024-08-09 10:45:08 +0000 (Fri, 09 Aug 2024)
Log Message:
-----------
Fixed folder move bug for regular users (non-superusers)
Modified Paths:
--------------
Client/trunk/Cinnamon4/C4ServerConnector/C4Session.cs
Modified: Client/trunk/Cinnamon4/C4ServerConnector/C4Session.cs
===================================================================
--- Client/trunk/Cinnamon4/C4ServerConnector/C4Session.cs 2024-08-08 11:46:33 UTC (rev 3790)
+++ Client/trunk/Cinnamon4/C4ServerConnector/C4Session.cs 2024-08-09 10:45:08 UTC (rev 3791)
@@ -674,7 +674,7 @@
}
}
// TODO: extend this to work with multiple folders
- public XmlDocument UpdateFolder(long id, long? parentId = null, string name = null, long? ownerId = null, long? typeId = null, long? aclId = null, bool? metadataChanged = false) // summaryEl.Name must be summary, no further check
+ public XmlDocument UpdateFolder(long id, long? parentId = null, string name = null, long? ownerId = null, long? typeId = null, long? aclId = null, bool? metadataChanged = null) // summaryEl.Name must be summary, no further check
{
try
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2024-08-08 11:46:35
|
Revision: 3790
http://sourceforge.net/p/cinnamon/code/3790
Author: bhorner
Date: 2024-08-08 11:46:33 +0000 (Thu, 08 Aug 2024)
Log Message:
-----------
Window taller to fit the content and avoid scrolling
Modified Paths:
--------------
Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditAclGroup.Designer.cs
Modified: Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditAclGroup.Designer.cs
===================================================================
--- Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditAclGroup.Designer.cs 2024-08-08 11:17:22 UTC (rev 3789)
+++ Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditAclGroup.Designer.cs 2024-08-08 11:46:33 UTC (rev 3790)
@@ -58,9 +58,9 @@
panel7.Controls.Add(pSaveAs);
panel7.Controls.Add(pSave);
panel7.Dock = DockStyle.Bottom;
- panel7.Location = new Point(0, 481);
+ panel7.Location = new Point(0, 845);
panel7.Name = "panel7";
- panel7.Size = new Size(746, 37);
+ panel7.Size = new Size(570, 37);
panel7.TabIndex = 6;
//
// pCancel
@@ -142,7 +142,7 @@
pData.Location = new Point(0, 0);
pData.Name = "pData";
pData.Padding = new Padding(5, 6, 5, 6);
- pData.Size = new Size(746, 481);
+ pData.Size = new Size(570, 845);
pData.TabIndex = 0;
//
// clbPermissions
@@ -152,7 +152,7 @@
clbPermissions.FormattingEnabled = true;
clbPermissions.Location = new Point(5, 162);
clbPermissions.Name = "clbPermissions";
- clbPermissions.Size = new Size(736, 313);
+ clbPermissions.Size = new Size(560, 677);
clbPermissions.TabIndex = 14;
clbPermissions.ItemCheck += clbPermissions_ItemCheck;
//
@@ -175,7 +175,7 @@
cboGroup.FormattingEnabled = true;
cboGroup.Location = new Point(5, 115);
cboGroup.Name = "cboGroup";
- cboGroup.Size = new Size(736, 23);
+ cboGroup.Size = new Size(560, 23);
cboGroup.TabIndex = 11;
cboGroup.SelectedIndexChanged += cboGroup_SelectedIndexChanged;
//
@@ -198,7 +198,7 @@
cboAcl.FormattingEnabled = true;
cboAcl.Location = new Point(5, 68);
cboAcl.Name = "cboAcl";
- cboAcl.Size = new Size(736, 23);
+ cboAcl.Size = new Size(560, 23);
cboAcl.TabIndex = 5;
cboAcl.SelectedIndexChanged += cboAcl_SelectedIndexChanged;
//
@@ -221,7 +221,7 @@
txtId.Margin = new Padding(0);
txtId.Name = "txtId";
txtId.ReadOnly = true;
- txtId.Size = new Size(736, 23);
+ txtId.Size = new Size(560, 23);
txtId.TabIndex = 1;
//
// lblId
@@ -241,7 +241,7 @@
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
CancelButton = cmdCancel;
- ClientSize = new Size(746, 518);
+ ClientSize = new Size(570, 882);
Controls.Add(pData);
Controls.Add(panel7);
FormBorderStyle = FormBorderStyle.FixedDialog;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2024-08-08 11:17:30
|
Revision: 3789
http://sourceforge.net/p/cinnamon/code/3789
Author: bhorner
Date: 2024-08-08 11:17:22 +0000 (Thu, 08 Aug 2024)
Log Message:
-----------
Correct logic for default in using progress bar on delete
User now accepts @ in names (required for Azure integration where usernames can be email addresses.
Modified Paths:
--------------
Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.Designer.cs
Client/trunk/Cinnamon4/CDCplusLib/ContextFunctions/DeleteSelection.cs
Modified: Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.Designer.cs
===================================================================
--- Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.Designer.cs 2024-08-08 07:10:32 UTC (rev 3788)
+++ Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.Designer.cs 2024-08-08 11:17:22 UTC (rev 3789)
@@ -429,7 +429,7 @@
vtxtName.InvalidReadOnlyColor = Color.LightYellow;
vtxtName.Location = new Point(5, 68);
vtxtName.Name = "vtxtName";
- vtxtName.RegularExpression = "^[a-zA-Z0-9_.-]+$";
+ vtxtName.RegularExpression = "^[a-zA-Z0-9_.-@]+$";
vtxtName.Size = new Size(447, 23);
vtxtName.TabIndex = 0;
vtxtName.ValidColor = Color.White;
Modified: Client/trunk/Cinnamon4/CDCplusLib/ContextFunctions/DeleteSelection.cs
===================================================================
--- Client/trunk/Cinnamon4/CDCplusLib/ContextFunctions/DeleteSelection.cs 2024-08-08 07:10:32 UTC (rev 3788)
+++ Client/trunk/Cinnamon4/CDCplusLib/ContextFunctions/DeleteSelection.cs 2024-08-08 11:17:22 UTC (rev 3789)
@@ -327,7 +327,7 @@
_gad = globalAppData;
XmlNode davdN = configEl.SelectSingleNode("custom/delete_all_versions[@enabled='false']");
_deleteAllVersionsEnabled = davdN is null;
- _useProgressBar = s.Server.LocalSettings.ContainsKey("use_threaded_gui_controls") ? s.Server.LocalSettings["use_threaded_gui_controls"] == "true" : false;
+ _useProgressBar = s.Server.LocalSettings.ContainsKey("use_threaded_gui_controls") ? s.Server.LocalSettings["use_threaded_gui_controls"] == "true" : true;
}
public Image GetIcon()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2024-08-08 07:10:39
|
Revision: 3788
http://sourceforge.net/p/cinnamon/code/3788
Author: bhorner
Date: 2024-08-08 07:10:32 +0000 (Thu, 08 Aug 2024)
Log Message:
-----------
Bugfix in set unique metaset when no metasets were there before
EditUser now sets _everyone membership and expects non-ASCII characters in user real names
Fix using timer-based controls in ResultListDisplay
Modified Paths:
--------------
Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.Designer.cs
Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.cs
Client/trunk/Cinnamon4/C4ObjectApi/Helpers/ApiHelper.cs
Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/ResultListDisplay.cs
Modified: Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.Designer.cs
===================================================================
--- Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.Designer.cs 2024-07-29 13:16:20 UTC (rev 3787)
+++ Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.Designer.cs 2024-08-08 07:10:32 UTC (rev 3788)
@@ -369,7 +369,7 @@
vtxtFullName.InvalidReadOnlyColor = Color.LightYellow;
vtxtFullName.Location = new Point(5, 162);
vtxtFullName.Name = "vtxtFullName";
- vtxtFullName.RegularExpression = "^[ a-zA-Z0-9_.-]+$";
+ vtxtFullName.RegularExpression = "^[ \\p{L}0-9_.-]+$";
vtxtFullName.Size = new Size(447, 23);
vtxtFullName.TabIndex = 36;
vtxtFullName.ValidColor = Color.White;
Modified: Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.cs
===================================================================
--- Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.cs 2024-07-29 13:16:20 UTC (rev 3787)
+++ Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.cs 2024-08-08 07:10:32 UTC (rev 3788)
@@ -20,7 +20,11 @@
cboUiLanguage.Items.Clear();
foreach (C4Language l in uiLanguages.Values) cboUiLanguage.Items.Add(l);
clbGroups.Items.Clear();
- foreach (C4Group g in groups.Values) clbGroups.Items.Add(g);
+ foreach (C4Group g in groups.Values)
+ {
+ clbGroups.Items.Add(g);
+ if (g.Name == "_everyone") clbGroups.SetItemChecked(clbGroups.Items.IndexOf(g), true);
+ }
cboLoginType.Items.Clear(); // softcode?
cboLoginType.Items.Add("CINNAMON");
cboLoginType.Items.Add("LDAP");
Modified: Client/trunk/Cinnamon4/C4ObjectApi/Helpers/ApiHelper.cs
===================================================================
--- Client/trunk/Cinnamon4/C4ObjectApi/Helpers/ApiHelper.cs 2024-07-29 13:16:20 UTC (rev 3787)
+++ Client/trunk/Cinnamon4/C4ObjectApi/Helpers/ApiHelper.cs 2024-08-08 07:10:32 UTC (rev 3788)
@@ -18,8 +18,8 @@
// new metaset
if(deleteExisting)
{
- C4Metadata m = c4s.GetObjectMeta(objectId, DictionaryHelper.IdToHashSet((long)msType.Id));
- c4s.DeleteObjectMetasets(m.MetasetsByTypeId[(long)msType.Id].Select(x => (long)x.Id).ToList().ToHashSet<long>());
+ C4Metadata m = c4s.GetObjectMeta(objectId, new HashSet<long> { (long)msType.Id });
+ if(m.MetasetsByTypeId.Count>0) c4s.DeleteObjectMetasets(m.MetasetsByTypeId[(long)msType.Id].Select(x => (long)x.Id).ToList().ToHashSet<long>());
}
C4Metaset ms=new C4Metaset((long)msType.Id, objectId, metasetContent);
c4s.CreateObjectMeta(new Dictionary<long, HashSet<C4Metaset>>() { { objectId, new HashSet<C4Metaset>() { ms } } });
Modified: Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/ResultListDisplay.cs
===================================================================
--- Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/ResultListDisplay.cs 2024-07-29 13:16:20 UTC (rev 3787)
+++ Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/ResultListDisplay.cs 2024-08-08 07:10:32 UTC (rev 3788)
@@ -51,7 +51,7 @@
_enableSelectionChangeEvent = false;
_view = View.Details;
XmlAttribute frs = ((XmlAttribute)(rldConfigEl.SelectSingleNode("appearance/full_row_select/@value")));
- _useTimer = s.Server.LocalSettings.ContainsKey("use_threaded_gui_controls") ? s.Server.LocalSettings["use_threaded_gui_controls"] == "true" : false;
+ _useTimer = s.Server.LocalSettings.ContainsKey("use_threaded_gui_controls") ? s.Server.LocalSettings["use_threaded_gui_controls"] == "true" : true;
if(_useTimer)
{
selectionChangedTimer = new System.Windows.Forms.Timer();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2024-07-29 13:16:23
|
Revision: 3787
http://sourceforge.net/p/cinnamon/code/3787
Author: bhorner
Date: 2024-07-29 13:16:20 +0000 (Mon, 29 Jul 2024)
Log Message:
-----------
Sorted lifecycles
User must be _everyone and never _owner
Modified Paths:
--------------
Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditAcl.Designer.cs
Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditAcl.cs
Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditAcl.resx
Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditLifecycle.cs
Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.Designer.cs
Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.cs
Modified: Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditAcl.Designer.cs
===================================================================
--- Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditAcl.Designer.cs 2024-07-29 11:18:41 UTC (rev 3786)
+++ Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditAcl.Designer.cs 2024-07-29 13:16:20 UTC (rev 3787)
@@ -21,240 +21,240 @@
base.Dispose(disposing);
}
- #region Windows Form Designer generated code
+ #region Windows Form Designer generated code
- /// <summary>
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- /// </summary>
- private void InitializeComponent()
- {
- panel7 = new System.Windows.Forms.Panel();
- pCancel = new System.Windows.Forms.Panel();
- cmdCancel = new System.Windows.Forms.Button();
- pSaveAs = new System.Windows.Forms.Panel();
- cmdSaveAs = new System.Windows.Forms.Button();
- pSave = new System.Windows.Forms.Panel();
- cmdOk = new System.Windows.Forms.Button();
- pData = new System.Windows.Forms.Panel();
- lvwAclGroups = new System.Windows.Forms.ListView();
- colId = new System.Windows.Forms.ColumnHeader();
- colName = new System.Windows.Forms.ColumnHeader();
- lblAclGroups = new System.Windows.Forms.Label();
- vtxtName = new C4GeneralGui.GuiElements.ValidatingTextBox();
- lblName = new System.Windows.Forms.Label();
- txtId = new System.Windows.Forms.TextBox();
- lblId = new System.Windows.Forms.Label();
- panel7.SuspendLayout();
- pCancel.SuspendLayout();
- pSaveAs.SuspendLayout();
- pSave.SuspendLayout();
- pData.SuspendLayout();
- SuspendLayout();
- //
- // panel7
- //
- panel7.Controls.Add(pCancel);
- panel7.Controls.Add(pSaveAs);
- panel7.Controls.Add(pSave);
- panel7.Dock = System.Windows.Forms.DockStyle.Bottom;
- panel7.Location = new System.Drawing.Point(0, 481);
- panel7.Name = "panel7";
- panel7.Size = new System.Drawing.Size(746, 37);
- panel7.TabIndex = 6;
- //
- // pCancel
- //
- pCancel.Controls.Add(cmdCancel);
- pCancel.Dock = System.Windows.Forms.DockStyle.Left;
- pCancel.Location = new System.Drawing.Point(224, 0);
- pCancel.Name = "pCancel";
- pCancel.Padding = new System.Windows.Forms.Padding(6, 7, 10, 7);
- pCancel.Size = new System.Drawing.Size(112, 37);
- pCancel.TabIndex = 11;
- //
- // cmdCancel
- //
- cmdCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- cmdCancel.Dock = System.Windows.Forms.DockStyle.Fill;
- cmdCancel.Location = new System.Drawing.Point(6, 7);
- cmdCancel.Name = "cmdCancel";
- cmdCancel.Size = new System.Drawing.Size(96, 23);
- cmdCancel.TabIndex = 9;
- cmdCancel.Text = "Cancel";
- cmdCancel.UseVisualStyleBackColor = true;
- cmdCancel.Click += cmdCancel_Click;
- //
- // pSaveAs
- //
- pSaveAs.Controls.Add(cmdSaveAs);
- pSaveAs.Dock = System.Windows.Forms.DockStyle.Left;
- pSaveAs.Location = new System.Drawing.Point(112, 0);
- pSaveAs.Name = "pSaveAs";
- pSaveAs.Padding = new System.Windows.Forms.Padding(6, 7, 10, 7);
- pSaveAs.Size = new System.Drawing.Size(112, 37);
- pSaveAs.TabIndex = 10;
- //
- // cmdSaveAs
- //
- cmdSaveAs.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- cmdSaveAs.Dock = System.Windows.Forms.DockStyle.Fill;
- cmdSaveAs.Location = new System.Drawing.Point(6, 7);
- cmdSaveAs.Name = "cmdSaveAs";
- cmdSaveAs.Size = new System.Drawing.Size(96, 23);
- cmdSaveAs.TabIndex = 6;
- cmdSaveAs.Text = "Save as";
- cmdSaveAs.UseVisualStyleBackColor = true;
- cmdSaveAs.Click += cmdSaveAs_Click;
- //
- // pSave
- //
- pSave.Controls.Add(cmdOk);
- pSave.Dock = System.Windows.Forms.DockStyle.Left;
- pSave.Location = new System.Drawing.Point(0, 0);
- pSave.Name = "pSave";
- pSave.Padding = new System.Windows.Forms.Padding(6, 7, 10, 7);
- pSave.Size = new System.Drawing.Size(112, 37);
- pSave.TabIndex = 9;
- //
- // cmdOk
- //
- cmdOk.Dock = System.Windows.Forms.DockStyle.Fill;
- cmdOk.Location = new System.Drawing.Point(6, 7);
- cmdOk.Name = "cmdOk";
- cmdOk.Size = new System.Drawing.Size(96, 23);
- cmdOk.TabIndex = 2;
- cmdOk.Text = "Save";
- cmdOk.UseVisualStyleBackColor = true;
- cmdOk.Click += cmdOk_Click;
- //
- // pData
- //
- pData.Controls.Add(lvwAclGroups);
- pData.Controls.Add(lblAclGroups);
- pData.Controls.Add(vtxtName);
- pData.Controls.Add(lblName);
- pData.Controls.Add(txtId);
- pData.Controls.Add(lblId);
- pData.Dock = System.Windows.Forms.DockStyle.Fill;
- pData.Location = new System.Drawing.Point(0, 0);
- pData.Name = "pData";
- pData.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6);
- pData.Size = new System.Drawing.Size(746, 481);
- pData.TabIndex = 0;
- //
- // lvwAclGroups
- //
- lvwAclGroups.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { colId, colName });
- lvwAclGroups.Dock = System.Windows.Forms.DockStyle.Fill;
- lvwAclGroups.FullRowSelect = true;
- lvwAclGroups.Location = new System.Drawing.Point(5, 115);
- lvwAclGroups.Name = "lvwAclGroups";
- lvwAclGroups.Size = new System.Drawing.Size(736, 360);
- lvwAclGroups.Sorting = System.Windows.Forms.SortOrder.Ascending;
- lvwAclGroups.TabIndex = 6;
- lvwAclGroups.UseCompatibleStateImageBehavior = false;
- lvwAclGroups.View = System.Windows.Forms.View.Details;
- lvwAclGroups.MouseUp += lvwAclGroups_MouseUp;
- //
- // colId
- //
- colId.Text = "Id";
- colId.Width = 75;
- //
- // colName
- //
- colName.Text = "Name";
- colName.Width = 250;
- //
- // lblAclGroups
- //
- lblAclGroups.AutoSize = true;
- lblAclGroups.Dock = System.Windows.Forms.DockStyle.Top;
- lblAclGroups.Location = new System.Drawing.Point(5, 91);
- lblAclGroups.Margin = new System.Windows.Forms.Padding(0);
- lblAclGroups.Name = "lblAclGroups";
- lblAclGroups.Padding = new System.Windows.Forms.Padding(0, 9, 0, 0);
- lblAclGroups.Size = new System.Drawing.Size(45, 24);
- lblAclGroups.TabIndex = 5;
- lblAclGroups.Text = "Groups";
- //
- // vtxtName
- //
- vtxtName.BackColor = System.Drawing.Color.Yellow;
- vtxtName.BothInvalidColor = System.Drawing.Color.Red;
- vtxtName.Dock = System.Windows.Forms.DockStyle.Top;
- vtxtName.ExternalInvalidColor = System.Drawing.Color.Orange;
- vtxtName.ExternalValidation = null;
- vtxtName.InternalInvalidColor = System.Drawing.Color.Yellow;
- vtxtName.InvalidReadOnlyColor = System.Drawing.Color.LightYellow;
- vtxtName.Location = new System.Drawing.Point(5, 68);
- vtxtName.Name = "vtxtName";
- vtxtName.RegularExpression = "^[a-zA-Z0-9_.-]+$";
- vtxtName.Size = new System.Drawing.Size(736, 23);
- vtxtName.TabIndex = 0;
- vtxtName.ValidColor = System.Drawing.Color.White;
- vtxtName.ValidReadOnlyColor = System.Drawing.SystemColors.Control;
- vtxtName.TextChanged += vtxtName_TextChanged;
- //
- // lblName
- //
- lblName.AutoSize = true;
- lblName.Dock = System.Windows.Forms.DockStyle.Top;
- lblName.Location = new System.Drawing.Point(5, 44);
- lblName.Margin = new System.Windows.Forms.Padding(0);
- lblName.Name = "lblName";
- lblName.Padding = new System.Windows.Forms.Padding(0, 9, 0, 0);
- lblName.Size = new System.Drawing.Size(39, 24);
- lblName.TabIndex = 4;
- lblName.Text = "Name";
- //
- // txtId
- //
- txtId.Dock = System.Windows.Forms.DockStyle.Top;
- txtId.Location = new System.Drawing.Point(5, 21);
- txtId.Margin = new System.Windows.Forms.Padding(0);
- txtId.Name = "txtId";
- txtId.ReadOnly = true;
- txtId.Size = new System.Drawing.Size(736, 23);
- txtId.TabIndex = 1;
- //
- // lblId
- //
- lblId.AutoSize = true;
- lblId.Dock = System.Windows.Forms.DockStyle.Top;
- lblId.Location = new System.Drawing.Point(5, 6);
- lblId.Margin = new System.Windows.Forms.Padding(0);
- lblId.Name = "lblId";
- lblId.Size = new System.Drawing.Size(17, 15);
- lblId.TabIndex = 0;
- lblId.Text = "Id";
- //
- // EditAcl
- //
- AcceptButton = cmdOk;
- AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
- AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- CancelButton = cmdCancel;
- ClientSize = new System.Drawing.Size(746, 518);
- Controls.Add(pData);
- Controls.Add(panel7);
- FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
- Name = "EditAcl";
- Text = "Edit ACL";
- Load += EditFolderType_Load;
- panel7.ResumeLayout(false);
- pCancel.ResumeLayout(false);
- pSaveAs.ResumeLayout(false);
- pSave.ResumeLayout(false);
- pData.ResumeLayout(false);
- pData.PerformLayout();
- ResumeLayout(false);
- }
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ panel7 = new Panel();
+ pCancel = new Panel();
+ cmdCancel = new Button();
+ pSaveAs = new Panel();
+ cmdSaveAs = new Button();
+ pSave = new Panel();
+ cmdOk = new Button();
+ pData = new Panel();
+ lvwAclGroups = new ListView();
+ colId = new ColumnHeader();
+ colName = new ColumnHeader();
+ lblAclGroups = new Label();
+ vtxtName = new C4GeneralGui.GuiElements.ValidatingTextBox();
+ lblName = new Label();
+ txtId = new TextBox();
+ lblId = new Label();
+ panel7.SuspendLayout();
+ pCancel.SuspendLayout();
+ pSaveAs.SuspendLayout();
+ pSave.SuspendLayout();
+ pData.SuspendLayout();
+ SuspendLayout();
+ //
+ // panel7
+ //
+ panel7.Controls.Add(pCancel);
+ panel7.Controls.Add(pSaveAs);
+ panel7.Controls.Add(pSave);
+ panel7.Dock = DockStyle.Bottom;
+ panel7.Location = new Point(0, 481);
+ panel7.Name = "panel7";
+ panel7.Size = new Size(746, 37);
+ panel7.TabIndex = 6;
+ //
+ // pCancel
+ //
+ pCancel.Controls.Add(cmdCancel);
+ pCancel.Dock = DockStyle.Left;
+ pCancel.Location = new Point(224, 0);
+ pCancel.Name = "pCancel";
+ pCancel.Padding = new Padding(6, 7, 10, 7);
+ pCancel.Size = new Size(112, 37);
+ pCancel.TabIndex = 11;
+ //
+ // cmdCancel
+ //
+ cmdCancel.DialogResult = DialogResult.Cancel;
+ cmdCancel.Dock = DockStyle.Fill;
+ cmdCancel.Location = new Point(6, 7);
+ cmdCancel.Name = "cmdCancel";
+ cmdCancel.Size = new Size(96, 23);
+ cmdCancel.TabIndex = 9;
+ cmdCancel.Text = "Cancel";
+ cmdCancel.UseVisualStyleBackColor = true;
+ cmdCancel.Click += cmdCancel_Click;
+ //
+ // pSaveAs
+ //
+ pSaveAs.Controls.Add(cmdSaveAs);
+ pSaveAs.Dock = DockStyle.Left;
+ pSaveAs.Location = new Point(112, 0);
+ pSaveAs.Name = "pSaveAs";
+ pSaveAs.Padding = new Padding(6, 7, 10, 7);
+ pSaveAs.Size = new Size(112, 37);
+ pSaveAs.TabIndex = 10;
+ //
+ // cmdSaveAs
+ //
+ cmdSaveAs.DialogResult = DialogResult.Cancel;
+ cmdSaveAs.Dock = DockStyle.Fill;
+ cmdSaveAs.Location = new Point(6, 7);
+ cmdSaveAs.Name = "cmdSaveAs";
+ cmdSaveAs.Size = new Size(96, 23);
+ cmdSaveAs.TabIndex = 6;
+ cmdSaveAs.Text = "Save as";
+ cmdSaveAs.UseVisualStyleBackColor = true;
+ cmdSaveAs.Click += cmdSaveAs_Click;
+ //
+ // pSave
+ //
+ pSave.Controls.Add(cmdOk);
+ pSave.Dock = DockStyle.Left;
+ pSave.Location = new Point(0, 0);
+ pSave.Name = "pSave";
+ pSave.Padding = new Padding(6, 7, 10, 7);
+ pSave.Size = new Size(112, 37);
+ pSave.TabIndex = 9;
+ //
+ // cmdOk
+ //
+ cmdOk.Dock = DockStyle.Fill;
+ cmdOk.Location = new Point(6, 7);
+ cmdOk.Name = "cmdOk";
+ cmdOk.Size = new Size(96, 23);
+ cmdOk.TabIndex = 2;
+ cmdOk.Text = "Save";
+ cmdOk.UseVisualStyleBackColor = true;
+ cmdOk.Click += cmdOk_Click;
+ //
+ // pData
+ //
+ pData.Controls.Add(lvwAclGroups);
+ pData.Controls.Add(lblAclGroups);
+ pData.Controls.Add(vtxtName);
+ pData.Controls.Add(lblName);
+ pData.Controls.Add(txtId);
+ pData.Controls.Add(lblId);
+ pData.Dock = DockStyle.Fill;
+ pData.Location = new Point(0, 0);
+ pData.Name = "pData";
+ pData.Padding = new Padding(5, 6, 5, 6);
+ pData.Size = new Size(746, 481);
+ pData.TabIndex = 0;
+ //
+ // lvwAclGroups
+ //
+ lvwAclGroups.Columns.AddRange(new ColumnHeader[] { colId, colName });
+ lvwAclGroups.Dock = DockStyle.Fill;
+ lvwAclGroups.FullRowSelect = true;
+ lvwAclGroups.Location = new Point(5, 115);
+ lvwAclGroups.Name = "lvwAclGroups";
+ lvwAclGroups.Size = new Size(736, 360);
+ lvwAclGroups.Sorting = SortOrder.Ascending;
+ lvwAclGroups.TabIndex = 6;
+ lvwAclGroups.UseCompatibleStateImageBehavior = false;
+ lvwAclGroups.View = View.Details;
+ lvwAclGroups.MouseUp += lvwAclGroups_MouseUp;
+ //
+ // colId
+ //
+ colId.Text = "Id";
+ colId.Width = 75;
+ //
+ // colName
+ //
+ colName.Text = "Name";
+ colName.Width = 250;
+ //
+ // lblAclGroups
+ //
+ lblAclGroups.AutoSize = true;
+ lblAclGroups.Dock = DockStyle.Top;
+ lblAclGroups.Location = new Point(5, 91);
+ lblAclGroups.Margin = new Padding(0);
+ lblAclGroups.Name = "lblAclGroups";
+ lblAclGroups.Padding = new Padding(0, 9, 0, 0);
+ lblAclGroups.Size = new Size(45, 24);
+ lblAclGroups.TabIndex = 5;
+ lblAclGroups.Text = "Groups";
+ //
+ // vtxtName
+ //
+ vtxtName.BackColor = Color.Yellow;
+ vtxtName.BothInvalidColor = Color.Red;
+ vtxtName.Dock = DockStyle.Top;
+ vtxtName.ExternalInvalidColor = Color.Orange;
+ vtxtName.ExternalValidation = null;
+ vtxtName.InternalInvalidColor = Color.Yellow;
+ vtxtName.InvalidReadOnlyColor = Color.LightYellow;
+ vtxtName.Location = new Point(5, 68);
+ vtxtName.Name = "vtxtName";
+ vtxtName.RegularExpression = "^[a-zA-Z0-9_.-]+$";
+ vtxtName.Size = new Size(736, 23);
+ vtxtName.TabIndex = 0;
+ vtxtName.ValidColor = Color.White;
+ vtxtName.ValidReadOnlyColor = SystemColors.Control;
+ vtxtName.TextChanged += vtxtName_TextChanged;
+ //
+ // lblName
+ //
+ lblName.AutoSize = true;
+ lblName.Dock = DockStyle.Top;
+ lblName.Location = new Point(5, 44);
+ lblName.Margin = new Padding(0);
+ lblName.Name = "lblName";
+ lblName.Padding = new Padding(0, 9, 0, 0);
+ lblName.Size = new Size(39, 24);
+ lblName.TabIndex = 4;
+ lblName.Text = "Name";
+ //
+ // txtId
+ //
+ txtId.Dock = DockStyle.Top;
+ txtId.Location = new Point(5, 21);
+ txtId.Margin = new Padding(0);
+ txtId.Name = "txtId";
+ txtId.ReadOnly = true;
+ txtId.Size = new Size(736, 23);
+ txtId.TabIndex = 1;
+ //
+ // lblId
+ //
+ lblId.AutoSize = true;
+ lblId.Dock = DockStyle.Top;
+ lblId.Location = new Point(5, 6);
+ lblId.Margin = new Padding(0);
+ lblId.Name = "lblId";
+ lblId.Size = new Size(17, 15);
+ lblId.TabIndex = 0;
+ lblId.Text = "Id";
+ //
+ // EditAcl
+ //
+ AcceptButton = cmdOk;
+ AutoScaleDimensions = new SizeF(7F, 15F);
+ AutoScaleMode = AutoScaleMode.Font;
+ CancelButton = cmdCancel;
+ ClientSize = new Size(746, 518);
+ Controls.Add(pData);
+ Controls.Add(panel7);
+ FormBorderStyle = FormBorderStyle.FixedDialog;
+ Name = "EditAcl";
+ Text = "Edit ACL";
+ Load += EditFolderType_Load;
+ panel7.ResumeLayout(false);
+ pCancel.ResumeLayout(false);
+ pSaveAs.ResumeLayout(false);
+ pSave.ResumeLayout(false);
+ pData.ResumeLayout(false);
+ pData.PerformLayout();
+ ResumeLayout(false);
+ }
- #endregion
+ #endregion
- private System.Windows.Forms.Panel panel7;
+ private System.Windows.Forms.Panel panel7;
private System.Windows.Forms.Panel pData;
private System.Windows.Forms.TextBox txtId;
private System.Windows.Forms.Label lblId;
Modified: Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditAcl.cs
===================================================================
--- Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditAcl.cs 2024-07-29 11:18:41 UTC (rev 3786)
+++ Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditAcl.cs 2024-07-29 13:16:20 UTC (rev 3787)
@@ -3,6 +3,7 @@
using C4GeneralGui.Helpers;
using C4ServerConnector;
using C4ServerConnector.Assets;
+using CDCplusLib.Common;
using System.Xml;
namespace C4Admin.GUI.AssetEditors
@@ -10,10 +11,11 @@
public partial class EditAcl : Form
{
private C4Session _s;
- public C4Acl Acl { get; private set; }
- public bool SaveAs { get; private set; }
+ private ListViewSort _lvwSort;
private string _origName;
private Dictionary<long, C4Group> _groups;
+ public C4Acl Acl { get; private set; }
+ public bool SaveAs { get; private set; }
public EditAcl(string title, C4Session s, C4Acl acl, bool showSaveAs)
{
InitializeComponent();
@@ -52,9 +54,11 @@
lvi.SubItems.Add(_groups[(long)(aclGroup.GroupId)].Name);
}
}
- }
+ if (_lvwSort == null) _lvwSort = new ListViewSort(lvwAclGroups);
+ _lvwSort.Sort(_lvwSort.LastColumn, _lvwSort.ColumnSortOrder);
+ }
- private void cmdOk_Click(object sender, EventArgs e)
+ private void cmdOk_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.OK;
SaveAs = false;
Modified: Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditAcl.resx
===================================================================
--- Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditAcl.resx 2024-07-29 11:18:41 UTC (rev 3786)
+++ Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditAcl.resx 2024-07-29 13:16:20 UTC (rev 3787)
@@ -18,7 +18,7 @@
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing"">Blue</data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
Modified: Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditLifecycle.cs
===================================================================
--- Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditLifecycle.cs 2024-07-29 11:18:41 UTC (rev 3786)
+++ Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditLifecycle.cs 2024-07-29 13:16:20 UTC (rev 3787)
@@ -4,6 +4,7 @@
using C4GeneralGui.Helpers;
using C4GeneralGui.GuiElements;
using System.Xml;
+using CDCplusLib.Common;
namespace C4Admin.GUI.AssetEditors
{
@@ -11,7 +12,8 @@
{
public C4Lifecycle Lifecycle { get; private set; }
public bool SaveAs { get; private set; }
- private string _origName;
+ private ListViewSort _lvwSort;
+ private string _origName;
private C4Session _c4s;
private Dictionary<long, C4LifecycleState> _allStates;
@@ -55,10 +57,11 @@
lvi.SubItems.Add(state.StateClass);
lvi.SubItems.Add(state.LifecycleStateForCopyId == null ? "" : _allStates[(long)state.LifecycleStateForCopyId].Name);
}
+ if (_lvwSort == null) _lvwSort = new ListViewSort(lvwStates);
+ _lvwSort.Sort(_lvwSort.LastColumn, _lvwSort.ColumnSortOrder);
+ }
- }
-
- private void cmdOk_Click(object sender, EventArgs e)
+ private void cmdOk_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.OK;
SaveAs = false;
Modified: Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.Designer.cs
===================================================================
--- Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.Designer.cs 2024-07-29 11:18:41 UTC (rev 3786)
+++ Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.Designer.cs 2024-07-29 13:16:20 UTC (rev 3787)
@@ -237,6 +237,7 @@
clbGroups.Size = new Size(447, 129);
clbGroups.Sorted = true;
clbGroups.TabIndex = 63;
+ clbGroups.ItemCheck += clbGroups_ItemCheck;
//
// xtxtConfig
//
@@ -368,7 +369,7 @@
vtxtFullName.InvalidReadOnlyColor = Color.LightYellow;
vtxtFullName.Location = new Point(5, 162);
vtxtFullName.Name = "vtxtFullName";
- vtxtFullName.RegularExpression = "^[ a-zA-Z0-9_.-@]+$";
+ vtxtFullName.RegularExpression = "^[ a-zA-Z0-9_.-]+$";
vtxtFullName.Size = new Size(447, 23);
vtxtFullName.TabIndex = 36;
vtxtFullName.ValidColor = Color.White;
@@ -428,7 +429,7 @@
vtxtName.InvalidReadOnlyColor = Color.LightYellow;
vtxtName.Location = new Point(5, 68);
vtxtName.Name = "vtxtName";
- vtxtName.RegularExpression = "^[a-zA-Z0-9_.-@]+$";
+ vtxtName.RegularExpression = "^[a-zA-Z0-9_.-]+$";
vtxtName.Size = new Size(447, 23);
vtxtName.TabIndex = 0;
vtxtName.ValidColor = Color.White;
Modified: Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.cs
===================================================================
--- Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.cs 2024-07-29 11:18:41 UTC (rev 3786)
+++ Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.cs 2024-07-29 13:16:20 UTC (rev 3787)
@@ -6,153 +6,165 @@
namespace C4Admin.GUI.AssetEditors
{
public partial class EditUser : Form
- {
- public C4User User { get; private set; }
- public bool SaveAs { get; private set; }
- private string _origName;
- private C4Session _s;
- public EditUser(string title, C4User user, Dictionary<long, C4Group> groups, Dictionary<long, C4Language> uiLanguages, bool showSaveAs, C4Session s)
- {
- InitializeComponent();
- _s = s;
- Text = title;
- User = user;
- cboUiLanguage.Items.Clear();
- foreach (C4Language l in uiLanguages.Values) cboUiLanguage.Items.Add(l);
- clbGroups.Items.Clear();
- foreach (C4Group g in groups.Values) clbGroups.Items.Add(g);
- cboLoginType.Items.Clear(); // softcode?
- cboLoginType.Items.Add("CINNAMON");
- cboLoginType.Items.Add("LDAP");
+ {
+ public C4User User { get; private set; }
+ public bool SaveAs { get; private set; }
+ private string _origName;
+ private C4Session _s;
+ public EditUser(string title, C4User user, Dictionary<long, C4Group> groups, Dictionary<long, C4Language> uiLanguages, bool showSaveAs, C4Session s)
+ {
+ InitializeComponent();
+ _s = s;
+ Text = title;
+ User = user;
+ cboUiLanguage.Items.Clear();
+ foreach (C4Language l in uiLanguages.Values) cboUiLanguage.Items.Add(l);
+ clbGroups.Items.Clear();
+ foreach (C4Group g in groups.Values) clbGroups.Items.Add(g);
+ cboLoginType.Items.Clear(); // softcode?
+ cboLoginType.Items.Add("CINNAMON");
+ cboLoginType.Items.Add("LDAP");
cboLoginType.Items.Add("AZURE");
if (user == null)
- {
- txtId.Text = Definitions.NEW;
- vtxtName.Text = "";
- vtxtFullName.Text = "";
- cboLoginType.SelectedItem = "CINNAMON";
- cboUiLanguage.SelectedIndex = 0;
- chkActive.Checked = true;
- chkChangeTriggers.Checked = true;
- chkChangeTracking.Checked = true;
- chkLocked.Checked = false;
- chkPasswordExpired.Checked = false;
- xtxtConfig.SetText("<config/>");
- vtxtEmail.Text = "";
- _origName = null;
- }
- else
- {
- txtId.Text = User.Id == null ? Definitions.NEW : User.Id.ToString();
- vtxtName.Text = User.Name;
- vtxtFullName.Text = User.FullName;
- cboLoginType.SelectedItem = User.LoginType;
- cboUiLanguage.SelectedItem = uiLanguages[User.UiLanguageId];
- foreach (C4Group g in groups.Values)
- {
- if (User.GroupIds.Contains((long)g.Id)) clbGroups.SetItemChecked(clbGroups.Items.IndexOf(g), true);
- }
- chkActive.Checked = User.Active;
- chkChangeTriggers.Checked = User.ActivateTriggers;
- chkChangeTracking.Checked = User.ChangeTracking;
- chkLocked.Checked = User.Locked;
- chkPasswordExpired.Checked = User.PasswordExpired;
- xtxtConfig.SetText(User.UserConfig.OuterXml);
- vtxtEmail.Text = User.Email;
- _origName = null;
- _origName = User.Name;
- }
+ {
+ txtId.Text = Definitions.NEW;
+ vtxtName.Text = "";
+ vtxtFullName.Text = "";
+ cboLoginType.SelectedItem = "CINNAMON";
+ cboUiLanguage.SelectedIndex = 0;
+ chkActive.Checked = true;
+ chkChangeTriggers.Checked = true;
+ chkChangeTracking.Checked = true;
+ chkLocked.Checked = false;
+ chkPasswordExpired.Checked = false;
+ xtxtConfig.SetText("<config/>");
+ vtxtEmail.Text = "";
+ _origName = null;
+ }
+ else
+ {
+ txtId.Text = User.Id == null ? Definitions.NEW : User.Id.ToString();
+ vtxtName.Text = User.Name;
+ vtxtFullName.Text = User.FullName;
+ cboLoginType.SelectedItem = User.LoginType;
+ cboUiLanguage.SelectedItem = uiLanguages[User.UiLanguageId];
+ foreach (C4Group g in groups.Values)
+ {
+ if(g.Name == "_owner") clbGroups.SetItemChecked(clbGroups.Items.IndexOf(g), false);
+ else if (g.Name == "_everyone") clbGroups.SetItemChecked(clbGroups.Items.IndexOf(g), true);
+ else if (User.GroupIds.Contains((long)g.Id)) clbGroups.SetItemChecked(clbGroups.Items.IndexOf(g), true);
+ }
+ chkActive.Checked = User.Active;
+ chkChangeTriggers.Checked = User.ActivateTriggers;
+ chkChangeTracking.Checked = User.ChangeTracking;
+ chkLocked.Checked = User.Locked;
+ chkPasswordExpired.Checked = User.PasswordExpired;
+ xtxtConfig.SetText(User.UserConfig.OuterXml);
+ vtxtEmail.Text = User.Email;
+ _origName = null;
+ _origName = User.Name;
+ }
- GuiActions();
- pSaveAs.Visible = showSaveAs;
- }
+ GuiActions();
+ pSaveAs.Visible = showSaveAs;
+ }
- private void cmdOk_Click(object sender, EventArgs e)
- {
- DialogResult = DialogResult.OK;
- SaveAs = false;
- long? id = null;
- if (txtId.Text != Definitions.NEW) id = long.Parse(txtId.Text);
- XmlDocument userConfig = new XmlDocument();
- userConfig.LoadXml(xtxtConfig.Text);
- HashSet<long> groupIds = new HashSet<long>();
- foreach (C4Group g in clbGroups.CheckedItems) groupIds.Add((long)g.Id);
- User = new C4User(vtxtName.Text,
- vtxtPassword.Text,
- id,
- vtxtFullName.Text,
- (long)((C4Language)cboUiLanguage.SelectedItem).Id,
- cboLoginType.Text,
- vtxtEmail.Text,
- chkActive.Checked,
- chkChangeTriggers.Checked,
- chkLocked.Checked,
- chkChangeTracking.Checked,
- chkPasswordExpired.Checked,
- groupIds,
- userConfig,
- _s);
- Close();
- }
+ private void cmdOk_Click(object sender, EventArgs e)
+ {
+ DialogResult = DialogResult.OK;
+ SaveAs = false;
+ long? id = null;
+ if (txtId.Text != Definitions.NEW) id = long.Parse(txtId.Text);
+ XmlDocument userConfig = new XmlDocument();
+ userConfig.LoadXml(xtxtConfig.Text);
+ HashSet<long> groupIds = new HashSet<long>();
+ foreach (C4Group g in clbGroups.CheckedItems) groupIds.Add((long)g.Id);
+ User = new C4User(vtxtName.Text,
+ vtxtPassword.Text,
+ id,
+ vtxtFullName.Text,
+ (long)((C4Language)cboUiLanguage.SelectedItem).Id,
+ cboLoginType.Text,
+ vtxtEmail.Text,
+ chkActive.Checked,
+ chkChangeTriggers.Checked,
+ chkLocked.Checked,
+ chkChangeTracking.Checked,
+ chkPasswordExpired.Checked,
+ groupIds,
+ userConfig,
+ _s);
+ Close();
+ }
- private void cmdSaveAs_Click(object sender, EventArgs e)
- {
- DialogResult = DialogResult.OK;
- SaveAs = true;
- long? id = null;
- if (txtId.Text != Definitions.NEW) id = long.Parse(txtId.Text);
- XmlDocument userConfig = new XmlDocument();
- userConfig.LoadXml(xtxtConfig.Text);
- HashSet<long> groupIds = new HashSet<long>();
- foreach (C4Group g in clbGroups.CheckedItems) groupIds.Add((long)g.Id);
- User = new C4User(vtxtName.Text,
- vtxtPassword.Text,
- id,
- vtxtFullName.Text,
- (long)((C4Language)cboUiLanguage.SelectedItem).Id,
- cboLoginType.Text,
- vtxtEmail.Text,
- chkActive.Checked,
- chkChangeTriggers.Checked,
- chkLocked.Checked,
- chkChangeTracking.Checked,
- chkPasswordExpired.Checked,
- groupIds,
- userConfig,
- _s);
- Close();
- }
- private void cmdCancel_Click(object sender, EventArgs e)
- {
- DialogResult = DialogResult.Cancel;
- Close();
- }
+ private void cmdSaveAs_Click(object sender, EventArgs e)
+ {
+ DialogResult = DialogResult.OK;
+ SaveAs = true;
+ long? id = null;
+ if (txtId.Text != Definitions.NEW) id = long.Parse(txtId.Text);
+ XmlDocument userConfig = new XmlDocument();
+ userConfig.LoadXml(xtxtConfig.Text);
+ HashSet<long> groupIds = new HashSet<long>();
+ foreach (C4Group g in clbGroups.CheckedItems) groupIds.Add((long)g.Id);
+ User = new C4User(vtxtName.Text,
+ vtxtPassword.Text,
+ id,
+ vtxtFullName.Text,
+ (long)((C4Language)cboUiLanguage.SelectedItem).Id,
+ cboLoginType.Text,
+ vtxtEmail.Text,
+ chkActive.Checked,
+ chkChangeTriggers.Checked,
+ chkLocked.Checked,
+ chkChangeTracking.Checked,
+ chkPasswordExpired.Checked,
+ groupIds,
+ userConfig,
+ _s);
+ Close();
+ }
+ private void cmdCancel_Click(object sender, EventArgs e)
+ {
+ DialogResult = DialogResult.Cancel;
+ Close();
+ }
- private void GuiActions()
- {
- bool valid = vtxtName.IsValid && vtxtFullName.IsValid && vtxtPassword.IsValid;
- cmdOk.Enabled = valid;
- cmdSaveAs.Enabled = (vtxtName.Text != _origName && valid);
- }
- private void vtxtName_TextChanged(object sender, EventArgs e)
- {
- GuiActions();
- }
+ private void GuiActions()
+ {
+ bool valid = vtxtName.IsValid && vtxtFullName.IsValid && vtxtPassword.IsValid;
+ cmdOk.Enabled = valid;
+ cmdSaveAs.Enabled = (vtxtName.Text != _origName && valid);
+ }
+ private void vtxtName_TextChanged(object sender, EventArgs e)
+ {
+ GuiActions();
+ }
- private void EditGroup_Load(object sender, EventArgs e)
- {
- ActiveControl = vtxtName;
- }
+ private void EditGroup_Load(object sender, EventArgs e)
+ {
+ ActiveControl = vtxtName;
+ }
- private void vtxtPassword_TextChanged(object sender, EventArgs e)
- {
- GuiActions();
- }
+ private void vtxtPassword_TextChanged(object sender, EventArgs e)
+ {
+ GuiActions();
+ }
- private void vtxtFullName_TextChanged(object sender, EventArgs e)
- {
- GuiActions();
- }
- }
+ private void vtxtFullName_TextChanged(object sender, EventArgs e)
+ {
+ GuiActions();
+ }
+
+ private void clbGroups_ItemCheck(object sender, ItemCheckEventArgs e)
+ {
+ CheckedListBox clb = sender as CheckedListBox;
+ if (clb != null)
+ {
+ if (clb.Items[e.Index].ToString() == "_owner" && e.NewValue == CheckState.Checked) e.NewValue = CheckState.Unchecked;
+ else if (clb.Items[e.Index].ToString() == "_everyone" && e.NewValue != CheckState.Checked) e.NewValue = CheckState.Checked;
+ }
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2024-07-29 11:18:43
|
Revision: 3786
http://sourceforge.net/p/cinnamon/code/3786
Author: bhorner
Date: 2024-07-29 11:18:41 +0000 (Mon, 29 Jul 2024)
Log Message:
-----------
OBJECT_NOT_FOUND ignored in http interface
Modified Paths:
--------------
Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.Designer.cs
Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.cs
Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.resx
Client/trunk/Cinnamon4/C4ServerConnector/HttpInterface.cs
Client/trunk/Cinnamon4/ChangeTrigger/Controllers/ChangeTriggerController.cs
Client/trunk/Cinnamon4/ChangeTrigger/Program.cs
Modified: Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.Designer.cs
===================================================================
--- Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.Designer.cs 2024-07-16 10:52:47 UTC (rev 3785)
+++ Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.Designer.cs 2024-07-29 11:18:41 UTC (rev 3786)
@@ -21,478 +21,478 @@
base.Dispose(disposing);
}
- #region Windows Form Designer generated code
+ #region Windows Form Designer generated code
- /// <summary>
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- /// </summary>
- private void InitializeComponent()
- {
- System.Windows.Forms.Label label3;
- System.Windows.Forms.Label label2;
- System.Windows.Forms.Label label5;
- System.Windows.Forms.Label label6;
- panel7 = new System.Windows.Forms.Panel();
- pCancel = new System.Windows.Forms.Panel();
- cmdCancel = new System.Windows.Forms.Button();
- pSaveAs = new System.Windows.Forms.Panel();
- cmdSaveAs = new System.Windows.Forms.Button();
- pSave = new System.Windows.Forms.Panel();
- cmdOk = new System.Windows.Forms.Button();
- pData = new System.Windows.Forms.Panel();
- clbGroups = new System.Windows.Forms.CheckedListBox();
- xtxtConfig = new C4GeneralGui.GuiElements.XmlTextBox();
- chkPasswordExpired = new System.Windows.Forms.CheckBox();
- chkLocked = new System.Windows.Forms.CheckBox();
- chkChangeTracking = new System.Windows.Forms.CheckBox();
- chkChangeTriggers = new System.Windows.Forms.CheckBox();
- chkActive = new System.Windows.Forms.CheckBox();
- vtxtEmail = new C4GeneralGui.GuiElements.ValidatingTextBox();
- label4 = new System.Windows.Forms.Label();
- cboLoginType = new System.Windows.Forms.ComboBox();
- cboUiLanguage = new System.Windows.Forms.ComboBox();
- vtxtFullName = new C4GeneralGui.GuiElements.ValidatingTextBox();
- label7 = new System.Windows.Forms.Label();
- vtxtPassword = new C4GeneralGui.GuiElements.ValidatingTextBox();
- label1 = new System.Windows.Forms.Label();
- vtxtName = new C4GeneralGui.GuiElements.ValidatingTextBox();
- lblName = new System.Windows.Forms.Label();
- txtId = new System.Windows.Forms.TextBox();
- lblId = new System.Windows.Forms.Label();
- label3 = new System.Windows.Forms.Label();
- label2 = new System.Windows.Forms.Label();
- label5 = new System.Windows.Forms.Label();
- label6 = new System.Windows.Forms.Label();
- panel7.SuspendLayout();
- pCancel.SuspendLayout();
- pSaveAs.SuspendLayout();
- pSave.SuspendLayout();
- pData.SuspendLayout();
- SuspendLayout();
- //
- // label3
- //
- label3.AutoSize = true;
- label3.Dock = System.Windows.Forms.DockStyle.Top;
- label3.Location = new System.Drawing.Point(5, 232);
- label3.Margin = new System.Windows.Forms.Padding(0);
- label3.Name = "label3";
- label3.Padding = new System.Windows.Forms.Padding(0, 9, 0, 0);
- label3.Size = new System.Drawing.Size(63, 24);
- label3.TabIndex = 40;
- label3.Text = "Login type";
- //
- // label2
- //
- label2.AutoSize = true;
- label2.Dock = System.Windows.Forms.DockStyle.Top;
- label2.Location = new System.Drawing.Point(5, 185);
- label2.Margin = new System.Windows.Forms.Padding(0);
- label2.Name = "label2";
- label2.Padding = new System.Windows.Forms.Padding(0, 9, 0, 0);
- label2.Size = new System.Drawing.Size(73, 24);
- label2.TabIndex = 38;
- label2.Text = "UI Language";
- //
- // label5
- //
- label5.AutoSize = true;
- label5.Dock = System.Windows.Forms.DockStyle.Top;
- label5.Location = new System.Drawing.Point(5, 609);
- label5.Margin = new System.Windows.Forms.Padding(0);
- label5.Name = "label5";
- label5.Padding = new System.Windows.Forms.Padding(0, 9, 0, 0);
- label5.Size = new System.Drawing.Size(115, 24);
- label5.TabIndex = 62;
- label5.Text = "Group memberships";
- //
- // label6
- //
- label6.AutoSize = true;
- label6.Dock = System.Windows.Forms.DockStyle.Top;
- label6.Location = new System.Drawing.Point(5, 471);
- label6.Margin = new System.Windows.Forms.Padding(0);
- label6.Name = "label6";
- label6.Padding = new System.Windows.Forms.Padding(0, 9, 0, 0);
- label6.Size = new System.Drawing.Size(43, 24);
- label6.TabIndex = 60;
- label6.Text = "Config";
- //
- // panel7
- //
- panel7.Controls.Add(pCancel);
- panel7.Controls.Add(pSaveAs);
- panel7.Controls.Add(pSave);
- panel7.Dock = System.Windows.Forms.DockStyle.Bottom;
- panel7.Location = new System.Drawing.Point(0, 768);
- panel7.Name = "panel7";
- panel7.Size = new System.Drawing.Size(457, 37);
- panel7.TabIndex = 6;
- //
- // pCancel
- //
- pCancel.Controls.Add(cmdCancel);
- pCancel.Dock = System.Windows.Forms.DockStyle.Left;
- pCancel.Location = new System.Drawing.Point(224, 0);
- pCancel.Name = "pCancel";
- pCancel.Padding = new System.Windows.Forms.Padding(6, 7, 10, 7);
- pCancel.Size = new System.Drawing.Size(112, 37);
- pCancel.TabIndex = 11;
- //
- // cmdCancel
- //
- cmdCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- cmdCancel.Dock = System.Windows.Forms.DockStyle.Fill;
- cmdCancel.Location = new System.Drawing.Point(6, 7);
- cmdCancel.Name = "cmdCancel";
- cmdCancel.Size = new System.Drawing.Size(96, 23);
- cmdCancel.TabIndex = 9;
- cmdCancel.Text = "Cancel";
- cmdCancel.UseVisualStyleBackColor = true;
- cmdCancel.Click += cmdCancel_Click;
- //
- // pSaveAs
- //
- pSaveAs.Controls.Add(cmdSaveAs);
- pSaveAs.Dock = System.Windows.Forms.DockStyle.Left;
- pSaveAs.Location = new System.Drawing.Point(112, 0);
- pSaveAs.Name = "pSaveAs";
- pSaveAs.Padding = new System.Windows.Forms.Padding(6, 7, 10, 7);
- pSaveAs.Size = new System.Drawing.Size(112, 37);
- pSaveAs.TabIndex = 10;
- //
- // cmdSaveAs
- //
- cmdSaveAs.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- cmdSaveAs.Dock = System.Windows.Forms.DockStyle.Fill;
- cmdSaveAs.Location = new System.Drawing.Point(6, 7);
- cmdSaveAs.Name = "cmdSaveAs";
- cmdSaveAs.Size = new System.Drawing.Size(96, 23);
- cmdSaveAs.TabIndex = 6;
- cmdSaveAs.Text = "Save as";
- cmdSaveAs.UseVisualStyleBackColor = true;
- cmdSaveAs.Click += cmdSaveAs_Click;
- //
- // pSave
- //
- pSave.Controls.Add(cmdOk);
- pSave.Dock = System.Windows.Forms.DockStyle.Left;
- pSave.Location = new System.Drawing.Point(0, 0);
- pSave.Name = "pSave";
- pSave.Padding = new System.Windows.Forms.Padding(6, 7, 10, 7);
- pSave.Size = new System.Drawing.Size(112, 37);
- pSave.TabIndex = 9;
- //
- // cmdOk
- //
- cmdOk.Dock = System.Windows.Forms.DockStyle.Fill;
- cmdOk.Location = new System.Drawing.Point(6, 7);
- cmdOk.Name = "cmdOk";
- cmdOk.Size = new System.Drawing.Size(96, 23);
- cmdOk.TabIndex = 2;
- cmdOk.Text = "Save";
- cmdOk.UseVisualStyleBackColor = true;
- cmdOk.Click += cmdOk_Click;
- //
- // pData
- //
- pData.Controls.Add(clbGroups);
- pData.Controls.Add(label5);
- pData.Controls.Add(xtxtConfig);
- pData.Controls.Add(label6);
- pData.Controls.Add(chkPasswordExpired);
- pData.Controls.Add(chkLocked);
- pData.Controls.Add(chkChangeTracking);
- pData.Controls.Add(chkChangeTriggers);
- pData.Controls.Add(chkActive);
- pData.Controls.Add(vtxtEmail);
- pData.Controls.Add(label4);
- pData.Controls.Add(cboLoginType);
- pData.Controls.Add(label3);
- pData.Controls.Add(cboUiLanguage);
- pData.Controls.Add(label2);
- pData.Controls.Add(vtxtFullName);
- pData.Controls.Add(label7);
- pData.Controls.Add(vtxtPassword);
- pData.Controls.Add(label1);
- pData.Controls.Add(vtxtName);
- pData.Controls.Add(lblName);
- pData.Controls.Add(txtId);
- pData.Controls.Add(lblId);
- pData.Dock = System.Windows.Forms.DockStyle.Fill;
- pData.Location = new System.Drawing.Point(0, 0);
- pData.Name = "pData";
- pData.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6);
- pData.Size = new System.Drawing.Size(457, 768);
- pData.TabIndex = 0;
- //
- // clbGroups
- //
- clbGroups.CheckOnClick = true;
- clbGroups.Dock = System.Windows.Forms.DockStyle.Fill;
- clbGroups.FormattingEnabled = true;
- clbGroups.Location = new System.Drawing.Point(5, 633);
- clbGroups.Name = "clbGroups";
- clbGroups.Size = new System.Drawing.Size(447, 129);
- clbGroups.Sorted = true;
- clbGroups.TabIndex = 63;
- //
- // xtxtConfig
- //
- xtxtConfig.Dock = System.Windows.Forms.DockStyle.Top;
- xtxtConfig.Location = new System.Drawing.Point(5, 495);
- xtxtConfig.Name = "xtxtConfig";
- xtxtConfig.Size = new System.Drawing.Size(447, 114);
- xtxtConfig.TabIndex = 61;
- xtxtConfig.Text = "";
- //
- // chkPasswordExpired
- //
- chkPasswordExpired.AutoSize = true;
- chkPasswordExpired.Dock = System.Windows.Forms.DockStyle.Top;
- chkPasswordExpired.Location = new System.Drawing.Point(5, 442);
- chkPasswordExpired.Name = "chkPasswordExpired";
- chkPasswordExpired.Padding = new System.Windows.Forms.Padding(0, 10, 0, 0);
- chkPasswordExpired.Size = new System.Drawing.Size(447, 29);
- chkPasswordExpired.TabIndex = 59;
- chkPasswordExpired.Text = "Password expired";
- chkPasswordExpired.UseVisualStyleBackColor = true;
- //
- // chkLocked
- //
- chkLocked.AutoSize = true;
- chkLocked.Dock = System.Windows.Forms.DockStyle.Top;
- chkLocked.Location = new System.Drawing.Point(5, 413);
- chkLocked.Name = "chkLocked";
- chkLocked.Padding = new System.Windows.Forms.Padding(0, 10, 0, 0);
- chkLocked.Size = new System.Drawing.Size(447, 29);
- chkLocked.TabIndex = 58;
- chkLocked.Text = "Locked";
- chkLocked.UseVisualStyleBackColor = true;
- //
- // chkChangeTracking
- //
- chkChangeTracking.AutoSize = true;
- chkChangeTracking.Dock = System.Windows.Forms.DockStyle.Top;
- chkChangeTracking.Location = new System.Drawing.Point(5, 384);
- chkChangeTracking.Name = "chkChangeTracking";
- chkChangeTracking.Padding = new System.Windows.Forms.Padding(0, 10, 0, 0);
- chkChangeTracking.Size = new System.Drawing.Size(447, 29);
- chkChangeTracking.TabIndex = 57;
- chkChangeTracking.Text = "Activate change tracking";
- chkChangeTracking.UseVisualStyleBackColor = true;
- //
- // chkChangeTriggers
- //
- chkChangeTriggers.AutoSize = true;
- chkChangeTriggers.Dock = System.Windows.Forms.DockStyle.Top;
- chkChangeTriggers.Location = new System.Drawing.Point(5, 355);
- chkChangeTriggers.Name = "chkChangeTriggers";
- chkChangeTriggers.Padding = new System.Windows.Forms.Padding(0, 10, 0, 0);
- chkChangeTriggers.Size = new System.Drawing.Size(447, 29);
- chkChangeTriggers.TabIndex = 56;
- chkChangeTriggers.Text = "Activate change triggers";
- chkChangeTriggers.UseVisualStyleBackColor = true;
- //
- // chkActive
- //
- chkActive.AutoSize = true;
- chkActive.Dock = System.Windows.Forms.DockStyle.Top;
- chkActive.Location = new System.Drawing.Point(5, 326);
- chkActive.Name = "chkActive";
- chkActive.Padding = new System.Windows.Forms.Padding(0, 10, 0, 0);
- chkActive.Size = new System.Drawing.Size(447, 29);
- chkActive.TabIndex = 55;
- chkActive.Text = "Active";
- chkActive.UseVisualStyleBackColor = true;
- //
- // vtxtEmail
- //
- vtxtEmail.BackColor = System.Drawing.Color.Yellow;
- vtxtEmail.BothInvalidColor = System.Drawing.Color.Red;
- vtxtEmail.Dock = System.Windows.Forms.DockStyle.Top;
- vtxtEmail.ExternalInvalidColor = System.Drawing.Color.Orange;
- vtxtEmail.ExternalValidation = null;
- vtxtEmail.InternalInvalidColor = System.Drawing.Color.Yellow;
- vtxtEmail.InvalidReadOnlyColor = System.Drawing.Color.LightYellow;
- vtxtEmail.Location = new System.Drawing.Point(5, 303);
- vtxtEmail.Name = "vtxtEmail";
- vtxtEmail.RegularExpression = "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$";
- vtxtEmail.Size = new System.Drawing.Size(447, 23);
- vtxtEmail.TabIndex = 43;
- vtxtEmail.ValidColor = System.Drawing.Color.White;
- vtxtEmail.ValidReadOnlyColor = System.Drawing.SystemColors.Control;
- //
- // label4
- //
- label4.AutoSize = true;
- label4.Dock = System.Windows.Forms.DockStyle.Top;
- label4.Location = new System.Drawing.Point(5, 279);
- label4.Name = "label4";
- label4.Padding = new System.Windows.Forms.Padding(0, 9, 0, 0);
- label4.Size = new System.Drawing.Size(36, 24);
- label4.TabIndex = 42;
- label4.Text = "Email";
- //
- // cboLoginType
- //
- cboLoginType.Dock = System.Windows.Forms.DockStyle.Top;
- cboLoginType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- cboLoginType.FormattingEnabled = true;
- cboLoginType.Location = new System.Drawing.Point(5, 256);
- cboLoginType.Name = "cboLoginType";
- cboLoginType.Size = new System.Drawing.Size(447, 23);
- cboLoginType.Sorted = true;
- cboLoginType.TabIndex = 41;
- //
- // cboUiLanguage
- //
- cboUiLanguage.Dock = System.Windows.Forms.DockStyle.Top;
- cboUiLanguage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- cboUiLanguage.FormattingEnabled = true;
- cboUiLanguage.Location = new System.Drawing.Point(5, 209);
- cboUiLanguage.Name = "cboUiLanguage";
- cboUiLanguage.Size = new System.Drawing.Size(447, 23);
- cboUiLanguage.Sorted = true;
- cboUiLanguage.TabIndex = 39;
- //
- // vtxtFullName
- //
- vtxtFullName.BackColor = System.Drawing.Color.Yellow;
- vtxtFullName.BothInvalidColor = System.Drawing.Color.Red;
- vtxtFullName.Dock = System.Windows.Forms.DockStyle.Top;
- vtxtFullName.ExternalInvalidColor = System.Drawing.Color.Orange;
- vtxtFullName.ExternalValidation = null;
- vtxtFullName.InternalInvalidColor = System.Drawing.Color.Yellow;
- vtxtFullName.InvalidReadOnlyColor = System.Drawing.Color.LightYellow;
- vtxtFullName.Location = new System.Drawing.Point(5, 162);
- vtxtFullName.Name = "vtxtFullName";
- vtxtFullName.RegularExpression = "^[ a-zA-Z0-9_.-]+$";
- vtxtFullName.Size = new System.Drawing.Size(447, 23);
- vtxtFullName.TabIndex = 36;
- vtxtFullName.ValidColor = System.Drawing.Color.White;
- vtxtFullName.ValidReadOnlyColor = System.Drawing.SystemColors.Control;
- vtxtFullName.TextChanged += vtxtFullName_TextChanged;
- //
- // label7
- //
- label7.AutoSize = true;
- label7.Dock = System.Windows.Forms.DockStyle.Top;
- label7.Location = new System.Drawing.Point(5, 138);
- label7.Margin = new System.Windows.Forms.Padding(0);
- label7.Name = "label7";
- label7.Padding = new System.Windows.Forms.Padding(0, 9, 0, 0);
- label7.Size = new System.Drawing.Size(59, 24);
- label7.TabIndex = 37;
- label7.Text = "Full name";
- //
- // vtxtPassword
- //
- vtxtPassword.BackColor = System.Drawing.Color.White;
- vtxtPassword.BothInvalidColor = System.Drawing.Color.Red;
- vtxtPassword.Dock = System.Windows.Forms.DockStyle.Top;
- vtxtPassword.ExternalInvalidColor = System.Drawing.Color.Orange;
- vtxtPassword.ExternalValidation = null;
- vtxtPassword.InternalInvalidColor = System.Drawing.Color.Yellow;
- vtxtPassword.InvalidReadOnlyColor = System.Drawing.Color.LightYellow;
- vtxtPassword.Location = new System.Drawing.Point(5, 115);
- vtxtPassword.Name = "vtxtPassword";
- vtxtPassword.PasswordChar = '*';
- vtxtPassword.RegularExpression = "^.{7}.+$|^$";
- vtxtPassword.Size = new System.Drawing.Size(447, 23);
- vtxtPassword.TabIndex = 6;
- vtxtPassword.ValidColor = System.Drawing.Color.White;
- vtxtPassword.ValidReadOnlyColor = System.Drawing.SystemColors.Control;
- vtxtPassword.TextChanged += vtxtPassword_TextChanged;
- //
- // label1
- //
- label1.AutoSize = true;
- label1.Dock = System.Windows.Forms.DockStyle.Top;
- label1.Location = new System.Drawing.Point(5, 91);
- label1.Name = "label1";
- label1.Padding = new System.Windows.Forms.Padding(0, 9, 0, 0);
- label1.Size = new System.Drawing.Size(57, 24);
- label1.TabIndex = 5;
- label1.Text = "Password";
- //
- // vtxtName
- //
- vtxtName.BackColor = System.Drawing.Color.Yellow;
- vtxtName.BothInvalidColor = System.Drawing.Color.Red;
- vtxtName.Dock = System.Windows.Forms.DockStyle.Top;
- vtxtName.ExternalInvalidColor = System.Drawing.Color.Orange;
- vtxtName.ExternalValidation = null;
- vtxtName.InternalInvalidColor = System.Drawing.Color.Yellow;
- vtxtName.InvalidReadOnlyColor = System.Drawing.Color.LightYellow;
- vtxtName.Location = new System.Drawing.Point(5, 68);
- vtxtName.Name = "vtxtName";
- vtxtName.RegularExpression = "^[a-zA-Z0-9_.-]+$";
- vtxtName.Size = new System.Drawing.Size(447, 23);
- vtxtName.TabIndex = 0;
- vtxtName.ValidColor = System.Drawing.Color.White;
- vtxtName.ValidReadOnlyColor = System.Drawing.SystemColors.Control;
- vtxtName.TextChanged += vtxtName_TextChanged;
- //
- // lblName
- //
- lblName.AutoSize = true;
- lblName.Dock = System.Windows.Forms.DockStyle.Top;
- lblName.Location = new System.Drawing.Point(5, 44);
- lblName.Margin = new System.Windows.Forms.Padding(0);
- lblName.Name = "lblName";
- lblName.Padding = new System.Windows.Forms.Padding(0, 9, 0, 0);
- lblName.Size = new System.Drawing.Size(39, 24);
- lblName.TabIndex = 4;
- lblName.Text = "Name";
- //
- // txtId
- //
- txtId.Dock = System.Windows.Forms.DockStyle.Top;
- txtId.Location = new System.Drawing.Point(5, 21);
- txtId.Margin = new System.Windows.Forms.Padding(0);
- txtId.Name = "txtId";
- txtId.ReadOnly = true;
- txtId.Size = new System.Drawing.Size(447, 23);
- txtId.TabIndex = 1;
- //
- // lblId
- //
- lblId.AutoSize = true;
- lblId.Dock = System.Windows.Forms.DockStyle.Top;
- lblId.Location = new System.Drawing.Point(5, 6);
- lblId.Margin = new System.Windows.Forms.Padding(0);
- lblId.Name = "lblId";
- lblId.Size = new System.Drawing.Size(17, 15);
- lblId.TabIndex = 0;
- lblId.Text = "Id";
- //
- // EditUser
- //
- AcceptButton = cmdOk;
- AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
- AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- CancelButton = cmdCancel;
- ClientSize = new System.Drawing.Size(457, 805);
- Controls.Add(pData);
- Controls.Add(panel7);
- FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
- Name = "EditUser";
- Text = "Edit user";
- Load += EditGroup_Load;
- panel7.ResumeLayout(false);
- pCancel.ResumeLayout(false);
- pSaveAs.ResumeLayout(false);
- pSave.ResumeLayout(false);
- pData.ResumeLayout(false);
- pData.PerformLayout();
- ResumeLayout(false);
- }
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ Label label3;
+ Label label2;
+ Label label5;
+ Label label6;
+ panel7 = new Panel();
+ pCancel = new Panel();
+ cmdCancel = new Button();
+ pSaveAs = new Panel();
+ cmdSaveAs = new Button();
+ pSave = new Panel();
+ cmdOk = new Button();
+ pData = new Panel();
+ clbGroups = new CheckedListBox();
+ xtxtConfig = new C4GeneralGui.GuiElements.XmlTextBox();
+ chkPasswordExpired = new CheckBox();
+ chkLocked = new CheckBox();
+ chkChangeTracking = new CheckBox();
+ chkChangeTriggers = new CheckBox();
+ chkActive = new CheckBox();
+ vtxtEmail = new C4GeneralGui.GuiElements.ValidatingTextBox();
+ label4 = new Label();
+ cboLoginType = new ComboBox();
+ cboUiLanguage = new ComboBox();
+ vtxtFullName = new C4GeneralGui.GuiElements.ValidatingTextBox();
+ label7 = new Label();
+ vtxtPassword = new C4GeneralGui.GuiElements.ValidatingTextBox();
+ label1 = new Label();
+ vtxtName = new C4GeneralGui.GuiElements.ValidatingTextBox();
+ lblName = new Label();
+ txtId = new TextBox();
+ lblId = new Label();
+ label3 = new Label();
+ label2 = new Label();
+ label5 = new Label();
+ label6 = new Label();
+ panel7.SuspendLayout();
+ pCancel.SuspendLayout();
+ pSaveAs.SuspendLayout();
+ pSave.SuspendLayout();
+ pData.SuspendLayout();
+ SuspendLayout();
+ //
+ // label3
+ //
+ label3.AutoSize = true;
+ label3.Dock = DockStyle.Top;
+ label3.Location = new Point(5, 232);
+ label3.Margin = new Padding(0);
+ label3.Name = "label3";
+ label3.Padding = new Padding(0, 9, 0, 0);
+ label3.Size = new Size(63, 24);
+ label3.TabIndex = 40;
+ label3.Text = "Login type";
+ //
+ // label2
+ //
+ label2.AutoSize = true;
+ label2.Dock = DockStyle.Top;
+ label2.Location = new Point(5, 185);
+ label2.Margin = new Padding(0);
+ label2.Name = "label2";
+ label2.Padding = new Padding(0, 9, 0, 0);
+ label2.Size = new Size(73, 24);
+ label2.TabIndex = 38;
+ label2.Text = "UI Language";
+ //
+ // label5
+ //
+ label5.AutoSize = true;
+ label5.Dock = DockStyle.Top;
+ label5.Location = new Point(5, 609);
+ label5.Margin = new Padding(0);
+ label5.Name = "label5";
+ label5.Padding = new Padding(0, 9, 0, 0);
+ label5.Size = new Size(115, 24);
+ label5.TabIndex = 62;
+ label5.Text = "Group memberships";
+ //
+ // label6
+ //
+ label6.AutoSize = true;
+ label6.Dock = DockStyle.Top;
+ label6.Location = new Point(5, 471);
+ label6.Margin = new Padding(0);
+ label6.Name = "label6";
+ label6.Padding = new Padding(0, 9, 0, 0);
+ label6.Size = new Size(43, 24);
+ label6.TabIndex = 60;
+ label6.Text = "Config";
+ //
+ // panel7
+ //
+ panel7.Controls.Add(pCancel);
+ panel7.Controls.Add(pSaveAs);
+ panel7.Controls.Add(pSave);
+ panel7.Dock = DockStyle.Bottom;
+ panel7.Location = new Point(0, 768);
+ panel7.Name = "panel7";
+ panel7.Size = new Size(457, 37);
+ panel7.TabIndex = 6;
+ //
+ // pCancel
+ //
+ pCancel.Controls.Add(cmdCancel);
+ pCancel.Dock = DockStyle.Left;
+ pCancel.Location = new Point(224, 0);
+ pCancel.Name = "pCancel";
+ pCancel.Padding = new Padding(6, 7, 10, 7);
+ pCancel.Size = new Size(112, 37);
+ pCancel.TabIndex = 11;
+ //
+ // cmdCancel
+ //
+ cmdCancel.DialogResult = DialogResult.Cancel;
+ cmdCancel.Dock = DockStyle.Fill;
+ cmdCancel.Location = new Point(6, 7);
+ cmdCancel.Name = "cmdCancel";
+ cmdCancel.Size = new Size(96, 23);
+ cmdCancel.TabIndex = 9;
+ cmdCancel.Text = "Cancel";
+ cmdCancel.UseVisualStyleBackColor = true;
+ cmdCancel.Click += cmdCancel_Click;
+ //
+ // pSaveAs
+ //
+ pSaveAs.Controls.Add(cmdSaveAs);
+ pSaveAs.Dock = DockStyle.Left;
+ pSaveAs.Location = new Point(112, 0);
+ pSaveAs.Name = "pSaveAs";
+ pSaveAs.Padding = new Padding(6, 7, 10, 7);
+ pSaveAs.Size = new Size(112, 37);
+ pSaveAs.TabIndex = 10;
+ //
+ // cmdSaveAs
+ //
+ cmdSaveAs.DialogResult = DialogResult.Cancel;
+ cmdSaveAs.Dock = DockStyle.Fill;
+ cmdSaveAs.Location = new Point(6, 7);
+ cmdSaveAs.Name = "cmdSaveAs";
+ cmdSaveAs.Size = new Size(96, 23);
+ cmdSaveAs.TabIndex = 6;
+ cmdSaveAs.Text = "Save as";
+ cmdSaveAs.UseVisualStyleBackColor = true;
+ cmdSaveAs.Click += cmdSaveAs_Click;
+ //
+ // pSave
+ //
+ pSave.Controls.Add(cmdOk);
+ pSave.Dock = DockStyle.Left;
+ pSave.Location = new Point(0, 0);
+ pSave.Name = "pSave";
+ pSave.Padding = new Padding(6, 7, 10, 7);
+ pSave.Size = new Size(112, 37);
+ pSave.TabIndex = 9;
+ //
+ // cmdOk
+ //
+ cmdOk.Dock = DockStyle.Fill;
+ cmdOk.Location = new Point(6, 7);
+ cmdOk.Name = "cmdOk";
+ cmdOk.Size = new Size(96, 23);
+ cmdOk.TabIndex = 2;
+ cmdOk.Text = "Save";
+ cmdOk.UseVisualStyleBackColor = true;
+ cmdOk.Click += cmdOk_Click;
+ //
+ // pData
+ //
+ pData.Controls.Add(clbGroups);
+ pData.Controls.Add(label5);
+ pData.Controls.Add(xtxtConfig);
+ pData.Controls.Add(label6);
+ pData.Controls.Add(chkPasswordExpired);
+ pData.Controls.Add(chkLocked);
+ pData.Controls.Add(chkChangeTracking);
+ pData.Controls.Add(chkChangeTriggers);
+ pData.Controls.Add(chkActive);
+ pData.Controls.Add(vtxtEmail);
+ pData.Controls.Add(label4);
+ pData.Controls.Add(cboLoginType);
+ pData.Controls.Add(label3);
+ pData.Controls.Add(cboUiLanguage);
+ pData.Controls.Add(label2);
+ pData.Controls.Add(vtxtFullName);
+ pData.Controls.Add(label7);
+ pData.Controls.Add(vtxtPassword);
+ pData.Controls.Add(label1);
+ pData.Controls.Add(vtxtName);
+ pData.Controls.Add(lblName);
+ pData.Controls.Add(txtId);
+ pData.Controls.Add(lblId);
+ pData.Dock = DockStyle.Fill;
+ pData.Location = new Point(0, 0);
+ pData.Name = "pData";
+ pData.Padding = new Padding(5, 6, 5, 6);
+ pData.Size = new Size(457, 768);
+ pData.TabIndex = 0;
+ //
+ // clbGroups
+ //
+ clbGroups.CheckOnClick = true;
+ clbGroups.Dock = DockStyle.Fill;
+ clbGroups.FormattingEnabled = true;
+ clbGroups.Location = new Point(5, 633);
+ clbGroups.Name = "clbGroups";
+ clbGroups.Size = new Size(447, 129);
+ clbGroups.Sorted = true;
+ clbGroups.TabIndex = 63;
+ //
+ // xtxtConfig
+ //
+ xtxtConfig.Dock = DockStyle.Top;
+ xtxtConfig.Location = new Point(5, 495);
+ xtxtConfig.Name = "xtxtConfig";
+ xtxtConfig.Size = new Size(447, 114);
+ xtxtConfig.TabIndex = 61;
+ xtxtConfig.Text = "";
+ //
+ // chkPasswordExpired
+ //
+ chkPasswordExpired.AutoSize = true;
+ chkPasswordExpired.Dock = DockStyle.Top;
+ chkPasswordExpired.Location = new Point(5, 442);
+ chkPasswordExpired.Name = "chkPasswordExpired";
+ chkPasswordExpired.Padding = new Padding(0, 10, 0, 0);
+ chkPasswordExpired.Size = new Size(447, 29);
+ chkPasswordExpired.TabIndex = 59;
+ chkPasswordExpired.Text = "Password expired";
+ chkPasswordExpired.UseVisualStyleBackColor = true;
+ //
+ // chkLocked
+ //
+ chkLocked.AutoSize = true;
+ chkLocked.Dock = DockStyle.Top;
+ chkLocked.Location = new Point(5, 413);
+ chkLocked.Name = "chkLocked";
+ chkLocked.Padding = new Padding(0, 10, 0, 0);
+ chkLocked.Size = new Size(447, 29);
+ chkLocked.TabIndex = 58;
+ chkLocked.Text = "Locked";
+ chkLocked.UseVisualStyleBackColor = true;
+ //
+ // chkChangeTracking
+ //
+ chkChangeTracking.AutoSize = true;
+ chkChangeTracking.Dock = DockStyle.Top;
+ chkChangeTracking.Location = new Point(5, 384);
+ chkChangeTracking.Name = "chkChangeTracking";
+ chkChangeTracking.Padding = new Padding(0, 10, 0, 0);
+ chkChangeTracking.Size = new Size(447, 29);
+ chkChangeTracking.TabIndex = 57;
+ chkChangeTracking.Text = "Activate change tracking";
+ chkChangeTracking.UseVisualStyleBackColor = true;
+ //
+ // chkChangeTriggers
+ //
+ chkChangeTriggers.AutoSize = true;
+ chkChangeTriggers.Dock = DockStyle.Top;
+ chkChangeTriggers.Location = new Point(5, 355);
+ chkChangeTriggers.Name = "chkChangeTriggers";
+ chkChangeTriggers.Padding = new Padding(0, 10, 0, 0);
+ chkChangeTriggers.Size = new Size(447, 29);
+ chkChangeTriggers.TabIndex = 56;
+ chkChangeTriggers.Text = "Activate change triggers";
+ chkChangeTriggers.UseVisualStyleBackColor = true;
+ //
+ // chkActive
+ //
+ chkActive.AutoSize = true;
+ chkActive.Dock = DockStyle.Top;
+ chkActive.Location = new Point(5, 326);
+ chkActive.Name = "chkActive";
+ chkActive.Padding = new Padding(0, 10, 0, 0);
+ chkActive.Size = new Size(447, 29);
+ chkActive.TabIndex = 55;
+ chkActive.Text = "Active";
+ chkActive.UseVisualStyleBackColor = true;
+ //
+ // vtxtEmail
+ //
+ vtxtEmail.BackColor = Color.Yellow;
+ vtxtEmail.BothInvalidColor = Color.Red;
+ vtxtEmail.Dock = DockStyle.Top;
+ vtxtEmail.ExternalInvalidColor = Color.Orange;
+ vtxtEmail.ExternalValidation = null;
+ vtxtEmail.InternalInvalidColor = Color.Yellow;
+ vtxtEmail.InvalidReadOnlyColor = Color.LightYellow;
+ vtxtEmail.Location = new Point(5, 303);
+ vtxtEmail.Name = "vtxtEmail";
+ vtxtEmail.RegularExpression = "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$";
+ vtxtEmail.Size = new Size(447, 23);
+ vtxtEmail.TabIndex = 43;
+ vtxtEmail.ValidColor = Color.White;
+ vtxtEmail.ValidReadOnlyColor = SystemColors.Control;
+ //
+ // label4
+ //
+ label4.AutoSize = true;
+ label4.Dock = DockStyle.Top;
+ label4.Location = new Point(5, 279);
+ label4.Name = "label4";
+ label4.Padding = new Padding(0, 9, 0, 0);
+ label4.Size = new Size(36, 24);
+ label4.TabIndex = 42;
+ label4.Text = "Email";
+ //
+ // cboLoginType
+ //
+ cboLoginType.Dock = DockStyle.Top;
+ cboLoginType.DropDownStyle = ComboBoxStyle.DropDownList;
+ cboLoginType.FormattingEnabled = true;
+ cboLoginType.Location = new Point(5, 256);
+ cboLoginType.Name = "cboLoginType";
+ cboLoginType.Size = new Size(447, 23);
+ cboLoginType.Sorted = true;
+ cboLoginType.TabIndex = 41;
+ //
+ // cboUiLanguage
+ //
+ cboUiLanguage.Dock = DockStyle.Top;
+ cboUiLanguage.DropDownStyle = ComboBoxStyle.DropDownList;
+ cboUiLanguage.FormattingEnabled = true;
+ cboUiLanguage.Location = new Point(5, 209);
+ cboUiLanguage.Name = "cboUiLanguage";
+ cboUiLanguage.Size = new Size(447, 23);
+ cboUiLanguage.Sorted = true;
+ cboUiLanguage.TabIndex = 39;
+ //
+ // vtxtFullName
+ //
+ vtxtFullName.BackColor = Color.Yellow;
+ vtxtFullName.BothInvalidColor = Color.Red;
+ vtxtFullName.Dock = DockStyle.Top;
+ vtxtFullName.ExternalInvalidColor = Color.Orange;
+ vtxtFullName.ExternalValidation = null;
+ vtxtFullName.InternalInvalidColor = Color.Yellow;
+ vtxtFullName.InvalidReadOnlyColor = Color.LightYellow;
+ vtxtFullName.Location = new Point(5, 162);
+ vtxtFullName.Name = "vtxtFullName";
+ vtxtFullName.RegularExpression = "^[ a-zA-Z0-9_.-@]+$";
+ vtxtFullName.Size = new Size(447, 23);
+ vtxtFullName.TabIndex = 36;
+ vtxtFullName.ValidColor = Color.White;
+ vtxtFullName.ValidReadOnlyColor = SystemColors.Control;
+ vtxtFullName.TextChanged += vtxtFullName_TextChanged;
+ //
+ // label7
+ //
+ label7.AutoSize = true;
+ label7.Dock = DockStyle.Top;
+ label7.Location = new Point(5, 138);
+ label7.Margin = new Padding(0);
+ label7.Name = "label7";
+ label7.Padding = new Padding(0, 9, 0, 0);
+ label7.Size = new Size(59, 24);
+ label7.TabIndex = 37;
+ label7.Text = "Full name";
+ //
+ // vtxtPassword
+ //
+ vtxtPassword.BackColor = Color.White;
+ vtxtPassword.BothInvalidColor = Color.Red;
+ vtxtPassword.Dock = DockStyle.Top;
+ vtxtPassword.ExternalInvalidColor = Color.Orange;
+ vtxtPassword.ExternalValidation = null;
+ vtxtPassword.InternalInvalidColor = Color.Yellow;
+ vtxtPassword.InvalidReadOnlyColor = Color.LightYellow;
+ vtxtPassword.Location = new Point(5, 115);
+ vtxtPassword.Name = "vtxtPassword";
+ vtxtPassword.PasswordChar = '*';
+ vtxtPassword.RegularExpression = "^.{7}.+$|^$";
+ vtxtPassword.Size = new Size(447, 23);
+ vtxtPassword.TabIndex = 6;
+ vtxtPassword.ValidColor = Color.White;
+ vtxtPassword.ValidReadOnlyColor = SystemColors.Control;
+ vtxtPassword.TextChanged += vtxtPassword_TextChanged;
+ //
+ // label1
+ //
+ label1.AutoSize = true;
+ label1.Dock = DockStyle.Top;
+ label1.Location = new Point(5, 91);
+ label1.Name = "label1";
+ label1.Padding = new Padding(0, 9, 0, 0);
+ label1.Size = new Size(57, 24);
+ label1.TabIndex = 5;
+ label1.Text = "Password";
+ //
+ // vtxtName
+ //
+ vtxtName.BackColor = Color.Yellow;
+ vtxtName.BothInvalidColor = Color.Red;
+ vtxtName.Dock = DockStyle.Top;
+ vtxtName.ExternalInvalidColor = Color.Orange;
+ vtxtName.ExternalValidation = null;
+ vtxtName.InternalInvalidColor = Color.Yellow;
+ vtxtName.InvalidReadOnlyColor = Color.LightYellow;
+ vtxtName.Location = new Point(5, 68);
+ vtxtName.Name = "vtxtName";
+ vtxtName.RegularExpression = "^[a-zA-Z0-9_.-@]+$";
+ vtxtName.Size = new Size(447, 23);
+ vtxtName.TabIndex = 0;
+ vtxtName.ValidColor = Color.White;
+ vtxtName.ValidReadOnlyColor = SystemColors.Control;
+ vtxtName.TextChanged += vtxtName_TextChanged;
+ //
+ // lblName
+ //
+ lblName.AutoSize = true;
+ lblName.Dock = DockStyle.Top;
+ lblName.Location = new Point(5, 44);
+ lblName.Margin = new Padding(0);
+ lblName.Name = "lblName";
+ lblName.Padding = new Padding(0, 9, 0, 0);
+ lblName.Size = new Size(39, 24);
+ lblName.TabIndex = 4;
+ lblName.Text = "Name";
+ //
+ // txtId
+ //
+ txtId.Dock = DockStyle.Top;
+ txtId.Location = new Point(5, 21);
+ txtId.Margin = new Padding(0);
+ txtId.Name = "txtId";
+ txtId.ReadOnly = true;
+ txtId.Size = new Size(447, 23);
+ txtId.TabIndex = 1;
+ //
+ // lblId
+ //
+ lblId.AutoSize = true;
+ lblId.Dock = DockStyle.Top;
+ lblId.Location = new Point(5, 6);
+ lblId.Margin = new Padding(0);
+ lblId.Name = "lblId";
+ lblId.Size = new Size(17, 15);
+ lblId.TabIndex = 0;
+ lblId.Text = "Id";
+ //
+ // EditUser
+ //
+ AcceptButton = cmdOk;
+ AutoScaleDimensions = new SizeF(7F, 15F);
+ AutoScaleMode = AutoScaleMode.Font;
+ CancelButton = cmdCancel;
+ ClientSize = new Size(457, 805);
+ Controls.Add(pData);
+ Controls.Add(panel7);
+ FormBorderStyle = FormBorderStyle.FixedDialog;
+ Name = "EditUser";
+ Text = "Edit user";
+ Load += EditGroup_Load;
+ panel7.ResumeLayout(false);
+ pCancel.ResumeLayout(false);
+ pSaveAs.ResumeLayout(false);
+ pSave.ResumeLayout(false);
+ pData.ResumeLayout(false);
+ pData.PerformLayout();
+ ResumeLayout(false);
+ }
- #endregion
+ #endregion
- private System.Windows.Forms.Panel panel7;
+ private System.Windows.Forms.Panel panel7;
private System.Windows.Forms.Panel pData;
private System.Windows.Forms.TextBox txtId;
private System.Windows.Forms.Label lblId;
Modified: Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.cs
===================================================================
--- Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.cs 2024-07-16 10:52:47 UTC (rev 3785)
+++ Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.cs 2024-07-29 11:18:41 UTC (rev 3786)
@@ -24,7 +24,8 @@
cboLoginType.Items.Clear(); // softcode?
cboLoginType.Items.Add("CINNAMON");
cboLoginType.Items.Add("LDAP");
- if (user == null)
+ cboLoginType.Items.Add("AZURE");
+ if (user == null)
{
txtId.Text = Definitions.NEW;
vtxtName.Text = "";
Modified: Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.resx
===================================================================
--- Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.resx 2024-07-16 10:52:47 UTC (rev 3785)
+++ Client/trunk/Cinnamon4/C4Admin/GUI/AssetEditors/EditUser.resx 2024-07-29 11:18:41 UTC (rev 3786)
@@ -18,7 +18,7 @@
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing"">Blue</data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
Modified: Client/trunk/Cinnamon4/C4ServerConnector/HttpInterface.cs
===================================================================
--- Client/trunk/Cinnamon4/C4ServerConnector/HttpInterface.cs 2024-07-16 10:52:47 UTC (rev 3785)
+++ Client/trunk/Cinnamon4/C4ServerConnector/HttpInterface.cs 2024-07-29 11:18:41 UTC (rev 3786)
@@ -217,6 +217,7 @@
if (code == "INTERNAL_SERVER_ERROR_TRY_AGAIN_LATER") throw new InternalServerErrorException(errorEl.SelectSingleNode("message").InnerText);
else if (code == "AUTHENTICATION_FAIL_SESSION_EXPIRED") throw new SessionExpiredException(errorEl.SelectSingleNode("message").InnerText);
else if (code == "FOLDER_NOT_FOUND") ; /* do nothing*/
+ else if (code == "OBJECT_NOT_FOUND") ; /* do nothing*/
else throw new ApplicationException(errorEl.SelectSingleNode("message").InnerText);
}
else
Modified: Client/trunk/Cinnamon4/ChangeTrigger/Controllers/ChangeTriggerController.cs
===================================================================
--- Client/trunk/Cinnamon4/ChangeTrigger/Controllers/ChangeTriggerController.cs 2024-07-16 10:52:47 UTC (rev 3785)
+++ Client/trunk/Cinnamon4/ChangeTrigger/Controllers/ChangeTriggerController.cs 2024-07-29 11:18:41 UTC (rev 3786)
@@ -6,6 +6,7 @@
using System.Text;
using System.Threading.Tasks;
using System.Xml;
+using Serilog;
[ApiController]
[Route("[controller]")]
Modified: Client/trunk/Cinnamon4/ChangeTrigger/Program.cs
===================================================================
--- Client/trunk/Cinnamon4/ChangeTrigger/Program.cs 2024-07-16 10:52:47 UTC (rev 3785)
+++ Client/trunk/Cinnamon4/ChangeTrigger/Program.cs 2024-07-29 11:18:41 UTC (rev 3786)
@@ -7,7 +7,7 @@
WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
-// Configure Serilog
+// Configure Serilog early
Log.Logger = new LoggerConfiguration()
.MinimumLevel.Information()
.WriteTo.Console()
@@ -14,14 +14,16 @@
.CreateLogger();
// Register Serilog
-builder.Host.UseSerilog();
+builder.Host.UseSerilog(Log.Logger);
+Log.Information("Application starting up");
+
string pfxFile = (builder.Configuration["Https:Pfx"].Length == 0 ? null : Path.Combine(Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath), builder.Configuration["Https:Pfx"]));
string pfxSecret = (builder.Configuration["Https:Secret"].Length == 0 ? null : builder.Configuration["Https:Secret"]);
int httpsPort = (builder.Configuration["Https:Port"].Length == 0 ? 8080 : int.Parse(builder.Configuration["Https:Port"]));
// TODO: if statement to execute this only if the config contains such data
-if (pfxFile != null && pfxSecret != null)
+if (!string.IsNullOrEmpty(pfxFile) && !string.IsNullOrEmpty(pfxSecret))
{
builder.WebHost.ConfigureKestrel(serverOptions =>
{
@@ -32,7 +34,6 @@
});
}
-
// Configure logging
builder.Logging.ClearProviders();
builder.Logging.AddSerilog();
@@ -45,19 +46,18 @@
string assemblyPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
config.Load(Path.Combine(assemblyPath, "ct.config.xml"));
-// Register the TriggerActionService with Serilog
builder.Services.AddSingleton<TriggerActionService>(serviceProvider =>
{
var logger = serviceProvider.GetRequiredService<ILogger<TriggerActionService>>();
- TriggerActionService triggerActionService = new TriggerActionService(config, logger);
+ var triggerActionService = new TriggerActionService(config, logger);
triggerActionService.InitCustomServices();
triggerActionService.InitFactories();
return triggerActionService;
});
-// add custom singleton services
+// Add other custom singleton services here
-WebApplication app = builder.Build();
+var app = builder.Build();
if (app.Environment.IsDevelopment())
{
@@ -69,4 +69,4 @@
app.MapControllers();
-app.Run(); // Listen on port 80
+app.Run();
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2024-07-16 10:52:48
|
Revision: 3785
http://sourceforge.net/p/cinnamon/code/3785
Author: bhorner
Date: 2024-07-16 10:52:47 +0000 (Tue, 16 Jul 2024)
Log Message:
-----------
Loading local_settings from ServerHub.config.xml
Using thread settings in DeleteSelection
Modified Paths:
--------------
Client/trunk/Cinnamon4/C4ObjectApi/Repository/CmnServer.cs
Client/trunk/Cinnamon4/C4ObjectApi/Repository/CmnSession.cs
Client/trunk/Cinnamon4/CDCplus/Controls/ServerEntry.cs
Client/trunk/Cinnamon4/CDCplus/ServerHub.cs
Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/ResultListDisplay.cs
Client/trunk/Cinnamon4/CDCplusLib/ContextFunctions/DeleteSelection.cs
Modified: Client/trunk/Cinnamon4/C4ObjectApi/Repository/CmnServer.cs
===================================================================
--- Client/trunk/Cinnamon4/C4ObjectApi/Repository/CmnServer.cs 2024-07-10 14:19:12 UTC (rev 3784)
+++ Client/trunk/Cinnamon4/C4ObjectApi/Repository/CmnServer.cs 2024-07-16 10:52:47 UTC (rev 3785)
@@ -3,6 +3,7 @@
using System.Xml;
using System.IO;
using C4ServerConnector;
+using System.Collections.Generic;
namespace C4ObjectApi.Repository
{
@@ -13,8 +14,9 @@
public string CheckoutDir { get; }
public string LocksDir { get; }
public string LocalCertFile { get; }
+ public Dictionary<string, string> LocalSettings { get; }
- public CmnServer(string url, string localRoot, string name, string id, string cdnUri, string localCertFile, string namedUserConfig = null)
+ public CmnServer(string url, string localRoot, string name, string id, string cdnUri, string localCertFile, Dictionary<string, string> localSettings, string namedUserConfig = null)
{
Url = url;
CdnUrl = cdnUri;
@@ -24,6 +26,7 @@
CheckoutDir = Path.Combine(localRoot, "checkout");
LocksDir = Path.Combine(localRoot, "locks");
LocalCertFile = localCertFile;
+ LocalSettings = localSettings;
InitHost();
GetServerResponse();
}
Modified: Client/trunk/Cinnamon4/C4ObjectApi/Repository/CmnSession.cs
===================================================================
--- Client/trunk/Cinnamon4/C4ObjectApi/Repository/CmnSession.cs 2024-07-10 14:19:12 UTC (rev 3784)
+++ Client/trunk/Cinnamon4/C4ObjectApi/Repository/CmnSession.cs 2024-07-16 10:52:47 UTC (rev 3785)
@@ -36,6 +36,9 @@
private Dictionary<string, XmlDocument> _configEntries;
public LocksManager LocksMgr { get; }
public Dictionary<long, CmnFolder> CachedFolders { get; private set; }
+ public C4Session CommandSession { get; private set; }
+ public CmnServer Server { get; private set; }
+ public UserConfigTypes UserConfigType { get; private set; }
public enum Versions
{
@@ -130,7 +133,6 @@
}
}
- public C4Session CommandSession { get; private set; }
private XmlDocument BuildUserConfig(Dictionary<long, C4Group> groups, string namedUserConfig = null)
{
@@ -189,8 +191,6 @@
}
- public CmnServer Server { get; private set; }
- public UserConfigTypes UserConfigType { get; private set; }
public string Ticket { get; private set; }
Modified: Client/trunk/Cinnamon4/CDCplus/Controls/ServerEntry.cs
===================================================================
--- Client/trunk/Cinnamon4/CDCplus/Controls/ServerEntry.cs 2024-07-10 14:19:12 UTC (rev 3784)
+++ Client/trunk/Cinnamon4/CDCplus/Controls/ServerEntry.cs 2024-07-16 10:52:47 UTC (rev 3785)
@@ -7,6 +7,7 @@
using C4ObjectApi.Repository;
using CDCplus.Properties;
using C4GeneralGui.GuiElements;
+using System.Collections.Generic;
namespace CDCplus.Controls
{
@@ -39,6 +40,7 @@
Server.Id,
Server.CdnUrl,
ucN != null ? ucN.InnerText : null,
+ Server.LocalSettings,
Server.LocalCertFile);
gbServer.Text = Server.Name;
lblVersionBuild.Text = string.Format(Resources.lblVersionBuild, Server.Version, Server.Build);
Modified: Client/trunk/Cinnamon4/CDCplus/ServerHub.cs
===================================================================
--- Client/trunk/Cinnamon4/CDCplus/ServerHub.cs 2024-07-10 14:19:12 UTC (rev 3784)
+++ Client/trunk/Cinnamon4/CDCplus/ServerHub.cs 2024-07-16 10:52:47 UTC (rev 3785)
@@ -8,6 +8,7 @@
using CDCplusLib.Common;
using C4ObjectApi.Repository;
using C4GeneralGui.GuiElements;
+using System.Collections.Generic;
namespace CDCplus
{
@@ -40,12 +41,18 @@
int timeout = svrEl.HasAttribute("timeout") ? int.Parse(svrEl.GetAttribute("timeout")) : 10000;
XmlNode localCertFileN = svrEl.SelectSingleNode("local_cert_file");
string localCertFile = (localCertFileN == null ? null : Path.Combine(Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath), localCertFileN.InnerText));
- svr = new CmnServer(svrEl.GetAttribute("url"),
+ Dictionary<string, string> localSettings = new Dictionary<string, string>();
+ foreach (XmlElement lsEl in svrEl.SelectNodes("local_settings/parameter"))
+ {
+ localSettings.Add(lsEl.GetAttribute("name"), lsEl.InnerText);
+ }
+ svr = new CmnServer(svrEl.GetAttribute("url"),
_gad.LocalRootPath,
svrEl.GetAttribute("label"),
svrEl.GetAttribute("id"),
cdnUrl,
localCertFile,
+ localSettings,
ucN != null ? ucN.InnerText : null);
}
catch (Exception ex)
Modified: Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/ResultListDisplay.cs
===================================================================
--- Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/ResultListDisplay.cs 2024-07-10 14:19:12 UTC (rev 3784)
+++ Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/ResultListDisplay.cs 2024-07-16 10:52:47 UTC (rev 3785)
@@ -51,8 +51,7 @@
_enableSelectionChangeEvent = false;
_view = View.Details;
XmlAttribute frs = ((XmlAttribute)(rldConfigEl.SelectSingleNode("appearance/full_row_select/@value")));
- XmlNode useTimerN = rldConfigEl.SelectSingleNode("appearance/use_timer");
- if(useTimerN != null) _useTimer = useTimerN.InnerText == "true";
+ _useTimer = s.Server.LocalSettings.ContainsKey("use_threaded_gui_controls") ? s.Server.LocalSettings["use_threaded_gui_controls"] == "true" : false;
if(_useTimer)
{
selectionChangedTimer = new System.Windows.Forms.Timer();
Modified: Client/trunk/Cinnamon4/CDCplusLib/ContextFunctions/DeleteSelection.cs
===================================================================
--- Client/trunk/Cinnamon4/CDCplusLib/ContextFunctions/DeleteSelection.cs 2024-07-10 14:19:12 UTC (rev 3784)
+++ Client/trunk/Cinnamon4/CDCplusLib/ContextFunctions/DeleteSelection.cs 2024-07-16 10:52:47 UTC (rev 3785)
@@ -16,6 +16,7 @@
private GlobalApplicationData _gad;
private CmnSession _s;
private bool _deleteAllVersionsEnabled;
+ private bool _useProgressBar;
public void AppendSubmenu(ToolStripMenuItem cmi)
{
@@ -78,18 +79,22 @@
if (delDlg.ShowDialog() == DialogResult.OK)
{
delAllRels = delDlg.DeleteProtectedRelations;
- ProgressBarPopup dlgProgress = new ProgressBarPopup(Properties.Resources.lblDelete, 0, sel.Count, 0, "");
- dlgProgress.UpdateProgressBar(0, "Getting items");
- dlgProgress.Show();
+ ProgressBarPopup dlgProgress=null;
+ if (_useProgressBar)
+ {
+ dlgProgress = new ProgressBarPopup(Properties.Resources.lblDelete, 0, sel.Count, 0, "");
+ dlgProgress.UpdateProgressBar(0, "Getting items");
+ dlgProgress.Show();
+ }
int i = 0;
foreach (IRepositoryNode ow in sel.Values)
{
AppendOwnable(ow, l, delDlg.AllVersions);
i += 1;
- dlgProgress.UpdateProgressBar(i);
+ if (_useProgressBar) dlgProgress.UpdateProgressBar(i);
}
- dlgProgress.Close();
+ if (_useProgressBar) dlgProgress.Close();
}
// End If
@@ -122,10 +127,14 @@
// msg.Source = instanceName_
if (l.Count > 1)
{
- ProgressBarPopup dlgProgress = new ProgressBarPopup(Properties.Resources.lblDelete, 0, l.Count, 0, "");
- dlgProgress.Show();
+ ProgressBarPopup dlgProgress=null;
+ if (_useProgressBar)
+ {
+ dlgProgress = new ProgressBarPopup(Properties.Resources.lblDelete, 0, l.Count, 0, "");
+ dlgProgress.Show();
+ }
int remaining = DeleteList(l, msg.DeletedObjects, delAllRels, dlgProgress).Count;
- dlgProgress.Close();
+ if (_useProgressBar) dlgProgress.Close();
if (remaining > 0)
StandardMessage.ShowMessage(string.Format(Properties.Resources.msgFailureDeleting, remaining.ToString()), StandardMessage.Severity.ErrorMessage);
}
@@ -187,7 +196,7 @@
private SortedDictionary<string, IRepositoryNode> DeleteList(Dictionary<long, IRepositoryNode> l, Dictionary<long, IRepositoryNode> deletedObjects, bool delAllRels, ProgressBarPopup dlgProgress)
{
SortedDictionary<string, IRepositoryNode> sl = new SortedDictionary<string, IRepositoryNode>();
- dlgProgress.UpdateProgressBar(0, "Configuring delete operation");
+ if (_useProgressBar) dlgProgress.UpdateProgressBar(0, "Configuring delete operation");
foreach (IRepositoryNode ow in l.Values)
{
string key = "";
@@ -205,7 +214,7 @@
sl.Add(key, ow);
}
- dlgProgress.UpdateProgressBar(0, "Deleting");
+ if (_useProgressBar) dlgProgress.UpdateProgressBar(0, "Deleting");
int ct = sl.Count;
bool cont = true;
SortedDictionary<string, IRepositoryNode> result = DeletePass(sl, deletedObjects, delAllRels, dlgProgress, 0);
@@ -256,7 +265,7 @@
if (!deletedObjects.ContainsKey(ow.Id))
deletedObjects.Add(ow.Id, ow);
i += 1;
- dlgProgress.UpdateProgressBar(i);
+ if (_useProgressBar) dlgProgress.UpdateProgressBar(i);
}
catch (Exception ex)
{
@@ -318,6 +327,7 @@
_gad = globalAppData;
XmlNode davdN = configEl.SelectSingleNode("custom/delete_all_versions[@enabled='false']");
_deleteAllVersionsEnabled = davdN is null;
+ _useProgressBar = s.Server.LocalSettings.ContainsKey("use_threaded_gui_controls") ? s.Server.LocalSettings["use_threaded_gui_controls"] == "true" : false;
}
public Image GetIcon()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2024-07-10 14:19:14
|
Revision: 3784
http://sourceforge.net/p/cinnamon/code/3784
Author: bhorner
Date: 2024-07-10 14:19:12 +0000 (Wed, 10 Jul 2024)
Log Message:
-----------
Cinnamon icon in ServerHub and MainWindow
Modified Paths:
--------------
Client/trunk/Cinnamon4/CDCplus/ServerHub.Designer.cs
Client/trunk/Cinnamon4/CDCplus/ServerHub.resx
Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/MainWindow.Designer.cs
Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/MainWindow.resx
Modified: Client/trunk/Cinnamon4/CDCplus/ServerHub.Designer.cs
===================================================================
--- Client/trunk/Cinnamon4/CDCplus/ServerHub.Designer.cs 2024-07-10 13:08:08 UTC (rev 3783)
+++ Client/trunk/Cinnamon4/CDCplus/ServerHub.Designer.cs 2024-07-10 14:19:12 UTC (rev 3784)
@@ -20,144 +20,145 @@
base.Dispose(disposing);
}
- #region Windows Form Designer generated code
+ #region Windows Form Designer generated code
- /// <summary>
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- /// </summary>
- private void InitializeComponent()
- {
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServerHub));
- panel1 = new System.Windows.Forms.Panel();
- panel2 = new System.Windows.Forms.Panel();
- panel3 = new System.Windows.Forms.Panel();
- cmdReloadDiscServers = new System.Windows.Forms.Button();
- cmdAbout = new System.Windows.Forms.Button();
- pictureBox1 = new System.Windows.Forms.PictureBox();
- pEntries = new System.Windows.Forms.Panel();
- panel1.SuspendLayout();
- panel2.SuspendLayout();
- panel3.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)pictureBox1).BeginInit();
- SuspendLayout();
- //
- // panel1
- //
- panel1.BackColor = System.Drawing.Color.WhiteSmoke;
- panel1.Controls.Add(panel2);
- panel1.Controls.Add(pictureBox1);
- panel1.Dock = System.Windows.Forms.DockStyle.Top;
- panel1.Location = new System.Drawing.Point(0, 0);
- panel1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
- panel1.Name = "panel1";
- panel1.Padding = new System.Windows.Forms.Padding(4, 3, 0, 3);
- panel1.Size = new System.Drawing.Size(833, 65);
- panel1.TabIndex = 0;
- //
- // panel2
- //
- panel2.BackColor = System.Drawing.Color.Transparent;
- panel2.Controls.Add(panel3);
- panel2.Dock = System.Windows.Forms.DockStyle.Fill;
- panel2.Location = new System.Drawing.Point(202, 3);
- panel2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
- panel2.Name = "panel2";
- panel2.Size = new System.Drawing.Size(631, 59);
- panel2.TabIndex = 2;
- //
- // panel3
- //
- panel3.Controls.Add(cmdReloadDiscServers);
- panel3.Controls.Add(cmdAbout);
- panel3.Dock = System.Windows.Forms.DockStyle.Top;
- panel3.Location = new System.Drawing.Point(0, 0);
- panel3.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
- panel3.Name = "panel3";
- panel3.Size = new System.Drawing.Size(631, 44);
- panel3.TabIndex = 0;
- //
- // cmdReloadDiscServers
- //
- cmdReloadDiscServers.BackColor = System.Drawing.Color.Transparent;
- cmdReloadDiscServers.Dock = System.Windows.Forms.DockStyle.Right;
- cmdReloadDiscServers.FlatAppearance.BorderSize = 0;
- cmdReloadDiscServers.FlatAppearance.MouseDownBackColor = System.Drawing.Color.LimeGreen;
- cmdReloadDiscServers.FlatAppearance.MouseOverBackColor = System.Drawing.Color.LightGreen;
- cmdReloadDiscServers.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- cmdReloadDiscServers.Image = (System.Drawing.Image)resources.GetObject("cmdReloadDiscServers.Image");
- cmdReloadDiscServers.Location = new System.Drawing.Point(543, 0);
- cmdReloadDiscServers.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
- cmdReloadDiscServers.Name = "cmdReloadDiscServers";
- cmdReloadDiscServers.Size = new System.Drawing.Size(44, 44);
- cmdReloadDiscServers.TabIndex = 2;
- cmdReloadDiscServers.UseVisualStyleBackColor = false;
- cmdReloadDiscServers.Click += cmdReloadDiscServers_Click;
- //
- // cmdAbout
- //
- cmdAbout.BackColor = System.Drawing.Color.Transparent;
- cmdAbout.Dock = System.Windows.Forms.DockStyle.Right;
- cmdAbout.FlatAppearance.BorderSize = 0;
- cmdAbout.FlatAppearance.MouseDownBackColor = System.Drawing.Color.DeepSkyBlue;
- cmdAbout.FlatAppearance.MouseOverBackColor = System.Drawing.Color.LightSkyBlue;
- cmdAbout.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- cmdAbout.Image = (System.Drawing.Image)resources.GetObject("cmdAbout.Image");
- cmdAbout.Location = new System.Drawing.Point(587, 0);
- cmdAbout.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
- cmdAbout.Name = "cmdAbout";
- cmdAbout.Size = new System.Drawing.Size(44, 44);
- cmdAbout.TabIndex = 1;
- cmdAbout.UseVisualStyleBackColor = false;
- cmdAbout.Click += cmdAbout_Click;
- //
- // pictureBox1
- //
- pictureBox1.BackColor = System.Drawing.Color.Transparent;
- pictureBox1.Dock = System.Windows.Forms.DockStyle.Left;
- pictureBox1.Image = (System.Drawing.Image)resources.GetObject("pictureBox1.Image");
- pictureBox1.InitialImage = (System.Drawing.Image)resources.GetObject("pictureBox1.InitialImage");
- pictureBox1.Location = new System.Drawing.Point(4, 3);
- pictureBox1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
- pictureBox1.Name = "pictureBox1";
- pictureBox1.Size = new System.Drawing.Size(198, 59);
- pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- pictureBox1.TabIndex = 1;
- pictureBox1.TabStop = false;
- //
- // pEntries
- //
- pEntries.BackColor = System.Drawing.Color.WhiteSmoke;
- pEntries.Dock = System.Windows.Forms.DockStyle.Fill;
- pEntries.Location = new System.Drawing.Point(0, 65);
- pEntries.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
- pEntries.Name = "pEntries";
- pEntries.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3);
- pEntries.Size = new System.Drawing.Size(833, 4);
- pEntries.TabIndex = 1;
- //
- // ServerHub
- //
- AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
- AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- ClientSize = new System.Drawing.Size(833, 69);
- Controls.Add(pEntries);
- Controls.Add(panel1);
- FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
- Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
- Name = "ServerHub";
- Text = "CDCplus";
- Shown += ServerHub_Shown;
- panel1.ResumeLayout(false);
- panel2.ResumeLayout(false);
- panel3.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)pictureBox1).EndInit();
- ResumeLayout(false);
- }
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServerHub));
+ panel1 = new System.Windows.Forms.Panel();
+ panel2 = new System.Windows.Forms.Panel();
+ panel3 = new System.Windows.Forms.Panel();
+ cmdReloadDiscServers = new System.Windows.Forms.Button();
+ cmdAbout = new System.Windows.Forms.Button();
+ pictureBox1 = new System.Windows.Forms.PictureBox();
+ pEntries = new System.Windows.Forms.Panel();
+ panel1.SuspendLayout();
+ panel2.SuspendLayout();
+ panel3.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)pictureBox1).BeginInit();
+ SuspendLayout();
+ //
+ // panel1
+ //
+ panel1.BackColor = System.Drawing.Color.WhiteSmoke;
+ panel1.Controls.Add(panel2);
+ panel1.Controls.Add(pictureBox1);
+ panel1.Dock = System.Windows.Forms.DockStyle.Top;
+ panel1.Location = new System.Drawing.Point(0, 0);
+ panel1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ panel1.Name = "panel1";
+ panel1.Padding = new System.Windows.Forms.Padding(4, 3, 0, 3);
+ panel1.Size = new System.Drawing.Size(833, 65);
+ panel1.TabIndex = 0;
+ //
+ // panel2
+ //
+ panel2.BackColor = System.Drawing.Color.Transparent;
+ panel2.Controls.Add(panel3);
+ panel2.Dock = System.Windows.Forms.DockStyle.Fill;
+ panel2.Location = new System.Drawing.Point(202, 3);
+ panel2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ panel2.Name = "panel2";
+ panel2.Size = new System.Drawing.Size(631, 59);
+ panel2.TabIndex = 2;
+ //
+ // panel3
+ //
+ panel3.Controls.Add(cmdReloadDiscServers);
+ panel3.Controls.Add(cmdAbout);
+ panel3.Dock = System.Windows.Forms.DockStyle.Top;
+ panel3.Location = new System.Drawing.Point(0, 0);
+ panel3.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ panel3.Name = "panel3";
+ panel3.Size = new System.Drawing.Size(631, 44);
+ panel3.TabIndex = 0;
+ //
+ // cmdReloadDiscServers
+ //
+ cmdReloadDiscServers.BackColor = System.Drawing.Color.Transparent;
+ cmdReloadDiscServers.Dock = System.Windows.Forms.DockStyle.Right;
+ cmdReloadDiscServers.FlatAppearance.BorderSize = 0;
+ cmdReloadDiscServers.FlatAppearance.MouseDownBackColor = System.Drawing.Color.LimeGreen;
+ cmdReloadDiscServers.FlatAppearance.MouseOverBackColor = System.Drawing.Color.LightGreen;
+ cmdReloadDiscServers.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ cmdReloadDiscServers.Image = (System.Drawing.Image)resources.GetObject("cmdReloadDiscServers.Image");
+ cmdReloadDiscServers.Location = new System.Drawing.Point(543, 0);
+ cmdReloadDiscServers.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ cmdReloadDiscServers.Name = "cmdReloadDiscServers";
+ cmdReloadDiscServers.Size = new System.Drawing.Size(44, 44);
+ cmdReloadDiscServers.TabIndex = 2;
+ cmdReloadDiscServers.UseVisualStyleBackColor = false;
+ cmdReloadDiscServers.Click += cmdReloadDiscServers_Click;
+ //
+ // cmdAbout
+ //
+ cmdAbout.BackColor = System.Drawing.Color.Transparent;
+ cmdAbout.Dock = System.Windows.Forms.DockStyle.Right;
+ cmdAbout.FlatAppearance.BorderSize = 0;
+ cmdAbout.FlatAppearance.MouseDownBackColor = System.Drawing.Color.DeepSkyBlue;
+ cmdAbout.FlatAppearance.MouseOverBackColor = System.Drawing.Color.LightSkyBlue;
+ cmdAbout.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ cmdAbout.Image = (System.Drawing.Image)resources.GetObject("cmdAbout.Image");
+ cmdAbout.Location = new System.Drawing.Point(587, 0);
+ cmdAbout.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ cmdAbout.Name = "cmdAbout";
+ cmdAbout.Size = new System.Drawing.Size(44, 44);
+ cmdAbout.TabIndex = 1;
+ cmdAbout.UseVisualStyleBackColor = false;
+ cmdAbout.Click += cmdAbout_Click;
+ //
+ // pictureBox1
+ //
+ pictureBox1.BackColor = System.Drawing.Color.Transparent;
+ pictureBox1.Dock = System.Windows.Forms.DockStyle.Left;
+ pictureBox1.Image = (System.Drawing.Image)resources.GetObject("pictureBox1.Image");
+ pictureBox1.InitialImage = (System.Drawing.Image)resources.GetObject("pictureBox1.InitialImage");
+ pictureBox1.Location = new System.Drawing.Point(4, 3);
+ pictureBox1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ pictureBox1.Name = "pictureBox1";
+ pictureBox1.Size = new System.Drawing.Size(198, 59);
+ pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ pictureBox1.TabIndex = 1;
+ pictureBox1.TabStop = false;
+ //
+ // pEntries
+ //
+ pEntries.BackColor = System.Drawing.Color.WhiteSmoke;
+ pEntries.Dock = System.Windows.Forms.DockStyle.Fill;
+ pEntries.Location = new System.Drawing.Point(0, 65);
+ pEntries.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ pEntries.Name = "pEntries";
+ pEntries.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ pEntries.Size = new System.Drawing.Size(833, 4);
+ pEntries.TabIndex = 1;
+ //
+ // ServerHub
+ //
+ AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+ AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ ClientSize = new System.Drawing.Size(833, 69);
+ Controls.Add(pEntries);
+ Controls.Add(panel1);
+ FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+ Icon = (System.Drawing.Icon)resources.GetObject("$this.Icon");
+ Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ Name = "ServerHub";
+ Text = "CDCplus";
+ Shown += ServerHub_Shown;
+ panel1.ResumeLayout(false);
+ panel2.ResumeLayout(false);
+ panel3.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)pictureBox1).EndInit();
+ ResumeLayout(false);
+ }
- #endregion
+ #endregion
- private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Panel pEntries;
private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.Panel panel3;
Modified: Client/trunk/Cinnamon4/CDCplus/ServerHub.resx
===================================================================
--- Client/trunk/Cinnamon4/CDCplus/ServerHub.resx 2024-07-10 13:08:08 UTC (rev 3783)
+++ Client/trunk/Cinnamon4/CDCplus/ServerHub.resx 2024-07-10 14:19:12 UTC (rev 3784)
@@ -18,7 +18,7 @@
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing"">Blue</data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
@@ -1557,4 +1557,382 @@
TkSuQmCC
</value>
</data>
+ <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAABAAMAEBAAAAEAIABoBAAANgAAACAgAAABACAAqBAAAJ4EAABAQAAAAQAgAChCAABGFQAAKAAAABAA
+ AAAgAAAAAQAgAAAAAAAABAAAnQAAAJ0AAAAAAAAAAAAAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAGeu
+ //9Jnv//Sp///2Wt//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAALpD//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//ymO//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAG4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//H4j//wD/AAAA/wAAAP8AAAD/AAAA/wAAG4b//xuG
+ //8bhv//OZb//wD/AAAA/wAAAP8AAAD/AABbqP//Hof//wD/AAAA/wAAAP8AAAD/AAAA/wAAL5D//xuG
+ //8bhv//V6b//wD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AABuG
+ //8bhv//LY///wD/AAAA/wAA2sGS/7+TQf+9kDz/xqBY/wD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAGiv
+ //8bhv//G4b//4K9//8A/wAA4Myl/72QPP+9kDz/vZA8/72QPP/CmEr/AP8AAAD/AAAA/wAAAP8AAAD/
+ AABMoP//G4b//xuG//8A/wAAAP8AAMmkX/+9kDz/vZA8/72QPP+9kDz/vZA8/wD/AAAA/wAAAP8AAAD/
+ AAAA/wAASZ///xuG//8bhv//AP8AAAD/AADJpF//vZA8/72QPP+9kDz/vZA8/72QPP8A/wAAAP8AAAD/
+ AAAA/wAAAP8AAGWt//8bhv//G4b//3y6//8A/wAA4Mqi/72QPP+9kDz/vZA8/72QPP/CmEv/AP8AAAD/
+ AAAA/wAAAP8AAAD/AABJnv//G4b//xuG//8ojf//AP8AAAD/AADZv4//v5NB/72QPP/GoFj/AP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AACuP//8bhv//G4b//0mf//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AABJnv//AP8AAAD/AAAA/wAAAP8AAAD/AACizv//G4b//xuG//8bhv//LY///wD/AAAA/wAAAP8AAAD/
+ AABJnv//G4b//0me//8A/wAAAP8AAAD/AAAA/wAAAP8AAEme//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//SZ7//wD/AAAA/wAAAP8AAAD/AAAA/wAAoM3//yiN//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8mjP//SZ7//wD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAmMj//1qn
+ //9Amf//P5n//1mn//+Wx///AP8AAAD/AAAA/wAAAP8AAAD/AAD8PwAA8A8AAOAHAADDzwAAh/8AAIw/
+ AAAIHwAAGB8AABgfAAAIHwAADD8AAIfvAACDxwAAwAMAAOAHAAD4HwAAKAAAACAAAABAAAAAAQAgAAAA
+ AAAAEAAAOwEAADsBAAAAAAAAAAAAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAGuw//9ws///AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAHG0//8sj///G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8li///X6r//wD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAFWl//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//0mf//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAgif//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//x6H//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAG4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//92tv//AP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAd7f//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//L5D//wD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAbhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//yWL
+ //9vs///AP8AAAD/AAAA/wAAAP8AAAD/AABVpf//HIb//xuG//8bhv//G4b//yqO//8A/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAIYn//xuG//8bhv//G4b//xuG//8bhv//G4b//yCJ
+ //8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAXan//xuG//8mjP//AP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAFqn//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8xkv//AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAG4b//xuG//8bhv//G4b//xuG
+ //8bhv//L5D//wD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAGux//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8A/wAAAP8AAAD/AAAA/wAAAP8AANzEmP/Bl0f/vZA8/72QPP+9kDz/wJVF/9m/
+ j/8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAALI///xuG
+ //8bhv//G4b//xuG//8bhv//YKv//wD/AAAA/wAAAP8AAAD/AADKpmL/vZA8/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/8ehWv8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAbhv//G4b//xuG//8bhv//G4b//xuG//8A/wAAAP8AAAD/AAAA/wAA0LB0/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/vZA8/8ypaP8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AABuG//8bhv//G4b//xuG//8bhv//KY7//wD/AAAA/wAAAP8AAAD/AAC9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/wD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAG4b//xuG//8bhv//G4b//xuG//9Zp///AP8AAAD/AAAA/wAA17yJ/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/07V9/wD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAHS1//8bhv//G4b//xuG//8bhv//G4b//2ux//8A/wAAAP8AAAD/
+ AADMqmn/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP/Io17/AP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAbLH//xuG//8bhv//G4b//xuG//8bhv//bbL//wD/
+ AAAA/wAAAP8AAMypaP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/8ij
+ Xf8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAG4b//xuG//8bhv//G4b//xuG
+ //9Pov//AP8AAAD/AAAA/wAA17uI/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/07V8/wD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAbhv//G4b//xuG
+ //8bhv//G4b//yaM//8A/wAAAP8AAAD/AAAA/wAAvZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AABuG
+ //8bhv//G4b//xuG//8bhv//G4b//wD/AAAA/wAAAP8AAAD/AADPrnD/vZA8/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/y6hn/wD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAKo7//xuG//8bhv//G4b//xuG//8bhv//TaH//wD/AAAA/wAAAP8AAAD/AADIo17/vZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/vZA8/8agWP8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AABrsf//G4b//xuG//8bhv//G4b//xuG//8bhv//AP8AAAD/AAAA/wAAAP8AAAD/
+ AADawZL/wJZG/72QPP+9kDz/vZA8/8CURP/Yvo3/AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAbhv//G4b//xuG//8bhv//G4b//xuG//8hif//AP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAEyg//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8mjP//AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAdLX//2Os
+ //8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAB6H//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//Za3//wD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AADuX
+ //8bhv//G4b//16q//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AABuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//0Wc//96uP//AP8AAAD/AAAA/wAAa7D//zCR
+ //8bhv//G4b//xuG//8bhv//G4b//1qo//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAZ67//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//1al//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAZa3//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//UqP//wD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAB2H//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//3S1//8A/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAEOb//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//zmW//8A/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AABVpf//H4j//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//Hof//1Ok//8A/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AABvs///Xan//1al//9tsv//AP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAD//n///8AD//8AAP/+AAB//AAAH/AA
+ AD/wA+B/4B/4/8A////Af///gPgP/4DwB/+B4AP/geAD/4HAAf8BwAH/AcAB/4HAAf+B4AP/geAD/4Dw
+ B/+A+A//wH///8A//P/gD/h/8AHAP/AAAB/4AAAf/gAAP/8AAP//wAP///w//ygAAABAAAAAgAAAAAEA
+ IAAAAAAAAEAAAHYCAAB2AgAAAAAAAAAAAAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAGau//89mP//H4j//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//y+Q//9fqv//AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAA5lv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//LpD//wD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAV6b//xyG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//0Wc//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AABSo///G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//zmW//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAdh///G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//0+i
+ //8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AADCR
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//I4r//wD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAB6H//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//Yqv//wD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AABuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //9Inv//AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAXqr//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//wD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAWKb//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//3S1//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AABuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//2St//8A/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AABuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8chv//QZr//22y//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AABTpP//I4r//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//2Cr
+ //8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAB6H//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//1al//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAcLP//yaM//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//1al//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AADeV//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//Z67//wD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AACiN
+ //8bhv//G4b//xuG//8bhv//G4b//02h//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAbhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//88mP//AP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAZK3//xuG//8bhv//G4b//0ed//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAdh///G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //9ssf//AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAIYn//z2Y//8A/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AABYpv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAG4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAYav//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AADXvIr/17yK/wD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAB2H
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//9EnP//AP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAvZA8/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP/JpF//AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAbhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8eh///AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAM6sbv+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP/Gn1b/AP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AABDm///G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAL+U
+ Q/+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/76S
+ P/8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAG4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//H4j//wD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAL+TQf+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/vZA9/wD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AABuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//wD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAMCWRv+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP++kT7/AP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAHK0//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAMypaP+9kDz/vZA8/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/8ag
+ WP8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AABAmf//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8ojf//AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAC9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAIIn//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AADOrW7/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/8afV/8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AABuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//wD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAvZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/AP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAbhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAL2QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/wD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAG4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAC9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP/VuIP/AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AABuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//wD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AADawZL/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/0bJ4/wD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAbhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8A/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAA2L6N/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/9Gy
+ d/8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAG4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAC9kDz/vZA8/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP/VuIL/AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AABuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//wD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAvZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAbhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAL6RPv+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/wD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAH4j//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//SZ///wD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AADOrG7/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/8Wd
+ VP8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAD2Y//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//x6H//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAL2QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AABjrP//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AADMqmn/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP/FnVT/AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AABuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//0ed//8A/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAL+TQv+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kD3/AP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAbhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAvpI//72QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/AP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAMpL//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//0ed//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AADAlET/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72Q
+ PP+9kD3/AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAbhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//AP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAMqlYf+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP/FnlT/AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAG4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//ySL
+ //8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAMuoZf+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/vZA8/8ehWf8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAEug//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//O5f//wD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAA07V9/9O1ff/Wu4f/AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAG4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//9Kn///AP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAESc
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//0ad
+ //8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAebj//0CZ//8A/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAG4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//L5D//wD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAU6T//xuG
+ //8bhv//QZr//wD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAGKr//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8chv//AP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAKo7//xuG//8bhv//G4b//xuG//89mP//AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAJoz//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8mjP//AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAA8mP//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//zqX//8A/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAbhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8dh///UqP//wD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AACaM//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//NpT//wD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAdbb//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//x+I
+ //85lv//S6D//1im//9Rov//Q5v//yaM//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//81lP//AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AABQov//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//zGS//8A/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAEie//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//L5D//wD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAQJn//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//ymO//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AABSo///G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//zCR//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAGiv//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//0ed//8A/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AACWL//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//26y
+ //8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAATKD//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//N5X//wD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAM5P//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8jiv//AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAOZb//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//yeM//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAY6z//yOK//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8chv//UqP//wD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAHm4//9EnP//Hof//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//NZT//2yx//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA//////////////+AAf///////AAAP//////gAAAH
+ /////4AAAAH/////AAAAAH////wAAAAAP///+AAAAAAP///wAAAAAAf//8AAAAAAB///gAAAAAAH//+A
+ AAAAAA///wAAA/AAH//+AAA//gA///wAAP//wH///AAD///g///4AAf///n///AAH///////8AA/////
+ ///gAH//P////+AAf/gD////4AD/wAD////AAf+AAH///8AB/wAAP///wAP+AAAf//+AA/wAAA///4AD
+ /AAAD///gAf4AAAH//+AB/gAAAf//4AH+AAAB///gAf4AAAD//+AB/AAAAP//4AH8AAAA///gAf4AAAD
+ //+AB/gAAAf//4AH+AAAB///gAP4AAAH//+AA/wAAA///4AD/AAAD///wAH+AAAf///AAf8AAD///8AA
+ /4AAf///4AD/wAD////gAH/wA////+AAP/8f////8AAf///////wAA////n///gAB///8P//+AAD///g
+ f//8AAD//4A///4AAB/+AB///gAAAAAAD///AAAAAAAH//+AAAAAAAP//8AAAAAAA///4AAAAAAH///w
+ AAAAAA////wAAAAAH////gAAAAB/////gAAAAf/////gAAAH//////gAAB///////wAA////////////
+ //8=
+</value>
+ </data>
</root>
\ No newline at end of file
Modified: Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/MainWindow.Designer.cs
===================================================================
--- Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/MainWindow.Designer.cs 2024-07-10 13:08:08 UTC (rev 3783)
+++ Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/MainWindow.Designer.cs 2024-07-10 14:19:12 UTC (rev 3784)
@@ -29,6 +29,7 @@
/// </summary>
private void InitializeComponent()
{
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainWindow));
tstrRepositoryNav = new ToolStrip();
txtQuickSearch = new ToolStripTextBox();
tsbQuickSearch = new ToolStripButton();
@@ -194,6 +195,7 @@
Controls.Add(splVert);
Controls.Add(tstrRepositoryNav);
Controls.Add(sstrRepositoryNav);
+ Icon = (Icon)resources.GetObject("$this.Icon");
Name = "MainWindow";
Text = "MainWindow";
FormClosing += MainWindow_FormClosing;
Modified: Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/MainWindow.resx
===================================================================
--- Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/MainWindow.resx 2024-07-10 13:08:08 UTC (rev 3783)
+++ Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/MainWindow.resx 2024-07-10 14:19:12 UTC (rev 3784)
@@ -1,4 +1,64 @@
-<root>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
@@ -63,4 +123,383 @@
<metadata name="sstrRepositoryNav.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>516, 17</value>
</metadata>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAABAAMAEBAAAAEAIABoBAAANgAAACAgAAABACAAqBAAAJ4EAABAQAAAAQAgAChCAABGFQAAKAAAABAA
+ AAAgAAAAAQAgAAAAAAAABAAAnQAAAJ0AAAAAAAAAAAAAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAGeu
+ //9Jnv//Sp///2Wt//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAALpD//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//ymO//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAG4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//H4j//wD/AAAA/wAAAP8AAAD/AAAA/wAAG4b//xuG
+ //8bhv//OZb//wD/AAAA/wAAAP8AAAD/AABbqP//Hof//wD/AAAA/wAAAP8AAAD/AAAA/wAAL5D//xuG
+ //8bhv//V6b//wD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AABuG
+ //8bhv//LY///wD/AAAA/wAA2sGS/7+TQf+9kDz/xqBY/wD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAGiv
+ //8bhv//G4b//4K9//8A/wAA4Myl/72QPP+9kDz/vZA8/72QPP/CmEr/AP8AAAD/AAAA/wAAAP8AAAD/
+ AABMoP//G4b//xuG//8A/wAAAP8AAMmkX/+9kDz/vZA8/72QPP+9kDz/vZA8/wD/AAAA/wAAAP8AAAD/
+ AAAA/wAASZ///xuG//8bhv//AP8AAAD/AADJpF//vZA8/72QPP+9kDz/vZA8/72QPP8A/wAAAP8AAAD/
+ AAAA/wAAAP8AAGWt//8bhv//G4b//3y6//8A/wAA4Mqi/72QPP+9kDz/vZA8/72QPP/CmEv/AP8AAAD/
+ AAAA/wAAAP8AAAD/AABJnv//G4b//xuG//8ojf//AP8AAAD/AADZv4//v5NB/72QPP/GoFj/AP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AACuP//8bhv//G4b//0mf//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AABJnv//AP8AAAD/AAAA/wAAAP8AAAD/AACizv//G4b//xuG//8bhv//LY///wD/AAAA/wAAAP8AAAD/
+ AABJnv//G4b//0me//8A/wAAAP8AAAD/AAAA/wAAAP8AAEme//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//SZ7//wD/AAAA/wAAAP8AAAD/AAAA/wAAoM3//yiN//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8mjP//SZ7//wD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAmMj//1qn
+ //9Amf//P5n//1mn//+Wx///AP8AAAD/AAAA/wAAAP8AAAD/AAD8PwAA8A8AAOAHAADDzwAAh/8AAIw/
+ AAAIHwAAGB8AABgfAAAIHwAADD8AAIfvAACDxwAAwAMAAOAHAAD4HwAAKAAAACAAAABAAAAAAQAgAAAA
+ AAAAEAAAOwEAADsBAAAAAAAAAAAAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAGuw//9ws///AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAHG0//8sj///G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8li///X6r//wD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAFWl//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//0mf//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAgif//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//x6H//8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAG4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//92tv//AP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAd7f//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//xuG//8bhv//L5D//wD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAbhv//G4b//xuG//8bhv//G4b//xuG//8bhv//G4b//yWL
+ //9vs///AP8AAAD/AAAA/wAAAP8AAAD/AABVpf//HIb//xuG//8bhv//G4b//yqO//8A/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAIYn//xuG//8bhv//G4b//xuG//8bhv//G4b//yCJ
+ //8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAXan//xuG//8mjP//AP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAFqn//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8xkv//AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAG4b//xuG//8bhv//G4b//xuG
+ //8bhv//L5D//wD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAGux//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8A/wAAAP8AAAD/AAAA/wAAAP8AANzEmP/Bl0f/vZA8/72QPP+9kDz/wJVF/9m/
+ j/8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAALI///xuG
+ //8bhv//G4b//xuG//8bhv//YKv//wD/AAAA/wAAAP8AAAD/AADKpmL/vZA8/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/8ehWv8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAbhv//G4b//xuG//8bhv//G4b//xuG//8A/wAAAP8AAAD/AAAA/wAA0LB0/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/vZA8/8ypaP8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AABuG//8bhv//G4b//xuG//8bhv//KY7//wD/AAAA/wAAAP8AAAD/AAC9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/wD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAG4b//xuG//8bhv//G4b//xuG//9Zp///AP8AAAD/AAAA/wAA17yJ/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/07V9/wD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAHS1//8bhv//G4b//xuG//8bhv//G4b//2ux//8A/wAAAP8AAAD/
+ AADMqmn/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP/Io17/AP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAbLH//xuG//8bhv//G4b//xuG//8bhv//bbL//wD/
+ AAAA/wAAAP8AAMypaP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/8ij
+ Xf8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAG4b//xuG//8bhv//G4b//xuG
+ //9Pov//AP8AAAD/AAAA/wAA17uI/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/07V8/wD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAbhv//G4b//xuG
+ //8bhv//G4b//yaM//8A/wAAAP8AAAD/AAAA/wAAvZA8/72QPP+9kDz/vZA8/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AABuG
+ //8bhv//G4b//xuG//8bhv//G4b//wD/AAAA/wAAAP8AAAD/AADPrnD/vZA8/72QPP+9kDz/vZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/y6hn/wD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAKo7//xuG//8bhv//G4b//xuG//8bhv//TaH//wD/AAAA/wAAAP8AAAD/AADIo17/vZA8/72Q
+ PP+9kDz/vZA8/72QPP+9kDz/vZA8/8agWP8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AABrsf//G4b//xuG//8bhv//G4b//xuG//8bhv//AP8AAAD/AAAA/wAAAP8AAAD/
+ AADawZL/wJZG/72QPP+9kDz/vZA8/8CURP/Yvo3/AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAbhv//G4b//xuG//8bhv//G4b//xuG//8hif//AP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/
+ AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAEyg//8bhv//G4b//xuG//8bhv//G4b//xuG
+ //8mjP//AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAdLX//2Os
+ //8A/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAB6H//8bhv//G4b//xuG
+ //8bhv//G4b//xuG//8bhv//Za3//wD/AAAA/wAAAP8...
[truncated message content] |
|
From: <bh...@us...> - 2024-07-10 13:08:10
|
Revision: 3783
http://sourceforge.net/p/cinnamon/code/3783
Author: bhorner
Date: 2024-07-10 13:08:08 +0000 (Wed, 10 Jul 2024)
Log Message:
-----------
timer use in ResultListDisplay now configurable (default true)
Modified Paths:
--------------
Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/ResultListDisplay.cs
Client/trunk/Cinnamon4/ChangeTriggerLib/Services/TriggerActionService.cs
Client/trunk/Cinnamon4/ChangeTriggerLib/TriggerActionFactories/UserCreateFactory.cs
Modified: Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/ResultListDisplay.cs
===================================================================
--- Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/ResultListDisplay.cs 2024-07-08 09:42:33 UTC (rev 3782)
+++ Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/ResultListDisplay.cs 2024-07-10 13:08:08 UTC (rev 3783)
@@ -13,7 +13,6 @@
{
public partial class ResultListDisplay : UserControl
{
- private const bool USE_TIMER = true;
private CmnNodeList _nl;
private IIconService _iconService;
@@ -22,6 +21,7 @@
private ListViewSort _lvwSort;
private bool _enableCheck;
private bool _enableSelectionChangeEvent;
+ private bool _useTimer = true;
private View _view;
private System.Windows.Forms.Timer selectionChangedTimer;
@@ -40,12 +40,6 @@
lvwNodeList.StateImageList.ColorDepth = ColorDepth.Depth24Bit;
lvwNodeList.StateImageList.Images.Add("blank", new Bitmap(Path.Combine(stateImagePath, "blank.png")));
lvwNodeList.StateImageList.Images.Add("link", new Bitmap(Path.Combine(stateImagePath, "emblem-symbolic-link.png")));
- if(USE_TIMER)
- {
- selectionChangedTimer = new System.Windows.Forms.Timer();
- selectionChangedTimer.Interval = 100; // Delay in milliseconds
- selectionChangedTimer.Tick += SelectionChangedTimer_Tick;
- }
}
public void Init(CmnSession s, XmlElement customConfigEl, XmlElement rldConfigEl, INodeDataProvider ndp)
{
@@ -57,6 +51,15 @@
_enableSelectionChangeEvent = false;
_view = View.Details;
XmlAttribute frs = ((XmlAttribute)(rldConfigEl.SelectSingleNode("appearance/full_row_select/@value")));
+ XmlNode useTimerN = rldConfigEl.SelectSingleNode("appearance/use_timer");
+ if(useTimerN != null) _useTimer = useTimerN.InnerText == "true";
+ if(_useTimer)
+ {
+ selectionChangedTimer = new System.Windows.Forms.Timer();
+ selectionChangedTimer.Interval = 100; // Delay in milliseconds
+ selectionChangedTimer.Tick += SelectionChangedTimer_Tick;
+ }
+
lvwNodeList.FullRowSelect = (frs != null && frs.Value == "true");
lvwNodeList.Columns.Clear();
foreach (string colName in _nodeDataProvider.GetColumnDefinitions().Keys)
@@ -401,7 +404,7 @@
{
try
{
- if(USE_TIMER)
+ if(_useTimer)
{
selectionChangedTimer.Stop();
selectionChangedTimer.Start();
Modified: Client/trunk/Cinnamon4/ChangeTriggerLib/Services/TriggerActionService.cs
===================================================================
--- Client/trunk/Cinnamon4/ChangeTriggerLib/Services/TriggerActionService.cs 2024-07-08 09:42:33 UTC (rev 3782)
+++ Client/trunk/Cinnamon4/ChangeTriggerLib/Services/TriggerActionService.cs 2024-07-10 13:08:08 UTC (rev 3783)
@@ -47,7 +47,7 @@
}
public void InitCustomServices()
{
- Console.WriteLine("InitCustomServices");
+ _logger.LogInformation("InitCustomServices");
_customServices = new Dictionary<string, ICustomService>();
foreach (XmlElement sngServiceEl in _config.DocumentElement.SelectNodes("singleton_services/singleton_service"))
{
@@ -55,13 +55,13 @@
string assembly = sngServiceEl.GetAttribute("assembly");
string type = sngServiceEl.GetAttribute("type");
Assembly asm = Assembly.LoadFrom(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), assembly + ".dll"));
- Console.WriteLine("Loading: " + Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), assembly + ".dll"));
- Console.WriteLine("Assembly is " + (asm == null ? "null" : "not null"));
+ _logger.LogInformation("Loading: " + Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), assembly + ".dll"));
+ _logger.LogInformation("Assembly is " + (asm == null ? "null" : "not null"));
ICustomService? customService = (ICustomService)asm.CreateInstance(assembly + "." + type);
- Console.WriteLine("Custom service is " + (customService == null ? "null" : "not null"));
+ _logger.LogInformation("Custom service is " + (customService == null ? "null" : "not null"));
customService.Init(sngServiceEl);
_customServices.Add(name, customService);
- Console.WriteLine("Added: " + name);
+ _logger.LogInformation("Added: " + name);
}
}
@@ -82,7 +82,7 @@
_logger.LogInformation("Factory is " + (factory == null ? "null" : "not null"));
factory.Init(triggerActionFactoryEl, this);
_factories.Add(name, factory);
- Console.WriteLine("Added: "+name);
+ _logger.LogInformation("Added: "+name);
}
}
Modified: Client/trunk/Cinnamon4/ChangeTriggerLib/TriggerActionFactories/UserCreateFactory.cs
===================================================================
--- Client/trunk/Cinnamon4/ChangeTriggerLib/TriggerActionFactories/UserCreateFactory.cs 2024-07-08 09:42:33 UTC (rev 3782)
+++ Client/trunk/Cinnamon4/ChangeTriggerLib/TriggerActionFactories/UserCreateFactory.cs 2024-07-10 13:08:08 UTC (rev 3783)
@@ -32,7 +32,6 @@
public void Init(XmlElement config, TriggerActionService triggerActionService)
{
- Console.WriteLine("Init UserCreateFactory");
_config = config;
_triggerActionService = triggerActionService;
_usersFolder = _triggerActionService.ServiceSession.GetFolderByPath("/.data/users");
@@ -52,7 +51,7 @@
{
HashSet<C4Folder> folders = new HashSet<C4Folder>();
- Console.WriteLine("UserCreateAction: "+requestData.OuterXml);
+ _logger.LogInformation("UserCreateAction: "+requestData.OuterXml);
foreach (XmlElement userEl in requestData.DocumentElement.SelectNodes("users/user"))
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2024-07-08 09:42:35
|
Revision: 3782
http://sourceforge.net/p/cinnamon/code/3782
Author: bhorner
Date: 2024-07-08 09:42:33 +0000 (Mon, 08 Jul 2024)
Log Message:
-----------
Timer use configurable by const in ResultListDisplay
Modified Paths:
--------------
Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/ResultListDisplay.cs
Modified: Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/ResultListDisplay.cs
===================================================================
--- Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/ResultListDisplay.cs 2024-07-04 12:40:18 UTC (rev 3781)
+++ Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/ResultListDisplay.cs 2024-07-08 09:42:33 UTC (rev 3782)
@@ -13,6 +13,8 @@
{
public partial class ResultListDisplay : UserControl
{
+ private const bool USE_TIMER = true;
+
private CmnNodeList _nl;
private IIconService _iconService;
private INodeDataProvider _nodeDataProvider;
@@ -21,7 +23,7 @@
private bool _enableCheck;
private bool _enableSelectionChangeEvent;
private View _view;
- private System.Windows.Forms.Timer selectionChangedTimer = new System.Windows.Forms.Timer();
+ private System.Windows.Forms.Timer selectionChangedTimer;
//private bool _idleHandlerSet;
private CmnSession _s;
@@ -38,8 +40,12 @@
lvwNodeList.StateImageList.ColorDepth = ColorDepth.Depth24Bit;
lvwNodeList.StateImageList.Images.Add("blank", new Bitmap(Path.Combine(stateImagePath, "blank.png")));
lvwNodeList.StateImageList.Images.Add("link", new Bitmap(Path.Combine(stateImagePath, "emblem-symbolic-link.png")));
- selectionChangedTimer.Interval = 100; // Delay in milliseconds
- selectionChangedTimer.Tick += SelectionChangedTimer_Tick;
+ if(USE_TIMER)
+ {
+ selectionChangedTimer = new System.Windows.Forms.Timer();
+ selectionChangedTimer.Interval = 100; // Delay in milliseconds
+ selectionChangedTimer.Tick += SelectionChangedTimer_Tick;
+ }
}
public void Init(CmnSession s, XmlElement customConfigEl, XmlElement rldConfigEl, INodeDataProvider ndp)
{
@@ -395,8 +401,15 @@
{
try
{
- selectionChangedTimer.Stop();
- selectionChangedTimer.Start();
+ if(USE_TIMER)
+ {
+ selectionChangedTimer.Stop();
+ selectionChangedTimer.Start();
+ }
+ else
+ {
+ SelectionChanged();
+ }
}
catch (Exception ex)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2024-07-04 12:40:21
|
Revision: 3781
http://sourceforge.net/p/cinnamon/code/3781
Author: bhorner
Date: 2024-07-04 12:40:18 +0000 (Thu, 04 Jul 2024)
Log Message:
-----------
Thread safety
Modified Paths:
--------------
Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/ContextTabControlContainer.cs
Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/ResultListDisplay.cs
Modified: Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/ContextTabControlContainer.cs
===================================================================
--- Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/ContextTabControlContainer.cs 2024-07-03 06:31:24 UTC (rev 3780)
+++ Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/ContextTabControlContainer.cs 2024-07-04 12:40:18 UTC (rev 3781)
@@ -16,6 +16,7 @@
private Dictionary<long, IRepositoryNode> _context;
private bool _listContext;
private string _lastSelectedTabName;
+ private readonly object _tabContextLock = new object();
public event MessageSentEventHandler MessageSent;
@@ -163,82 +164,86 @@
public void UpdateTabControl(Dictionary<long, IRepositoryNode> context, IGenericControl.ContextType ct, IClientMessage msg)
{
- try
+ if (InvokeRequired)
{
- tabContext.SuspendLayout();
- _context = context;
+ Invoke((MethodInvoker)(() => UpdateTabControl(context, ct, msg)));
+ return;
+ }
- // get tab fingerprint
- string newTabFingerprint = null;
- foreach (string k in _tabPages.Keys)
+ lock (_tabContextLock)
+ {
+ try
{
- TabPage tp = _tabPages[k];
- if (tp.Controls.Count > 0)
+ tabContext.SuspendLayout();
+ _context = context;
+
+ string newTabFingerprint = null;
+ foreach (string k in _tabPages.Keys)
{
- IGenericControl ctl = (IGenericControl)tp.Controls[0];
-
- if (ctl.IsValid(_context, ct))
+ TabPage tp = _tabPages[k];
+ if (tp.Controls.Count > 0)
{
- if (newTabFingerprint is null)
+ IGenericControl ctl = tp.Controls[0] as IGenericControl;
+ if (ctl != null && ctl.IsValid(_context, ct))
{
- newTabFingerprint = k;
+ if (newTabFingerprint == null)
+ {
+ newTabFingerprint = k;
+ }
+ else
+ {
+ newTabFingerprint += "#" + k;
+ }
}
- else
- {
- newTabFingerprint += "#" + k;
- }
}
}
- }
- TabPage sel = tabContext.SelectedTab;
- if(sel!=null) _lastSelectedTabName = sel.Name;
- if(_currentTabFingerprint!=newTabFingerprint)
- {
- tabContext.TabPages.Clear();
- foreach (string k in _tabPages.Keys)
+ TabPage sel = tabContext.SelectedTab;
+ if (sel != null) _lastSelectedTabName = sel.Name;
+
+ if (_currentTabFingerprint != newTabFingerprint)
{
- TabPage tp = _tabPages[k];
- if (tp.Controls.Count > 0)
+ tabContext.TabPages.Clear();
+ foreach (string k in _tabPages.Keys)
{
- IGenericControl ctl = (IGenericControl)tp.Controls[0];
-
- if (ctl.IsValid(_context, ct))
+ TabPage tp = _tabPages[k];
+ if (tp.Controls.Count > 0)
{
- tabContext.TabPages.Add(_tabPages[k]);
+ IGenericControl ctl = tp.Controls[0] as IGenericControl;
+ if (ctl != null && ctl.IsValid(_context, ct))
+ {
+ tabContext.TabPages.Add(tp);
+ }
}
}
}
+ if (tabContext.TabPages.ContainsKey(_lastSelectedTabName))
+ {
+ tabContext.SelectTab(_lastSelectedTabName);
+ }
+ else if (tabContext.TabPages.Count > 0)
+ {
+ tabContext.SelectTab(0);
+ }
+
+ if (tabContext.SelectedTab != null && tabContext.SelectedTab.Controls.Count > 0)
+ {
+ IGenericControl ctl = tabContext.SelectedTab.Controls[0] as IGenericControl;
+ ctl?.Init(_context, msg);
+ }
+
+ _currentTabFingerprint = newTabFingerprint;
}
-
- if (tabContext.TabPages.ContainsKey(_lastSelectedTabName))
+ catch (Exception ex)
{
- tabContext.SelectTab(_lastSelectedTabName);
+ StandardMessage.ShowMessage(Properties.Resources.exFailureUpdatingTabs, StandardMessage.Severity.ErrorMessage, this, ex);
}
- else if (tabContext.TabPages.Count > 0)
- tabContext.SelectTab(0);
-
-
- if (tabContext.SelectedTab != null)
+ finally
{
- IGenericControl ctl = (IGenericControl)tabContext.SelectedTab.Controls[0];
- ctl.Init(_context, msg);
-
- //if (msg is object)
- // ctl.MessageReceived(msg);
+ tabContext.ResumeLayout();
}
- _currentTabFingerprint = newTabFingerprint;
}
- catch (Exception ex)
- {
- StandardMessage.ShowMessage(Properties.Resources.exFailureUpdatingTabs, StandardMessage.Severity.ErrorMessage,this, ex);
-
- }
- finally
- {
- tabContext.ResumeLayout();
- }
}
}
}
Modified: Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/ResultListDisplay.cs
===================================================================
--- Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/ResultListDisplay.cs 2024-07-03 06:31:24 UTC (rev 3780)
+++ Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/ResultListDisplay.cs 2024-07-04 12:40:18 UTC (rev 3781)
@@ -7,6 +7,7 @@
using C4ObjectApi.Interfaces;
using C4ObjectApi.Repository;
using C4GeneralGui.GuiElements;
+using System.Diagnostics;
namespace CDCplusLib.Common.GUI
{
@@ -353,9 +354,29 @@
}
+ private void SelectionChangedTimer_Tick(object sender, EventArgs e)
+ {
+ try
+ {
+ selectionChangedTimer.Stop();
+ if (InvokeRequired)
+ {
+ Invoke((MethodInvoker)SelectionChanged);
+ }
+ else
+ {
+ SelectionChanged();
+ }
+ }
+ catch (Exception ex)
+ {
+ Debug.Print(string.Join("\n", ex.GetType().ToString(), ex.Message, ex.StackTrace));
+ }
+ }
+
private void SelectionChanged()
{
- if(_enableSelectionChangeEvent)
+ if (_enableSelectionChangeEvent)
{
ListSelectionChangeMessage msg = new ListSelectionChangeMessage();
//msg.Source = EVENT_SOURCE
@@ -368,27 +389,19 @@
if (lvwNodeList.SelectedItems.Count > 0)
lvwNodeList.SelectedItems[0].EnsureVisible();
lvwNodeList.Focus();
-
}
- //Application.Idle -= SelectionChanged;
- //_idleHandlerSet = false;
-
}
- private void SelectionChangedTimer_Tick(object sender, EventArgs e)
- {
- selectionChangedTimer.Stop();
- SelectionChanged();
- }
private void lvwNodeList_SelectedIndexChanged(object sender, EventArgs e)
{
- selectionChangedTimer.Stop();
- selectionChangedTimer.Start();
- //SelectionChanged(sender, e);
- //if (!_idleHandlerSet)
- //{
- // Application.Idle += SelectionChanged;
- // _idleHandlerSet = true;
- //}
+ try
+ {
+ selectionChangedTimer.Stop();
+ selectionChangedTimer.Start();
+ }
+ catch (Exception ex)
+ {
+ Debug.Print(string.Join("\n", ex.GetType().ToString(), ex.Message, ex.StackTrace));
+ }
}
private void lvwNodeList_ItemCheck(object sender, ItemCheckEventArgs e)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2024-07-03 06:31:26
|
Revision: 3780
http://sourceforge.net/p/cinnamon/code/3780
Author: bhorner
Date: 2024-07-03 06:31:24 +0000 (Wed, 03 Jul 2024)
Log Message:
-----------
Checking for null parent before setting pointer
Modified Paths:
--------------
Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/ContextTabControlContainer.cs
Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/MainWindow.cs
Client/trunk/Cinnamon4/CDCplusLib/DataModel/ContextFunctionsContainer.cs
Modified: Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/ContextTabControlContainer.cs
===================================================================
--- Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/ContextTabControlContainer.cs 2024-06-21 09:25:33 UTC (rev 3779)
+++ Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/ContextTabControlContainer.cs 2024-07-03 06:31:24 UTC (rev 3780)
@@ -67,6 +67,7 @@
}
catch (NotImplementedException ex)
{
+ StandardMessage.ShowMessage(Properties.Resources.exFailureUpdatingTabs, StandardMessage.Severity.ErrorMessage, this, ex);
}
// for the time being, ignore
// TODO: think of a better solution (clear control, remove tab, ...)
@@ -97,10 +98,13 @@
public void MessageReceived(IClientMessage msg)
{
- IGenericControl ctl = (IGenericControl)tabContext.SelectedTab.Controls[0];
- if (ctl is object)
+ if(tabContext.SelectedTab!=null)
{
- ctl.MessageReceived(msg);
+ IGenericControl ctl = (IGenericControl)tabContext.SelectedTab.Controls[0];
+ if (ctl is object)
+ {
+ ctl.MessageReceived(msg);
+ }
}
}
Modified: Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/MainWindow.cs
===================================================================
--- Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/MainWindow.cs 2024-06-21 09:25:33 UTC (rev 3779)
+++ Client/trunk/Cinnamon4/CDCplusLib/Common/GUI/MainWindow.cs 2024-07-03 06:31:24 UTC (rev 3780)
@@ -368,7 +368,7 @@
{
Dictionary<long, IRepositoryNode> dict = new Dictionary<long, IRepositoryNode>();
CmnFolder f = (CmnFolder)selection.Tag;
- stSession.SetSelection(f);
+ //stSession.SetSelection(f);
dict.Add(f.Id, f);
ctccTreeContext.UpdateTabControl(dict, IGenericControl.ContextType.Folder, msg);
}
Modified: Client/trunk/Cinnamon4/CDCplusLib/DataModel/ContextFunctionsContainer.cs
===================================================================
--- Client/trunk/Cinnamon4/CDCplusLib/DataModel/ContextFunctionsContainer.cs 2024-06-21 09:25:33 UTC (rev 3779)
+++ Client/trunk/Cinnamon4/CDCplusLib/DataModel/ContextFunctionsContainer.cs 2024-07-03 06:31:24 UTC (rev 3780)
@@ -190,7 +190,7 @@
{
try
{
- _parentWindow.Cursor = Cursors.WaitCursor;
+ if(_parentWindow!=null) _parentWindow.Cursor = Cursors.WaitCursor;
ToolStripItem cmi = (ToolStripItem)sender;
ContextFunctionPayload pl = (ContextFunctionPayload)cmi.Tag;
if(pl!=null)
@@ -213,7 +213,7 @@
}
finally
{
- _parentWindow.Cursor = Cursors.Default;
+ if (_parentWindow != null) _parentWindow.Cursor = Cursors.Default;
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
