Change Name to MultiTool

This commit is contained in:
Jonathan Jenne 2021-10-29 10:37:04 +02:00
parent f00e332737
commit 1035a0fb1f
121 changed files with 186 additions and 185 deletions

View File

@ -1,62 +0,0 @@
'------------------------------------------------------------------------------
' <auto-generated>
' This code was generated by a tool.
' Runtime Version:4.0.30319.42000
'
' Changes to this file may cause incorrect behavior and will be lost if
' the code is regenerated.
' </auto-generated>
'------------------------------------------------------------------------------
Option Strict On
Option Explicit On
Namespace My.Resources
'This class was auto-generated by the StronglyTypedResourceBuilder
'class via a tool like ResGen or Visual Studio.
'To add or remove a member, edit your .ResX file then rerun ResGen
'with the /str option, or rebuild your VS project.
'''<summary>
''' A strongly-typed resource class, for looking up localized strings, etc.
'''</summary>
<Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _
Friend Module Resources
Private resourceMan As Global.System.Resources.ResourceManager
Private resourceCulture As Global.System.Globalization.CultureInfo
'''<summary>
''' Returns the cached ResourceManager instance used by this class.
'''</summary>
<Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
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("ImporterShared.Resources", GetType(Resources).Assembly)
resourceMan = temp
End If
Return resourceMan
End Get
End Property
'''<summary>
''' Overrides the current thread's CurrentUICulture property for all
''' resource lookups using this strongly typed resource class.
'''</summary>
<Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Friend Property Culture() As Global.System.Globalization.CultureInfo
Get
Return resourceCulture
End Get
Set(ByVal value As Global.System.Globalization.CultureInfo)
resourceCulture = value
End Set
End Property
End Module
End Namespace

View File

@ -2,7 +2,7 @@
Imports DevExpress.XtraGrid.Views.Grid Imports DevExpress.XtraGrid.Views.Grid
Imports DigitalData.GUIs.Common Imports DigitalData.GUIs.Common
Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Logging
Imports ImporterShared Imports MultiTool.Shared
Public Class GridLoader Public Class GridLoader
Inherits BaseClass Inherits BaseClass
@ -68,16 +68,16 @@ Public Class GridLoader
Private Function GetColumnType(pColumn As Schemas.Schema.Column) Private Function GetColumnType(pColumn As Schemas.Schema.Column)
Select Case pColumn.DataType Select Case pColumn.DataType
Case ImporterShared.Constants.ColumnType.Boolean Case MultiTool.Shared.Constants.ColumnType.Boolean
Return DevExpress.Data.UnboundColumnType.Boolean Return DevExpress.Data.UnboundColumnType.Boolean
Case ImporterShared.Constants.ColumnType.Date Case MultiTool.Shared.Constants.ColumnType.Date
Return DevExpress.Data.UnboundColumnType.DateTime Return DevExpress.Data.UnboundColumnType.DateTime
Case ImporterShared.Constants.ColumnType.Integer Case MultiTool.Shared.Constants.ColumnType.Integer
Return DevExpress.Data.UnboundColumnType.Integer Return DevExpress.Data.UnboundColumnType.Integer
Case ImporterShared.Constants.ColumnType.Decimal Case MultiTool.Shared.Constants.ColumnType.Decimal
Return DevExpress.Data.UnboundColumnType.Decimal Return DevExpress.Data.UnboundColumnType.Decimal
Case Else Case Else

View File

@ -6,9 +6,9 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{7AAEC958-955D-4F77-964C-38658684E424}</ProjectGuid> <ProjectGuid>{7AAEC958-955D-4F77-964C-38658684E424}</ProjectGuid>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<StartupObject>ImporterForm.My.MyApplication</StartupObject> <StartupObject>MultiTool.Form.My.MyApplication</StartupObject>
<RootNamespace>ImporterForm</RootNamespace> <RootNamespace>MultiTool.Form</RootNamespace>
<AssemblyName>ImporterForm</AssemblyName> <AssemblyName>MultiTool.Form</AssemblyName>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<MyType>WindowsForms</MyType> <MyType>WindowsForms</MyType>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
@ -22,7 +22,7 @@
<DefineDebug>true</DefineDebug> <DefineDebug>true</DefineDebug>
<DefineTrace>true</DefineTrace> <DefineTrace>true</DefineTrace>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<DocumentationFile>ImporterForm.xml</DocumentationFile> <DocumentationFile>MultiTool.Form.xml</DocumentationFile>
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn> <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@ -32,7 +32,7 @@
<DefineTrace>true</DefineTrace> <DefineTrace>true</DefineTrace>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
<DocumentationFile>ImporterForm.xml</DocumentationFile> <DocumentationFile>MultiTool.Form.xml</DocumentationFile>
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn> <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
@ -308,11 +308,10 @@
<None Include="Resources\import.svg" /> <None Include="Resources\import.svg" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\ImporterShared\ImporterShared.vbproj"> <ProjectReference Include="..\MultiTool.Shared\MultiTool.Shared.vbproj">
<Project>{dd1ac3b9-7595-4d3c-b9bb-97c46a480fa0}</Project> <Project>{dd1ac3b9-7595-4d3c-b9bb-97c46a480fa0}</Project>
<Name>ImporterShared</Name> <Name>MultiTool.Shared</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
</Project> </Project>

