diff --git a/StarCitizen Helper/Controls/WL_Modification.resx b/StarCitizen Helper/Controls/WL_Modification.resx index d04af04..c9edf8c 100644 --- a/StarCitizen Helper/Controls/WL_Modification.resx +++ b/StarCitizen Helper/Controls/WL_Modification.resx @@ -120,6 +120,9 @@ True + + True + True diff --git a/StarCitizen Helper/Controls/WL_Pack.vb b/StarCitizen Helper/Controls/WL_Pack.vb index 98806e6..b779c02 100644 --- a/StarCitizen Helper/Controls/WL_Pack.vb +++ b/StarCitizen Helper/Controls/WL_Pack.vb @@ -49,6 +49,7 @@ Public Class WL_Pack Private sPath_Folder_Meta As String = Nothing Private sName_File_Meta As String = Nothing Private sPath_File_Meta As String = Nothing + Private sPath_File_AltLocal As String = Nothing Private hashGitList As String = Nothing Private hashCurrentList As String = Nothing @@ -129,6 +130,17 @@ Public Class WL_Pack End Set End Property + Public Property Property_FilePath_AltLocal() As String + Get + Return Me.sPath_File_AltLocal + End Get + Set(ByVal Value As String) + Me.sPath_File_AltLocal = Value + End Set + End Property + + + Public Property Property_LocalizationList() As List(Of String) Get Return Me.lLocal_LangList @@ -700,8 +712,12 @@ Fin: RaiseEvent _Event_ListGit_List_Change_After() If Me.Property_FilePath_Config Is Nothing Then Exit Sub Dim _SYSTEM As New Class_INI + Dim _ALTLANG As New Class_INI _SYSTEM.SkipInvalidLines = True + _ALTLANG.SkipInvalidLines = True + _SYSTEM._FSO = Me.Property_FilePath_Config + _ALTLANG._FSO = Me.Property_FilePath_AltLocal Me.Property_LocalizationDefault = _SYSTEM._GET_VALUE(Nothing, "g_language", Nothing, _VARS.utf8NoBom).Value.Trim If Len(Me.Property_LocalizationDefault) > 0 Then @@ -710,7 +726,7 @@ Fin: RaiseEvent _Event_ListGit_List_Change_After() For Each elem As String In Split(_SYSTEM._GET_VALUE(Nothing, "sys_languages", Me.Property_LocalizationDefault, _VARS.utf8NoBom).Value, ",") Dim temp As String = Trim(elem) LocalList.Add(temp) - AltLocalList.Add(_SYSTEM._GET_VALUE(Nothing, temp, temp, _VARS.utf8NoBom).Value) + AltLocalList.Add(_ALTLANG._GET_VALUE(Nothing, temp, temp, _VARS.utf8NoBom).Value) Next Me.Property_AltLocalizationList = AltLocalList Me.Property_LocalizationList = LocalList diff --git a/StarCitizen Helper/Modules/Module_INI.vb b/StarCitizen Helper/Modules/Module_INI.vb index ada250f..979a19f 100644 --- a/StarCitizen Helper/Modules/Module_INI.vb +++ b/StarCitizen Helper/Modules/Module_INI.vb @@ -1,5 +1,7 @@ Imports IniParser Imports IniParser.Parser +Imports SC.Class_FSO + Module Module_INI @@ -12,11 +14,15 @@ Module Module_INI Public Key As String Public Value As String Public SkipInvalidLines As Boolean + Public NewLineStr As String = Nothing + End Class Class Class_INI - Private Config = New FileIniDataParser() + Private Config As FileIniDataParser = New FileIniDataParser() Private FilePath As String = Nothing Public SkipInvalidLines As Boolean = False + Public NewLineStr = vbCrLf + Public FSO As New Class_FSO Public WriteOnly Property _FSO() As String Set(ByVal Value As String) @@ -64,14 +70,25 @@ Module Module_INI result.Key = Key result.Value = DefaultValue result.SkipInvalidLines = Me.SkipInvalidLines + result.NewLineStr = Me.NewLineStr result.ErrDescription = _LANG._Get("File_MSG_SectionNotFound", Section, _APP.configFullPath) - Me.Config.parser.configuration.skipinvalidlines = Me.SkipInvalidLines - Dim Data As IniParser.Model.IniData = Me.Config.ReadFile(Me.FilePath) - Data = Me.Config.ReadFile(Me.FilePath, Encoding) - Data.Configuration.SkipInvalidLines = Me.SkipInvalidLines - Try + Me.Config.Parser.Configuration.SkipInvalidLines = Me.SkipInvalidLines + Me.Config.Parser.Configuration.NewLineStr = Me.NewLineStr + + + Dim fileData As String = FSO._ReadTextFile(Me.FilePath, Encoding) + fileData = Replace(fileData, vbCrLf, vbLf) + fileData = Replace(fileData, vbCr, vbLf) + fileData = Replace(fileData, vbLf, vbCrLf) + Dim Data As IniParser.Model.IniData = Me.Config.Parser.Parse(fileData) + + 'Dim Data As IniParser.Model.IniData = Me.Config.ReadFile(Me.FilePath, Encoding) + Data.Configuration.NewLineStr = Me.NewLineStr + Data.Configuration.SkipInvalidLines = Me.SkipInvalidLines + + If Section IsNot Nothing Then If Data.Sections.Count > 0 Then Dim DataSection As IniParser.Model.SectionDataCollection = Data.Sections diff --git a/StarCitizen Helper/Modules/Module_MAIN.vb b/StarCitizen Helper/Modules/Module_MAIN.vb index f61d6fb..d41227c 100644 --- a/StarCitizen Helper/Modules/Module_MAIN.vb +++ b/StarCitizen Helper/Modules/Module_MAIN.vb @@ -104,6 +104,7 @@ Module Module_MAIN MAIN_THREAD.WL_Mod._Update(2) 'Build list and select localization in Mod Tab + MAIN_THREAD.WL_Pack.Property_FilePath_AltLocal = _FSO._CombinePath(MAIN_THREAD.WL_Mod.Property_GameRootFolderPath, MAIN_THREAD.WL_Mod.Property_GameModFolderName, "languages.ini") MAIN_THREAD.WL_Pack.GetLocals() LoadUserCfgFile() diff --git a/StarCitizen Helper/My Project/AssemblyInfo.vb b/StarCitizen Helper/My Project/AssemblyInfo.vb index 4758e0e..ce4ab52 100644 --- a/StarCitizen Helper/My Project/AssemblyInfo.vb +++ b/StarCitizen Helper/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + + diff --git a/install/package/Input/StarCitizen Helper.exe b/install/package/Input/StarCitizen Helper.exe index 34cf075..a5bb2ce 100644 Binary files a/install/package/Input/StarCitizen Helper.exe and b/install/package/Input/StarCitizen Helper.exe differ diff --git a/install/package/Output/mysetup.exe b/install/package/Output/mysetup.exe index 4a2fb12..c4cd62b 100644 Binary files a/install/package/Output/mysetup.exe and b/install/package/Output/mysetup.exe differ diff --git a/install/package/install.iss b/install/package/install.iss index 910fc7c..6997c69 100644 --- a/install/package/install.iss +++ b/install/package/install.iss @@ -1,6 +1,6 @@ [Setup] -AppVersion=1.8.21.124 +AppVersion=1.8.21.125 AppName=StarCitizen Helper DefaultDirName={userappdata}\StarCitizen Helper DefaultGroupName=StarCitizen Helper diff --git a/install/setup.exe b/install/setup.exe index 4a2fb12..c4cd62b 100644 Binary files a/install/setup.exe and b/install/setup.exe differ