Compare commits

...

3 Commits

Author SHA1 Message Date
Jonathan Jenne
0728bb14bc Version 2.3.0.1 2020-12-11 13:12:58 +01:00
Jonathan Jenne
b02d87c2a4 Fix Icon in frm Start, Resources 2020-12-11 13:12:49 +01:00
Jonathan Jenne
158c043675 Reload Indicies when ObjectType changes 2020-12-11 11:43:34 +01:00
5 changed files with 15 additions and 9 deletions

View File

@@ -13,6 +13,8 @@
<MyType>WindowsForms</MyType> <MyType>WindowsForms</MyType>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<IsWebBootstrapper>false</IsWebBootstrapper>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl> <PublishUrl>publish\</PublishUrl>
<Install>true</Install> <Install>true</Install>
<InstallFrom>Disk</InstallFrom> <InstallFrom>Disk</InstallFrom>
@@ -25,10 +27,8 @@
<MapFileExtensions>true</MapFileExtensions> <MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision> <ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion> <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled> <BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
@@ -63,7 +63,7 @@
<OptionInfer>On</OptionInfer> <OptionInfer>On</OptionInfer>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<ApplicationIcon>DD_Icons_ICO_GLOBIX_128.ico</ApplicationIcon> <ApplicationIcon>Resources\DD_Icons_ICO_GLOBIX_128.ico</ApplicationIcon>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<ApplicationManifest>My Project\app.manifest</ApplicationManifest> <ApplicationManifest>My Project\app.manifest</ApplicationManifest>

View File

@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.3.0.0")> <Assembly: AssemblyVersion("2.3.0.1")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: NeutralResourcesLanguageAttribute("")> <Assembly: NeutralResourcesLanguageAttribute("")>

View File

@@ -9,6 +9,8 @@ Public Class frmAdministration
Private SourceAttributes As List(Of String) Private SourceAttributes As List(Of String)
Private SourceObjectTypes As List(Of String) Private SourceObjectTypes As List(Of String)
Private Current_ObjectType As String = ""
Private GroupToDelete As Integer = Nothing Private GroupToDelete As Integer = Nothing
Private IsInsert As Boolean = False Private IsInsert As Boolean = False
Dim frmloaded As Boolean = False Dim frmloaded As Boolean = False
@@ -300,6 +302,8 @@ Public Class frmAdministration
Private Sub OBJEKTTYPComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles OBJEKTTYPComboBox.SelectedIndexChanged Private Sub OBJEKTTYPComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles OBJEKTTYPComboBox.SelectedIndexChanged
If WINDREAM_DIRECTCheckBox.Checked = True Then If WINDREAM_DIRECTCheckBox.Checked = True Then
load_WDIndices() load_WDIndices()
Current_ObjectType = OBJEKTTYPComboBox.Text
End If End If
End Sub End Sub
Sub load_WDIndices() Sub load_WDIndices()
@@ -309,14 +313,14 @@ Public Class frmAdministration
Me.WD_INDEXComboBox.Items.Add("") Me.WD_INDEXComboBox.Items.Add("")
Me.INDEXNAME_AutoIndexCMB.Items.Clear() Me.INDEXNAME_AutoIndexCMB.Items.Clear()
If SourceAttributes Is Nothing Then If SourceAttributes Is Nothing Or Current_ObjectType <> OBJEKTTYPComboBox.Text Then
SourceAttributes = WINDREAM.GetIndiciesByObjecttype(OBJEKTTYPComboBox.Text) SourceAttributes = WINDREAM.GetIndiciesByObjecttype(OBJEKTTYPComboBox.Text)
End If End If
If SourceAttributes IsNot Nothing Then If SourceAttributes IsNot Nothing Then
For Each index As String In SourceAttributes For Each oIndex As String In SourceAttributes
Me.WD_INDEXComboBox.Items.Add(index) Me.WD_INDEXComboBox.Items.Add(oIndex)
INDEXNAME_AutoIndexCMB.Items.Add(index) INDEXNAME_AutoIndexCMB.Items.Add(oIndex)
Next Next
End If End If
End If End If

View File

@@ -192,7 +192,7 @@
<Directory Id="resources.de" Name="de"> <Directory Id="resources.de" Name="de">
<Component Id="GlobalIndexer.Locales.de" Guid="9E7F8C29-44DF-4D38-AD7B-D64B74990CDB"> <Component Id="GlobalIndexer.Locales.de" Guid="9E7F8C29-44DF-4D38-AD7B-D64B74990CDB">
<File Id="Global_Indexer.resources.de" Name="Global_Indexer.resources.dll" Source="de\Global_Indexer.resources.dll"></File> <File Id="Global_Indexer.resources.de_DE" Name="Global_Indexer.resources.dll" Source="de-DE\Global_Indexer.resources.dll"></File>
</Component> </Component>
<Component Id="Devexpress.Locales.de" Guid="6be5ff05-af76-4249-862a-5b13e3c56c2a"> <Component Id="Devexpress.Locales.de" Guid="6be5ff05-af76-4249-862a-5b13e3c56c2a">

View File

@@ -14,6 +14,8 @@
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<DefineConstants>Debug</DefineConstants> <DefineConstants>Debug</DefineConstants>
<LinkerAdditionalOptions>-b "$(SolutionDir)Global_Indexer\bin\$(Configuration)"</LinkerAdditionalOptions> <LinkerAdditionalOptions>-b "$(SolutionDir)Global_Indexer\bin\$(Configuration)"</LinkerAdditionalOptions>
<Cultures>
</Cultures>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>bin\$(Configuration)\</OutputPath> <OutputPath>bin\$(Configuration)\</OutputPath>