View File

@ -32,7 +32,7 @@ Namespace My
<Global.System.Diagnostics.DebuggerStepThroughAttribute()> _ <Global.System.Diagnostics.DebuggerStepThroughAttribute()> _
Protected Overrides Sub OnCreateMainForm() Protected Overrides Sub OnCreateMainForm()
Me.MainForm = Global.ImporterForm.frmImportMain Me.MainForm = Global.MultiTool.Form.frmImportMain
End Sub End Sub
End Class End Class
End Namespace End Namespace

View File

@ -39,7 +39,7 @@ Namespace My.Resources
Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
Get Get
If Object.ReferenceEquals(resourceMan, Nothing) Then If Object.ReferenceEquals(resourceMan, Nothing) Then
Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("ImporterForm.Resources", GetType(Resources).Assembly) Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("MultiTool.Form.Resources", GetType(Resources).Assembly)
resourceMan = temp resourceMan = temp
End If End If
Return resourceMan Return resourceMan

View File

@ -64,9 +64,9 @@ Namespace My
Friend Module MySettingsProperty Friend Module MySettingsProperty
<Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")> _ <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")> _
Friend ReadOnly Property Settings() As Global.ImporterForm.My.MySettings Friend ReadOnly Property Settings() As Global.MultiTool.Form.My.MySettings
Get Get
Return Global.ImporterForm.My.MySettings.Default Return Global.MultiTool.Form.My.MySettings.Default
End Get End Get
End Property End Property
End Module End Module

View File

@ -1,10 +1,10 @@
Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Logging
Imports ImporterForm.Positions Imports MultiTool.Form.Positions
Imports ImporterShared.Winline Imports MultiTool.Shared.Winline
Imports ImporterShared.Schemas Imports MultiTool.Shared.Schemas
Public Class PositionData Public Class PositionData
Inherits ImporterShared.BaseClass Inherits MultiTool.Shared.BaseClass
Private Winline As Data Private Winline As Data

View File

@ -1,7 +1,7 @@
Imports DevExpress.XtraGrid.Columns Imports DevExpress.XtraGrid.Columns
Imports DevExpress.XtraGrid.Views.Grid Imports DevExpress.XtraGrid.Views.Grid
Imports ImporterShared.Documents Imports MultiTool.Shared.Documents
Imports ImporterForm.Positions Imports MultiTool.Form.Positions
Namespace Positions Namespace Positions
Public Class PositionGrid Public Class PositionGrid

View File

@ -501,7 +501,7 @@ Partial Public Class OrderReport
' '
'ObjectDataSource1 'ObjectDataSource1
' '
Me.ObjectDataSource1.DataSource = GetType(ImporterShared.Schemas.Orders.ReportSource) Me.ObjectDataSource1.DataSource = GetType(MultiTool.Shared.Schemas.Orders.ReportSource)
Me.ObjectDataSource1.Name = "ObjectDataSource1" Me.ObjectDataSource1.Name = "ObjectDataSource1"
' '
'XrLabel12 'XrLabel12

View File

@ -313,7 +313,7 @@ Partial Class frmConfig
Me.Controls.Add(Me.barDockControlRight) Me.Controls.Add(Me.barDockControlRight)
Me.Controls.Add(Me.barDockControlBottom) Me.Controls.Add(Me.barDockControlBottom)
Me.Controls.Add(Me.barDockControlTop) Me.Controls.Add(Me.barDockControlTop)
Me.IconOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.bo_unknown1 Me.IconOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.bo_unknown1
Me.Name = "frmConfig" Me.Name = "frmConfig"
Me.Ribbon = Me.RibbonControl1 Me.Ribbon = Me.RibbonControl1
Me.StatusBar = Me.RibbonStatusBar1 Me.StatusBar = Me.RibbonStatusBar1

View File

@ -1,9 +1,9 @@
Imports DigitalData.Modules.Config Imports DigitalData.Modules.Config
Public Class frmConfig Public Class frmConfig
Public Property ConfigManager As ConfigManager(Of ImporterShared.Config) Public Property ConfigManager As ConfigManager(Of MultiTool.Shared.Config)
Private ReadOnly Property Config As ImporterShared.Config Private ReadOnly Property Config As MultiTool.Shared.Config
Get Get
Return ConfigManager?.Config Return ConfigManager?.Config
End Get End Get

View File

