diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/AbstractBaseControl.Designer.cs b/DepartmentPortal/Common/ToolsDesktop/BaseControls/AbstractBaseControl.Designer.cs similarity index 98% rename from DepartmentPortal/Common/DesktopTools/BaseControls/AbstractBaseControl.Designer.cs rename to DepartmentPortal/Common/ToolsDesktop/BaseControls/AbstractBaseControl.Designer.cs index 2e1282a..9f7ac0b 100644 --- a/DepartmentPortal/Common/DesktopTools/BaseControls/AbstractBaseControl.Designer.cs +++ b/DepartmentPortal/Common/ToolsDesktop/BaseControls/AbstractBaseControl.Designer.cs @@ -1,5 +1,5 @@  -namespace DesktopTools.BaseControls +namespace ToolsDesktop.BaseControls { partial class AbstractBaseControl { diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/AbstractBaseControl.cs b/DepartmentPortal/Common/ToolsDesktop/BaseControls/AbstractBaseControl.cs similarity index 98% rename from DepartmentPortal/Common/DesktopTools/BaseControls/AbstractBaseControl.cs rename to DepartmentPortal/Common/ToolsDesktop/BaseControls/AbstractBaseControl.cs index 7550f38..9ba2a46 100644 --- a/DepartmentPortal/Common/DesktopTools/BaseControls/AbstractBaseControl.cs +++ b/DepartmentPortal/Common/ToolsDesktop/BaseControls/AbstractBaseControl.cs @@ -1,9 +1,9 @@ -using DesktopTools.Interfaces; +using ToolsDesktop.Interfaces; using ToolsModule.Extensions; using System; using System.Windows.Forms; -namespace DesktopTools.BaseControls +namespace ToolsDesktop.BaseControls { /// /// Описание контрола для работы со значением свойства класса diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/AbstractBaseControl.resx b/DepartmentPortal/Common/ToolsDesktop/BaseControls/AbstractBaseControl.resx similarity index 100% rename from DepartmentPortal/Common/DesktopTools/BaseControls/AbstractBaseControl.resx rename to DepartmentPortal/Common/ToolsDesktop/BaseControls/AbstractBaseControl.resx diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlBool.Designer.cs b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlBool.Designer.cs similarity index 98% rename from DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlBool.Designer.cs rename to DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlBool.Designer.cs index 010aa7e..65e5ba6 100644 --- a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlBool.Designer.cs +++ b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlBool.Designer.cs @@ -1,5 +1,5 @@  -namespace DesktopTools.BaseControls +namespace ToolsDesktop.BaseControls { partial class BaseControlBool { diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlBool.cs b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlBool.cs similarity index 96% rename from DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlBool.cs rename to DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlBool.cs index 1bfe248..aec3eab 100644 --- a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlBool.cs +++ b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlBool.cs @@ -1,8 +1,8 @@ -using DesktopTools.Interfaces; +using ToolsDesktop.Interfaces; using System; using System.Windows.Forms; -namespace DesktopTools.BaseControls +namespace ToolsDesktop.BaseControls { /// /// Контрол, предоставляющий работу с bool-полем diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlBool.resx b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlBool.resx similarity index 100% rename from DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlBool.resx rename to DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlBool.resx diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlDateTime.Designer.cs b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlDateTime.Designer.cs similarity index 98% rename from DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlDateTime.Designer.cs rename to DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlDateTime.Designer.cs index 1eed672..3c11401 100644 --- a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlDateTime.Designer.cs +++ b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlDateTime.Designer.cs @@ -1,5 +1,5 @@  -namespace DesktopTools.BaseControls +namespace ToolsDesktop.BaseControls { partial class BaseControlDateTime { diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlDateTime.cs b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlDateTime.cs similarity index 96% rename from DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlDateTime.cs rename to DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlDateTime.cs index 44e57ac..41d9a2b 100644 --- a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlDateTime.cs +++ b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlDateTime.cs @@ -1,9 +1,9 @@ -using DesktopTools.Interfaces; +using ToolsDesktop.Interfaces; using ToolsModule.Extensions; using System; using System.Windows.Forms; -namespace DesktopTools.BaseControls +namespace ToolsDesktop.BaseControls { /// /// Контрол, предоставляющий работу с датой diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlDecimal.Designer.cs b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlDecimal.Designer.cs similarity index 98% rename from DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlDecimal.Designer.cs rename to DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlDecimal.Designer.cs index d0a4fe6..fa14a7c 100644 --- a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlDecimal.Designer.cs +++ b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlDecimal.Designer.cs @@ -1,5 +1,5 @@  -namespace DesktopTools.BaseControls +namespace ToolsDesktop.BaseControls { partial class BaseControlDecimal { diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlDecimal.cs b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlDecimal.cs similarity index 96% rename from DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlDecimal.cs rename to DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlDecimal.cs index 5aff5f8..4864cc4 100644 --- a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlDecimal.cs +++ b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlDecimal.cs @@ -1,8 +1,8 @@ -using DesktopTools.Interfaces; +using ToolsDesktop.Interfaces; using System; using System.Windows.Forms; -namespace DesktopTools.BaseControls +namespace ToolsDesktop.BaseControls { /// /// Контрол, предоставляющий работу с вещественным полем diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlDecimal.resx b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlDecimal.resx similarity index 100% rename from DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlDecimal.resx rename to DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlDecimal.resx diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlEnum.Designer.cs b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlEnum.Designer.cs similarity index 98% rename from DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlEnum.Designer.cs rename to DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlEnum.Designer.cs index 6db9900..b5c982d 100644 --- a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlEnum.Designer.cs +++ b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlEnum.Designer.cs @@ -1,5 +1,5 @@  -namespace DesktopTools.BaseControls +namespace ToolsDesktop.BaseControls { partial class BaseControlEnum { diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlEnum.cs b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlEnum.cs similarity index 97% rename from DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlEnum.cs rename to DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlEnum.cs index 4e93e46..9c07449 100644 --- a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlEnum.cs +++ b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlEnum.cs @@ -1,9 +1,9 @@ -using DesktopTools.Interfaces; +using ToolsDesktop.Interfaces; using System; using System.Drawing; using System.Windows.Forms; -namespace DesktopTools.BaseControls +namespace ToolsDesktop.BaseControls { /// /// Контрол, предоставляющий работу с перечислениями diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlEnum.resx b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlEnum.resx similarity index 100% rename from DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlEnum.resx rename to DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlEnum.resx diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlGuid.Designer.cs b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlGuid.Designer.cs similarity index 96% rename from DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlGuid.Designer.cs rename to DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlGuid.Designer.cs index b95cce6..e7c3d9b 100644 --- a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlGuid.Designer.cs +++ b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlGuid.Designer.cs @@ -1,5 +1,5 @@  -namespace DesktopTools.BaseControls +namespace ToolsDesktop.BaseControls { partial class BaseControlGuid { @@ -32,7 +32,7 @@ namespace DesktopTools.BaseControls // // buttonClear // - this.buttonClear.BackgroundImage = global::DesktopTools.Properties.Resources.Clear; + this.buttonClear.BackgroundImage = global::ToolsDesktop.Properties.Resources.Clear; this.buttonClear.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonClear.Dock = System.Windows.Forms.DockStyle.Right; this.buttonClear.Location = new System.Drawing.Point(74, 12); diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlGuid.cs b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlGuid.cs similarity index 95% rename from DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlGuid.cs rename to DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlGuid.cs index 945f03f..a5a47c2 100644 --- a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlGuid.cs +++ b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlGuid.cs @@ -1,11 +1,11 @@ -using DesktopTools.Enums; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Enums; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using System; using System.Drawing; using System.Windows.Forms; -namespace DesktopTools.BaseControls +namespace ToolsDesktop.BaseControls { public partial class BaseControlGuid : AbstractBaseControl, IBaseControl { diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlGuid.resx b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlGuid.resx similarity index 100% rename from DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlGuid.resx rename to DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlGuid.resx diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlImage.Designer.cs b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlImage.Designer.cs similarity index 98% rename from DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlImage.Designer.cs rename to DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlImage.Designer.cs index 0272eb5..c95b139 100644 --- a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlImage.Designer.cs +++ b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlImage.Designer.cs @@ -1,7 +1,7 @@  using System.Windows.Forms; -namespace DesktopTools.BaseControls +namespace ToolsDesktop.BaseControls { partial class BaseControlImage { diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlImage.cs b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlImage.cs similarity index 97% rename from DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlImage.cs rename to DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlImage.cs index 7571b0c..b26f057 100644 --- a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlImage.cs +++ b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlImage.cs @@ -1,10 +1,10 @@ -using DesktopTools.Interfaces; +using ToolsDesktop.Interfaces; using System; using System.Drawing; using System.IO; using System.Windows.Forms; -namespace DesktopTools.BaseControls +namespace ToolsDesktop.BaseControls { /// /// Контрол, предоставляющий работу с изображением diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlImage.resx b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlImage.resx similarity index 100% rename from DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlImage.resx rename to DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlImage.resx diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlInt.Designer.cs b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlInt.Designer.cs similarity index 98% rename from DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlInt.Designer.cs rename to DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlInt.Designer.cs index 23f8023..4cff65b 100644 --- a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlInt.Designer.cs +++ b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlInt.Designer.cs @@ -1,5 +1,5 @@  -namespace DesktopTools.BaseControls +namespace ToolsDesktop.BaseControls { partial class BaseControlInt { diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlInt.cs b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlInt.cs similarity index 96% rename from DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlInt.cs rename to DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlInt.cs index baa1d7b..042a783 100644 --- a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlInt.cs +++ b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlInt.cs @@ -1,8 +1,8 @@ -using DesktopTools.Interfaces; +using ToolsDesktop.Interfaces; using System; using System.Windows.Forms; -namespace DesktopTools.BaseControls +namespace ToolsDesktop.BaseControls { /// /// Контрол, предоставляющий работу с целочисленным полем diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlInt.resx b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlInt.resx similarity index 100% rename from DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlInt.resx rename to DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlInt.resx diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlString.Designer.cs b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlString.Designer.cs similarity index 97% rename from DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlString.Designer.cs rename to DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlString.Designer.cs index 06f9b36..4f5169d 100644 --- a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlString.Designer.cs +++ b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlString.Designer.cs @@ -1,5 +1,5 @@  -namespace DesktopTools.BaseControls +namespace ToolsDesktop.BaseControls { partial class BaseControlString { diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlString.cs b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlString.cs similarity index 95% rename from DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlString.cs rename to DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlString.cs index fad35bc..3ae1969 100644 --- a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlString.cs +++ b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlString.cs @@ -1,9 +1,9 @@ -using DesktopTools.Interfaces; +using ToolsDesktop.Interfaces; using ToolsModule.Extensions; using System; using System.Drawing; -namespace DesktopTools.BaseControls +namespace ToolsDesktop.BaseControls { /// /// Контрол, предоставляющий работу с однострочным текстовым полем diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlString.resx b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlString.resx similarity index 100% rename from DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlString.resx rename to DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlString.resx diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlText.Designer.cs b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlText.Designer.cs similarity index 97% rename from DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlText.Designer.cs rename to DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlText.Designer.cs index 27307bc..1f21cc0 100644 --- a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlText.Designer.cs +++ b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlText.Designer.cs @@ -1,5 +1,5 @@  -namespace DesktopTools.BaseControls +namespace ToolsDesktop.BaseControls { partial class BaseControlText { diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlText.cs b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlText.cs similarity index 96% rename from DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlText.cs rename to DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlText.cs index 662b25c..cad3e1d 100644 --- a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlText.cs +++ b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlText.cs @@ -1,9 +1,9 @@ -using DesktopTools.Interfaces; +using ToolsDesktop.Interfaces; using ToolsModule.Extensions; using System; using System.Drawing; -namespace DesktopTools.BaseControls +namespace ToolsDesktop.BaseControls { /// /// Контрол, предоставляющий работу с текстовым полем на несколько строк diff --git a/DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlText.resx b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlText.resx similarity index 100% rename from DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlText.resx rename to DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlText.resx diff --git a/DepartmentPortal/Common/DesktopTools/BusinessLogics/DesktopLoader.cs b/DepartmentPortal/Common/ToolsDesktop/BusinessLogics/DesktopLoader.cs similarity index 94% rename from DepartmentPortal/Common/DesktopTools/BusinessLogics/DesktopLoader.cs rename to DepartmentPortal/Common/ToolsDesktop/BusinessLogics/DesktopLoader.cs index b5e3ca9..8a404e3 100644 --- a/DepartmentPortal/Common/DesktopTools/BusinessLogics/DesktopLoader.cs +++ b/DepartmentPortal/Common/ToolsDesktop/BusinessLogics/DesktopLoader.cs @@ -1,4 +1,4 @@ -using DesktopTools.Interfaces; +using ToolsDesktop.Interfaces; using ToolsModule.Extensions; using System; using System.Collections.Generic; @@ -6,7 +6,7 @@ using System.IO; using System.Linq; using System.Reflection; -namespace DesktopTools.BusinessLogics +namespace ToolsDesktop.BusinessLogics { public static partial class DesktopLoader { diff --git a/DepartmentPortal/Common/DesktopTools/Enums/ControlOpenMode.cs b/DepartmentPortal/Common/ToolsDesktop/Enums/ControlOpenMode.cs similarity index 92% rename from DepartmentPortal/Common/DesktopTools/Enums/ControlOpenMode.cs rename to DepartmentPortal/Common/ToolsDesktop/Enums/ControlOpenMode.cs index 34664b4..779e3b4 100644 --- a/DepartmentPortal/Common/DesktopTools/Enums/ControlOpenMode.cs +++ b/DepartmentPortal/Common/ToolsDesktop/Enums/ControlOpenMode.cs @@ -1,4 +1,4 @@ -namespace DesktopTools.Enums +namespace ToolsDesktop.Enums { /// /// С какой целью открыт контрол diff --git a/DepartmentPortal/Common/DesktopTools/Enums/ToolStripButtonListNames.cs b/DepartmentPortal/Common/ToolsDesktop/Enums/ToolStripButtonListNames.cs similarity index 90% rename from DepartmentPortal/Common/DesktopTools/Enums/ToolStripButtonListNames.cs rename to DepartmentPortal/Common/ToolsDesktop/Enums/ToolStripButtonListNames.cs index 8765709..6c195a4 100644 --- a/DepartmentPortal/Common/DesktopTools/Enums/ToolStripButtonListNames.cs +++ b/DepartmentPortal/Common/ToolsDesktop/Enums/ToolStripButtonListNames.cs @@ -1,4 +1,4 @@ -namespace DesktopTools.Enums +namespace ToolsDesktop.Enums { /// /// Имена кнопок на основной панеле контрола для работы со списком сущности diff --git a/DepartmentPortal/Common/DesktopTools/Helpers/DialogHelper.cs b/DepartmentPortal/Common/ToolsDesktop/Helpers/DialogHelper.cs similarity index 97% rename from DepartmentPortal/Common/DesktopTools/Helpers/DialogHelper.cs rename to DepartmentPortal/Common/ToolsDesktop/Helpers/DialogHelper.cs index dba1273..147c1ff 100644 --- a/DepartmentPortal/Common/DesktopTools/Helpers/DialogHelper.cs +++ b/DepartmentPortal/Common/ToolsDesktop/Helpers/DialogHelper.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Windows.Forms; -namespace DesktopTools.Helpers +namespace ToolsDesktop.Helpers { public static class DialogHelper { diff --git a/DepartmentPortal/Common/DesktopTools/Interfaces/IBaseControl.cs b/DepartmentPortal/Common/ToolsDesktop/Interfaces/IBaseControl.cs similarity index 96% rename from DepartmentPortal/Common/DesktopTools/Interfaces/IBaseControl.cs rename to DepartmentPortal/Common/ToolsDesktop/Interfaces/IBaseControl.cs index 7aa968f..8cb9f7d 100644 --- a/DepartmentPortal/Common/DesktopTools/Interfaces/IBaseControl.cs +++ b/DepartmentPortal/Common/ToolsDesktop/Interfaces/IBaseControl.cs @@ -1,4 +1,4 @@ -namespace DesktopTools.Interfaces +namespace ToolsDesktop.Interfaces { /// /// Работа с контролами вывода свойства элемента diff --git a/DepartmentPortal/Common/DesktopTools/Interfaces/IControl.cs b/DepartmentPortal/Common/ToolsDesktop/Interfaces/IControl.cs similarity index 94% rename from DepartmentPortal/Common/DesktopTools/Interfaces/IControl.cs rename to DepartmentPortal/Common/ToolsDesktop/Interfaces/IControl.cs index dda94a4..0c2c23c 100644 --- a/DepartmentPortal/Common/DesktopTools/Interfaces/IControl.cs +++ b/DepartmentPortal/Common/ToolsDesktop/Interfaces/IControl.cs @@ -1,8 +1,8 @@ -using DesktopTools.Models; +using ToolsDesktop.Models; using ToolsModule.Enums; using System; -namespace DesktopTools.Interfaces +namespace ToolsDesktop.Interfaces { /// /// Основные параметры для контрола diff --git a/DepartmentPortal/Common/DesktopTools/Interfaces/IControlChildEntity.cs b/DepartmentPortal/Common/ToolsDesktop/Interfaces/IControlChildEntity.cs similarity index 95% rename from DepartmentPortal/Common/DesktopTools/Interfaces/IControlChildEntity.cs rename to DepartmentPortal/Common/ToolsDesktop/Interfaces/IControlChildEntity.cs index 40d4af9..dc7b687 100644 --- a/DepartmentPortal/Common/DesktopTools/Interfaces/IControlChildEntity.cs +++ b/DepartmentPortal/Common/ToolsDesktop/Interfaces/IControlChildEntity.cs @@ -1,6 +1,6 @@ using System; -namespace DesktopTools.Interfaces +namespace ToolsDesktop.Interfaces { /// /// параметры для контрола-налсденика diff --git a/DepartmentPortal/Common/DesktopTools/Interfaces/IControlEntityList.cs b/DepartmentPortal/Common/ToolsDesktop/Interfaces/IControlEntityList.cs similarity index 88% rename from DepartmentPortal/Common/DesktopTools/Interfaces/IControlEntityList.cs rename to DepartmentPortal/Common/ToolsDesktop/Interfaces/IControlEntityList.cs index ff295ad..6936d44 100644 --- a/DepartmentPortal/Common/DesktopTools/Interfaces/IControlEntityList.cs +++ b/DepartmentPortal/Common/ToolsDesktop/Interfaces/IControlEntityList.cs @@ -1,4 +1,4 @@ -namespace DesktopTools.Interfaces +namespace ToolsDesktop.Interfaces { /// /// параметры для контрола-списка diff --git a/DepartmentPortal/Common/DesktopTools/Interfaces/IControlEntitySelectable.cs b/DepartmentPortal/Common/ToolsDesktop/Interfaces/IControlEntitySelectable.cs similarity index 95% rename from DepartmentPortal/Common/DesktopTools/Interfaces/IControlEntitySelectable.cs rename to DepartmentPortal/Common/ToolsDesktop/Interfaces/IControlEntitySelectable.cs index fcb464b..6967aeb 100644 --- a/DepartmentPortal/Common/DesktopTools/Interfaces/IControlEntitySelectable.cs +++ b/DepartmentPortal/Common/ToolsDesktop/Interfaces/IControlEntitySelectable.cs @@ -1,6 +1,6 @@ using System; -namespace DesktopTools.Interfaces +namespace ToolsDesktop.Interfaces { /// /// Методы для работы с контролом при выборе элемента из списка diff --git a/DepartmentPortal/Common/DesktopTools/Interfaces/IControlViewEntityElement.cs b/DepartmentPortal/Common/ToolsDesktop/Interfaces/IControlViewEntityElement.cs similarity index 92% rename from DepartmentPortal/Common/DesktopTools/Interfaces/IControlViewEntityElement.cs rename to DepartmentPortal/Common/ToolsDesktop/Interfaces/IControlViewEntityElement.cs index 69bcdbf..bbd7c78 100644 --- a/DepartmentPortal/Common/DesktopTools/Interfaces/IControlViewEntityElement.cs +++ b/DepartmentPortal/Common/ToolsDesktop/Interfaces/IControlViewEntityElement.cs @@ -1,6 +1,6 @@ -using DesktopTools.Models; +using ToolsDesktop.Models; -namespace DesktopTools.Interfaces +namespace ToolsDesktop.Interfaces { /// /// Работа с контролом элемента diff --git a/DepartmentPortal/Common/DesktopTools/Interfaces/IControlViewEntityList.cs b/DepartmentPortal/Common/ToolsDesktop/Interfaces/IControlViewEntityList.cs similarity index 93% rename from DepartmentPortal/Common/DesktopTools/Interfaces/IControlViewEntityList.cs rename to DepartmentPortal/Common/ToolsDesktop/Interfaces/IControlViewEntityList.cs index 80f5ba2..c28ce1b 100644 --- a/DepartmentPortal/Common/DesktopTools/Interfaces/IControlViewEntityList.cs +++ b/DepartmentPortal/Common/ToolsDesktop/Interfaces/IControlViewEntityList.cs @@ -1,7 +1,7 @@ -using DesktopTools.Models; +using ToolsDesktop.Models; using System; -namespace DesktopTools.Interfaces +namespace ToolsDesktop.Interfaces { /// /// Работа с контролом списка diff --git a/DepartmentPortal/Common/DesktopTools/Interfaces/IGenericControlEntityElement.cs b/DepartmentPortal/Common/ToolsDesktop/Interfaces/IGenericControlEntityElement.cs similarity index 87% rename from DepartmentPortal/Common/DesktopTools/Interfaces/IGenericControlEntityElement.cs rename to DepartmentPortal/Common/ToolsDesktop/Interfaces/IGenericControlEntityElement.cs index 0b07057..f47d4bd 100644 --- a/DepartmentPortal/Common/DesktopTools/Interfaces/IGenericControlEntityElement.cs +++ b/DepartmentPortal/Common/ToolsDesktop/Interfaces/IGenericControlEntityElement.cs @@ -1,6 +1,6 @@ -using DesktopTools.Models; +using ToolsDesktop.Models; -namespace DesktopTools.Interfaces +namespace ToolsDesktop.Interfaces { /// /// Работа с generic-контролом элемента diff --git a/DepartmentPortal/Common/DesktopTools/Interfaces/IGenericControlEntityList.cs b/DepartmentPortal/Common/ToolsDesktop/Interfaces/IGenericControlEntityList.cs similarity index 87% rename from DepartmentPortal/Common/DesktopTools/Interfaces/IGenericControlEntityList.cs rename to DepartmentPortal/Common/ToolsDesktop/Interfaces/IGenericControlEntityList.cs index 51f2786..9cf98e6 100644 --- a/DepartmentPortal/Common/DesktopTools/Interfaces/IGenericControlEntityList.cs +++ b/DepartmentPortal/Common/ToolsDesktop/Interfaces/IGenericControlEntityList.cs @@ -1,6 +1,6 @@ -using DesktopTools.Models; +using ToolsDesktop.Models; -namespace DesktopTools.Interfaces +namespace ToolsDesktop.Interfaces { /// /// Работа с generic-контролом списка diff --git a/DepartmentPortal/Common/DesktopTools/Interfaces/IWindowDesktopExtension.cs b/DepartmentPortal/Common/ToolsDesktop/Interfaces/IWindowDesktopExtension.cs similarity index 93% rename from DepartmentPortal/Common/DesktopTools/Interfaces/IWindowDesktopExtension.cs rename to DepartmentPortal/Common/ToolsDesktop/Interfaces/IWindowDesktopExtension.cs index 5be9890..62922fe 100644 --- a/DepartmentPortal/Common/DesktopTools/Interfaces/IWindowDesktopExtension.cs +++ b/DepartmentPortal/Common/ToolsDesktop/Interfaces/IWindowDesktopExtension.cs @@ -1,7 +1,7 @@ -using DesktopTools.Models; +using ToolsDesktop.Models; using System.Collections.Generic; -namespace DesktopTools.Interfaces +namespace ToolsDesktop.Interfaces { /// /// Интерфейс для регистрации контролов для десктопного приложения diff --git a/DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityElement.Designer.cs b/DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityElement.Designer.cs similarity index 96% rename from DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityElement.Designer.cs rename to DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityElement.Designer.cs index 923e2e3..30f85ab 100644 --- a/DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityElement.Designer.cs +++ b/DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityElement.Designer.cs @@ -1,5 +1,5 @@  -namespace DesktopTools.Controls +namespace ToolsDesktop.Controls { partial class GenericControlEntityElement { diff --git a/DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityElement.cs b/DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityElement.cs similarity index 98% rename from DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityElement.cs rename to DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityElement.cs index 8d2a9ff..715e828 100644 --- a/DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityElement.cs +++ b/DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityElement.cs @@ -1,8 +1,8 @@ -using DesktopTools.BaseControls; -using DesktopTools.Enums; -using DesktopTools.Helpers; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.BaseControls; +using ToolsDesktop.Enums; +using ToolsDesktop.Helpers; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.Attributes; using ToolsModule.BindingModels; using ToolsModule.BusinessLogics; @@ -16,7 +16,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using System.Xml.Linq; -namespace DesktopTools.Controls +namespace ToolsDesktop.Controls { public partial class GenericControlEntityElement : MainControlViewEntityElement, IControlViewEntityElement where G : GetBindingModel, new() diff --git a/DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityElement.resx b/DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityElement.resx similarity index 100% rename from DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityElement.resx rename to DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityElement.resx diff --git a/DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityList.Designer.cs b/DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityList.Designer.cs similarity index 96% rename from DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityList.Designer.cs rename to DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityList.Designer.cs index 0e5acfa..9c5bdf7 100644 --- a/DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityList.Designer.cs +++ b/DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityList.Designer.cs @@ -1,4 +1,4 @@ -namespace DesktopTools.Controls +namespace ToolsDesktop.Controls { partial class GenericControlEntityList { diff --git a/DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityList.cs b/DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityList.cs similarity index 99% rename from DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityList.cs rename to DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityList.cs index 642d5df..9e5619f 100644 --- a/DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityList.cs +++ b/DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityList.cs @@ -1,7 +1,7 @@ -using DesktopTools.Enums; -using DesktopTools.Helpers; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Enums; +using ToolsDesktop.Helpers; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.Attributes; using ToolsModule.BindingModels; using ToolsModule.BusinessLogics; @@ -15,7 +15,7 @@ using System.Reflection; using System.Windows.Forms; using System.Xml.Linq; -namespace DesktopTools.Controls +namespace ToolsDesktop.Controls { public partial class GenericControlEntityList : MainControlViewEntityList, IControlViewEntityList where G : GetBindingModel, new() diff --git a/DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityList.resx b/DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityList.resx similarity index 100% rename from DepartmentPortal/Common/DesktopTools/MainControls/GenericControlEntityList.resx rename to DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityList.resx diff --git a/DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityElement.Designer.cs b/DepartmentPortal/Common/ToolsDesktop/MainControls/MainControlViewEntityElement.Designer.cs similarity index 96% rename from DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityElement.Designer.cs rename to DepartmentPortal/Common/ToolsDesktop/MainControls/MainControlViewEntityElement.Designer.cs index d9a10bb..53f8172 100644 --- a/DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityElement.Designer.cs +++ b/DepartmentPortal/Common/ToolsDesktop/MainControls/MainControlViewEntityElement.Designer.cs @@ -1,5 +1,5 @@  -namespace DesktopTools.Controls +namespace ToolsDesktop.Controls { partial class MainControlViewEntityElement { @@ -57,7 +57,7 @@ namespace DesktopTools.Controls // toolStripButtonSave // this.toolStripButtonSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButtonSave.Image = global::DesktopTools.Properties.Resources.Save; + this.toolStripButtonSave.Image = global::ToolsDesktop.Properties.Resources.Save; this.toolStripButtonSave.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonSave.Name = "toolStripButtonSave"; this.toolStripButtonSave.Size = new System.Drawing.Size(23, 22); @@ -66,7 +66,7 @@ namespace DesktopTools.Controls // toolStripButtonReload // this.toolStripButtonReload.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButtonReload.Image = global::DesktopTools.Properties.Resources.Reload; + this.toolStripButtonReload.Image = global::ToolsDesktop.Properties.Resources.Reload; this.toolStripButtonReload.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonReload.Name = "toolStripButtonReload"; this.toolStripButtonReload.Size = new System.Drawing.Size(23, 22); @@ -76,7 +76,7 @@ namespace DesktopTools.Controls // this.toolStripButtonClose.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; this.toolStripButtonClose.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButtonClose.Image = global::DesktopTools.Properties.Resources.Close; + this.toolStripButtonClose.Image = global::ToolsDesktop.Properties.Resources.Close; this.toolStripButtonClose.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonClose.Name = "toolStripButtonClose"; this.toolStripButtonClose.Size = new System.Drawing.Size(23, 22); diff --git a/DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityElement.cs b/DepartmentPortal/Common/ToolsDesktop/MainControls/MainControlViewEntityElement.cs similarity index 93% rename from DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityElement.cs rename to DepartmentPortal/Common/ToolsDesktop/MainControls/MainControlViewEntityElement.cs index 6c9a3a7..eb85b26 100644 --- a/DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityElement.cs +++ b/DepartmentPortal/Common/ToolsDesktop/MainControls/MainControlViewEntityElement.cs @@ -1,10 +1,10 @@ -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.Enums; using System; using System.Windows.Forms; -namespace DesktopTools.Controls +namespace ToolsDesktop.Controls { public partial class MainControlViewEntityElement : UserControl, IControl, IControlChildEntity { diff --git a/DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityElement.resx b/DepartmentPortal/Common/ToolsDesktop/MainControls/MainControlViewEntityElement.resx similarity index 100% rename from DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityElement.resx rename to DepartmentPortal/Common/ToolsDesktop/MainControls/MainControlViewEntityElement.resx diff --git a/DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityList.Designer.cs b/DepartmentPortal/Common/ToolsDesktop/MainControls/MainControlViewEntityList.Designer.cs similarity index 97% rename from DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityList.Designer.cs rename to DepartmentPortal/Common/ToolsDesktop/MainControls/MainControlViewEntityList.Designer.cs index 51cd6b1..f743d9c 100644 --- a/DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityList.Designer.cs +++ b/DepartmentPortal/Common/ToolsDesktop/MainControls/MainControlViewEntityList.Designer.cs @@ -1,5 +1,5 @@  -namespace DesktopTools.Controls +namespace ToolsDesktop.Controls { partial class MainControlViewEntityList { @@ -97,7 +97,7 @@ namespace DesktopTools.Controls // // toolStripButtonAdd // - this.toolStripButtonAdd.Image = global::DesktopTools.Properties.Resources.Add; + this.toolStripButtonAdd.Image = global::ToolsDesktop.Properties.Resources.Add; this.toolStripButtonAdd.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonAdd.Name = "toolStripButtonAdd"; this.toolStripButtonAdd.Size = new System.Drawing.Size(79, 22); @@ -110,7 +110,7 @@ namespace DesktopTools.Controls // // toolStripButtonUpd // - this.toolStripButtonUpd.Image = global::DesktopTools.Properties.Resources.Upd; + this.toolStripButtonUpd.Image = global::ToolsDesktop.Properties.Resources.Upd; this.toolStripButtonUpd.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonUpd.Name = "toolStripButtonUpd"; this.toolStripButtonUpd.Size = new System.Drawing.Size(81, 22); @@ -123,7 +123,7 @@ namespace DesktopTools.Controls // // toolStripButtonDel // - this.toolStripButtonDel.Image = global::DesktopTools.Properties.Resources.Del; + this.toolStripButtonDel.Image = global::ToolsDesktop.Properties.Resources.Del; this.toolStripButtonDel.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonDel.Name = "toolStripButtonDel"; this.toolStripButtonDel.Size = new System.Drawing.Size(71, 22); @@ -136,7 +136,7 @@ namespace DesktopTools.Controls // // toolStripButtonSearch // - this.toolStripButtonSearch.Image = global::DesktopTools.Properties.Resources.Search; + this.toolStripButtonSearch.Image = global::ToolsDesktop.Properties.Resources.Search; this.toolStripButtonSearch.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonSearch.Name = "toolStripButtonSearch"; this.toolStripButtonSearch.Size = new System.Drawing.Size(62, 22); @@ -149,7 +149,7 @@ namespace DesktopTools.Controls // // toolStripButtonRef // - this.toolStripButtonRef.Image = global::DesktopTools.Properties.Resources.Ref; + this.toolStripButtonRef.Image = global::ToolsDesktop.Properties.Resources.Ref; this.toolStripButtonRef.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonRef.Name = "toolStripButtonRef"; this.toolStripButtonRef.Size = new System.Drawing.Size(81, 22); @@ -172,7 +172,7 @@ namespace DesktopTools.Controls // this.toolStripButtonClose.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; this.toolStripButtonClose.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButtonClose.Image = global::DesktopTools.Properties.Resources.Close; + this.toolStripButtonClose.Image = global::ToolsDesktop.Properties.Resources.Close; this.toolStripButtonClose.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonClose.Name = "toolStripButtonClose"; this.toolStripButtonClose.Size = new System.Drawing.Size(23, 22); @@ -267,7 +267,7 @@ namespace DesktopTools.Controls // toolStripButtonPrev // this.toolStripButtonPrev.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButtonPrev.Image = global::DesktopTools.Properties.Resources.Left; + this.toolStripButtonPrev.Image = global::ToolsDesktop.Properties.Resources.Left; this.toolStripButtonPrev.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonPrev.Name = "toolStripButtonPrev"; this.toolStripButtonPrev.Size = new System.Drawing.Size(23, 22); @@ -306,7 +306,7 @@ namespace DesktopTools.Controls // toolStripButtonNext // this.toolStripButtonNext.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButtonNext.Image = global::DesktopTools.Properties.Resources.Right; + this.toolStripButtonNext.Image = global::ToolsDesktop.Properties.Resources.Right; this.toolStripButtonNext.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonNext.Name = "toolStripButtonNext"; this.toolStripButtonNext.Size = new System.Drawing.Size(23, 22); diff --git a/DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityList.cs b/DepartmentPortal/Common/ToolsDesktop/MainControls/MainControlViewEntityList.cs similarity index 94% rename from DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityList.cs rename to DepartmentPortal/Common/ToolsDesktop/MainControls/MainControlViewEntityList.cs index b30c309..aac2a99 100644 --- a/DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityList.cs +++ b/DepartmentPortal/Common/ToolsDesktop/MainControls/MainControlViewEntityList.cs @@ -1,10 +1,10 @@ -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.Enums; using System; using System.Windows.Forms; -namespace DesktopTools.Controls +namespace ToolsDesktop.Controls { public partial class MainControlViewEntityList : UserControl, IControl, IControlChildEntity, IControlEntityList, IControlEntitySelectable { diff --git a/DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityList.resx b/DepartmentPortal/Common/ToolsDesktop/MainControls/MainControlViewEntityList.resx similarity index 100% rename from DepartmentPortal/Common/DesktopTools/MainControls/MainControlViewEntityList.resx rename to DepartmentPortal/Common/ToolsDesktop/MainControls/MainControlViewEntityList.resx diff --git a/DepartmentPortal/Common/DesktopTools/Models/ControlOpenModel.cs b/DepartmentPortal/Common/ToolsDesktop/Models/ControlOpenModel.cs similarity index 95% rename from DepartmentPortal/Common/DesktopTools/Models/ControlOpenModel.cs rename to DepartmentPortal/Common/ToolsDesktop/Models/ControlOpenModel.cs index 33e3285..82c01bc 100644 --- a/DepartmentPortal/Common/DesktopTools/Models/ControlOpenModel.cs +++ b/DepartmentPortal/Common/ToolsDesktop/Models/ControlOpenModel.cs @@ -1,7 +1,7 @@ -using DesktopTools.Enums; +using ToolsDesktop.Enums; using System; -namespace DesktopTools.Models +namespace ToolsDesktop.Models { /// /// Данные, передаваемый при открытии контрола diff --git a/DepartmentPortal/Common/DesktopTools/Models/ControlViewEntityElementConfiguration.cs b/DepartmentPortal/Common/ToolsDesktop/Models/ControlViewEntityElementConfiguration.cs similarity index 94% rename from DepartmentPortal/Common/DesktopTools/Models/ControlViewEntityElementConfiguration.cs rename to DepartmentPortal/Common/ToolsDesktop/Models/ControlViewEntityElementConfiguration.cs index 9520b1d..4eda50a 100644 --- a/DepartmentPortal/Common/DesktopTools/Models/ControlViewEntityElementConfiguration.cs +++ b/DepartmentPortal/Common/ToolsDesktop/Models/ControlViewEntityElementConfiguration.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace DesktopTools.Models +namespace ToolsDesktop.Models { /// /// Настройки для контрола вывода элемента сущности diff --git a/DepartmentPortal/Common/DesktopTools/Models/ControlViewEntityListConfiguration.cs b/DepartmentPortal/Common/ToolsDesktop/Models/ControlViewEntityListConfiguration.cs similarity index 96% rename from DepartmentPortal/Common/DesktopTools/Models/ControlViewEntityListConfiguration.cs rename to DepartmentPortal/Common/ToolsDesktop/Models/ControlViewEntityListConfiguration.cs index 3f7d403..ebb6738 100644 --- a/DepartmentPortal/Common/DesktopTools/Models/ControlViewEntityListConfiguration.cs +++ b/DepartmentPortal/Common/ToolsDesktop/Models/ControlViewEntityListConfiguration.cs @@ -1,8 +1,8 @@ -using DesktopTools.Enums; +using ToolsDesktop.Enums; using System; using System.Collections.Generic; -namespace DesktopTools.Models +namespace ToolsDesktop.Models { /// /// Настройки для контрола вывода списка записей сущности diff --git a/DepartmentPortal/Common/DesktopTools/Models/PageNamesForPaginationModel.cs b/DepartmentPortal/Common/ToolsDesktop/Models/PageNamesForPaginationModel.cs similarity index 89% rename from DepartmentPortal/Common/DesktopTools/Models/PageNamesForPaginationModel.cs rename to DepartmentPortal/Common/ToolsDesktop/Models/PageNamesForPaginationModel.cs index 190706f..713216d 100644 --- a/DepartmentPortal/Common/DesktopTools/Models/PageNamesForPaginationModel.cs +++ b/DepartmentPortal/Common/ToolsDesktop/Models/PageNamesForPaginationModel.cs @@ -1,4 +1,4 @@ -namespace DesktopTools.Models +namespace ToolsDesktop.Models { /// /// Модель для выпадабщего списка пагинации diff --git a/DepartmentPortal/Common/DesktopTools/Models/WindowDesktopExtensionControlModel.cs b/DepartmentPortal/Common/ToolsDesktop/Models/WindowDesktopExtensionControlModel.cs similarity index 73% rename from DepartmentPortal/Common/DesktopTools/Models/WindowDesktopExtensionControlModel.cs rename to DepartmentPortal/Common/ToolsDesktop/Models/WindowDesktopExtensionControlModel.cs index c93ff23..5be8925 100644 --- a/DepartmentPortal/Common/DesktopTools/Models/WindowDesktopExtensionControlModel.cs +++ b/DepartmentPortal/Common/ToolsDesktop/Models/WindowDesktopExtensionControlModel.cs @@ -1,7 +1,7 @@ -using DesktopTools.Interfaces; +using ToolsDesktop.Interfaces; using System; -namespace DesktopTools.Models +namespace ToolsDesktop.Models { public class WindowDesktopExtensionControlModel { diff --git a/DepartmentPortal/Common/DesktopTools/Properties/Resources.Designer.cs b/DepartmentPortal/Common/ToolsDesktop/Properties/Resources.Designer.cs similarity index 88% rename from DepartmentPortal/Common/DesktopTools/Properties/Resources.Designer.cs rename to DepartmentPortal/Common/ToolsDesktop/Properties/Resources.Designer.cs index baf6ccf..339e362 100644 --- a/DepartmentPortal/Common/DesktopTools/Properties/Resources.Designer.cs +++ b/DepartmentPortal/Common/ToolsDesktop/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace DesktopTools.Properties { +namespace ToolsDesktop.Properties { using System; @@ -22,7 +22,7 @@ namespace DesktopTools.Properties { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - public class Resources { + internal class Resources { private static global::System.Resources.ResourceManager resourceMan; @@ -36,10 +36,10 @@ namespace DesktopTools.Properties { /// Возвращает кэшированный экземпляр ResourceManager, использованный этим классом. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Resources.ResourceManager ResourceManager { + internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DesktopTools.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ToolsDesktop.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; @@ -51,7 +51,7 @@ namespace DesktopTools.Properties { /// обращений к ресурсу с помощью этого класса ресурса со строгой типизацией. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Globalization.CultureInfo Culture { + internal static global::System.Globalization.CultureInfo Culture { get { return resourceCulture; } @@ -63,7 +63,7 @@ namespace DesktopTools.Properties { /// /// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap Add { + internal static System.Drawing.Bitmap Add { get { object obj = ResourceManager.GetObject("Add", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -73,7 +73,7 @@ namespace DesktopTools.Properties { /// /// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap Clear { + internal static System.Drawing.Bitmap Clear { get { object obj = ResourceManager.GetObject("Clear", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -83,7 +83,7 @@ namespace DesktopTools.Properties { /// /// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap Close { + internal static System.Drawing.Bitmap Close { get { object obj = ResourceManager.GetObject("Close", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -93,7 +93,7 @@ namespace DesktopTools.Properties { /// /// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap Del { + internal static System.Drawing.Bitmap Del { get { object obj = ResourceManager.GetObject("Del", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -103,7 +103,7 @@ namespace DesktopTools.Properties { /// /// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap Down { + internal static System.Drawing.Bitmap Down { get { object obj = ResourceManager.GetObject("Down", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -113,7 +113,7 @@ namespace DesktopTools.Properties { /// /// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap Left { + internal static System.Drawing.Bitmap Left { get { object obj = ResourceManager.GetObject("Left", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -123,7 +123,7 @@ namespace DesktopTools.Properties { /// /// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap Ref { + internal static System.Drawing.Bitmap Ref { get { object obj = ResourceManager.GetObject("Ref", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -133,7 +133,7 @@ namespace DesktopTools.Properties { /// /// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap Reload { + internal static System.Drawing.Bitmap Reload { get { object obj = ResourceManager.GetObject("Reload", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -143,7 +143,7 @@ namespace DesktopTools.Properties { /// /// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap Right { + internal static System.Drawing.Bitmap Right { get { object obj = ResourceManager.GetObject("Right", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -153,7 +153,7 @@ namespace DesktopTools.Properties { /// /// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap Save { + internal static System.Drawing.Bitmap Save { get { object obj = ResourceManager.GetObject("Save", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -163,7 +163,7 @@ namespace DesktopTools.Properties { /// /// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap Search { + internal static System.Drawing.Bitmap Search { get { object obj = ResourceManager.GetObject("Search", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -173,7 +173,7 @@ namespace DesktopTools.Properties { /// /// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap Up { + internal static System.Drawing.Bitmap Up { get { object obj = ResourceManager.GetObject("Up", resourceCulture); return ((System.Drawing.Bitmap)(obj)); @@ -183,7 +183,7 @@ namespace DesktopTools.Properties { /// /// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap Upd { + internal static System.Drawing.Bitmap Upd { get { object obj = ResourceManager.GetObject("Upd", resourceCulture); return ((System.Drawing.Bitmap)(obj)); diff --git a/DepartmentPortal/Common/DesktopTools/Properties/Resources.resx b/DepartmentPortal/Common/ToolsDesktop/Properties/Resources.resx similarity index 97% rename from DepartmentPortal/Common/DesktopTools/Properties/Resources.resx rename to DepartmentPortal/Common/ToolsDesktop/Properties/Resources.resx index e565783..21a71f2 100644 --- a/DepartmentPortal/Common/DesktopTools/Properties/Resources.resx +++ b/DepartmentPortal/Common/ToolsDesktop/Properties/Resources.resx @@ -112,49 +112,49 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\Ref.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Right.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Upd.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Left.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Clear.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Up.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Down.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Left.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Clear.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Ref.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Reload.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Right.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Up.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Upd.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/DepartmentPortal/Common/DesktopTools/Resources/Add.png b/DepartmentPortal/Common/ToolsDesktop/Resources/Add.png similarity index 100% rename from DepartmentPortal/Common/DesktopTools/Resources/Add.png rename to DepartmentPortal/Common/ToolsDesktop/Resources/Add.png diff --git a/DepartmentPortal/Common/DesktopTools/Resources/Clear.png b/DepartmentPortal/Common/ToolsDesktop/Resources/Clear.png similarity index 100% rename from DepartmentPortal/Common/DesktopTools/Resources/Clear.png rename to DepartmentPortal/Common/ToolsDesktop/Resources/Clear.png diff --git a/DepartmentPortal/Common/DesktopTools/Resources/Close.png b/DepartmentPortal/Common/ToolsDesktop/Resources/Close.png similarity index 100% rename from DepartmentPortal/Common/DesktopTools/Resources/Close.png rename to DepartmentPortal/Common/ToolsDesktop/Resources/Close.png diff --git a/DepartmentPortal/Common/DesktopTools/Resources/Del.png b/DepartmentPortal/Common/ToolsDesktop/Resources/Del.png similarity index 100% rename from DepartmentPortal/Common/DesktopTools/Resources/Del.png rename to DepartmentPortal/Common/ToolsDesktop/Resources/Del.png diff --git a/DepartmentPortal/Common/DesktopTools/Resources/Down.jpg b/DepartmentPortal/Common/ToolsDesktop/Resources/Down.jpg similarity index 100% rename from DepartmentPortal/Common/DesktopTools/Resources/Down.jpg rename to DepartmentPortal/Common/ToolsDesktop/Resources/Down.jpg diff --git a/DepartmentPortal/Common/DesktopTools/Resources/Left.jpg b/DepartmentPortal/Common/ToolsDesktop/Resources/Left.jpg similarity index 100% rename from DepartmentPortal/Common/DesktopTools/Resources/Left.jpg rename to DepartmentPortal/Common/ToolsDesktop/Resources/Left.jpg diff --git a/DepartmentPortal/Common/DesktopTools/Resources/Ref.png b/DepartmentPortal/Common/ToolsDesktop/Resources/Ref.png similarity index 100% rename from DepartmentPortal/Common/DesktopTools/Resources/Ref.png rename to DepartmentPortal/Common/ToolsDesktop/Resources/Ref.png diff --git a/DepartmentPortal/Common/DesktopTools/Resources/Reload.png b/DepartmentPortal/Common/ToolsDesktop/Resources/Reload.png similarity index 100% rename from DepartmentPortal/Common/DesktopTools/Resources/Reload.png rename to DepartmentPortal/Common/ToolsDesktop/Resources/Reload.png diff --git a/DepartmentPortal/Common/DesktopTools/Resources/Right.jpg b/DepartmentPortal/Common/ToolsDesktop/Resources/Right.jpg similarity index 100% rename from DepartmentPortal/Common/DesktopTools/Resources/Right.jpg rename to DepartmentPortal/Common/ToolsDesktop/Resources/Right.jpg diff --git a/DepartmentPortal/Common/DesktopTools/Resources/Save.png b/DepartmentPortal/Common/ToolsDesktop/Resources/Save.png similarity index 100% rename from DepartmentPortal/Common/DesktopTools/Resources/Save.png rename to DepartmentPortal/Common/ToolsDesktop/Resources/Save.png diff --git a/DepartmentPortal/Common/DesktopTools/Resources/Search.png b/DepartmentPortal/Common/ToolsDesktop/Resources/Search.png similarity index 100% rename from DepartmentPortal/Common/DesktopTools/Resources/Search.png rename to DepartmentPortal/Common/ToolsDesktop/Resources/Search.png diff --git a/DepartmentPortal/Common/DesktopTools/Resources/Up.jpg b/DepartmentPortal/Common/ToolsDesktop/Resources/Up.jpg similarity index 100% rename from DepartmentPortal/Common/DesktopTools/Resources/Up.jpg rename to DepartmentPortal/Common/ToolsDesktop/Resources/Up.jpg diff --git a/DepartmentPortal/Common/DesktopTools/Resources/Upd.png b/DepartmentPortal/Common/ToolsDesktop/Resources/Upd.png similarity index 100% rename from DepartmentPortal/Common/DesktopTools/Resources/Upd.png rename to DepartmentPortal/Common/ToolsDesktop/Resources/Upd.png diff --git a/DepartmentPortal/Common/DesktopTools/DesktopTools.csproj b/DepartmentPortal/Common/ToolsDesktop/ToolsDesktop.csproj similarity index 92% rename from DepartmentPortal/Common/DesktopTools/DesktopTools.csproj rename to DepartmentPortal/Common/ToolsDesktop/ToolsDesktop.csproj index fe5aa5f..6f530a0 100644 --- a/DepartmentPortal/Common/DesktopTools/DesktopTools.csproj +++ b/DepartmentPortal/Common/ToolsDesktop/ToolsDesktop.csproj @@ -19,7 +19,7 @@ - PublicResXFileCodeGenerator + ResXFileCodeGenerator Resources.Designer.cs diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/DepartmentWindowDesktopExtension.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/DepartmentWindowDesktopExtension.cs index ad0dd8d..beef28a 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/DepartmentWindowDesktopExtension.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/DepartmentWindowDesktopExtension.cs @@ -1,6 +1,6 @@ using DepartmentWindowsDesktop.EntityControls; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.BindingModels; using ToolsModule.BusinessLogics; using ToolsModule.Enums; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/DepartmentWindowsDesktop.csproj b/DepartmentPortal/Department/DepartmentWindowsDesktop/DepartmentWindowsDesktop.csproj index 8190248..9490125 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/DepartmentWindowsDesktop.csproj +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/DepartmentWindowsDesktop.csproj @@ -6,7 +6,7 @@ - + diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlan/ControlAcademicPlanElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlan/ControlAcademicPlanElement.cs index 55c8198..eba827d 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlan/ControlAcademicPlanElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlan/ControlAcademicPlanElement.cs @@ -1,10 +1,10 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Helpers; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Helpers; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using System; using System.Collections.Generic; using System.Windows.Forms; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlan/ControlAcademicPlanList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlan/ControlAcademicPlanList.cs index 5db57f2..894b889 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlan/ControlAcademicPlanList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlan/ControlAcademicPlanList.cs @@ -1,11 +1,11 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Enums; -using DesktopTools.Helpers; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Enums; +using ToolsDesktop.Helpers; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecord/ControlAcademicPlanRecordElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecord/ControlAcademicPlanRecordElement.cs index e5fd3a8..b996770 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecord/ControlAcademicPlanRecordElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecord/ControlAcademicPlanRecordElement.cs @@ -1,9 +1,9 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using System; namespace DepartmentWindowsDesktop.EntityControls diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecord/ControlAcademicPlanRecordList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecord/ControlAcademicPlanRecordList.cs index cd133e2..5ccf96e 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecord/ControlAcademicPlanRecordList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecord/ControlAcademicPlanRecordList.cs @@ -2,10 +2,10 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Enums; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Enums; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourElement.cs index cf0bad3..6f7c59c 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourElement.cs @@ -1,9 +1,9 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using System; namespace DepartmentWindowsDesktop.EntityControls diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourList.cs index 9393677..30d5370 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourList.cs @@ -1,10 +1,10 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Enums; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Enums; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Classroom/ControlClassroomElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Classroom/ControlClassroomElement.cs index 409d66e..c6be254 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Classroom/ControlClassroomElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Classroom/ControlClassroomElement.cs @@ -1,9 +1,9 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using System; namespace DepartmentWindowsDesktop.EntityControls diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Classroom/ControlClassroomList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Classroom/ControlClassroomList.cs index d9eff6d..9716a29 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Classroom/ControlClassroomList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Classroom/ControlClassroomList.cs @@ -1,10 +1,10 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Enums; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Enums; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineElement.cs index d2aacdb..ac40568 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineElement.cs @@ -1,9 +1,9 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using System; namespace DepartmentWindowsDesktop.EntityControls diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineList.cs index 760e082..5b52b27 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineList.cs @@ -1,10 +1,10 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.BaseControls; -using DesktopTools.Controls; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.BaseControls; +using ToolsDesktop.Controls; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.BusinessLogics; using ToolsModule.Enums; using System; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/DisciplineBlock/ControlDisciplineBlockElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/DisciplineBlock/ControlDisciplineBlockElement.cs index 60452b2..f504b54 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/DisciplineBlock/ControlDisciplineBlockElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/DisciplineBlock/ControlDisciplineBlockElement.cs @@ -1,9 +1,9 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using System; namespace DepartmentWindowsDesktop.EntityControls diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/DisciplineBlock/ControlDisciplineBlockList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/DisciplineBlock/ControlDisciplineBlockList.cs index 9a6639c..7acf4cd 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/DisciplineBlock/ControlDisciplineBlockList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/DisciplineBlock/ControlDisciplineBlockList.cs @@ -1,10 +1,10 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Enums; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Enums; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EducationDirection/ControlEducationDirectionElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EducationDirection/ControlEducationDirectionElement.cs index b59ba9c..2ace957 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EducationDirection/ControlEducationDirectionElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EducationDirection/ControlEducationDirectionElement.cs @@ -1,9 +1,9 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using System; namespace DepartmentWindowsDesktop.EntityControls diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EducationDirection/ControlEducationDirectionList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EducationDirection/ControlEducationDirectionList.cs index afd3eb0..d1bf0ad 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EducationDirection/ControlEducationDirectionList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EducationDirection/ControlEducationDirectionList.cs @@ -1,10 +1,10 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Enums; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Enums; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeElement.cs index a02054a..df7ac14 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeElement.cs @@ -1,11 +1,11 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.BaseControls; -using DesktopTools.Controls; -using DesktopTools.Helpers; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.BaseControls; +using ToolsDesktop.Controls; +using ToolsDesktop.Helpers; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.BusinessLogics; using ToolsModule.Extensions; using SecurityBusinessLogic.BindingModels; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeList.cs index 75540b5..1f66f60 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeList.cs @@ -1,10 +1,10 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Enums; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Enums; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EmployeePost/ControlEmployeePostElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EmployeePost/ControlEmployeePostElement.cs index ab79f25..0671641 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EmployeePost/ControlEmployeePostElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EmployeePost/ControlEmployeePostElement.cs @@ -1,9 +1,9 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using System; namespace DepartmentWindowsDesktop.EntityControls diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EmployeePost/ControlEmployeePostList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EmployeePost/ControlEmployeePostList.cs index 48419f1..887928f 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EmployeePost/ControlEmployeePostList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EmployeePost/ControlEmployeePostList.cs @@ -1,10 +1,10 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Enums; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Enums; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerElement.cs index 0d27fe4..ba29590 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerElement.cs @@ -1,11 +1,11 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.BaseControls; -using DesktopTools.Controls; -using DesktopTools.Helpers; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.BaseControls; +using ToolsDesktop.Controls; +using ToolsDesktop.Helpers; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.BusinessLogics; using ToolsModule.Extensions; using SecurityBusinessLogic.BindingModels; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerList.cs index b7fbe91..d71809a 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerList.cs @@ -1,10 +1,10 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Enums; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Enums; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicDegree/ControlLecturerAcademicDegreeElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicDegree/ControlLecturerAcademicDegreeElement.cs index 429d1ad..aca3fbe 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicDegree/ControlLecturerAcademicDegreeElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicDegree/ControlLecturerAcademicDegreeElement.cs @@ -1,9 +1,9 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using System; namespace DepartmentWindowsDesktop.EntityControls diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicDegree/ControlLecturerAcademicDegreeList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicDegree/ControlLecturerAcademicDegreeList.cs index 8c116f2..22009f5 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicDegree/ControlLecturerAcademicDegreeList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicDegree/ControlLecturerAcademicDegreeList.cs @@ -1,10 +1,10 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Enums; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Enums; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicRank/ControlLecturerAcademicRankElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicRank/ControlLecturerAcademicRankElement.cs index bd03a74..3b551b4 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicRank/ControlLecturerAcademicRankElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicRank/ControlLecturerAcademicRankElement.cs @@ -1,9 +1,9 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using System; namespace DepartmentWindowsDesktop.EntityControls diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicRank/ControlLecturerAcademicRankList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicRank/ControlLecturerAcademicRankList.cs index dbe645d..39c8dbc 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicRank/ControlLecturerAcademicRankList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicRank/ControlLecturerAcademicRankList.cs @@ -1,10 +1,10 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Enums; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Enums; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerPost/ControlLecturerPostElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerPost/ControlLecturerPostElement.cs index d8c6468..988f44f 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerPost/ControlLecturerPostElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerPost/ControlLecturerPostElement.cs @@ -1,9 +1,9 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using System; namespace DepartmentWindowsDesktop.EntityControls diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerPost/ControlLecturerPostList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerPost/ControlLecturerPostList.cs index 3c5baf3..d980ce2 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerPost/ControlLecturerPostList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerPost/ControlLecturerPostList.cs @@ -1,10 +1,10 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Enums; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Enums; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Order/ControlOrderElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Order/ControlOrderElement.cs index 1119a39..7b3fb3f 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Order/ControlOrderElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Order/ControlOrderElement.cs @@ -1,9 +1,9 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using System; namespace DepartmentWindowsDesktop.EntityControls diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Order/ControlOrderList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Order/ControlOrderList.cs index 47cbb29..cafeee8 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Order/ControlOrderList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Order/ControlOrderList.cs @@ -1,9 +1,9 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.Enums; using System; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderStudentRecord/ControlOrderStudentRecordElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderStudentRecord/ControlOrderStudentRecordElement.cs index 0c35d0a..ada0a35 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderStudentRecord/ControlOrderStudentRecordElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderStudentRecord/ControlOrderStudentRecordElement.cs @@ -1,9 +1,9 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using System; namespace DepartmentWindowsDesktop.EntityControls diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderStudentRecord/ControlOrderStudentRecordList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderStudentRecord/ControlOrderStudentRecordList.cs index 67ac744..e91c302 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderStudentRecord/ControlOrderStudentRecordList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderStudentRecord/ControlOrderStudentRecordList.cs @@ -1,9 +1,9 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.Enums; using System; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistory/ControlOrderSyncHistoryElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistory/ControlOrderSyncHistoryElement.cs index 0331779..d43221b 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistory/ControlOrderSyncHistoryElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistory/ControlOrderSyncHistoryElement.cs @@ -1,9 +1,9 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using System; namespace DepartmentWindowsDesktop.EntityControls diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistory/ControlOrderSyncHistoryList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistory/ControlOrderSyncHistoryList.cs index e99804d..17512ae 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistory/ControlOrderSyncHistoryList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistory/ControlOrderSyncHistoryList.cs @@ -1,11 +1,11 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Enums; -using DesktopTools.Helpers; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Enums; +using ToolsDesktop.Helpers; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistoryRecord/ControlOrderSyncHistoryRecordElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistoryRecord/ControlOrderSyncHistoryRecordElement.cs index 33d6c22..08330ab 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistoryRecord/ControlOrderSyncHistoryRecordElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistoryRecord/ControlOrderSyncHistoryRecordElement.cs @@ -1,9 +1,9 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using System; namespace DepartmentWindowsDesktop.EntityControls diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistoryRecord/ControlOrderSyncHistoryRecordList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistoryRecord/ControlOrderSyncHistoryRecordList.cs index 0adab7c..2271155 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistoryRecord/ControlOrderSyncHistoryRecordList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistoryRecord/ControlOrderSyncHistoryRecordList.cs @@ -1,10 +1,10 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Enums; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Enums; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Post/ControlPostElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Post/ControlPostElement.cs index 45b10fc..3d3dea3 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Post/ControlPostElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Post/ControlPostElement.cs @@ -1,9 +1,9 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using System; namespace DepartmentWindowsDesktop.EntityControls diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Post/ControlPostList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Post/ControlPostList.cs index 012e85f..28ef476 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Post/ControlPostList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Post/ControlPostList.cs @@ -1,10 +1,10 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Enums; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Enums; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentElement.cs index 137eeeb..bc935ea 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentElement.cs @@ -1,11 +1,11 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.BaseControls; -using DesktopTools.Controls; -using DesktopTools.Helpers; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.BaseControls; +using ToolsDesktop.Controls; +using ToolsDesktop.Helpers; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.BusinessLogics; using ToolsModule.Extensions; using SecurityBusinessLogic.BindingModels; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentList.cs index 4e3bf71..f5f6f44 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentList.cs @@ -2,10 +2,10 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Enums; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Enums; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/StudentGroup/ControlStudentGroupElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/StudentGroup/ControlStudentGroupElement.cs index 4658fe3..6fe4c4f 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/StudentGroup/ControlStudentGroupElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/StudentGroup/ControlStudentGroupElement.cs @@ -1,9 +1,9 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using System; namespace DepartmentWindowsDesktop.EntityControls diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/StudentGroup/ControlStudentGroupList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/StudentGroup/ControlStudentGroupList.cs index 8e913b7..d90dd12 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/StudentGroup/ControlStudentGroupList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/StudentGroup/ControlStudentGroupList.cs @@ -1,10 +1,10 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Enums; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Enums; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/TimeNorm/ControlTimeNormElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/TimeNorm/ControlTimeNormElement.cs index 7bc6393..37c8485 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/TimeNorm/ControlTimeNormElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/TimeNorm/ControlTimeNormElement.cs @@ -1,9 +1,9 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using System; namespace DepartmentWindowsDesktop.EntityControls diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/TimeNorm/ControlTimeNormList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/TimeNorm/ControlTimeNormList.cs index 33af590..9bfd067 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/TimeNorm/ControlTimeNormList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/TimeNorm/ControlTimeNormList.cs @@ -1,10 +1,10 @@ using DepartmentBusinessLogic.BindingModels; using DepartmentBusinessLogic.BusinessLogics; using DepartmentBusinessLogic.ViewModels; -using DesktopTools.Controls; -using DesktopTools.Enums; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Enums; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.Enums; using System; using System.Collections.Generic; diff --git a/DepartmentPortal/DepartmentPortal.sln b/DepartmentPortal/DepartmentPortal.sln index 98136d6..4dd8fff 100644 --- a/DepartmentPortal/DepartmentPortal.sln +++ b/DepartmentPortal/DepartmentPortal.sln @@ -13,8 +13,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecurityBusinessLogic", "Se EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DepartmentPortalDesctop", "DepartmentPortalDesctop\DepartmentPortalDesctop.csproj", "{B6CE93CB-998F-4F2D-BE9E-6FDF37FDFD0E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DesktopTools", "Common\DesktopTools\DesktopTools.csproj", "{6B923E2B-85EE-4490-81BA-C7AB5DB582AC}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecurityWindowsDesktop", "Security\SecurityWindowsDesktop\SecurityWindowsDesktop.csproj", "{40F7C37A-3544-4A6A-893D-D611DE100036}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecurityDatabaseImplementation", "Security\SecurityDatabaseImplementation\SecurityDatabaseImplementation.csproj", "{26FCAAC6-F8F4-4CE6-92FE-1C6C376E5DE6}" @@ -31,6 +29,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreModels", "Common\CoreMo EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ToolsModule", "Common\ToolsModule\ToolsModule.csproj", "{26F68044-DA58-4E85-ACD7-FCC0B52B422B}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ToolsDesktop", "Common\ToolsDesktop\ToolsDesktop.csproj", "{FF2FD244-613D-4BE7-A6D6-6B71A45C662E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -49,10 +49,6 @@ Global {B6CE93CB-998F-4F2D-BE9E-6FDF37FDFD0E}.Debug|Any CPU.Build.0 = Debug|Any CPU {B6CE93CB-998F-4F2D-BE9E-6FDF37FDFD0E}.Release|Any CPU.ActiveCfg = Release|Any CPU {B6CE93CB-998F-4F2D-BE9E-6FDF37FDFD0E}.Release|Any CPU.Build.0 = Release|Any CPU - {6B923E2B-85EE-4490-81BA-C7AB5DB582AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B923E2B-85EE-4490-81BA-C7AB5DB582AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B923E2B-85EE-4490-81BA-C7AB5DB582AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B923E2B-85EE-4490-81BA-C7AB5DB582AC}.Release|Any CPU.Build.0 = Release|Any CPU {40F7C37A-3544-4A6A-893D-D611DE100036}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {40F7C37A-3544-4A6A-893D-D611DE100036}.Debug|Any CPU.Build.0 = Debug|Any CPU {40F7C37A-3544-4A6A-893D-D611DE100036}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -81,6 +77,10 @@ Global {26F68044-DA58-4E85-ACD7-FCC0B52B422B}.Debug|Any CPU.Build.0 = Debug|Any CPU {26F68044-DA58-4E85-ACD7-FCC0B52B422B}.Release|Any CPU.ActiveCfg = Release|Any CPU {26F68044-DA58-4E85-ACD7-FCC0B52B422B}.Release|Any CPU.Build.0 = Release|Any CPU + {FF2FD244-613D-4BE7-A6D6-6B71A45C662E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FF2FD244-613D-4BE7-A6D6-6B71A45C662E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FF2FD244-613D-4BE7-A6D6-6B71A45C662E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FF2FD244-613D-4BE7-A6D6-6B71A45C662E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -88,7 +88,6 @@ Global GlobalSection(NestedProjects) = preSolution {D4DAAEDE-A550-42BB-A50C-AD8FCB23D00A} = {6F154F8D-3437-45EE-9D89-02B96BDF3E8E} {D424B54F-AF26-4A39-8D2B-CF874F31DE42} = {7DA26C36-778E-4563-9AEC-966E26EA7B2A} - {6B923E2B-85EE-4490-81BA-C7AB5DB582AC} = {6F154F8D-3437-45EE-9D89-02B96BDF3E8E} {40F7C37A-3544-4A6A-893D-D611DE100036} = {7DA26C36-778E-4563-9AEC-966E26EA7B2A} {26FCAAC6-F8F4-4CE6-92FE-1C6C376E5DE6} = {7DA26C36-778E-4563-9AEC-966E26EA7B2A} {69B94DB1-D1BE-4905-81AC-A5D49D0C9719} = {A19E7709-6AD8-4E9B-B3AB-4339C67D9F39} @@ -96,6 +95,7 @@ Global {8E12DE14-0D83-48D8-964D-8B2BB06DB129} = {A19E7709-6AD8-4E9B-B3AB-4339C67D9F39} {FDF81413-ABAD-4890-A60F-4FEC62DD2A7D} = {6F154F8D-3437-45EE-9D89-02B96BDF3E8E} {26F68044-DA58-4E85-ACD7-FCC0B52B422B} = {6F154F8D-3437-45EE-9D89-02B96BDF3E8E} + {FF2FD244-613D-4BE7-A6D6-6B71A45C662E} = {6F154F8D-3437-45EE-9D89-02B96BDF3E8E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FBA0CB49-EF2D-4538-9D00-FCEDA24879A9} diff --git a/DepartmentPortal/DepartmentPortalDesctop/DepartmentPortalDesctop.csproj b/DepartmentPortal/DepartmentPortalDesctop/DepartmentPortalDesctop.csproj index 8702865..4be6966 100644 --- a/DepartmentPortal/DepartmentPortalDesctop/DepartmentPortalDesctop.csproj +++ b/DepartmentPortal/DepartmentPortalDesctop/DepartmentPortalDesctop.csproj @@ -15,7 +15,7 @@ - + diff --git a/DepartmentPortal/DepartmentPortalDesctop/FormMain.cs b/DepartmentPortal/DepartmentPortalDesctop/FormMain.cs index 30f0b8a..db0c950 100644 --- a/DepartmentPortal/DepartmentPortalDesctop/FormMain.cs +++ b/DepartmentPortal/DepartmentPortalDesctop/FormMain.cs @@ -1,7 +1,7 @@ -using DesktopTools.BusinessLogics; -using DesktopTools.Enums; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.BusinessLogics; +using ToolsDesktop.Enums; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using System; using System.Collections.Generic; using System.IO; diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessElement.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessElement.cs index 3e74245..3fcff6b 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessElement.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessElement.cs @@ -1,6 +1,6 @@ -using DesktopTools.Controls; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.BusinessLogics; using SecurityBusinessLogic.ViewModels; diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessList.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessList.cs index d5e491e..3ba27a5 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessList.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessList.cs @@ -1,7 +1,7 @@ -using DesktopTools.Controls; -using DesktopTools.Enums; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Enums; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.BusinessLogics; using ToolsModule.Enums; using SecurityBusinessLogic.BindingModels; diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingElement.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingElement.cs index ad83182..55ff53e 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingElement.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingElement.cs @@ -1,6 +1,6 @@ -using DesktopTools.Controls; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.BusinessLogics; using SecurityBusinessLogic.ViewModels; diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingList.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingList.cs index 2bac7a2..c2b2dd0 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingList.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingList.cs @@ -1,7 +1,7 @@ -using DesktopTools.Controls; -using DesktopTools.Enums; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Enums; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.Enums; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.BusinessLogics; diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleElement.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleElement.cs index 51dabd6..9b91098 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleElement.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleElement.cs @@ -1,6 +1,6 @@ -using DesktopTools.Controls; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.BusinessLogics; using SecurityBusinessLogic.ViewModels; diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleList.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleList.cs index d8d97cf..136caea 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleList.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleList.cs @@ -1,7 +1,7 @@ -using DesktopTools.Controls; -using DesktopTools.Enums; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Enums; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.Enums; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.BusinessLogics; diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserElement.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserElement.cs index ae7cf2d..049e18c 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserElement.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserElement.cs @@ -1,6 +1,6 @@ -using DesktopTools.Controls; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.BusinessLogics; using SecurityBusinessLogic.ViewModels; diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserList.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserList.cs index bb896de..09737d7 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserList.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserList.cs @@ -1,7 +1,7 @@ -using DesktopTools.BaseControls; -using DesktopTools.Controls; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.BaseControls; +using ToolsDesktop.Controls; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.Enums; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.BusinessLogics; diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/UserRole/ControlUserRoleElement.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/UserRole/ControlUserRoleElement.cs index f8efc6e..3b8459c 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/UserRole/ControlUserRoleElement.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/UserRole/ControlUserRoleElement.cs @@ -1,6 +1,6 @@ -using DesktopTools.Controls; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.BusinessLogics; using SecurityBusinessLogic.ViewModels; diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/UserRole/ControlUserRoleList.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/UserRole/ControlUserRoleList.cs index 70a83a8..9328dee 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/UserRole/ControlUserRoleList.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/UserRole/ControlUserRoleList.cs @@ -1,7 +1,7 @@ -using DesktopTools.Controls; -using DesktopTools.Enums; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Controls; +using ToolsDesktop.Enums; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.Enums; using SecurityBusinessLogic.BindingModels; using SecurityBusinessLogic.BusinessLogics; diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/SecurityWindowDesktopExtension.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/SecurityWindowDesktopExtension.cs index cbe87f6..2044bcb 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/SecurityWindowDesktopExtension.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/SecurityWindowDesktopExtension.cs @@ -1,5 +1,5 @@ -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.BindingModels; using ToolsModule.BusinessLogics; using ToolsModule.Enums; diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/SecurityWindowsDesktop.csproj b/DepartmentPortal/Security/SecurityWindowsDesktop/SecurityWindowsDesktop.csproj index 8ff9998..972b019 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/SecurityWindowsDesktop.csproj +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/SecurityWindowsDesktop.csproj @@ -10,7 +10,7 @@ - + diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/BackupControl.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/BackupControl.cs index 8b61873..69b4f6e 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/BackupControl.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/BackupControl.cs @@ -1,6 +1,6 @@ -using DesktopTools.Helpers; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Helpers; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.BusinessLogics; using ToolsModule.Enums; using SecurityBusinessLogic.BindingModels; diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/SynchronizationControl.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/SynchronizationControl.cs index ff9840a..26ca141 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/SynchronizationControl.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/SynchronizationControl.cs @@ -1,6 +1,6 @@ -using DesktopTools.Helpers; -using DesktopTools.Interfaces; -using DesktopTools.Models; +using ToolsDesktop.Helpers; +using ToolsDesktop.Interfaces; +using ToolsDesktop.Models; using ToolsModule.BusinessLogics; using ToolsModule.Enums; using SecurityBusinessLogic.BusinessLogics;