v0.9.86 update

NightlyRevenger · Aug 31, 2020 · 3f2dd98 · 3f2dd98
1 parent e19f602
commit 3f2dd98
Show file tree

Hide file tree

Showing 182 changed files with 8,352 additions and 1,475 deletions.
diff --git a/FFXIVWpfApp1/AppWindows/PatreonWin.xaml b/FFXIVWpfApp1/AppWindows/PatreonWin.xaml
@@ -6,16 +6,16 @@
         xmlns:local="clr-namespace:FFXIVTataruHelper"
         mc:Ignorable="d"
         ResizeMode="NoResize"
-        Title="{DynamicResource PatreonWindowName}" Height="390" Width="500">
+        Title="{DynamicResource PatreonWindowName}" Height="430" Width="500">
     <Grid>
-        <Grid Margin="10,0,10,210">
-            <Image HorizontalAlignment="Left" Height="153" Margin="10,10,0,0" VerticalAlignment="Top" Width="156">
+        <Grid Margin="10,0,10,0" VerticalAlignment="Top">
+            <Image HorizontalAlignment="Left" Height="153" Margin="0,10,0,0" VerticalAlignment="Top" Width="156">
                 <Image.Source>
                     <BitmapImage DecodePixelWidth="300" UriSource="/Resources/patreon_logo.png" />
                 </Image.Source>
             </Image>
             <Grid>
-                <TextBlock FontSize="26" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center" Text="{DynamicResource DearPatrons}" Margin="50,58,0,58" />
+                <TextBlock FontSize="25" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center" Text="{DynamicResource DearPatrons}" Margin="50,58,0,58" />
             </Grid>
         </Grid>
         <Grid Margin="10,156,10,10">
@@ -32,14 +32,14 @@
                 </TextBlock>
                 <TextBlock FontSize="16" FontWeight="Bold"  VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,0,10,0">
                     <StackPanel>
-                        <TextBlock>
-                            Gonzu
+                        <TextBlock Margin="0,0,0,2">
+                            Walrus Juice
                         </TextBlock>
-                        <TextBlock>
-                            LuxaxaN
+                        <TextBlock Margin="0,2">
+                            Prinnie PUGI
                         </TextBlock>
-                        <TextBlock>
-                            Pururu
+                        <TextBlock Margin="0,2">
+                            Айлин
                         </TextBlock>
                     </StackPanel>
                 </TextBlock>

diff --git a/FFXIVWpfApp1/ChatWindow.xaml.cs b/FFXIVWpfApp1/ChatWindow.xaml.cs
@@ -41,12 +41,16 @@ public long WinId
         TataruModel _TataruModel;
         ChatWindowViewModel _ChatWindowViewModel;
 
-        public ChatWindow(TataruModel tataruModel, ChatWindowViewModel chatWindowViewModel)
+        MainWindow _MainWindow;
+
+        public ChatWindow(TataruModel tataruModel, ChatWindowViewModel chatWindowViewModel, MainWindow mainWindow)
         {
             InitializeComponent();
 
             try
             {
+                _MainWindow = mainWindow;
+
                 _TataruModel = tataruModel;
                 _ChatWindowViewModel = chatWindowViewModel;
 
@@ -195,8 +199,10 @@ protected async Task OnTextArrived(ChatMessageArrivedEventArgs ea)
                 }
             }
 