@ -127,35 +127,35 @@ Partial Class frmImportMain
' '
Me.btnLoadFiles.Caption = "Dateien einlesen" Me.btnLoadFiles.Caption = "Dateien einlesen"
Me.btnLoadFiles.Id = 3 Me.btnLoadFiles.Id = 3
Me.btnLoadFiles.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.export Me.btnLoadFiles.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.export
Me.btnLoadFiles.Name = "btnLoadFiles" Me.btnLoadFiles.Name = "btnLoadFiles"
' '
'btnTransferFile 'btnTransferFile
' '
Me.btnTransferFile.Caption = "Aktuelle Datei übermitteln" Me.btnTransferFile.Caption = "Aktuelle Datei übermitteln"
Me.btnTransferFile.Id = 4 Me.btnTransferFile.Id = 4
Me.btnTransferFile.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.actions_send1 Me.btnTransferFile.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_send1
Me.btnTransferFile.Name = "btnTransferFile" Me.btnTransferFile.Name = "btnTransferFile"
' '
'btnOpenInputDirectory 'btnOpenInputDirectory
' '
Me.btnOpenInputDirectory.Caption = "Eingangsverzeichnis öffnen" Me.btnOpenInputDirectory.Caption = "Eingangsverzeichnis öffnen"
Me.btnOpenInputDirectory.Id = 6 Me.btnOpenInputDirectory.Id = 6
Me.btnOpenInputDirectory.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.open22 Me.btnOpenInputDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.open22
Me.btnOpenInputDirectory.Name = "btnOpenInputDirectory" Me.btnOpenInputDirectory.Name = "btnOpenInputDirectory"
' '
'btnOpenOutputDirectory 'btnOpenOutputDirectory
' '
Me.btnOpenOutputDirectory.Caption = "Ausgangsverzeichnis öffnen" Me.btnOpenOutputDirectory.Caption = "Ausgangsverzeichnis öffnen"
Me.btnOpenOutputDirectory.Id = 7 Me.btnOpenOutputDirectory.Id = 7
Me.btnOpenOutputDirectory.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.up Me.btnOpenOutputDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.up
Me.btnOpenOutputDirectory.Name = "btnOpenOutputDirectory" Me.btnOpenOutputDirectory.Name = "btnOpenOutputDirectory"
' '
'btnOpenSchemaDirectory 'btnOpenSchemaDirectory
' '
Me.btnOpenSchemaDirectory.Caption = "Vorlagenverzeichnis öffnen" Me.btnOpenSchemaDirectory.Caption = "Vorlagenverzeichnis öffnen"
Me.btnOpenSchemaDirectory.Id = 9 Me.btnOpenSchemaDirectory.Id = 9
Me.btnOpenSchemaDirectory.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.open1 Me.btnOpenSchemaDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.open1
Me.btnOpenSchemaDirectory.Name = "btnOpenSchemaDirectory" Me.btnOpenSchemaDirectory.Name = "btnOpenSchemaDirectory"
' '
'btnReloadFile 'btnReloadFile
@ -163,7 +163,7 @@ Partial Class frmImportMain
Me.btnReloadFile.Caption = "Aktuelle Datei neu laden" Me.btnReloadFile.Caption = "Aktuelle Datei neu laden"
Me.btnReloadFile.Enabled = False Me.btnReloadFile.Enabled = False
Me.btnReloadFile.Id = 11 Me.btnReloadFile.Id = 11
Me.btnReloadFile.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.rotatecounterclockwise Me.btnReloadFile.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.rotatecounterclockwise
Me.btnReloadFile.Name = "btnReloadFile" Me.btnReloadFile.Name = "btnReloadFile"
' '
'btnTransferAllFiles 'btnTransferAllFiles
@ -171,7 +171,7 @@ Partial Class frmImportMain
Me.btnTransferAllFiles.Caption = "Ausgewählte Dateien übermitteln" Me.btnTransferAllFiles.Caption = "Ausgewählte Dateien übermitteln"
Me.btnTransferAllFiles.Enabled = False Me.btnTransferAllFiles.Enabled = False
Me.btnTransferAllFiles.Id = 13 Me.btnTransferAllFiles.Id = 13
Me.btnTransferAllFiles.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.actions_send Me.btnTransferAllFiles.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_send
Me.btnTransferAllFiles.Name = "btnTransferAllFiles" Me.btnTransferAllFiles.Name = "btnTransferAllFiles"
' '
'BarButtonItem1 'BarButtonItem1
@ -179,7 +179,7 @@ Partial Class frmImportMain
Me.BarButtonItem1.Caption = "Belegvorschau für aktuelle Datei anzeigen" Me.BarButtonItem1.Caption = "Belegvorschau für aktuelle Datei anzeigen"
Me.BarButtonItem1.Enabled = False Me.BarButtonItem1.Enabled = False
Me.BarButtonItem1.Id = 14 Me.BarButtonItem1.Id = 14
Me.BarButtonItem1.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.mailmergepreview Me.BarButtonItem1.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.mailmergepreview
Me.BarButtonItem1.Name = "BarButtonItem1" Me.BarButtonItem1.Name = "BarButtonItem1"
' '
'btnShowXml 'btnShowXml
@ -187,21 +187,21 @@ Partial Class frmImportMain
Me.btnShowXml.Caption = "XML-Datei anzeigen" Me.btnShowXml.Caption = "XML-Datei anzeigen"
Me.btnShowXml.Enabled = False Me.btnShowXml.Enabled = False
Me.btnShowXml.Id = 15 Me.btnShowXml.Id = 15
Me.btnShowXml.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.togglefieldcodes Me.btnShowXml.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.togglefieldcodes
Me.btnShowXml.Name = "btnShowXml" Me.btnShowXml.Name = "btnShowXml"
' '
'btnOpenLogDirectory 'btnOpenLogDirectory
' '
Me.btnOpenLogDirectory.Caption = "Logverzeichnis öffnen" Me.btnOpenLogDirectory.Caption = "Logverzeichnis öffnen"
Me.btnOpenLogDirectory.Id = 16 Me.btnOpenLogDirectory.Id = 16
Me.btnOpenLogDirectory.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.logical Me.btnOpenLogDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.logical
Me.btnOpenLogDirectory.Name = "btnOpenLogDirectory" Me.btnOpenLogDirectory.Name = "btnOpenLogDirectory"
' '
'btnOpenConfigDirectory 'btnOpenConfigDirectory
' '
Me.btnOpenConfigDirectory.Caption = "Konfigurationsverzeichnis öffnen" Me.btnOpenConfigDirectory.Caption = "Konfigurationsverzeichnis öffnen"
Me.btnOpenConfigDirectory.Id = 17 Me.btnOpenConfigDirectory.Id = 17
Me.btnOpenConfigDirectory.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.parameters Me.btnOpenConfigDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.parameters
Me.btnOpenConfigDirectory.Name = "btnOpenConfigDirectory" Me.btnOpenConfigDirectory.Name = "btnOpenConfigDirectory"
' '
'txtCurrentFile 'txtCurrentFile
@ -215,7 +215,7 @@ Partial Class frmImportMain
' '
Me.btnConfig.Caption = "Konfiguration" Me.btnConfig.Caption = "Konfiguration"
Me.btnConfig.Id = 24 Me.btnConfig.Id = 24
Me.btnConfig.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.bo_unknown Me.btnConfig.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.bo_unknown
Me.btnConfig.Name = "btnConfig" Me.btnConfig.Name = "btnConfig"
' '
'RibbonPage1 'RibbonPage1

