1.2.3

- Fixed an issue with '[!] ' highlighted messages being ignored.

GTAWorld Screenshot Editor/Controllers/ChatParser.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -120,19 +121,18 @@ public static string ParseChatLog(string directoryPath, int linesToParse = 100,
                 log = log.TrimEnd('\r', '\n');                  // Remove the `new line` characters from the end
 
                 PreviousLog = log;
-                
+
                 //remove timestamps from log
                 log = Regex.Replace(log, @"\[\d{1,2}:\d{1,2}:\d{1,2}\] ", string.Empty);
 
+                //remove '[!] ' highlight on chat lines if any.
+                log = Regex.Replace(log, @"\[!\] ", string.Empty);
+
                 //split log into lines
                 var lines = log.Split(new[] { "\n", "\r\n" }, StringSplitOptions.RemoveEmptyEntries).ToList();
 
                 //remvoe paid date if you were paid
-                lines.ForEach(fe =>
-                    Regex.Replace(fe, @"( \(\d{2}/[A-z]{3}/\d{4} - \d{2}:\d{2}:\d{2}\))", string.Empty));
-
-                //remove '[!] ' highlight on chat lines if any.
-                lines.ForEach(fe => fe = fe.Replace("[!] ", ""));
+                lines.ForEach(fe => fe = Regex.Replace(fe, @"( \(\d{2}/[A-z]{3}/\d{4} - \d{2}:\d{2}:\d{2}\))", string.Empty));
 
                 //pull only n > 100  or n < 1000 of last lines
                 if (lines.Count > 100)

GTAWorld Screenshot Editor/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@
 // 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("1.2.2.0")]
-[assembly: AssemblyFileVersion("1.2.2.0")]
+[assembly: AssemblyVersion("1.2.3.0")]
+[assembly: AssemblyFileVersion("1.2.3.0")]

GTAWorld Screenshot Editor/ViewModels/MainViewModel.cs

@@ -1134,8 +1134,8 @@ private void GenerateText()
                     @"( \(\d{2}/[A-z]{3}/\d{4} - \d{2}:\d{2}:\d{2}\))", string.Empty);
 
                 //remove highlight from line