-            text = await _TataruModel.ChatProcessor.Translate(ea.ChatMessage.Text, _ChatWindowViewModel.CurrentTransaltionEngine,
-            _ChatWindowViewModel.CurrentTranslateFromLanguague, _ChatWindowViewModel.CurrentTranslateToLanguague, chatCode.Code);
+            DateTime timeStamp = default(DateTime);
+
+            if (_ChatWindowViewModel.ShowTimestamps)
+                timeStamp = ea.ChatMessage.TimeStamp;
 
             await this.UIThreadAsync(() =>
             {
@@ -205,7 +211,7 @@ await this.UIThreadAsync(() =>
                 if (_ChatWindowViewModel.IsHiddenByUser == false)
                     _TextArrivedTime = DateTime.UtcNow;
 
-                ShowTransaltedText(text, textColor);
+                ShowTransaltedText(text, textColor, timeStamp);
 
                 if (_ChatWindowViewModel.IsHiddenByUser == false)
                     _TextArrivedTime = DateTime.UtcNow;
@@ -295,7 +301,7 @@ await this.UIThreadAsync(() =>
 
         #region **Transaltion.
 
-        void ShowTransaltedText(string translatedMsg, Color color)
+        void ShowTransaltedText(string translatedMsg, Color color, DateTime timeStamp = default(DateTime))
         {
             try
             {
@@ -329,18 +335,25 @@ void ShowTransaltedText(string translatedMsg, Color color)
                     name = msgText.Substring(0, nameInd);
                     text = msgText.Substring(nameInd, msgText.Length - nameInd);
 
+                    if (timeStamp != default(DateTime))
+                        name = timeStamp.ToString("HH:mm") + " " + name;
+
                     TextRange tr1 = new TextRange(ChatRtb.Document.ContentEnd, ChatRtb.Document.ContentEnd);
                     tr1.Text = name;
                     tr1.ApplyPropertyValue(TextElement.ForegroundProperty, tmpColor);
                     tr1.ApplyPropertyValue(TextElement.FontWeightProperty, FontWeights.Bold);
 
                     TextRange tr2 = new TextRange(ChatRtb.Document.ContentEnd, ChatRtb.Document.ContentEnd);
+
                     tr2.Text = text;
                     tr2.ApplyPropertyValue(TextElement.ForegroundProperty, tmpColor);
                     tr2.ApplyPropertyValue(TextElement.FontWeightProperty, FontWeights.Normal);//*/
                 }
                 else
                 {
+                    if (timeStamp != default(DateTime))
+                        translatedMsg = timeStamp.ToString("HH:mm") + " " + translatedMsg;
+
                     TextRange tr = new TextRange(ChatRtb.Document.ContentEnd, ChatRtb.Document.ContentEnd);
                     tr.Text = translatedMsg;
 
@@ -468,6 +481,7 @@ void Settings_Click(object sender, RoutedEventArgs e)
             _SettigsWindow.Visibility = Visibility.Visible;
             _SettigsWindow.Activate();
             _SettigsWindow.Focus();//*/
+            _MainWindow.ShowSettingsWindow();
         }
 
         void Exit_Click(object sender, RoutedEventArgs e)

diff --git a/FFXIVWpfApp1/FFHandlers/FFMemoryReader.cs b/FFXIVWpfApp1/FFHandlers/FFMemoryReader.cs
@@ -487,6 +487,10 @@ public void SendDebugMessages()
             {
                 await Task.Delay(2000);
 
+                /*
+                _FFxivChat.Enqueue(new FFChatMsg(@"_11_ Inoshishi Bugyo: Für immer mit dieser Täuschung leben zu können  Endkampf zuerst die Augen der Wahrheit an sich reißen und schließlich die beiden Furien töten. Im Sterben sagt Alekto dem Spartaner voraus, dass ihr Tod nichts ändern und ihn nicht befreien werde. ", "003D", DateTime.Now));
+                _FFxivChat.Enqueue(new FFChatMsg(@"_12_ Inoshishi Bugyo: to live forever with this deception final battle first to grab the eyes of the truth and finally kill the two Furies. In dying, Alekto predicts to the Spartan that her death will not change anything and will not free him. ", "003D", DateTime.Now));//*/
+
                 _FFxivChat.Enqueue(new FFChatMsg(@"_1_ Dakshina:Once you have finished the task, feel free to disssmount your marid.", "003D", DateTime.Now));
                 _FFxivChat.Enqueue(new FFChatMsg(@"_2_ Dakshina:Once you have finished the task, feel free to disssmount your marid. It will make its own way back here.", "003D", DateTime.Now));
                 _FFxivChat.Enqueue(new FFChatMsg(@"_3_ Inoshishi Bugyo:But...the boar will not be next year's totem animal... <sigh>", "", DateTime.Now));
@@ -496,7 +500,9 @@ public void SendDebugMessages()
                 _FFxivChat.Enqueue(new FFChatMsg(@"_7_ Inoshishi Bugyo:But...the boar will not be next year's totem animal... <sigh>", "003D", DateTime.Now));
                 _FFxivChat.Enqueue(new FFChatMsg(@"_8_ Dakshina:Once you have finished the task, feel free to disssmount your marid. It will make its own way back here.", "", DateTime.Now));
                 _FFxivChat.Enqueue(new FFChatMsg(@"_9_ Lydirlona:Mayhap you have heard that Rowena's House of Splendors is expanding its operations. I am proud to say that these rumors are true.", "003D", DateTime.Now));
-                _FFxivChat.Enqueue(new FFChatMsg(@"_10_ Inoshishi Bugyo:But...the boar will not be next year's totem animal... <sigh>", "003D", DateTime.Now));//*/
+                _FFxivChat.Enqueue(new FFChatMsg(@"_10_ Inoshishi Bugyo:But...the boar will not be next year's totem animal... <sigh>", "003D", DateTime.Now));
+                _FFxivChat.Enqueue(new FFChatMsg(@"_11_ Inoshishi Bugyo: Für immer mit dieser Täuschung leben zu können  Endkampf zuerst die Augen der Wahrheit an sich reißen und schließlich die beiden Furien töten. Im Sterben sagt Alekto dem Spartaner voraus, dass ihr Tod nichts ändern und ihn nicht befreien werde. ", "003D", DateTime.Now));
+                _FFxivChat.Enqueue(new FFChatMsg(@"_12_ Inoshishi Bugyo: to live forever with this deception final battle first to grab the eyes of the truth and finally kill the two Furies. In dying, Alekto predicts to the Spartan that her death will not change anything and will not free him. ", "003D", DateTime.Now));
                 _FFxivChat.Enqueue(new FFChatMsg(@"Conrad:Ahhh, don't fret over that. You're not the first person to take up arms against the Empire under a false name. We'd do the same if we had any sense....My condolences for your loss, child.", "003D", DateTime.Now));
                 _FFxivChat.Enqueue(new FFChatMsg(@"Conrad:My comrades and I must confer on your proposal. A moment, if you please...", "003D", DateTime.Now));
                 _FFxivChat.Enqueue(new FFChatMsg(@"Conrad:Allow me to welcome you once more to Rhalgr's Reach, our humble headquarters.", "003D", DateTime.Now));

diff --git a/FFXIVWpfApp1/GlobalSettings.cs b/FFXIVWpfApp1/GlobalSettings.cs
@@ -27,6 +27,12 @@ static class GlobalSettings
 
         public static string pt_BR_LanguaguePath = @"pt-BR\pt_BR.mo";
 
+        public static string ca_Es_LanguaguePath = @"ca\ca_ES.mo";
+
+        public static string it_IT_LanguaguePath = @"it\it_IT.mo";
+
+        public static string uk_UA_LanguaguePath = @"uk\uk_UA.mo";
+
         public static int SpiWaitTimeOutMS = 500;
 
         public static int LookForPorcessDelay = 500;

diff --git a/FFXIVWpfApp1/Locale_cloud/ca/ca_ES.mo b/FFXIVWpfApp1/Locale_cloud/ca/ca_ES.mo
diff --git a/FFXIVWpfApp1/Locale_cloud/ca/ca_ES.po b/FFXIVWpfApp1/Locale_cloud/ca/ca_ES.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tataru-helper\n"
 "POT-Creation-Date: 2019-11-19 19:15+0300\n"
-"PO-Revision-Date: 2020-03-08 04:57\n"
+"PO-Revision-Date: 2020-05-03 22:07\n"
 "Last-Translator: \n"
 "Language-Team: Catalan\n"
 "Language: ca\n"

diff --git a/FFXIVWpfApp1/Locale_cloud/en/en_US.mo b/FFXIVWpfApp1/Locale_cloud/en/en_US.mo
diff --git a/FFXIVWpfApp1/Locale_cloud/en/en_US.po b/FFXIVWpfApp1/Locale_cloud/en/en_US.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tataru-helper\n"
 "POT-Creation-Date: 2019-11-19 19:15+0300\n"
-"PO-Revision-Date: 2020-03-08 04:57\n"
+"PO-Revision-Date: 2020-05-03 22:07\n"
 "Last-Translator: \n"
 "Language-Team: English\n"
 "Language: en\n"

diff --git a/FFXIVWpfApp1/Locale_cloud/es-ES/es_ES.mo b/FFXIVWpfApp1/Locale_cloud/es-ES/es_ES.mo
diff --git a/FFXIVWpfApp1/Locale_cloud/es-ES/es_ES.po b/FFXIVWpfApp1/Locale_cloud/es-ES/es_ES.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tataru-helper\n"
 "POT-Creation-Date: 2019-11-19 19:15+0300\n"
-"PO-Revision-Date: 2020-03-08 04:57\n"
+"PO-Revision-Date: 2020-05-03 22:07\n"
 "Last-Translator: \n"
 "Language-Team: Spanish\n"
 "Language: es\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: Utils/LanguagueWrapper.cs:109
 msgid "Settings"
-msgstr "Ajustes"
+msgstr "Configuración"
 
 #: Utils/LanguagueWrapper.cs:110
 msgid "Chat Window"

diff --git a/FFXIVWpfApp1/Locale_cloud/it/it_IT.mo b/FFXIVWpfApp1/Locale_cloud/it/it_IT.mo
diff --git a/FFXIVWpfApp1/Locale_cloud/it/it_IT.po b/FFXIVWpfApp1/Locale_cloud/it/it_IT.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tataru-helper\n"
 "POT-Creation-Date: 2019-11-19 19:15+0300\n"
-"PO-Revision-Date: 2020-03-08 04:57\n"
+"PO-Revision-Date: 2020-05-03 22:07\n"
 "Last-Translator: \n"
 "Language-Team: Italian\n"
 "Language: it\n"

diff --git a/FFXIVWpfApp1/Locale_cloud/ko/ko_KR.mo b/FFXIVWpfApp1/Locale_cloud/ko/ko_KR.mo
diff --git a/FFXIVWpfApp1/Locale_cloud/ko/ko_KR.po b/FFXIVWpfApp1/Locale_cloud/ko/ko_KR.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tataru-helper\n"
 "POT-Creation-Date: 2019-11-19 19:15+0300\n"
-"PO-Revision-Date: 2020-03-08 04:57\n"
+"PO-Revision-Date: 2020-08-15 15:35\n"
 "Last-Translator: \n"
 "Language-Team: Korean\n"
 "Language: ko\n"
@@ -15,8 +15,10 @@ msgstr ""
 "X-Poedit-KeywordsList: GetString;GetPluralString:1,2;GetParticularString:1c,2;GetParticularPluralString:1c,2,3;_;_n:1,2;_p:1c,2;_pn:1c,2,3\\n"
 "X-Poedit-SearchPath-0: .\n"
 "X-Crowdin-Project: tataru-helper\n"
+"X-Crowdin-Project-ID: 367037\n"
 "X-Crowdin-Language: ko\n"
 "X-Crowdin-File: en_US.po\n"
+"X-Crowdin-File-ID: 6\n"
 
 #: Utils/LanguagueWrapper.cs:109
 msgid "Settings"

diff --git a/FFXIVWpfApp1/Locale_cloud/pl/pl_PL.mo b/FFXIVWpfApp1/Locale_cloud/pl/pl_PL.mo
diff --git a/FFXIVWpfApp1/Locale_cloud/pl/pl_PL.po b/FFXIVWpfApp1/Locale_cloud/pl/pl_PL.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tataru-helper\n"
 "POT-Creation-Date: 2019-11-19 19:15+0300\n"
-"PO-Revision-Date: 2020-03-08 04:57\n"
+"PO-Revision-Date: 2020-05-03 22:07\n"
 "Last-Translator: \n"
 "Language-Team: Polish\n"
 "Language: pl\n"

diff --git a/FFXIVWpfApp1/Locale_cloud/pt-BR/pt_BR.mo b/FFXIVWpfApp1/Locale_cloud/pt-BR/pt_BR.mo
diff --git a/FFXIVWpfApp1/Locale_cloud/pt-BR/pt_BR.po b/FFXIVWpfApp1/Locale_cloud/pt-BR/pt_BR.po
@@ -2,10 +2,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tataru-helper\n"
 "POT-Creation-Date: 2019-11-19 19:15+0300\n"
-"PO-Revision-Date: 2020-03-08 04:57\n"
+"PO-Revision-Date: 2020-08-15 15:35\n"
 "Last-Translator: \n"
 "Language-Team: Portuguese, Brazilian\n"
-"Language: pt_BR\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -15,8 +15,10 @@ msgstr ""
 "X-Poedit-KeywordsList: GetString;GetPluralString:1,2;GetParticularString:1c,2;GetParticularPluralString:1c,2,3;_;_n:1,2;_p:1c,2;_pn:1c,2,3\\n"
 "X-Poedit-SearchPath-0: .\n"
 "X-Crowdin-Project: tataru-helper\n"
+"X-Crowdin-Project-ID: 367037\n"
 "X-Crowdin-Language: pt-BR\n"
 "X-Crowdin-File: en_US.po\n"
+"X-Crowdin-File-ID: 6\n"
 
 #: Utils/LanguagueWrapper.cs:109
 msgid "Settings"
@@ -368,23 +370,23 @@ msgstr ""
 
 #: Utils/LanguagueWrapper.cs:235
 msgid "Click here to update to new version."
-msgstr ""
+msgstr "Clique aqui para atualizar para a nova versão."
 
 #: Utils/LanguagueWrapper.cs:237
 msgid "Tataru Update"
 msgstr ""
 
 #: Utils/LanguagueWrapper.cs:238
 msgid "New Tataru helper version is available. Restart Application to update."
-msgstr ""
+msgstr "Nova versão disponível. Reinicie a aplicação para atualizar."
 
 #: Utils/LanguagueWrapper.cs:240
 msgid "Check updates"
 msgstr "Buscando Atts"
 
 #: Utils/LanguagueWrapper.cs:241
 msgid "Looking for updates..."
-msgstr ""
+msgstr "Procurando por atualizações..."
 
 #: Utils/LanguagueWrapper.cs:242
 msgid "No updates found."

diff --git a/FFXIVWpfApp1/Locale_cloud/ru/ru_RU.mo b/FFXIVWpfApp1/Locale_cloud/ru/ru_RU.mo
diff --git a/FFXIVWpfApp1/Locale_cloud/ru/ru_RU.po b/FFXIVWpfApp1/Locale_cloud/ru/ru_RU.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tataru-helper\n"
 "POT-Creation-Date: 2019-11-19 19:15+0300\n"
-"PO-Revision-Date: 2020-03-08 04:57\n"
+"PO-Revision-Date: 2020-08-15 15:35\n"
 "Last-Translator: \n"
 "Language-Team: Russian\n"
 "Language: ru\n"
@@ -15,8 +15,10 @@ msgstr ""
 "X-Poedit-KeywordsList: GetString;GetPluralString:1,2;GetParticularString:1c,2;GetParticularPluralString:1c,2,3;_;_n:1,2;_p:1c,2;_pn:1c,2,3\\n"
 "X-Poedit-SearchPath-0: .\n"
 "X-Crowdin-Project: tataru-helper\n"
+"X-Crowdin-Project-ID: 367037\n"
 "X-Crowdin-Language: ru\n"
 "X-Crowdin-File: en_US.po\n"
+"X-Crowdin-File-ID: 6\n"
 
 #: Utils/LanguagueWrapper.cs:109
 msgid "Settings"

diff --git a/FFXIVWpfApp1/Locale_cloud/uk/uk_UA.mo b/FFXIVWpfApp1/Locale_cloud/uk/uk_UA.mo
diff --git a/FFXIVWpfApp1/Locale_cloud/uk/uk_UA.po b/FFXIVWpfApp1/Locale_cloud/uk/uk_UA.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tataru-helper\n"
 "POT-Creation-Date: 2019-11-19 19:15+0300\n"
-"PO-Revision-Date: 2020-03-08 04:57\n"
+"PO-Revision-Date: 2020-05-03 22:07\n"
 "Last-Translator: \n"
 "Language-Team: Ukrainian\n"
 "Language: uk\n"

diff --git a/FFXIVWpfApp1/MainWindow.xaml b/FFXIVWpfApp1/MainWindow.xaml
@@ -24,30 +24,49 @@
             </tb:TaskbarIcon.ContextMenu>
         </tb:TaskbarIcon>
 
-        <DockPanel>
-            <Menu DockPanel.Dock="Top" Background="White" BorderThickness="0,0,0,1">
-                <MenuItem Header="{DynamicResource DocLanguage}">
-                    <MenuItem Header="{DynamicResource DocLanguageRu}" Command="{Binding SwitchLanguageCommand}" CommandParameter="Russian" />
+        <DockPanel HorizontalAlignment="Stretch">
+            <Menu Background="White" BorderThickness="0,0,0,1" DockPanel.Dock="Top" >
+                <Menu.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                        </Grid>
+                    </ItemsPanelTemplate>
+                </Menu.ItemsPanel>
+
+                <MenuItem Header="{DynamicResource DocLanguage}"  Grid.Column="0">
                     <MenuItem Header="{DynamicResource DocLanguageEn}" Command="{Binding SwitchLanguageCommand}" CommandParameter="English"/>
+                    <MenuItem Header="{DynamicResource DocLanguageRu}" Command="{Binding SwitchLanguageCommand}" CommandParameter="Russian" />
                     <MenuItem Header="{DynamicResource DocLanguageEs}" Command="{Binding SwitchLanguageCommand}" CommandParameter="Spanish"/>
                     <MenuItem Header="{DynamicResource DocLanguagePl}" Command="{Binding SwitchLanguageCommand}" CommandParameter="Polish" />
                     <MenuItem Header="{DynamicResource DocLanguageKr}" Command="{Binding SwitchLanguageCommand}" CommandParameter="Korean" />
                     <MenuItem Header="{DynamicResource DocLanguagePtBr}" Command="{Binding SwitchLanguageCommand}" CommandParameter="PortugueseBR" />
+                    <MenuItem Header="{DynamicResource DocLanguageCat}" Command="{Binding SwitchLanguageCommand}" CommandParameter="Catalan" />
+                    <MenuItem Header="{DynamicResource DocLanguageIta}" Command="{Binding SwitchLanguageCommand}" CommandParameter="Italian" />
+                    <MenuItem Header="{DynamicResource DocLanguageUkr}" Command="{Binding SwitchLanguageCommand}" CommandParameter="Ukrainian" />
+                    <MenuItem >
+                        <MenuItem.Header>
+                            <Hyperlink NavigateUri="https://crowdin.com/project/tataru-helper" RequestNavigate="Hyperlink_RequestNavigate">
+                                <TextBlock Text="https://crowdin.com"/>
+                            </Hyperlink>
+                        </MenuItem.Header>
+                    </MenuItem>
                 </MenuItem>
-                <MenuItem Header="{DynamicResource DockHelp}">
+                <MenuItem Header="{DynamicResource DockHelp}" Grid.Column="1">
                     <MenuItem Header="{DynamicResource DockAbout}"  Click="About_Click"/>
                     <MenuItem x:Name="CheckUpdatesButton" Header="{DynamicResource CheckUpdatesText}"  Click="CheckUpdates_Click"/>
                 </MenuItem>
-                <MenuItem Header="{DynamicResource DockPatrons}" Click="Patrons_Click">
-                </MenuItem>
+                <MenuItem Header="{DynamicResource DockPatrons}" Click="Patrons_Click" Background="#FFF96854" HorizontalAlignment="Right" Grid.Column="2" Margin="0,0,55,0"/>
+                <MenuItem Header="{DynamicResource DockDiscrod}" Click="Discord_Click" Background="#FF313138" Foreground="White" HorizontalAlignment="Right" Grid.Column="2"/>
             </Menu>
-            <Border BorderThickness="0,1,0,0" BorderBrush="LightGray">
-                <StackPanel>
-                </StackPanel>
-            </Border>
+            <Border BorderThickness="0,1,0,0" BorderBrush="LightGray"/>
         </DockPanel>
 
-        <WrapPanel HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,0,0,0" Height="46" Visibility="{Binding UpdatingBlockVisiblity,Converter={utils:BooleanToVisibilityConverterCollapse}, Mode=OneWay, FallbackValue=Collapsed}">
+        <WrapPanel HorizontalAlignment="Left" VerticalAlignment="Top"  Margin="110,1,0,0" Height="46" Visibility="{Binding UpdatingBlockVisiblity,Converter={utils:BooleanToVisibilityConverterCollapse}, Mode=OneWay, FallbackValue=Collapsed}">
             <WrapPanel Margin="0,0,10,0" Visibility="{Binding UserStartedUpdateTextVisibility, Converter={utils:BooleanToVisibilityConverterCollapse}, Mode=OneWay}">
                 <TextBlock x:Name="UserStartedUpdateText" Text=""/>
             </WrapPanel>
@@ -196,6 +215,8 @@
                                                 <CheckBox IsChecked="{Binding IsAutoHide, Mode=TwoWay}" Content="{DynamicResource AutoHideCB}" HorizontalAlignment="Left" Height="21" VerticalAlignment="Top" Width="80" Margin="0,5,0,0"/>
                                                 <xctk:IntegerUpDown Value="{Binding AutoHideTimeoutSeconds,Mode=TwoWay}" HorizontalAlignment="Left" Height="31" VerticalAlignment="Top" Width="86" Minimum="1" Maximum="36000"/>
                                             </StackPanel>
+
+                                            <CheckBox IsChecked="{Binding ShowTimestamps, Mode=TwoWay}" Content="{DynamicResource ShowTimestampsCb}" HorizontalAlignment="Left" Height="21" VerticalAlignment="Top" Margin="0,5,0,0" />
                                         </StackPanel>
                                     </GroupBox>
                                 </WrapPanel>