Skip to content

Compatibility for newest version #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IDeserveToBeWrited wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Compatibility for newest version #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2fefd2e
Polished Polish translation
IDeserveToBeWrited May 20, 2018
53b3a15
Added compatibility for new log format and trucks
IDeserveToBeWrited May 20, 2018
b559e66
New trucks
IDeserveToBeWrited Apr 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ExtDriversFromLogs/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,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>
Expand Down Expand Up @@ -71,7 +71,7 @@
<value>True</value>
</setting>
<setting name="regPattern" serializeAs="String">
<value>\[(?&lt;tHours&gt;[\d{2}]+):(?&lt;tMinutes&gt;[\d{2}]+):(?&lt;tSeconds&gt;[\d{2}]+)\]\s+Spawning\s+GameTruck\s+\((?&lt;name&gt;.+)\((?&lt;gameID&gt;\d+)\)\s+-\s+TruckersMP\s+ID:(?&lt;ets2mpID&gt;\d+)(?&lt;adInfo&gt;.*)\)\s+Additional\s+data:\s+(?&lt;adData&gt;.+)[\s\S]\[00\]\s+.+\s+.\/def\/vehicle\/truck\/(?&lt;truck&gt;.+)\/data.sii.</value>
<value>\[(?&lt;tHours&gt;[\d{2}]+):(?&lt;tMinutes&gt;[\d{2}]+):(?&lt;tSeconds&gt;[\d{2}]+)\]\s+Spawning\s+GameTruck\s+\((?&lt;name&gt;.+)\((?&lt;gameID&gt;\d+)\)\s+-\s+(TruckersMP\s+ID:|TMPID:\s|ETS2MPId:)(?&lt;ets2mpID&gt;\d+)(?&lt;adInfo&gt;.*)\)\s+Additional\s+data:\s+(?&lt;adData&gt;.+)[\s\S]\[00\]\s+.+\s+.\/def\/vehicle\/truck\/(?&lt;truck&gt;.+)\/data.sii.</value>
</setting>
<setting name="gameATS" serializeAs="String">
<value>False</value>
Expand Down
4 changes: 2 additions & 2 deletions ExtDriversFromLogs/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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("")]
4 changes: 2 additions & 2 deletions ExtDriversFromLogs/Properties/Settings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ExtDriversFromLogs/Properties/Settings.settings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
&lt;colNickname&gt;Game Nickname&lt;/colNickname&gt;
&lt;colGameID&gt;Game ID&lt;/colGameID&gt;
&lt;groupOpen&gt;Open log&lt;/groupOpen&gt;
&lt;btnOpen&gt;Form today&lt;/btnOpen&gt;
&lt;btnOpen&gt;From today&lt;/btnOpen&gt;
&lt;btnOpenYesterday&gt;From yesterday&lt;/btnOpenYesterday&gt;
&lt;btnOpenAnother&gt;Open file&lt;/btnOpenAnother&gt;
&lt;selectGame&gt;Select game&lt;/selectGame&gt;
Expand Down
21 changes: 18 additions & 3 deletions ExtDriversFromLogs/mainForm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -86,6 +98,9 @@ public string truck {
case "kenworth.w900":
truckName = "Kenworth W900";
break;
case "volvo.vnl":
truckName = "Volvo VNL";
break;
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions lang/pol.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
<groupLanguage>Język</groupLanguage>
<groupOptionSearch>Opcje wyszukania</groupOptionSearch>
<chckById>Wyszukaj po ID</chckById>
<chckByTag>Wyszukaj po Tag</chckByTag>
<chckCCase>Wielkość liter</chckCCase>
<chckByTag>Wyszukaj po Tagu</chckByTag>
<chckCCase>Bierz pod uwagę wielkość liter</chckCCase>
<btnSave>Zapisz</btnSave>
<groupRegLine>Główne wyrażenie</groupRegLine>
<groupRegLine>Linia wyrażenia regularnego</groupRegLine>
<lblRegAttention>Nie modyfikuj o ile nie wiesz co to jest!</lblRegAttention>
<btnRestore>Przywróć domyślne</btnRestore>
</optionsForm>
Expand Down