View File

@ -10,15 +10,15 @@ Imports DigitalData.GUIs.Common
Imports DigitalData.Modules.Config Imports DigitalData.Modules.Config
Imports DigitalData.Modules.Database Imports DigitalData.Modules.Database
Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Logging
Imports ImporterShared Imports MultiTool.Shared
Imports ImporterShared.Documents Imports MultiTool.Shared.Documents
Imports ImporterShared.Schemas Imports MultiTool.Shared.Schemas
Imports ImporterShared.Winline Imports MultiTool.Shared.Winline
Public Class frmImportMain Public Class frmImportMain
Private LogConfig As LogConfig Private LogConfig As LogConfig
Private Logger As Logger Private Logger As Logger
Private ConfigManager As ConfigManager(Of ImporterShared.Config) Private ConfigManager As ConfigManager(Of MultiTool.Shared.Config)
Private Database As MSSQLServer Private Database As MSSQLServer
Private Winline As Data Private Winline As Data
Private FileEx As DigitalData.Modules.Filesystem.File Private FileEx As DigitalData.Modules.Filesystem.File

View File

@ -102,7 +102,7 @@ Partial Class frmImportMain_old
Me.GridViewPositions = New DevExpress.XtraGrid.Views.Grid.GridView() Me.GridViewPositions = New DevExpress.XtraGrid.Views.Grid.GridView()
Me.SplitContainerControl3 = New DevExpress.XtraEditors.SplitContainerControl() Me.SplitContainerControl3 = New DevExpress.XtraEditors.SplitContainerControl()
Me.RichEditXml = New DevExpress.XtraRichEdit.RichEditControl() Me.RichEditXml = New DevExpress.XtraRichEdit.RichEditControl()
Me.SplashScreenManager1 = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, GetType(Global.ImporterForm.frmWaitForm), True, True) Me.SplashScreenManager1 = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, GetType(Global.MultiTool.Form.frmWaitForm), True, True)
CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.GridControlFiles, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControlFiles, System.ComponentModel.ISupportInitialize).BeginInit()
@ -190,35 +190,35 @@ Partial Class frmImportMain_old
' '
Me.BarButtonItem8.Caption = "Logverzeichnis öffnen" Me.BarButtonItem8.Caption = "Logverzeichnis öffnen"
Me.BarButtonItem8.Id = 15 Me.BarButtonItem8.Id = 15
Me.BarButtonItem8.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.singlepageview Me.BarButtonItem8.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.singlepageview
Me.BarButtonItem8.Name = "BarButtonItem8" Me.BarButtonItem8.Name = "BarButtonItem8"
' '
'BarButtonItem3 'BarButtonItem3
' '
Me.BarButtonItem3.Caption = "Konfigurationsverzeichnis öffnen" Me.BarButtonItem3.Caption = "Konfigurationsverzeichnis öffnen"
Me.BarButtonItem3.Id = 7 Me.BarButtonItem3.Id = 7
Me.BarButtonItem3.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.pagesetup Me.BarButtonItem3.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.pagesetup
Me.BarButtonItem3.Name = "BarButtonItem3" Me.BarButtonItem3.Name = "BarButtonItem3"
' '
'BarButtonItem1 'BarButtonItem1
' '
Me.BarButtonItem1.Caption = "Eingangsverzeichnis öffnen" Me.BarButtonItem1.Caption = "Eingangsverzeichnis öffnen"
Me.BarButtonItem1.Id = 5 Me.BarButtonItem1.Id = 5
Me.BarButtonItem1.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.open2 Me.BarButtonItem1.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.open2
Me.BarButtonItem1.Name = "BarButtonItem1" Me.BarButtonItem1.Name = "BarButtonItem1"
' '
'BarButtonItem2 'BarButtonItem2
' '
Me.BarButtonItem2.Caption = "Ausgangsverzeichnis öffnen" Me.BarButtonItem2.Caption = "Ausgangsverzeichnis öffnen"
Me.BarButtonItem2.Id = 6 Me.BarButtonItem2.Id = 6
Me.BarButtonItem2.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.open Me.BarButtonItem2.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.open
Me.BarButtonItem2.Name = "BarButtonItem2" Me.BarButtonItem2.Name = "BarButtonItem2"
' '
'btnLoadDocuments 'btnLoadDocuments
' '
Me.btnLoadDocuments.Caption = "Dokumente einlesen" Me.btnLoadDocuments.Caption = "Dokumente einlesen"
Me.btnLoadDocuments.Id = 1 Me.btnLoadDocuments.Id = 1
Me.btnLoadDocuments.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.import Me.btnLoadDocuments.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.import
Me.btnLoadDocuments.Name = "btnLoadDocuments" Me.btnLoadDocuments.Name = "btnLoadDocuments"
' '
'txtFilesLoaded 'txtFilesLoaded
@ -231,21 +231,21 @@ Partial Class frmImportMain_old
' '
Me.checkShowXml.Caption = "XML Datei anzeigen" Me.checkShowXml.Caption = "XML Datei anzeigen"
Me.checkShowXml.Id = 9 Me.checkShowXml.Id = 9
Me.checkShowXml.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.showallfieldcodes Me.checkShowXml.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.showallfieldcodes
Me.checkShowXml.Name = "checkShowXml" Me.checkShowXml.Name = "checkShowXml"
' '
'BarButtonItem4 'BarButtonItem4
' '
Me.BarButtonItem4.Caption = "Aktuelle Zeile übermitteln" Me.BarButtonItem4.Caption = "Aktuelle Zeile übermitteln"
Me.BarButtonItem4.Id = 10 Me.BarButtonItem4.Id = 10
Me.BarButtonItem4.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.bo_validation Me.BarButtonItem4.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.bo_validation
Me.BarButtonItem4.Name = "BarButtonItem4" Me.BarButtonItem4.Name = "BarButtonItem4"
' '
'BarButtonItem5 'BarButtonItem5
' '
Me.BarButtonItem5.Caption = "Markierte Zeilen übermitteln" Me.BarButtonItem5.Caption = "Markierte Zeilen übermitteln"
Me.BarButtonItem5.Id = 11 Me.BarButtonItem5.Id = 11
Me.BarButtonItem5.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.itemtypechecked Me.BarButtonItem5.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.itemtypechecked
Me.BarButtonItem5.Name = "BarButtonItem5" Me.BarButtonItem5.Name = "BarButtonItem5"
' '
'txtVersion 'txtVersion
@ -259,21 +259,21 @@ Partial Class frmImportMain_old
' '
Me.btnDeletePosition.Caption = "Zeile löschen" Me.btnDeletePosition.Caption = "Zeile löschen"
Me.btnDeletePosition.Id = 13 Me.btnDeletePosition.Id = 13
Me.btnDeletePosition.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.deletetablerows Me.btnDeletePosition.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.deletetablerows
Me.btnDeletePosition.Name = "btnDeletePosition" Me.btnDeletePosition.Name = "btnDeletePosition"
' '
'BarButtonItem7 'BarButtonItem7
' '
Me.BarButtonItem7.Caption = "Artikel ersetzen" Me.BarButtonItem7.Caption = "Artikel ersetzen"
Me.BarButtonItem7.Id = 14 Me.BarButtonItem7.Id = 14
Me.BarButtonItem7.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.tableproperties Me.BarButtonItem7.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.tableproperties
Me.BarButtonItem7.Name = "BarButtonItem7" Me.BarButtonItem7.Name = "BarButtonItem7"
' '
'btnPreviewReport 'btnPreviewReport
' '
Me.btnPreviewReport.Caption = "Belegvorschau für aktuelle Zeile öffnen" Me.btnPreviewReport.Caption = "Belegvorschau für aktuelle Zeile öffnen"
Me.btnPreviewReport.Id = 16 Me.btnPreviewReport.Id = 16
Me.btnPreviewReport.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.preview Me.btnPreviewReport.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.preview
Me.btnPreviewReport.Name = "btnPreviewReport" Me.btnPreviewReport.Name = "btnPreviewReport"
' '
'btnReportPreview 'btnReportPreview
@ -287,7 +287,7 @@ Partial Class frmImportMain_old
Me.btnReloadDocument.Caption = "Aktuelles Dokument erneut laden" Me.btnReloadDocument.Caption = "Aktuelles Dokument erneut laden"
Me.btnReloadDocument.Enabled = False Me.btnReloadDocument.Enabled = False
Me.btnReloadDocument.Id = 18 Me.btnReloadDocument.Id = 18
Me.btnReloadDocument.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.paymentrefund Me.btnReloadDocument.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.paymentrefund
Me.btnReloadDocument.Name = "btnReloadDocument" Me.btnReloadDocument.Name = "btnReloadDocument"
' '
'RibbonPage1 'RibbonPage1
@ -939,7 +939,7 @@ Partial Class frmImportMain_old
Me.Controls.Add(Me.SplitContainerControl3) Me.Controls.Add(Me.SplitContainerControl3)
Me.Controls.Add(Me.RibbonStatusBar) Me.Controls.Add(Me.RibbonStatusBar)
Me.Controls.Add(Me.RibbonControl) Me.Controls.Add(Me.RibbonControl)
Me.IconOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.tilelabels Me.IconOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.tilelabels
Me.Name = "frmImportMain_old" Me.Name = "frmImportMain_old"
Me.Ribbon = Me.RibbonControl Me.Ribbon = Me.RibbonControl
Me.StatusBar = Me.RibbonStatusBar Me.StatusBar = Me.RibbonStatusBar

