Rename Shared to Common
This commit is contained in:
Jonathan Jenne
parent
54ba722ecb
commit
8b6821adde
@ -1,6 +1,6 @@
|
||||
Imports System.IO
|
||||
Imports MultiTool.Shared.Templates
|
||||
Imports MultiTool.Shared.Winline.Entities
|
||||
Imports MultiTool.Common.Templates
|
||||
Imports MultiTool.Common.Winline.Entities
|
||||
|
||||
Namespace Documents
|
||||
Public Class Document
|
||||
@ -1,6 +1,6 @@
|
||||
Imports System.IO
|
||||
Imports DigitalData.Modules.Logging
|
||||
Imports MultiTool.Shared.Templates
|
||||
Imports MultiTool.Common.Templates
|
||||
|
||||
Namespace Documents
|
||||
Public Class DocumentCleaner
|
||||
@ -2,10 +2,10 @@
|
||||
Imports System.Text.RegularExpressions
|
||||
Imports DigitalData.Modules.Logging
|
||||
Imports DigitalData.Modules.Language
|
||||
Imports MultiTool.Shared.Exceptions
|
||||
Imports MultiTool.Shared.Templates
|
||||
Imports MultiTool.Shared.Winline
|
||||
Imports MultiTool.Shared.Winline.Entities
|
||||
Imports MultiTool.Common.Exceptions
|
||||
Imports MultiTool.Common.Templates
|
||||
Imports MultiTool.Common.Winline
|
||||
Imports MultiTool.Common.Winline.Entities
|
||||
|
||||
Namespace Documents
|
||||
Public Class DocumentLoader
|
||||
@ -3,7 +3,7 @@ Imports System.Text.RegularExpressions
|
||||
Imports AutoMapper
|
||||
Imports AutoMapper.Configuration
|
||||
Imports DigitalData.Modules.Logging
|
||||
Imports MultiTool.Shared.Documents.DocumentRow
|
||||
Imports MultiTool.Common.Documents.DocumentRow
|
||||
|
||||
Public Class Mapper
|
||||
Private MapperConfig As MapperConfiguration
|
||||
@ -6,8 +6,8 @@
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<RootNamespace>MultiTool.Shared</RootNamespace>
|
||||
<AssemblyName>MultiTool.Shared</AssemblyName>
|
||||
<RootNamespace>MultiTool.Common</RootNamespace>
|
||||
<AssemblyName>MultiTool.Common</AssemblyName>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<MyType>Windows</MyType>
|
||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||
@ -19,7 +19,7 @@
|
||||
<DefineDebug>true</DefineDebug>
|
||||
<DefineTrace>true</DefineTrace>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DocumentationFile>MultiTool.Shared.xml</DocumentationFile>
|
||||
<DocumentationFile>MultiTool.Common.xml</DocumentationFile>
|
||||
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
@ -28,7 +28,7 @@
|
||||
<DefineTrace>true</DefineTrace>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DocumentationFile>MultiTool.Shared.xml</DocumentationFile>
|
||||
<DocumentationFile>MultiTool.Common.xml</DocumentationFile>
|
||||
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
@ -65,8 +65,9 @@
|
||||
<Reference Include="DigitalData.Modules.Interfaces">
|
||||
<HintPath>..\..\DDMonorepo\Modules.Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="DigitalData.Modules.Language">
|
||||
<HintPath>..\..\DDMonorepo\Modules.Language\bin\Release\DigitalData.Modules.Language.dll</HintPath>
|
||||
<Reference Include="DigitalData.Modules.Language, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\DDMonorepo\Modules.Language\bin\Debug\DigitalData.Modules.Language.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="DigitalData.Modules.Logging">
|
||||
<HintPath>..\..\DDMonorepo\Modules.Logging\bin\Release\DigitalData.Modules.Logging.dll</HintPath>
|
||||
@ -103,7 +104,6 @@
|
||||
<Compile Include="BaseClass.vb" />
|
||||
<Compile Include="Config.vb" />
|
||||
<Compile Include="Constants.vb" />
|
||||
<Compile Include="DataRowEx.vb" />
|
||||
<Compile Include="Documents\Document.vb" />
|
||||
<Compile Include="Documents\DocumentCleaner.vb" />
|
||||
<Compile Include="Documents\DocumentRow.vb" />
|
||||
@ -8,10 +8,10 @@ Imports System.Runtime.InteropServices
|
||||
|
||||
' Werte der Assemblyattribute überprüfen
|
||||
|
||||
<Assembly: AssemblyTitle("MultiTool.Shared")>
|
||||
<Assembly: AssemblyTitle("MultiTool.Common")>
|
||||
<Assembly: AssemblyDescription("")>
|
||||
<Assembly: AssemblyCompany("")>
|
||||
<Assembly: AssemblyProduct("MultiTool.Shared")>
|
||||
<Assembly: AssemblyProduct("MultiTool.Common")>
|
||||
<Assembly: AssemblyCopyright("Copyright © 2022")>
|
||||
<Assembly: AssemblyTrademark("")>
|
||||
|
||||
@ -39,7 +39,7 @@ Namespace My.Resources
|
||||
Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
|
||||
Get
|
||||
If Object.ReferenceEquals(resourceMan, Nothing) Then
|
||||
Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("MultiTool.Shared.Resources", GetType(Resources).Assembly)
|
||||
Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("MultiTool.Common.Resources", GetType(Resources).Assembly)
|
||||
resourceMan = temp
|
||||
End If
|
||||
Return resourceMan
|
||||
@ -64,9 +64,9 @@ Namespace My
|
||||
Friend Module MySettingsProperty
|
||||
|
||||
<Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")> _
|
||||
Friend ReadOnly Property Settings() As Global.MultiTool.[Shared].My.MySettings
|
||||
Friend ReadOnly Property Settings() As Global.MultiTool.Common.My.MySettings
|
||||
Get
|
||||
Return Global.MultiTool.[Shared].My.MySettings.Default
|
||||
Return Global.MultiTool.Common.My.MySettings.Default
|
||||
End Get
|
||||
End Property
|
||||
End Module
|
||||
@ -1,8 +1,8 @@
|
||||
Imports System.Text.RegularExpressions
|
||||
Imports DigitalData.Modules.Logging
|
||||
Imports MultiTool.Shared.Documents
|
||||
Imports MultiTool.Shared.Templates
|
||||
Imports MultiTool.Shared.Winline.Entities
|
||||
Imports MultiTool.Common.Documents
|
||||
Imports MultiTool.Common.Templates
|
||||
Imports MultiTool.Common.Winline.Entities
|
||||
|
||||
Public Class Patterns
|
||||
Inherits BaseClass
|
||||
@ -2,11 +2,11 @@
|
||||
Imports DevExpress.XtraReports
|
||||
Imports DigitalData.Modules.Database
|
||||
Imports DigitalData.Modules.Logging
|
||||
Imports MultiTool.Shared.Documents
|
||||
Imports MultiTool.Shared.Documents.DocumentRow
|
||||
Imports MultiTool.Shared.Report
|
||||
Imports MultiTool.Shared.Templates
|
||||
Imports MultiTool.Shared.Winline.Entities
|
||||
Imports MultiTool.Common.Documents
|
||||
Imports MultiTool.Common.Documents.DocumentRow
|
||||
Imports MultiTool.Common.Report
|
||||
Imports MultiTool.Common.Templates
|
||||
Imports MultiTool.Common.Winline.Entities
|
||||
|
||||
Public Class ReportGenerator(Of TReport As IReport)
|
||||
Inherits BaseClass
|
||||
@ -1,5 +1,5 @@
|
||||
|
||||
Imports MultiTool.Shared.Winline
|
||||
Imports MultiTool.Common.Winline
|
||||
|
||||
Namespace Templates
|
||||
''' <summary>
|
||||
@ -1,4 +1,4 @@
|
||||
Imports MultiTool.Shared.Constants
|
||||
Imports MultiTool.Common.Constants
|
||||
Imports DigitalData.Modules.Language
|
||||
|
||||
Namespace Templates
|
||||
@ -1,6 +1,7 @@
|
||||
Imports System.IO
|
||||
Imports DigitalData.Modules.Database
|
||||
Imports DigitalData.Modules.Logging
|
||||
Imports DigitalData.Modules.Language
|
||||
|
||||
Namespace Templates
|
||||
Public Class TemplateLoader
|
||||
@ -14,17 +15,14 @@ Namespace Templates
|
||||
Public Property MandatorConfiguration As New MandatorConfig
|
||||
Public Property GeneralConfiguration As New GeneralConfig
|
||||
|
||||
Private ReadOnly Database As MSSQLServer
|
||||
|
||||
Private Const SQL_VWMT_ITEMS = "SELECT * FROM [DD_ECM].[dbo].[VWMT_ITEMS]"
|
||||
Private Const SQL_VWMT_MAPPING = "SELECT * FROM [DD_ECM].[dbo].[VWMT_MAPPING]"
|
||||
Private Const SQL_TBMT_MANDATORS = "SELECT * FROM [DD_ECM].[dbo].[TBMT_MANDATORS] ORDER BY ORDER_KEY"
|
||||
Private Const SQL_TBMT_CONFIG = "SELECT * FROM [DD_ECM].[dbo].[TBMT_CONFIG]"
|
||||
Private Const SQL_TBMT_TEMPLATES = "SELECT * FROM [DD_ECM].[dbo].[TBMT_TEMPLATES]"
|
||||
Private Const SQL_TBMT_TEMPLATES = "SELECT * FROM [DD_ECM].[dbo].[TBMT_TEMPLATES] WHERE ACTIVE = 1"
|
||||
|
||||
Public Sub New(pLogConfig As LogConfig, pMSSQL As MSSQLServer)
|
||||
MyBase.New(pLogConfig)
|
||||
Database = pMSSQL
|
||||
MyBase.New(pLogConfig, pMSSQL)
|
||||
End Sub
|
||||
|
||||
Public Async Function LoadTemplates() As Task(Of Boolean)
|
||||
@ -4,11 +4,11 @@ Imports System.Xml
|
||||
Imports DigitalData.Modules.Database
|
||||
Imports DigitalData.Modules.Filesystem
|
||||
Imports DigitalData.Modules.Logging
|
||||
Imports MultiTool.Shared.Documents
|
||||
Imports MultiTool.Shared.Exceptions
|
||||
Imports MultiTool.Shared.Templates
|
||||
Imports MultiTool.Shared.Templates.GeneralConfig
|
||||
Imports MultiTool.Shared.Winline.Entities
|
||||
Imports MultiTool.Common.Documents
|
||||
Imports MultiTool.Common.Exceptions
|
||||
Imports MultiTool.Common.Templates
|
||||
Imports MultiTool.Common.Templates.GeneralConfig
|
||||
Imports MultiTool.Common.Winline.Entities
|
||||
|
||||
Namespace Winline
|
||||
Public Class WebServiceData
|
||||
@ -1,9 +1,9 @@
|
||||
Imports DigitalData.Modules.Logging
|
||||
Imports DigitalData.Modules.Database
|
||||
Imports MultiTool.Shared.Winline.Entities
|
||||
Imports MultiTool.Common.Winline.Entities
|
||||
Imports System.Text.RegularExpressions
|
||||
Imports MultiTool.Shared.Templates
|
||||
Imports MultiTool.Shared.Constants
|
||||
Imports MultiTool.Common.Templates
|
||||
Imports MultiTool.Common.Constants
|
||||
Imports DigitalData.Modules.Language
|
||||
|
||||
Namespace Winline
|
||||
@ -1,5 +1,5 @@
|
||||
Imports DigitalData.Modules.Logging
|
||||
Imports MultiTool.Shared.Exceptions
|
||||
Imports MultiTool.Common.Exceptions
|
||||
|
||||
Public Class FormHelper
|
||||
Private ReadOnly Logger As Logger
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
Imports DevExpress.XtraGrid.Views.Grid
|
||||
Imports DigitalData.GUIs.Common
|
||||
Imports DigitalData.Modules.Logging
|
||||
Imports MultiTool.Shared
|
||||
Imports MultiTool.Shared.Constants
|
||||
Imports MultiTool.Common
|
||||
Imports MultiTool.Common.Constants
|
||||
|
||||
Public Class GridLoader
|
||||
Inherits BaseClass
|
||||
|
||||
@ -115,9 +115,9 @@
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\DDMonorepo\Modules.Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="DigitalData.Modules.Language, Version=1.3.2.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<Reference Include="DigitalData.Modules.Language, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\DDMonorepo\Modules.Language\bin\Release\DigitalData.Modules.Language.dll</HintPath>
|
||||
<HintPath>..\..\DDMonorepo\Modules.Language\bin\Debug\DigitalData.Modules.Language.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="DigitalData.Modules.Logging">
|
||||
<HintPath>..\..\DDMonorepo\Modules.Logging\bin\Release\DigitalData.Modules.Logging.dll</HintPath>
|
||||
@ -338,6 +338,9 @@
|
||||
<ItemGroup>
|
||||
<Content Include="CREATE_DATABASE.sql" />
|
||||
<Content Include="MultiTool.ico" />
|
||||
<None Include="Resources\refreshpivottable.svg" />
|
||||
<None Include="Resources\update.svg" />
|
||||
<None Include="Resources\actions_reload1.svg" />
|
||||
<None Include="Resources\logical3.svg" />
|
||||
<None Include="Resources\logical2.svg" />
|
||||
<None Include="Resources\bo_sale.svg" />
|
||||
@ -412,11 +415,10 @@
|
||||
<None Include="Resources\import.svg" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\MultiTool.Shared\MultiTool.Shared.vbproj">
|
||||
<ProjectReference Include="..\MultiTool.Common\MultiTool.Common.vbproj">
|
||||
<Project>{dd1ac3b9-7595-4d3c-b9bb-97c46a480fa0}</Project>
|
||||
<Name>MultiTool.Shared</Name>
|
||||
<Name>MultiTool.Common</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup />
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
|
||||
</Project>
|
||||
30
MultiTool.Form/My Project/Resources.Designer.vb
generated
30
MultiTool.Form/My Project/Resources.Designer.vb
generated
@ -160,6 +160,16 @@ Namespace My.Resources
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
|
||||
'''</summary>
|
||||
Friend ReadOnly Property actions_reload1() As DevExpress.Utils.Svg.SvgImage
|
||||
Get
|
||||
Dim obj As Object = ResourceManager.GetObject("actions_reload1", resourceCulture)
|
||||
Return CType(obj,DevExpress.Utils.Svg.SvgImage)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
|
||||
'''</summary>
|
||||
@ -610,6 +620,16 @@ Namespace My.Resources
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
|
||||
'''</summary>
|
||||
Friend ReadOnly Property refreshpivottable() As DevExpress.Utils.Svg.SvgImage
|
||||
Get
|
||||
Dim obj As Object = ResourceManager.GetObject("refreshpivottable", resourceCulture)
|
||||
Return CType(obj,DevExpress.Utils.Svg.SvgImage)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
|
||||
'''</summary>
|
||||
@ -740,6 +760,16 @@ Namespace My.Resources
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
|
||||
'''</summary>
|
||||
Friend ReadOnly Property update() As DevExpress.Utils.Svg.SvgImage
|
||||
Get
|
||||
Dim obj As Object = ResourceManager.GetObject("update", resourceCulture)
|
||||
Return CType(obj,DevExpress.Utils.Svg.SvgImage)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
|
||||
'''</summary>
|
||||
|
||||
@ -124,14 +124,17 @@
|
||||
<data name="actions_send" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\actions_send.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="bo_country" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\bo_country.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="save" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="mailmergepreview" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\mailmergepreview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
<data name="open24" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\open24.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="bo_country" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\bo_country.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
<data name="deletetablerows" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\deletetablerows.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="parameters" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\parameters.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
@ -157,6 +160,9 @@
|
||||
<data name="resetview" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\resetview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="update" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\update.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="open26" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\open26.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
@ -187,12 +193,12 @@
|
||||
<data name="bo_unknown2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\bo_unknown2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="deletetablerows" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\deletetablerows.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="open3" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\open3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="bo_sale" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\bo_sale.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="actions_checkcircled" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\actions_checkcircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
@ -202,9 +208,6 @@
|
||||
<data name="wraptext" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\wraptext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="logical2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\logical2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="tableproperties" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\tableproperties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
@ -217,9 +220,6 @@
|
||||
<data name="actions_send1" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\actions_send1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="actions_send4" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\actions_send4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="actions_send2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\actions_send2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
@ -235,8 +235,11 @@
|
||||
<data name="open23" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\open23.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="insertpagecount" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\insertpagecount.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
<data name="actions_reload1" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\actions_reload1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="mailmergepreview" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\mailmergepreview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="open2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
@ -244,8 +247,8 @@
|
||||
<data name="pagesetup" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="open24" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\open24.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
<data name="logical3" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\logical3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="bo_validation" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\bo_validation.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
@ -265,6 +268,9 @@
|
||||
<data name="paymentrefund" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\paymentrefund.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="squarified" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\squarified.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="support" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\support.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
@ -280,8 +286,8 @@
|
||||
<data name="preview" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\preview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="bo_sale" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\bo_sale.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
<data name="insertpagecount" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\insertpagecount.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="exporttopdf" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\exporttopdf.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
@ -307,22 +313,25 @@
|
||||
<data name="actions_addcircled" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\actions_addcircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="squarified" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\squarified.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
<data name="actions_send4" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\actions_send4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="open27" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\open27.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
<data name="logical2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\logical2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="export" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\export.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="open27" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\open27.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="new" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\new.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="actions_checkcircled2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\actions_checkcircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
<data name="logical3" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\logical3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
<data name="refreshpivottable" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\refreshpivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||
</data>
|
||||
</root>
|
||||
@ -1,6 +1,6 @@
|
||||
Imports MultiTool.Shared
|
||||
Imports MultiTool.Shared.Templates
|
||||
Imports MultiTool.Shared.Winline
|
||||
Imports MultiTool.Common
|
||||
Imports MultiTool.Common.Templates
|
||||
Imports MultiTool.Common.Winline
|
||||
|
||||
Namespace My
|
||||
<HideModuleName()>
|
||||
|
||||
2
MultiTool.Form/Reports/OrderReport.Designer.vb
generated
2
MultiTool.Form/Reports/OrderReport.Designer.vb
generated
@ -690,7 +690,7 @@ Partial Public Class OrderReport
|
||||
'
|
||||
'ObjectDataSource1
|
||||
'
|
||||
Me.ObjectDataSource1.DataSource = GetType(MultiTool.[Shared].Report.ReportSource)
|
||||
Me.ObjectDataSource1.DataSource = GetType(MultiTool.Common.Report.ReportSource)
|
||||
Me.ObjectDataSource1.Name = "ObjectDataSource1"
|
||||
'
|
||||
'GroupFooter1
|
||||
|
||||
15
MultiTool.Form/Resources/actions_reload1.svg
Normal file
15
MultiTool.Form/Resources/actions_reload1.svg
Normal file
@ -0,0 +1,15 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
|
||||
<style type="text/css">
|
||||
.Blue{fill:#1177D7;}
|
||||
.Yellow{fill:#FFB115;}
|
||||
.Black{fill:#727272;}
|
||||
.Green{fill:#039C23;}
|
||||
.Red{fill:#D11C1C;}
|
||||
.st0{opacity:0.75;}
|
||||
.st1{opacity:0.5;}
|
||||
</style>
|
||||
<g id="Reload_1_">
|
||||
<path d="M16,4c3.3,0,6.3,1.3,8.5,3.5L28,4v10h-0.2h-4.1H18l3.6-3.6C20.2,8.9,18.2,8,16,8c-4.4,0-8,3.6-8,8s3.6,8,8,8 c3.7,0,6.8-2.6,7.7-6h4.1c-1,5.7-5.9,10-11.8,10C9.4,28,4,22.6,4,16C4,9.4,9.4,4,16,4z" class="Green" />
|
||||
</g>
|
||||
</svg>
|
||||
14
MultiTool.Form/Resources/refreshpivottable.svg
Normal file
14
MultiTool.Form/Resources/refreshpivottable.svg
Normal file
@ -0,0 +1,14 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Refresh" style="enable-background:new 0 0 32 32">
|
||||
<style type="text/css">
|
||||
.Blue{fill:#1177D7;}
|
||||
.Black{fill:#727272;}
|
||||
.Green{fill:#039C23;}
|
||||
.st0{opacity:0.5;}
|
||||
</style>
|
||||
<g class="st0">
|
||||
<path d="M10,10H6V6h4V10z M24,6H12v4h12V6z M10,12H6v12h4V12z" class="Blue" />
|
||||
</g>
|
||||
<path d="M30,16v6h-0.1h-2H24l2.5-2.5C25.6,18.6,24.4,18,23,18c-2.4,0-4.4,1.7-4.9,4h-2c0.5-3.4,3.4-6,6.9-6 c1.9,0,3.7,0.8,4.9,2.1L30,16z M23,28c-1.4,0-2.6-0.6-3.5-1.5L22,24h-3.9h-2H16v6l2.1-2.1c1.3,1.3,3,2.1,4.9,2.1 c3.5,0,6.4-2.6,6.9-6h-2C27.4,26.3,25.4,28,23,28z" class="Green" />
|
||||
<path d="M27,2H3C2.4,2,2,2.4,2,3v24c0,0.6,0.4,1,1,1h11v-2H4V4h22v10.5c0.7,0.3,1.4,0.6,2,1V3C28,2.4,27.6,2,27,2z" class="Black" />
|
||||
</svg>
|
||||
22
MultiTool.Form/Resources/update.svg
Normal file
22
MultiTool.Form/Resources/update.svg
Normal file
@ -0,0 +1,22 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
|
||||
<style type="text/css">
|
||||
.Yellow{fill:#FFB115;}
|
||||
.Red{fill:#D11C1C;}
|
||||
.Black{fill:#727272;}
|
||||
.Blue{fill:#1177D7;}
|
||||
.White{fill:#FFFFFF;}
|
||||
.Green{fill:#039C23;}
|
||||
.st0{opacity:0.75;}
|
||||
.st1{opacity:0.5;}
|
||||
.st2{opacity:0.25;}
|
||||
.st3{fill:#FFB115;}
|
||||
</style>
|
||||
<g />
|
||||
<g id="Update">
|
||||
<g class="st1">
|
||||
<path d="M16,6h-6V2h6V6z M16,8h-6v4h6V8z M24,2h-6v4h6V2z M24,12V8h-6v4H24z M2,6h6V2H2V6z M2,18h6v-4H2V18z M16,14 L16,14l-6,0v4h2.8C13.5,16.4,14.6,15,16,14z M2,12h6V8H2V12z" class="Black" />
|
||||
</g>
|
||||
<path d="M27.7,20h2H30v-6l-2.3,2.3C26.2,14.9,24.2,14,22,14c-4.4,0-8,3.6-8,8c0,4.4,3.6,8,8,8s8-3.6,8-8h-2 c0,3.3-2.7,6-6,6s-6-2.7-6-6s2.7-6,6-6c1.7,0,3.2,0.7,4.2,1.8L24,20H27.7z" class="Green" />
|
||||
</g>
|
||||
</svg>
|
||||
@ -4,25 +4,24 @@ Imports DevExpress.XtraGrid.Views.Grid
|
||||
Imports DigitalData.Modules.Config
|
||||
Imports DigitalData.Modules.Database
|
||||
Imports DigitalData.Modules.Logging
|
||||
Imports MultiTool.Shared
|
||||
Imports MultiTool.Shared.Constants
|
||||
Imports DigitalData.Modules.Language
|
||||
|
||||
Public Class frmConfig
|
||||
Private ReadOnly ConfigManager As ConfigManager(Of MultiTool.Shared.Config)
|
||||
Private ReadOnly TBMT_CONFIG_GENERAL As New DS_DD_ECM.TBMT_CONFIGDataTable
|
||||
Private ReadOnly ConfigManager As ConfigManager(Of MultiTool.Common.Config)
|
||||
Private ReadOnly FormHelper As FormHelper
|
||||
|
||||
Private BindingSource As BindingSource = TBEDIXMLITEMSBindingSource
|
||||
Private View As GridView = GridViewSchema
|
||||
|
||||
Private TBMT_CONFIG_GENERAL As New DS_DD_ECM.TBMT_CONFIGDataTable
|
||||
|
||||
Private ReadOnly Property Config As MultiTool.Shared.Config
|
||||
Private ReadOnly Property Config As MultiTool.Common.Config
|
||||
Get
|
||||
Return ConfigManager?.Config
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of MultiTool.Shared.Config))
|
||||
Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of MultiTool.Common.Config))
|
||||
' Dieser Aufruf ist für den Designer erforderlich.
|
||||
InitializeComponent()
|
||||
|
||||
|
||||
@ -5,15 +5,14 @@ Imports DigitalData.Modules.Config
|
||||
Imports DigitalData.Modules.Database
|
||||
Imports DigitalData.Modules.Logging
|
||||
Imports DigitalData.Modules.Language
|
||||
Imports MultiTool.Shared
|
||||
Imports MultiTool.Shared.Templates
|
||||
Imports MultiTool.Shared.Exceptions
|
||||
Imports MultiTool.Shared.Winline
|
||||
Imports MultiTool.Shared.Winline.Entities
|
||||
Imports MultiTool.Common.Templates
|
||||
Imports MultiTool.Common.Exceptions
|
||||
Imports MultiTool.Common.Winline
|
||||
Imports MultiTool.Common.Winline.Entities
|
||||
|
||||
Public Class frmExportMain
|
||||
Private ReadOnly LogConfig As LogConfig
|
||||
Private ReadOnly ConfigManager As ConfigManager(Of Config)
|
||||
Private ReadOnly ConfigManager As ConfigManager(Of Common.Config)
|
||||
Private ReadOnly CurrentTemplate As Template = Nothing
|
||||
|
||||
Private Logger As Logger
|
||||
@ -24,7 +23,7 @@ Public Class frmExportMain
|
||||
Private GridBuilder As GridBuilder
|
||||
Private FileEx As DigitalData.Modules.Filesystem.File
|
||||
|
||||
Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of Config), pTemplate As Template)
|
||||
Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of Common.Config), pTemplate As Template)
|
||||
' Dieser Aufruf ist für den Designer erforderlich.
|
||||
InitializeComponent()
|
||||
|
||||
|
||||
@ -7,14 +7,14 @@ Imports DigitalData.GUIs.Common
|
||||
Imports DigitalData.Modules.Config
|
||||
Imports DigitalData.Modules.Database
|
||||
Imports DigitalData.Modules.Logging
|
||||
Imports MultiTool.Shared
|
||||
Imports MultiTool.Shared.Documents
|
||||
Imports MultiTool.Shared.Templates
|
||||
Imports MultiTool.Shared.Winline
|
||||
Imports MultiTool.Shared.Winline.Entities
|
||||
Imports MultiTool.Shared.Constants
|
||||
Imports MultiTool.Shared.Exceptions
|
||||
Imports MultiTool.Shared.Documents.Document
|
||||
Imports MultiTool.Common
|
||||
Imports MultiTool.Common.Documents
|
||||
Imports MultiTool.Common.Templates
|
||||
Imports MultiTool.Common.Winline
|
||||
Imports MultiTool.Common.Winline.Entities
|
||||
Imports MultiTool.Common.Constants
|
||||
Imports MultiTool.Common.Exceptions
|
||||
Imports MultiTool.Common.Documents.Document
|
||||
|
||||
Public Class frmImportMain
|
||||
Public LogConfig As LogConfig
|
||||
|
||||
30
MultiTool.Form/frmMain.Designer.vb
generated
30
MultiTool.Form/frmMain.Designer.vb
generated
@ -23,13 +23,14 @@ Partial Class frmMain
|
||||
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain))
|
||||
Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
|
||||
Me.btnOpenImportExportForm = New DevExpress.XtraBars.BarButtonItem()
|
||||
Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
|
||||
Me.btnReloadTemplates = New DevExpress.XtraBars.BarButtonItem()
|
||||
Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem()
|
||||
Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
|
||||
Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
|
||||
Me.txtVersion = New DevExpress.XtraBars.BarStaticItem()
|
||||
Me.txtCulture = New DevExpress.XtraBars.BarStaticItem()
|
||||
Me.btnOpenSchemaDirectory = New DevExpress.XtraBars.BarButtonItem()
|
||||
Me.btnReloadWinlineData = New DevExpress.XtraBars.BarButtonItem()
|
||||
Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
|
||||
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||
Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||
@ -54,9 +55,9 @@ Partial Class frmMain
|
||||
'RibbonControl1
|
||||
'
|
||||
Me.RibbonControl1.ExpandCollapseItem.Id = 0
|
||||
Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.btnOpenImportExportForm, Me.BarButtonItem1, Me.BarButtonItem4, Me.BarButtonItem2, Me.BarButtonItem3, Me.txtVersion, Me.txtCulture, Me.btnOpenSchemaDirectory})
|
||||
Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.btnOpenImportExportForm, Me.btnReloadTemplates, Me.BarButtonItem4, Me.BarButtonItem2, Me.BarButtonItem3, Me.txtVersion, Me.txtCulture, Me.btnOpenSchemaDirectory, Me.btnReloadWinlineData})
|
||||
Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
|
||||
Me.RibbonControl1.MaxItemId = 13
|
||||
Me.RibbonControl1.MaxItemId = 14
|
||||
Me.RibbonControl1.Name = "RibbonControl1"
|
||||
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage3})
|
||||
Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
|
||||
@ -72,12 +73,12 @@ Partial Class frmMain
|
||||
Me.btnOpenImportExportForm.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_checkcircled1
|
||||
Me.btnOpenImportExportForm.Name = "btnOpenImportExportForm"
|
||||
'
|
||||
'BarButtonItem1
|
||||
'btnReloadTemplates
|
||||
'
|
||||
Me.BarButtonItem1.Caption = "Daten neuladen"
|
||||
Me.BarButtonItem1.Id = 2
|
||||
Me.BarButtonItem1.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_reload
|
||||
Me.BarButtonItem1.Name = "BarButtonItem1"
|
||||
Me.btnReloadTemplates.Caption = "Vorlagen neuladen"
|
||||
Me.btnReloadTemplates.Id = 2
|
||||
Me.btnReloadTemplates.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.refreshpivottable
|
||||
Me.btnReloadTemplates.Name = "btnReloadTemplates"
|
||||
'
|
||||
'BarButtonItem4
|
||||
'
|
||||
@ -123,6 +124,13 @@ Partial Class frmMain
|
||||
Me.btnOpenSchemaDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.open26
|
||||
Me.btnOpenSchemaDirectory.Name = "btnOpenSchemaDirectory"
|
||||
'
|
||||
'btnReloadWinlineData
|
||||
'
|
||||
Me.btnReloadWinlineData.Caption = "WinLine Daten neuladen"
|
||||
Me.btnReloadWinlineData.Id = 13
|
||||
Me.btnReloadWinlineData.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.update
|
||||
Me.btnReloadWinlineData.Name = "btnReloadWinlineData"
|
||||
'
|
||||
'RibbonPage1
|
||||
'
|
||||
Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup3})
|
||||
@ -138,7 +146,8 @@ Partial Class frmMain
|
||||
'RibbonPageGroup3
|
||||
'
|
||||
Me.RibbonPageGroup3.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
|
||||
Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem1)
|
||||
Me.RibbonPageGroup3.ItemLinks.Add(Me.btnReloadTemplates)
|
||||
Me.RibbonPageGroup3.ItemLinks.Add(Me.btnReloadWinlineData)
|
||||
Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
|
||||
Me.RibbonPageGroup3.Text = "Daten"
|
||||
'
|
||||
@ -263,7 +272,7 @@ Partial Class frmMain
|
||||
Friend WithEvents colFileName As DevExpress.XtraGrid.Columns.GridColumn
|
||||
Friend WithEvents RibbonPage3 As DevExpress.XtraBars.Ribbon.RibbonPage
|
||||
Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
|
||||
Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
|
||||
Friend WithEvents btnReloadTemplates As DevExpress.XtraBars.BarButtonItem
|
||||
Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem
|
||||
Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
|
||||
Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem
|
||||
@ -273,4 +282,5 @@ Partial Class frmMain
|
||||
Friend WithEvents txtCulture As DevExpress.XtraBars.BarStaticItem
|
||||
Friend WithEvents btnOpenSchemaDirectory As DevExpress.XtraBars.BarButtonItem
|
||||
Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
|
||||
Friend WithEvents btnReloadWinlineData As DevExpress.XtraBars.BarButtonItem
|
||||
End Class
|
||||
|
||||
@ -6,14 +6,14 @@ Imports DigitalData.GUIs.Common
|
||||
Imports DigitalData.Modules.Config
|
||||
Imports DigitalData.Modules.Database
|
||||
Imports DigitalData.Modules.Logging
|
||||
Imports MultiTool.Shared.Templates
|
||||
Imports MultiTool.Shared.Winline
|
||||
Imports MultiTool.Shared.Winline.Entities
|
||||
Imports MultiTool.Common.Templates
|
||||
Imports MultiTool.Common.Winline
|
||||
Imports MultiTool.Common.Winline.Entities
|
||||
|
||||
Public Class frmMain
|
||||
Private LogConfig As LogConfig
|
||||
Private Logger As Logger
|
||||
Private ConfigManager As ConfigManager(Of [Shared].Config)
|
||||
Private ConfigManager As ConfigManager(Of Common.Config)
|
||||
Private Database As MSSQLServer
|
||||
Private TemplateLoader As TemplateLoader
|
||||
Private GridBuilder As GridBuilder
|
||||
@ -40,7 +40,7 @@ Public Class frmMain
|
||||
SplashScreenManager.SetWaitFormDescription("Initialisierung der Grundfunktionen")
|
||||
|
||||
FormHelper = New FormHelper(LogConfig, Me)
|
||||
ConfigManager = New ConfigManager(Of [Shared].Config)(LogConfig,
|
||||
ConfigManager = New ConfigManager(Of Common.Config)(LogConfig,
|
||||
Application.UserAppDataPath,
|
||||
Application.CommonAppDataPath,
|
||||
Application.StartupPath
|
||||
@ -70,13 +70,10 @@ Public Class frmMain
|
||||
Database = New MSSQLServer(LogConfig, oConnectionString)
|
||||
|
||||
SplashScreenManager.SetWaitFormDescription("Lade Vorlagen")
|
||||
Await LoadTemplateData()
|
||||
GridControl1.DataSource = Await LoadTemplateData()
|
||||
|
||||
SplashScreenManager.SetWaitFormDescription("Lade Winline Stammdaten")
|
||||
My.Winline = New WinlineData(LogConfig, Database, My.GeneralConfiguration, My.MappingConfiguration, My.MandatorConfiguration)
|
||||
Dim oBindingSource As BindingList(Of Template) = Await LoadWinlineData(My.Winline)
|
||||
GridControl1.DataSource = oBindingSource
|
||||
|
||||
|
||||
txtVersion.Caption = String.Format(My.Resources.frmMainExtra.Version___0_, My.Application.Info.Version.ToString)
|
||||
txtCulture.Caption = String.Format(My.Resources.frmMainExtra.Sprache___0_, My.Application.UICulture.ToString)
|
||||
@ -89,7 +86,7 @@ Public Class frmMain
|
||||
End Try
|
||||
End Sub
|
||||
|
||||
Private Async Function LoadWinlineData(Winline As WinlineData) As Task(Of BindingList(Of Template))
|
||||
Private Async Function LoadWinlineData(Winline As WinlineData) As Task
|
||||
Winline.Mandators.Clear()
|
||||
Winline.LoadEconomicYears()
|
||||
Await Winline.LoadMandators()
|
||||
@ -104,15 +101,9 @@ Public Class frmMain
|
||||
Next
|
||||
|
||||
My.Winline = Winline
|
||||
|
||||
Dim oBindingSource = New BindingList(Of Template)
|
||||
For Each oTemplate As Template In TemplateLoader.TemplateList
|
||||
oBindingSource.Add(oTemplate)
|
||||
Next
|
||||
Return oBindingSource
|
||||
End Function
|
||||
|
||||
Private Async Function LoadTemplateData() As Task
|
||||
Private Async Function LoadTemplateData() As Task(Of BindingList(Of Template))
|
||||
' Initialize Schemas
|
||||
TemplateLoader = New TemplateLoader(LogConfig, Database)
|
||||
Await TemplateLoader.LoadTemplates()
|
||||
@ -126,6 +117,12 @@ Public Class frmMain
|
||||
My.TemplateConfiguration = TemplateLoader.TemplateConfiguration
|
||||
My.MandatorConfiguration = TemplateLoader.MandatorConfiguration
|
||||
My.GeneralConfiguration = TemplateLoader.GeneralConfiguration
|
||||
|
||||
Dim oBindingSource = New BindingList(Of Template)
|
||||
For Each oTemplate As Template In TemplateLoader.TemplateList
|
||||
oBindingSource.Add(oTemplate)
|
||||
Next
|
||||
Return oBindingSource
|
||||
End Function
|
||||
|
||||
Private Sub btnOpenImportExportForm_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnOpenImportExportForm.ItemClick
|
||||
@ -233,7 +230,7 @@ Public Class frmMain
|
||||
End Try
|
||||
End Sub
|
||||
|
||||
Private Async Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
|
||||
Private Async Sub btnReloadTemplates_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnReloadTemplates.ItemClick
|
||||
If SplashScreenManager.IsSplashFormVisible Then
|
||||
Exit Sub
|
||||
End If
|
||||
@ -242,11 +239,27 @@ Public Class frmMain
|
||||
|
||||
Try
|
||||
SplashScreenManager.SetWaitFormDescription("Lade Vorlagen")
|
||||
Await LoadTemplateData()
|
||||
GridControl1.DataSource = Await LoadTemplateData()
|
||||
|
||||
Catch ex As Exception
|
||||
FormHelper.ShowError(ex, "Laden der Vorlagen")
|
||||
|
||||
Finally
|
||||
SplashScreenManager.CloseWaitForm()
|
||||
|
||||
End Try
|
||||
End Sub
|
||||
|
||||
Private Async Sub btnReloadWinlineData_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnReloadWinlineData.ItemClick
|
||||
If SplashScreenManager.IsSplashFormVisible Then
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
SplashScreenManager.ShowWaitForm()
|
||||
|
||||
Try
|
||||
SplashScreenManager.SetWaitFormDescription("Lade Winline Stammdaten")
|
||||
Dim oBindingSource As BindingList(Of Template) = Await LoadWinlineData(My.Winline)
|
||||
GridControl1.DataSource = oBindingSource
|
||||
Await LoadWinlineData(My.Winline)
|
||||
|
||||
Catch ex As Exception
|
||||
FormHelper.ShowError(ex, My.Resources.frmImportMainExtra.Laden_der_Winline_Daten)
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
Imports System.Globalization
|
||||
Imports MultiTool.Shared.Documents
|
||||
Imports MultiTool.Shared.Documents.DocumentRow
|
||||
Imports MultiTool.Shared.Winline
|
||||
Imports MultiTool.Shared.Winline.Entities
|
||||
Imports MultiTool.Shared.Templates
|
||||
Imports MultiTool.Shared.Constants
|
||||
Imports MultiTool.Common.Documents
|
||||
Imports MultiTool.Common.Documents.DocumentRow
|
||||
Imports MultiTool.Common.Winline
|
||||
Imports MultiTool.Common.Winline.Entities
|
||||
Imports MultiTool.Common.Templates
|
||||
Imports MultiTool.Common.Constants
|
||||
Imports DigitalData.Modules.Language
|
||||
Imports DigitalData.Modules.Logging
|
||||
Imports DevExpress.XtraEditors
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
Imports System.Runtime.CompilerServices
|
||||
Imports DigitalData.Modules.Language
|
||||
|
||||
Public Module DataRowEx
|
||||
<Extension()>
|
||||
Public Function ItemEx(Of T)(pRow As DataRow, pFieldName As String, Optional pDefaultValue As T = Nothing) As T
|
||||
Try
|
||||
Return Utils.NotNull(pRow.Item(pFieldName), pDefaultValue)
|
||||
Catch ex As Exception
|
||||
Return Nothing
|
||||
End Try
|
||||
End Function
|
||||
End Module
|
||||
@ -5,22 +5,40 @@ VisualStudioVersion = 16.0.31005.135
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "MultiTool.Form", "MultiTool.Form\MultiTool.Form.vbproj", "{7AAEC958-955D-4F77-964C-38658684E424}"
|
||||
EndProject
|
||||
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "MultiTool.Shared", "MultiTool.Shared\MultiTool.Shared.vbproj", "{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}"
|
||||
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "MultiTool.Common", "MultiTool.Common\MultiTool.Common.vbproj", "{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}"
|
||||
EndProject
|
||||
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Multitool.Form.Setup", "Multitool.Form.Setup\Multitool.Form.Setup.wixproj", "{A03D1911-C6D6-4AD0-9601-4D277B35E91D}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Debug|x86 = Debug|x86
|
||||
Release|Any CPU = Release|Any CPU
|
||||
Release|x86 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{7AAEC958-955D-4F77-964C-38658684E424}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{7AAEC958-955D-4F77-964C-38658684E424}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{7AAEC958-955D-4F77-964C-38658684E424}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{7AAEC958-955D-4F77-964C-38658684E424}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{7AAEC958-955D-4F77-964C-38658684E424}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{7AAEC958-955D-4F77-964C-38658684E424}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{7AAEC958-955D-4F77-964C-38658684E424}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{7AAEC958-955D-4F77-964C-38658684E424}.Release|x86.Build.0 = Release|Any CPU
|
||||
{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}.Release|x86.Build.0 = Release|Any CPU
|
||||
{A03D1911-C6D6-4AD0-9601-4D277B35E91D}.Debug|Any CPU.ActiveCfg = Debug|x86
|
||||
{A03D1911-C6D6-4AD0-9601-4D277B35E91D}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{A03D1911-C6D6-4AD0-9601-4D277B35E91D}.Debug|x86.Build.0 = Debug|x86
|
||||
{A03D1911-C6D6-4AD0-9601-4D277B35E91D}.Release|Any CPU.ActiveCfg = Release|x86
|
||||
{A03D1911-C6D6-4AD0-9601-4D277B35E91D}.Release|x86.ActiveCfg = Release|x86
|
||||
{A03D1911-C6D6-4AD0-9601-4D277B35E91D}.Release|x86.Build.0 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user