-                if (str.StartsWith("[!]"))
-                    str = str.Replace("[!] ", string.Empty);
+                //if (str.StartsWith("[!]"))
+                //    str = str.Replace("[!] ", string.Empty);
 
                 //if string missing '.' at end, add it.
                 if (line.EndsWith("$xxxx")

GTAWorld Screenshot Editor/bin/Debug/cached_screens/screenshots.cache

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ArrayOfCacheScreenshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <CacheScreenshot>
+    <Guid>9cf0e9ec-c179-4c57-ad67-bbc819df136c-84024c17-03cd-4aae-9ca5-e2cc343130d6</Guid>
+    <ScreenshotDate>2021-11-27T23:29:09.7721771+02:00</ScreenshotDate>
+    <ImageFilePath>cached_screens\screenshot_20211127_112909.jpg</ImageFilePath>
+    <TextBlocks>
+      <TextBlockModel>
+        <Selected>true</Selected>
+        <Margin>
+          <Left>21</Left>
+          <Top>18.006666666666661</Top>
+          <Right>0</Right>
+          <Bottom>0</Bottom>
+        </Margin>
+        <BlockName>Text Block #1</BlockName>
+        <ParsedChat>Shay Ezra says [low]: You Mike.
+Mikhail Argov says [low]: (Hebrew) Had a marathon to run following anti theft tracker. Someone tried ot jack my car.
+Shay Ezra says [low]: (Hebrew) Why you sweating like that, ahi?
+* Ryan Amsalem eyes Mikhail, perking a brow.
+Mikhail Argov says [low]: (Hebrew) No idea who it was, I maanged to shut the engine and track it.
+Mikhail Argov says [low]: (Hebrew) Yes, Ryan some cunt stole it outfront your crib.
+Shay Ezra says [low]: (Hebrew) Beni zonot, annoying kids...
+Ryan Amsalem says [low]: (Hebrew) There are cameras. We will try to get the footage later.
+Shay Ezra says [low]: (Hebrew) At least you caught his face or something?
+Mikhail Argov says [low]: (Hebrew) No, found the car empty.
+Mikhail Argov says [low]: (Hebrew) If I would've found the cunt I'd be probably covered in blood.
+Shay Ezra says: l Baduk.
+Ryan Amsalem says [low]: Ruthless.
+</ParsedChat>
+        <BlackBackgroundOpacity>false</BlackBackgroundOpacity>
+      </TextBlockModel>
+    </TextBlocks>
+    <Text>
+      <Width>1632</Width>
+      <CanvasScale>100</CanvasScale>
+      <ParseLines>100</ParseLines>
+    </Text>
+    <Resolution>
+      <AllowEdit>false</AllowEdit>
+      <Name>1080p</Name>
+      <Width>1920</Width>
+      <Height>1080</Height>
+    </Resolution>
+    <NamesToCensor />
+  </CacheScreenshot>
+  <CacheScreenshot>
+    <Guid>d3d3e65a-8108-435e-81ce-20449847232c-b19d6974-d70a-4a44-9047-a1c33f91ec0f</Guid>
+    <ScreenshotDate>2021-11-06T15:12:40.2381406+02:00</ScreenshotDate>
+    <ImageFilePath>cached_screens\screenshot_20211106_031240.jpg</ImageFilePath>
+    <TextBlocks>
+      <TextBlockModel>
+        <Selected>true</Selected>
+        <Margin>
+          <Left>348</Left>
+          <Top>605.00666666666666</Top>
+          <Right>0</Right>
+          <Bottom>0</Bottom>
+        </Margin>
+        <BlockName>Text Block #1</BlockName>
+        <ParsedChat>Mikhail Argov: toast.
+</ParsedChat>
+        <BlackBackgroundOpacity>false</BlackBackgroundOpacity>
+      </TextBlockModel>
+    </TextBlocks>
+    <Text>
+      <Width>3264</Width>
+      <CanvasScale>100</CanvasScale>
+      <ParseLines>100</ParseLines>
+    </Text>
+    <Resolution>
+      <AllowEdit>false</AllowEdit>
+      <Name>4k</Name>
+      <Width>3840</Width>
+      <Height>2160</Height>
+    </Resolution>
+    <NamesToCensor />
+  </CacheScreenshot>
+  <CacheScreenshot>
+    <Guid>c8a069b2-c2bd-4c64-a768-7a9d9a77b3ff-924b02df-d029-45ac-8944-8c9b099546c5</Guid>
+    <ScreenshotDate>2021-11-06T15:11:05.8465749+02:00</ScreenshotDate>
+    <ImageFilePath>cached_screens\screenshot_20211106_031105.jpg</ImageFilePath>
+    <TextBlocks>
+      <TextBlockModel>
+        <Selected>true</Selected>
+        <Margin>
+          <Left>336</Left>
+          <Top>607.00666666666666</Top>
+          <Right>0</Right>
+          <Bottom>0</Bottom>
+        </Margin>
+        <BlockName>Text Block #1</BlockName>
+        <ParsedChat>Mikhail Argov: toast.
+</ParsedChat>
+        <BlackBackgroundOpacity>false</BlackBackgroundOpacity>
+      </TextBlockModel>
+    </TextBlocks>
+    <Text>
+      <Width>3264</Width>
+      <CanvasScale>100</CanvasScale>
+      <ParseLines>100</ParseLines>
+    </Text>
+    <Resolution>
+      <AllowEdit>false</AllowEdit>
+      <Name>4k</Name>
+      <Width>3840</Width>
+      <Height>2160</Height>
+    </Resolution>
+    <NamesToCensor />
+  </CacheScreenshot>
+</ArrayOfCacheScreenshot>

GTAWorld Screenshot Editor/bin/Release/cached_screens/screenshots.cache

@@ -1,6 +1,124 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ArrayOfCacheScreenshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <CacheScreenshot>
+<<<<<<< HEAD
+    <Guid>1aad3c17-69d7-488d-aeb7-5d6807e08f52-470d897b-efb7-478e-accd-5bfacd757c01</Guid>
+    <ScreenshotDate>2021-11-27T23:31:27.0266691+02:00</ScreenshotDate>
+    <ImageFilePath>cached_screens\screenshot_20211127_113127.jpg</ImageFilePath>
+    <TextBlocks>
+      <TextBlockModel>
+        <Selected>true</Selected>
+        <Margin>
+          <Left>15</Left>
+          <Top>21.006666666666661</Top>
+          <Right>0</Right>
+          <Bottom>0</Bottom>
+        </Margin>
+        <BlockName>Text Block #1</BlockName>
+        <ParsedChat>Mikhail Argov says [low]: (Hebrew) Had a marathon to run following anti theft tracker. Someone tried ot jack my car.
+Shay Ezra says [low]: (Hebrew) Why you sweating like that, ahi?
+* Ryan Amsalem eyes Mikhail, perking a brow.
+Mikhail Argov says [low]: (Hebrew) No idea who it was, I maanged to shut the engine and track it.
+Mikhail Argov says [low]: (Hebrew) Yes, Ryan some cunt stole it outfront your crib.
+Shay Ezra says [low]: (Hebrew) Beni zonot, annoying kids...
+Ryan Amsalem says [low]: (Hebrew) There are cameras. We will try to get the footage later.
+Shay Ezra says [low]: (Hebrew) At least you caught his face or something?
+Mikhail Argov says [low]: (Hebrew) No, found the car empty.
+Mikhail Argov says [low]: (Hebrew) If I would've found the cunt I'd be probably covered in blood.
+Shay Ezra says [low]: Baduk.
+Ryan Amsalem says [low]: Ruthless.
+Mikhail Argov says [low]: (Hebrew) You touch my shit, I don't care you who you are. You ain't walking straight.
+</ParsedChat>
+        <BlackBackgroundOpacity>true</BlackBackgroundOpacity>
+      </TextBlockModel>
+    </TextBlocks>
+    <Text>
+      <Width>1632</Width>
+      <CanvasScale>100</CanvasScale>
+      <ParseLines>200</ParseLines>
+    </Text>
+    <Resolution>
+      <AllowEdit>false</AllowEdit>
+      <Name>1080p</Name>
+      <Width>1920</Width>
+      <Height>1080</Height>
+    </Resolution>
+    <NamesToCensor />
+  </CacheScreenshot>
+  <CacheScreenshot>
+    <Guid>01cdb01f-afdf-4a67-b314-7af982053b3c-d5163b4a-df6b-44ea-a489-5c9f716b3cee</Guid>
+    <ScreenshotDate>2021-11-04T00:59:46.1606794+02:00</ScreenshotDate>
+    <ImageFilePath>cached_screens\screenshot_20211104_125946.jpg</ImageFilePath>
+    <TextBlocks>
+      <TextBlockModel>
+        <Selected>true</Selected>
+        <Margin>
+          <Left>12</Left>
+          <Top>9.00666666666666</Top>
+          <Right>0</Right>
+          <Bottom>0</Bottom>
+        </Margin>
+        <BlockName>Text Block #1</BlockName>
+        <ParsedChat>Elad Gamliel says: Yeah, yeah.
+Vladimir Cheshuk says [low]: Or half of the coke.
+Elad Gamliel says [low]: Prefer the SMG, kapara.
+Vladimir Cheshuk says [low]: Are you sure?
+* Elad Gamliel ponders for a moment.
+Vladimir Cheshuk says [low]: Davai'. Take half of it.
+Elad Gamliel says [low]: How much is half, kapara?
+Mikhail Argov says [low]: Thirty five, for three hundred.
+Vladimir Cheshuk says [low]: Well, from seventy, it's uhhh--- Da...
+Elad Gamliel says [low]: So 60 plus eh...
+Mikhail Argov says [low]: Ninty eight.
+Mikhail Argov says [low]: Totall.
+Vladimir Cheshuk says [low]: He good in math.
+* Vladimir Cheshuk points at Argov.
+Mikhail Argov says [low]: Comes in handy.
+Elad Gamliel says [low]: I'll need to get a mashkanta, ya allah.
+Elad Gamliel says [low]: 100K you say?
+Mikhail Argov says [low]: Almost yea'.
+Vladimir Cheshuk says [low]: Ten grands more, and da.
+Mikhail Argov says [low]: Sixty three plus thirty five is ninety eight.
+Elad Gamliel says [low]: Mike, you trying to raise the prices?
+Mikhail Argov says [low]: Two grand short of a solid hundred.
+* Elad Gamliel chuckles.
+Vladimir Cheshuk says [low]: Davai' I like round numbers.
+Elad Gamliel says [low]: This guy, believe me.
+Mikhail Argov says [low]: No, price for the can was sixty three. Price of flour was seventy, half that is thirty five.
+Mikhail Argov says [low]: I keep track of numbers.
+Elad Gamliel says [low]: You know what? I'll check if I even have that much, brother.
+Elad Gamliel says [low]: If I'll have some spare, maybe.
+Elad Gamliel says [low]: Bet, Vova?
+Mikhail Argov says [low]: Well, for now Elad wants the Can. Regarding snow he needs to check if he got the money, right?
+* Mikhail Argov looks over at Elad.
+
+</ParsedChat>
+        <BlackBackgroundOpacity>false</BlackBackgroundOpacity>
+      </TextBlockModel>
+    </TextBlocks>
+    <Text>
+      <Width>1632</Width>
+      <CanvasScale>55</CanvasScale>
+      <ParseLines>1000</ParseLines>
+    </Text>
+    <Resolution>
+      <AllowEdit>false</AllowEdit>
+      <Name>1080p</Name>
+      <Width>1920</Width>
+      <Height>1080</Height>
+    </Resolution>
+    <NamesToCensor>
+      <NamesToReplace>
+        <Name>Vladimir Cheshuk</Name>
+        <FirstName>Vladimir</FirstName>
+        <LastName>Cheshuk</LastName>
+        <Mask>Mask_WZXLV_67</Mask>
+      </NamesToReplace>
+    </NamesToCensor>
+  </CacheScreenshot>
+  <CacheScreenshot>
+=======
+>>>>>>> parent of aa3954d (2.5.6)
     <Guid>a2f1111d-78f5-4a30-9fda-cc40fec5208f-e4be1382-9386-43c2-85e8-4f45c02a578e</Guid>
     <ScreenshotDate>2021-10-30T00:10:01.9779786+03:00</ScreenshotDate>
     <ImageFilePath>cached_screens\screenshot_20211030_121001.jpg</ImageFilePath>

GTAWorld Screenshot Editor/obj/Debug/GTAWorld Screenshot Editor.csproj.CoreCompileInputs.cache

@@ -0,0 +1 @@
+65c4da6b484e7244410c0f51ccc34f1f3f07c086

GTAWorld Screenshot Editor/obj/Debug/GTAWorld Screenshot Editor.csproj.FileListAbsolute.txt

@@ -0,0 +1,21 @@
+<<<<<<< HEAD
+C:\Users\xcast\Documents\GitHub\Screenshot_Editor\GTAWorld Screenshot Editor\obj\Debug\Views\MainWindow.g.cs
+C:\Users\xcast\Documents\GitHub\Screenshot_Editor\GTAWorld Screenshot Editor\obj\Debug\App.g.cs
+C:\Users\xcast\Documents\GitHub\Screenshot_Editor\GTAWorld Screenshot Editor\obj\Debug\GeneratedInternalTypeHelper.g.cs
+C:\Users\xcast\Documents\GitHub\Screenshot_Editor\GTAWorld Screenshot Editor\obj\Debug\GTAWorld Screenshot Editor_MarkupCompile.cache
+C:\Users\xcast\Documents\GitHub\Screenshot_Editor\GTAWorld Screenshot Editor\obj\Debug\GTAWorld Screenshot Editor_MarkupCompile.lref
+C:\Users\xcast\Documents\GitHub\Screenshot_Editor\GTAWorld Screenshot Editor\bin\Debug\GTAWorld Screenshot Editor.exe.config
+C:\Users\xcast\Documents\GitHub\Screenshot_Editor\GTAWorld Screenshot Editor\bin\Debug\GTAWorld Screenshot Editor.exe
+C:\Users\xcast\Documents\GitHub\Screenshot_Editor\GTAWorld Screenshot Editor\bin\Debug\GTAWorld Screenshot Editor.pdb
+C:\Users\xcast\Documents\GitHub\Screenshot_Editor\GTAWorld Screenshot Editor\obj\Debug\App.baml
+C:\Users\xcast\Documents\GitHub\Screenshot_Editor\GTAWorld Screenshot Editor\obj\Debug\Views\MainWindow.baml
+C:\Users\xcast\Documents\GitHub\Screenshot_Editor\GTAWorld Screenshot Editor\obj\Debug\GTAWorld Screenshot Editor.g.resources
+C:\Users\xcast\Documents\GitHub\Screenshot_Editor\GTAWorld Screenshot Editor\obj\Debug\GTAWorld_Screenshot_Editor.Localization.Strings.resources
+C:\Users\xcast\Documents\GitHub\Screenshot_Editor\GTAWorld Screenshot Editor\obj\Debug\GTAWorld_Screenshot_Editor.Properties.Resources.resources
+C:\Users\xcast\Documents\GitHub\Screenshot_Editor\GTAWorld Screenshot Editor\obj\Debug\GTAWorld Screenshot Editor.csproj.GenerateResource.cache
+C:\Users\xcast\Documents\GitHub\Screenshot_Editor\GTAWorld Screenshot Editor\obj\Debug\GTAWorld Screenshot Editor.csproj.CoreCompileInputs.cache
+C:\Users\xcast\Documents\GitHub\Screenshot_Editor\GTAWorld Screenshot Editor\obj\Debug\GTAWorld Screenshot Editor.csproj.Fody.CopyLocal.cache
+C:\Users\xcast\Documents\GitHub\Screenshot_Editor\GTAWorld Screenshot Editor\obj\Debug\GTAWorld Screenshot Editor.exe
+C:\Users\xcast\Documents\GitHub\Screenshot_Editor\GTAWorld Screenshot Editor\obj\Debug\GTAWorld Screenshot Editor.pdb
+=======
+>>>>>>> parent of aa3954d (2.5.6)

GTAWorld Screenshot Editor/obj/Debug/GTAWorld Screenshot Editor_MarkupCompile.cache

@@ -0,0 +1,20 @@
+GTAWorld Screenshot Editor
+
+
+winexe
+C#
+.cs
+C:\Users\xcast\Documents\GitHub\Screenshot_Editor\GTAWorld Screenshot Editor\obj\Debug\
+GTAWorld_Screenshot_Editor
+none
+false
+DEBUG;TRACE
+C:\Users\xcast\Documents\GitHub\Screenshot_Editor\GTAWorld Screenshot Editor\App.xaml
+11892971807
+
+30-925855100
+280-898569412
+Views\MainWindow.xaml;
+
+False
+

GTAWorld Screenshot Editor/obj/Debug/GTAWorld Screenshot Editor_MarkupCompile.i.lref

@@ -1,4 +1,9 @@
+<<<<<<< HEAD:GTAWorld Screenshot Editor/obj/Debug/GTAWorld Screenshot Editor_MarkupCompile.lref
+C:\Users\xcast\Documents\GitHub\Screenshot_Editor\GTAWorld Screenshot Editor\obj\Debug\GeneratedInternalTypeHelper.g.cs
+FC:\Users\xcast\Documents\GitHub\Screenshot_Editor\GTAWorld Screenshot Editor\App.xaml;;
+=======
 
 
+>>>>>>> parent of aa3954d (2.5.6):GTAWorld Screenshot Editor/obj/Debug/GTAWorld Screenshot Editor_MarkupCompile.i.lref
 FC:\Users\xcast\Documents\GitHub\Screenshot_Editor\GTAWorld Screenshot Editor\Views\MainWindow.xaml;;
 

GTAWorld Screenshot Editor/obj/Debug/GeneratedInternalTypeHelper.g.cs

@@ -0,0 +1,2 @@
+
+