View File

@ -7,14 +7,14 @@ Imports DigitalData.Modules.Database
Imports DigitalData.Modules.Config Imports DigitalData.Modules.Config
Imports DigitalData.Controls.SQLConfig Imports DigitalData.Controls.SQLConfig
Imports DigitalData.GUIs.Common Imports DigitalData.GUIs.Common
Imports ImporterShared.Documents Imports MultiTool.Shared.Documents
Imports ImporterShared.Winline Imports MultiTool.Shared.Winline
Imports ImporterForm.Positions Imports MultiTool.Form.Positions
Public Class frmImportMain_old Public Class frmImportMain_old
Public LogConfig As LogConfig Public LogConfig As LogConfig
Public Logger As Logger Public Logger As Logger
Public ConfigManager As ConfigManager(Of ImporterShared.Config) Public ConfigManager As ConfigManager(Of [Shared].Config)
Public Database As MSSQLServer Public Database As MSSQLServer
Public DocumentLoader As DocumentLoader Public DocumentLoader As DocumentLoader
Public GridBuilder As GridBuilder Public GridBuilder As GridBuilder
@ -31,7 +31,7 @@ Public Class frmImportMain_old
Logger = LogConfig.GetLogger() Logger = LogConfig.GetLogger()
Logger.Info("EDI Document Importer, Version [{0}]", Application.ProductVersion) Logger.Info("EDI Document Importer, Version [{0}]", Application.ProductVersion)
ConfigManager = New ConfigManager(Of ImporterShared.Config)(LogConfig, ConfigManager = New ConfigManager(Of MultiTool.Shared.Config)(LogConfig,
Application.UserAppDataPath, Application.UserAppDataPath,
Application.CommonAppDataPath, Application.CommonAppDataPath,
Application.StartupPath) Application.StartupPath)

