diff --git a/ExtDriversFromLogs/App.config b/ExtDriversFromLogs/App.config index 8b7f8ce..2cf98b9 100644 --- a/ExtDriversFromLogs/App.config +++ b/ExtDriversFromLogs/App.config @@ -19,7 +19,7 @@ Game Nickname Game ID Open log - Form today + From today From yesterday Open file Select game @@ -71,7 +71,7 @@ True - \[(?<tHours>[\d{2}]+):(?<tMinutes>[\d{2}]+):(?<tSeconds>[\d{2}]+)\]\s+Spawning\s+GameTruck\s+\((?<name>.+)\((?<gameID>\d+)\)\s+-\s+TruckersMP\s+ID:(?<ets2mpID>\d+)(?<adInfo>.*)\)\s+Additional\s+data:\s+(?<adData>.+)[\s\S]\[00\]\s+.+\s+.\/def\/vehicle\/truck\/(?<truck>.+)\/data.sii. + \[(?<tHours>[\d{2}]+):(?<tMinutes>[\d{2}]+):(?<tSeconds>[\d{2}]+)\]\s+Spawning\s+GameTruck\s+\((?<name>.+)\((?<gameID>\d+)\)\s+-\s+(TruckersMP\s+ID:|TMPID:\s|ETS2MPId:)(?<ets2mpID>\d+)(?<adInfo>.*)\)\s+Additional\s+data:\s+(?<adData>.+)[\s\S]\[00\]\s+.+\s+.\/def\/vehicle\/truck\/(?<truck>.+)\/data.sii. False diff --git a/ExtDriversFromLogs/Properties/AssemblyInfo.cs b/ExtDriversFromLogs/Properties/AssemblyInfo.cs index 532896f..d080296 100644 --- a/ExtDriversFromLogs/Properties/AssemblyInfo.cs +++ b/ExtDriversFromLogs/Properties/AssemblyInfo.cs @@ -33,6 +33,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.2.1.0")] -[assembly: AssemblyFileVersion("0.2.1.0")] +[assembly: AssemblyVersion("0.2.3.0")] +[assembly: AssemblyFileVersion("0.2.3.0")] [assembly: NeutralResourcesLanguageAttribute("")] diff --git a/ExtDriversFromLogs/Properties/Settings.Designer.cs b/ExtDriversFromLogs/Properties/Settings.Designer.cs index c94b31e..f6a865e 100644 --- a/ExtDriversFromLogs/Properties/Settings.Designer.cs +++ b/ExtDriversFromLogs/Properties/Settings.Designer.cs @@ -28,7 +28,7 @@ public static Settings Default { [global::System.Configuration.DefaultSettingValueAttribute("\r\n\r\n \r" + "\n Truck\r\n Tag\r\n Game" + " Nickname\r\n Game ID\r\n Open" + - " log\r\n Form today\r\n From " + + " log\r\n From today\r\n From " + "yesterday\r\n Open file\r\n " + " Select game\r\n Search\r\n " + " Options\r\n Exit\r\n [\d{2}]+):(?[\d{2}]+):(?[\d{2}]+)\]\s+Spawning\s+GameTruck\s+\((?.+)\((?\d+)\)\s+-\s+TruckersMP\s+ID:(?\d+)(?.*)\)\s+Additional\s+data:\s+(?.+)[\s\S]\[00\]\s+.+\s+.\/def\/vehicle\/truck\/(?.+)\/data.sii.")] + [global::System.Configuration.DefaultSettingValueAttribute(@"\[(?[\d{2}]+):(?[\d{2}]+):(?[\d{2}]+)\]\s+Spawning\s+GameTruck\s+\((?.+)\((?\d+)\)\s+-\s+(TruckersMP\s+ID:|TMPID:\s|ETS2MPId:)(?\d+)(?.*)\)\s+Additional\s+data:\s+(?.+)[\s\S]\[00\]\s+.+\s+.\/def\/vehicle\/truck\/(?.+)\/data.sii.")] public string regPattern { get { return ((string)(this["regPattern"])); diff --git a/ExtDriversFromLogs/Properties/Settings.settings b/ExtDriversFromLogs/Properties/Settings.settings index 31fb0e0..b6c6fff 100644 --- a/ExtDriversFromLogs/Properties/Settings.settings +++ b/ExtDriversFromLogs/Properties/Settings.settings @@ -11,7 +11,7 @@ <colNickname>Game Nickname</colNickname> <colGameID>Game ID</colGameID> <groupOpen>Open log</groupOpen> - <btnOpen>Form today</btnOpen> + <btnOpen>From today</btnOpen> <btnOpenYesterday>From yesterday</btnOpenYesterday> <btnOpenAnother>Open file</btnOpenAnother> <selectGame>Select game</selectGame> diff --git a/ExtDriversFromLogs/mainForm.cs b/ExtDriversFromLogs/mainForm.cs index 2154db6..a4ad6f4 100644 --- a/ExtDriversFromLogs/mainForm.cs +++ b/ExtDriversFromLogs/mainForm.cs @@ -50,6 +50,9 @@ public string truck { case "man.tgx": truckName = "MAN TGX"; break; + case "man.tgx_euro6": + truckName = "MAN TGX Euro6"; + break; case "mercedes.actros": truckName = "Mercedes Actros"; break; @@ -63,20 +66,29 @@ public string truck { truckName = "Renault Premium"; break; case "scania.r": - truckName = "Scania R"; + truckName = "Scania R 2012"; break; case "scania.streamline": truckName = "Scania StreamLine"; break; + case "scania.r_2016": + truckName = "Scania R"; + break; + case "scania.s_2016": + truckName = "Scania S"; + break; case "volvo.fh16": - truckName = "Volvo FH16 (2009)"; + truckName = "Volvo FH16 2009"; break; case "volvo.fh16_2012": - truckName = "Volvo FH16 (2012)"; + truckName = "Volvo FH16 2012"; break; case "skoda.superb": truckName = "Scout Super_D"; break; + case "peterbilt.389": + truckName = "Peterbilt 389"; + break; case "peterbilt.579": truckName = "Peterbilt 579"; break; @@ -86,6 +98,9 @@ public string truck { case "kenworth.w900": truckName = "Kenworth W900"; break; + case "volvo.vnl": + truckName = "Volvo VNL"; + break; } } } diff --git a/lang/pol.xml b/lang/pol.xml index f931616..f51d4da 100644 --- a/lang/pol.xml +++ b/lang/pol.xml @@ -22,10 +22,10 @@ Język Opcje wyszukania Wyszukaj po ID - Wyszukaj po Tag - Wielkość liter + Wyszukaj po Tagu + Bierz pod uwagę wielkość liter Zapisz - Główne wyrażenie + Linia wyrażenia regularnego Nie modyfikuj o ile nie wiesz co to jest! Przywróć domyślne