View File

@ -58,21 +58,21 @@ Partial Class frmRowEditor
' '
Me.btnSave.Caption = "Speichern und Schließen" Me.btnSave.Caption = "Speichern und Schließen"
Me.btnSave.Id = 1 Me.btnSave.Id = 1
Me.btnSave.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.save Me.btnSave.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.save
Me.btnSave.Name = "btnSave" Me.btnSave.Name = "btnSave"
' '
'btnApplyFromWinline 'btnApplyFromWinline
' '
Me.btnApplyFromWinline.Caption = "Aus Winline übernehmen" Me.btnApplyFromWinline.Caption = "Aus Winline übernehmen"
Me.btnApplyFromWinline.Id = 2 Me.btnApplyFromWinline.Id = 2
Me.btnApplyFromWinline.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.actions_arrow4down Me.btnApplyFromWinline.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_arrow4down
Me.btnApplyFromWinline.Name = "btnApplyFromWinline" Me.btnApplyFromWinline.Name = "btnApplyFromWinline"
' '
'btnApplyFromOriginal 'btnApplyFromOriginal
' '
Me.btnApplyFromOriginal.Caption = "Auf Originalwert setzen" Me.btnApplyFromOriginal.Caption = "Auf Originalwert setzen"
Me.btnApplyFromOriginal.Id = 3 Me.btnApplyFromOriginal.Id = 3
Me.btnApplyFromOriginal.ImageOptions.SvgImage = Global.ImporterForm.My.Resources.Resources.redo Me.btnApplyFromOriginal.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.redo
Me.btnApplyFromOriginal.Name = "btnApplyFromOriginal" Me.btnApplyFromOriginal.Name = "btnApplyFromOriginal"
' '
'RibbonPage1 'RibbonPage1

View File

@ -1,10 +1,10 @@
Imports DevExpress.XtraGrid.Columns Imports DevExpress.XtraGrid.Columns
Imports DevExpress.XtraGrid.Views.Grid Imports DevExpress.XtraGrid.Views.Grid
Imports DevExpress.XtraVerticalGrid.Rows Imports DevExpress.XtraVerticalGrid.Rows
Imports ImporterShared.Documents Imports MultiTool.Shared.Documents
Imports ImporterShared.DocumentRow Imports MultiTool.Shared.DocumentRow
Imports DevExpress.XtraEditors.Repository Imports DevExpress.XtraEditors.Repository
Imports ImporterShared.Winline Imports MultiTool.Shared.Winline
Imports DigitalData.Modules.Language Imports DigitalData.Modules.Language
Imports DevExpress.XtraEditors.Controls Imports DevExpress.XtraEditors.Controls
Imports System.Globalization Imports System.Globalization
@ -14,7 +14,7 @@ Public Class frmRowEditor
Private ReadOnly _Columns As List(Of String) Private ReadOnly _Columns As List(Of String)
Private ReadOnly _DataTable As New DataTable Private ReadOnly _DataTable As New DataTable
Private ReadOnly _Accounts As List(Of Account) Private ReadOnly _Accounts As List(Of Account)
Private ReadOnly _DocumentRow As ImporterShared.DocumentRow Private ReadOnly _DocumentRow As MultiTool.Shared.DocumentRow
Private ReadOnly DatePicker As New RepositoryItemDateEdit Private ReadOnly DatePicker As New RepositoryItemDateEdit
Private ReadOnly MultilineEditor As New RepositoryItemMemoEdit Private ReadOnly MultilineEditor As New RepositoryItemMemoEdit
@ -27,13 +27,13 @@ Public Class frmRowEditor
Private Const COL_VALUE_EXTERNAL = "VALUE_EXTERNAL" Private Const COL_VALUE_EXTERNAL = "VALUE_EXTERNAL"
Private Const COL_VALUE_FINAL = "VALUE_FINAL" Private Const COL_VALUE_FINAL = "VALUE_FINAL"
Public ReadOnly Property DocumentRow As ImporterShared.DocumentRow Public ReadOnly Property DocumentRow As MultiTool.Shared.DocumentRow
Get Get
Return _DocumentRow Return _DocumentRow
End Get End Get
End Property End Property
Public Sub New(pColumns As List(Of String), pDocumentRow As ImporterShared.DocumentRow, pAccounts As List(Of Account)) Public Sub New(pColumns As List(Of String), pDocumentRow As MultiTool.Shared.DocumentRow, pAccounts As List(Of Account))
' Dieser Aufruf ist für den Designer erforderlich. ' Dieser Aufruf ist für den Designer erforderlich.
InitializeComponent() InitializeComponent()

View File

@ -1,6 +1,6 @@
Imports System.IO Imports System.IO
Imports ImporterShared.Schemas Imports MultiTool.Shared.Schemas
Imports ImporterShared.Winline Imports MultiTool.Shared.Winline
Namespace Documents Namespace Documents
Public Class Document Public Class Document

View File

@ -1,8 +1,8 @@
Imports System.Globalization Imports System.Globalization
Imports System.IO Imports System.IO
Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Logging
Imports ImporterShared.Schemas Imports MultiTool.Shared.Schemas
Imports ImporterShared.Winline Imports MultiTool.Shared.Winline
Namespace Documents Namespace Documents
Public Class DocumentLoader Public Class DocumentLoader

View File

@ -6,8 +6,8 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}</ProjectGuid> <ProjectGuid>{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}</ProjectGuid>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<RootNamespace>ImporterShared</RootNamespace> <RootNamespace>MultiTool.Shared</RootNamespace>
<AssemblyName>ImporterShared</AssemblyName> <AssemblyName>MultiTool.Shared</AssemblyName>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<MyType>Windows</MyType> <MyType>Windows</MyType>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
@ -19,7 +19,7 @@
<DefineDebug>true</DefineDebug> <DefineDebug>true</DefineDebug>
<DefineTrace>true</DefineTrace> <DefineTrace>true</DefineTrace>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<DocumentationFile>ImporterShared.xml</DocumentationFile> <DocumentationFile>MultiTool.Shared.xml</DocumentationFile>
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn> <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@ -28,7 +28,7 @@
<DefineTrace>true</DefineTrace> <DefineTrace>true</DefineTrace>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
<DocumentationFile>ImporterShared.xml</DocumentationFile> <DocumentationFile>MultiTool.Shared.xml</DocumentationFile>
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn> <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
@ -107,6 +107,7 @@
<Compile Include="My Project\Application.Designer.vb"> <Compile Include="My Project\Application.Designer.vb">
<AutoGen>True</AutoGen> <AutoGen>True</AutoGen>
<DependentUpon>Application.myapp</DependentUpon> <DependentUpon>Application.myapp</DependentUpon>
<DesignTime>True</DesignTime>
</Compile> </Compile>
<Compile Include="My Project\Resources.Designer.vb"> <Compile Include="My Project\Resources.Designer.vb">
<AutoGen>True</AutoGen> <AutoGen>True</AutoGen>

View File

@ -1,10 +1,10 @@
'------------------------------------------------------------------------------ '------------------------------------------------------------------------------
' <auto-generated> ' <auto-generated>
' This code was generated by a tool. ' Dieser Code wurde von einem Tool generiert.
' Runtime Version:4.0.30319.42000 ' Laufzeitversion:4.0.30319.42000
' '
' Changes to this file may cause incorrect behavior and will be lost if ' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
' the code is regenerated. ' der Code erneut generiert wird.
' </auto-generated> ' </auto-generated>
'------------------------------------------------------------------------------ '------------------------------------------------------------------------------

View File

@ -8,11 +8,11 @@ Imports System.Runtime.InteropServices
' Werte der Assemblyattribute überprüfen ' Werte der Assemblyattribute überprüfen
<Assembly: AssemblyTitle("ImporterShared")> <Assembly: AssemblyTitle("MultiTool.Shared")>
<Assembly: AssemblyDescription("")> <Assembly: AssemblyDescription("")>
<Assembly: AssemblyCompany("")> <Assembly: AssemblyCompany("")>
<Assembly: AssemblyProduct("ImporterShared")> <Assembly: AssemblyProduct("MultiTool.Shared")>
<Assembly: AssemblyCopyright("Copyright © 2021")> <Assembly: AssemblyCopyright("Copyright © 2021")>
<Assembly: AssemblyTrademark("")> <Assembly: AssemblyTrademark("")>
<Assembly: ComVisible(False)> <Assembly: ComVisible(False)>

View File

@ -0,0 +1,63 @@
'------------------------------------------------------------------------------
' <auto-generated>
' Dieser Code wurde von einem Tool generiert.
' Laufzeitversion:4.0.30319.42000
'
' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
' der Code erneut generiert wird.
' </auto-generated>
'------------------------------------------------------------------------------
Option Strict On
Option Explicit On
Imports System
Namespace My.Resources
'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
'-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
'''<summary>
''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
'''</summary>
<Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _
Friend Module Resources
Private resourceMan As Global.System.Resources.ResourceManager
Private resourceCulture As Global.System.Globalization.CultureInfo
'''<summary>
''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
'''</summary>
<Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
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)
resourceMan = temp
End If
Return resourceMan
End Get
End Property
'''<summary>
''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
'''</summary>
<Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Friend Property Culture() As Global.System.Globalization.CultureInfo
Get
Return resourceCulture
End Get
Set
resourceCulture = value
End Set
End Property
End Module
End Namespace

View File

@ -1,10 +1,10 @@
'------------------------------------------------------------------------------ '------------------------------------------------------------------------------
' <auto-generated> ' <auto-generated>
' This code was generated by a tool. ' Dieser Code wurde von einem Tool generiert.
' Runtime Version:4.0.30319.42000 ' Laufzeitversion:4.0.30319.42000
' '
' Changes to this file may cause incorrect behavior and will be lost if ' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
' the code is regenerated. ' der Code erneut generiert wird.
' </auto-generated> ' </auto-generated>
'------------------------------------------------------------------------------ '------------------------------------------------------------------------------
@ -13,42 +13,42 @@ Option Explicit On
Namespace My Namespace My
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _ <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0"), _ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0"), _
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _ Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Partial Friend NotInheritable Class MySettings Partial Friend NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase Inherits Global.System.Configuration.ApplicationSettingsBase
Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings) Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
#Region "My.Settings Auto-Save Functionality" #Region "Automatische My.Settings-Speicherfunktion"
#If _MyType = "WindowsForms" Then #If _MyType = "WindowsForms" Then
Private Shared addedHandler As Boolean Private Shared addedHandler As Boolean
Private Shared addedHandlerLockObject As New Object Private Shared addedHandlerLockObject As New Object
<Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _ <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs)
If My.Application.SaveMySettingsOnExit Then If My.Application.SaveMySettingsOnExit Then
My.Settings.Save() My.Settings.Save()
End If End If
End Sub End Sub
#End If #End If
#End Region #End Region
Public Shared ReadOnly Property [Default]() As MySettings Public Shared ReadOnly Property [Default]() As MySettings
Get Get
#If _MyType = "WindowsForms" Then #If _MyType = "WindowsForms" Then
If Not addedHandler Then If Not addedHandler Then
SyncLock addedHandlerLockObject SyncLock addedHandlerLockObject
If Not addedHandler Then If Not addedHandler Then
AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
addedHandler = True addedHandler = True
End If End If
End SyncLock End SyncLock
End If End If
#End If #End If
Return defaultInstance Return defaultInstance
End Get End Get
@ -64,9 +64,9 @@ Namespace My
Friend Module MySettingsProperty Friend Module MySettingsProperty
<Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")> _ <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")> _
Friend ReadOnly Property Settings() As Global.ImporterShared.My.MySettings Friend ReadOnly Property Settings() As Global.MultiTool.[Shared].My.MySettings
Get Get
Return Global.ImporterShared.My.MySettings.Default Return Global.MultiTool.[Shared].My.MySettings.Default
End Get End Get
End Property End Property
End Module End Module

Some files were not shown because too many files have changed in this diff Show More