From 8bd05ae874a85ed75f9ef0b289506228e007da1b Mon Sep 17 00:00:00 2001
From: diluculo <diluculo@gmail.com>
Date: Mon, 16 Jul 2018 20:06:37 +0900
Subject: [PATCH 1/2] Theme: Add TextEditor styles

---
 .../Controls/CodeEditor.cs                    | 58 +++++++++++-
 .../Resources/Resources.xaml                  | 93 +++++++++++++++++++
 .../ViewModels/CodeEditorViewModel.cs         | 55 +++++++++++
 .../Views/CodeEditorView.xaml                 | 11 ++-
 src/Gemini/Themes/VS2013/BlueTheme.xaml       | 15 ++-
 src/Gemini/Themes/VS2013/DarkTheme.xaml       | 15 ++-
 src/Gemini/Themes/VS2013/LightTheme.xaml      | 15 ++-
 7 files changed, 254 insertions(+), 8 deletions(-)
 create mode 100644 src/Gemini.Modules.CodeEditor/Resources/Resources.xaml

diff --git a/src/Gemini.Modules.CodeEditor/Controls/CodeEditor.cs b/src/Gemini.Modules.CodeEditor/Controls/CodeEditor.cs
index 26d670ecb..f979ea728 100644
--- a/src/Gemini.Modules.CodeEditor/Controls/CodeEditor.cs
+++ b/src/Gemini.Modules.CodeEditor/Controls/CodeEditor.cs
@@ -1,3 +1,4 @@
+using System.Windows;
 using System.Windows.Media;
 using ICSharpCode.AvalonEdit;
 using ICSharpCode.AvalonEdit.Search;
@@ -6,17 +7,58 @@ namespace Gemini.Modules.CodeEditor.Controls
 {
     public class CodeEditor : TextEditor
     {
+        #region LineNumber
+
+        /// <summary>
+        /// The <see cref="LineNumber"/> property.
+        /// </summary>
+        public static DependencyProperty LineNumberProperty = DependencyProperty.Register(
+            "LineNumber",
+            typeof(int),
+            typeof(CodeEditor),
+            new PropertyMetadata(default(int)));
+
+        public int LineNumber
+        {
+            get { return (int)GetValue(LineNumberProperty); }
+            set { SetValue(LineNumberProperty, value); }
+        }
+
+        #endregion LineNumber
+
+        #region ColumnPosition
+
+        /// <summary>
+        /// The <see cref="ColumnPosition"/> property.
+        /// </summary>
+        public static DependencyProperty ColumnPositionProperty = DependencyProperty.Register(
+            "ColumnPosition",
+            typeof(int),
+            typeof(CodeEditor),
+            new PropertyMetadata(default(int)));
+
+        public int ColumnPosition
+        {
+            get { return (int)GetValue(ColumnPositionProperty); }
+            set { SetValue(ColumnPositionProperty, value); }
+        }
+
+        #endregion ColumnPosition
+
         public CodeEditor()
         {
             ApplySettings();
-            Loaded += (s, e) => SearchPanel.Install(this);
-            DocumentChanged += (s, e) => SearchPanel.Install(this);
+            
+            // Caret related
+            LineNumber = 1;
+            ColumnPosition = 1;
+            TextArea.Caret.PositionChanged += OnCaretPositionChanged;
         }
 
         public void ApplySettings()
         {
             FontFamily = new FontFamily("Consolas");
-            FontSize = 12;
+            FontSize = 14;
             ShowLineNumbers = Properties.Settings.Default.ShowLineNumbers;
             WordWrap = Properties.Settings.Default.WordWrap;
 
@@ -37,5 +79,15 @@ public void ApplySettings()
                 Options.ShowTabs = Properties.Settings.Default.ShowTabs;
             }
         }
+
+        #region Event Handlers
+
+        private void OnCaretPositionChanged(object sender, System.EventArgs e)
+        {
+            LineNumber = TextArea.Caret.Line;
+            ColumnPosition = TextArea.Caret.Column;
+        }
+
+        #endregion Event Handlers
     }
 }
diff --git a/src/Gemini.Modules.CodeEditor/Resources/Resources.xaml b/src/Gemini.Modules.CodeEditor/Resources/Resources.xaml
new file mode 100644
index 000000000..4f244ca67
--- /dev/null
+++ b/src/Gemini.Modules.CodeEditor/Resources/Resources.xaml
@@ -0,0 +1,93 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:avalonEdit="http://icsharpcode.net/sharpdevelop/avalonedit"
+                    xmlns:editing="clr-namespace:ICSharpCode.AvalonEdit.Editing;assembly=ICSharpCode.AvalonEdit"
+                    xmlns:rendering="clr-namespace:ICSharpCode.AvalonEdit.Rendering;assembly=ICSharpCode.AvalonEdit"
+                    xmlns:controls="clr-namespace:Gemini.Modules.CodeEditor.Controls">
+
+    <Style TargetType="{x:Type controls:CodeEditor}">
+        <!-- AvalonEdit does not support RTL, so ensure we use LTR by default -->
+        <Setter Property="Foreground" Value="{DynamicResource Editor.Foreground}" />
+        <Setter Property="Background" Value="{DynamicResource Editor.Background}" />
+        <Setter Property="LineNumbersForeground" Value="{DynamicResource Editor.LineNumbersForeground}" />
+        <Setter Property="FlowDirection" Value="LeftToRight"/>        
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:CodeEditor}">
+                    <ControlTemplate.Resources>
+                        <Style TargetType="{x:Type rendering:TextView}">
+                            <Setter Property="CurrentLineBackground" Value="{DynamicResource Editor.CurrentLineBackground}" />
+                            <Setter Property="CurrentLineBorder">
+                                <Setter.Value>
+                                    <Pen Brush="{DynamicResource Editor.CurrentLineBorder}"
+                                         Thickness="1"/>
+                                </Setter.Value>
+                            </Setter>
+                            <Setter Property="NonPrintableCharacterBrush" Value="{DynamicResource Editor.NonPrintableCharacter}" />
+                            <Setter Property="LinkTextForegroundBrush" Value="{DynamicResource Editor.LinkTextForeground}" />
+                            <Setter Property="LinkTextBackgroundBrush" Value="{DynamicResource Editor.LinkTextBackground}" />
+                        </Style>
+                        <Style TargetType="{x:Type editing:TextArea}">
+                            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+                            <Setter Property="SelectionBrush" Value="{DynamicResource Editor.SelectionBrush}"/>
+                            <Setter Property="SelectionBorder">
+                                <Setter.Value>
+                                    <Pen Brush="{DynamicResource Editor.SelectionBorder}"
+                                         Thickness="1"/>
+                                </Setter.Value>
+                            </Setter>
+                            <Setter Property="SelectionCornerRadius" Value="0" />
+                            <Setter Property="SelectionForeground" Value="{DynamicResource Editor.SelectionForeground}"/>
+                            <Setter Property="Template">
+                                <Setter.Value>
+                                    <ControlTemplate TargetType="{x:Type avalonEdit:TextArea}">
+                                        <DockPanel Focusable="False">
+                                            <ItemsControl DockPanel.Dock="Left"
+                                                          Focusable="False"
+                                                          ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=LeftMargins}">
+                                                <ItemsControl.ItemsPanel>
+                                                    <ItemsPanelTemplate>
+                                                        <StackPanel Orientation="Horizontal" />
+                                                    </ItemsPanelTemplate>
+                                                </ItemsControl.ItemsPanel>
+                                            </ItemsControl>
+                                            <ContentPresenter
+                                                Panel.ZIndex="-1"
+                                                Focusable="False"
+                                                Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TextView}"/>
+                                        </DockPanel>
+                                    </ControlTemplate>
+                                </Setter.Value>
+                            </Setter>
+                        </Style>
+                    </ControlTemplate.Resources>
+                    <Border
+						Background="{TemplateBinding Background}"
+						BorderBrush="{TemplateBinding BorderBrush}"
+						BorderThickness="{TemplateBinding BorderThickness}">
+                        <ScrollViewer
+							Name="PART_ScrollViewer"
+                            Focusable="False"							
+							CanContentScroll="True"
+							VerticalScrollBarVisibility="{TemplateBinding VerticalScrollBarVisibility}"
+							HorizontalScrollBarVisibility="{TemplateBinding HorizontalScrollBarVisibility}"
+							Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TextArea}"
+							VerticalContentAlignment="Top"
+							HorizontalContentAlignment="Left"
+							Padding="{TemplateBinding Padding}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="WordWrap"
+						         Value="True">
+                            <Setter TargetName="PART_ScrollViewer"
+							        Property="HorizontalScrollBarVisibility"
+							        Value="Disabled" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    
+</ResourceDictionary>
diff --git a/src/Gemini.Modules.CodeEditor/ViewModels/CodeEditorViewModel.cs b/src/Gemini.Modules.CodeEditor/ViewModels/CodeEditorViewModel.cs
index cb2c7ae64..955176c25 100644
--- a/src/Gemini.Modules.CodeEditor/ViewModels/CodeEditorViewModel.cs
+++ b/src/Gemini.Modules.CodeEditor/ViewModels/CodeEditorViewModel.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.ComponentModel.Composition;
 using System.IO;
 using System.Threading.Tasks;
@@ -8,6 +9,7 @@
 using Gemini.Framework.Threading;
 using Gemini.Modules.CodeEditor.Commands;
 using Gemini.Modules.CodeEditor.Views;
+using Gemini.Modules.StatusBar;
 
 namespace Gemini.Modules.CodeEditor.ViewModels
 {
@@ -27,12 +29,50 @@ public class CodeEditorViewModel : PersistedDocument,
         private string _originalText;
         private ICodeEditorView _view;
 
+        private IStatusBar _statusBar;
+
+        private int _lineNumber = 0;
+        [DisplayName("Line Number")]
+        public int LineNumber
+        {
+            get { return _lineNumber; }
+            set
+            {
+                if (_lineNumber != value)
+                {
+                    _lineNumber = value;
+                    NotifyOfPropertyChange(() => LineNumber);
+                    UpdateStatusBar();
+                }
+            }
+        }
+
+        private int _columnPosition = 0;
+        [DisplayName("Column Position")]
+        public int ColumnPosition
+        {
+            get { return _columnPosition; }
+            set
+            {
+                if (_columnPosition != value)
+                {
+                    _columnPosition = value;
+                    NotifyOfPropertyChange(() => ColumnPosition);
+                    UpdateStatusBar();
+                }
+            }
+        }
+
         [ImportingConstructor]
         public CodeEditorViewModel(LanguageDefinitionManager languageDefinitionManager)
         {
             _languageDefinitionManager = languageDefinitionManager;
+
+            _statusBar = IoC.Get<IStatusBar>();
         }
 
+        #region Override methods
+
         public override bool ShouldReopenOnStart
         {
             get { return true; }
@@ -88,6 +128,8 @@ protected override Task DoSave(string filePath)
             return TaskUtility.Completed;
         }
 
+        #endregion Override methods
+
         private void ApplyOriginalText()
         {
             if (_view == null)
@@ -122,6 +164,19 @@ public void ApplySettings()
             _view?.ApplySettings();
         }
 
+        #region StatusBar
+
+        private void UpdateStatusBar()
+        {
+            if (_statusBar != null && _statusBar.Items.Count >= 3)
+            {
+                _statusBar.Items[1].Message = string.Format("Ln {0}", LineNumber);
+                _statusBar.Items[2].Message = string.Format("Col {0}", ColumnPosition);
+            }
+        }
+
+        #endregion StatusBar
+
         #region CommandHandlers
         void ICommandHandler<WordWrapCommandDefinition>.Update(Command command)
         {
diff --git a/src/Gemini.Modules.CodeEditor/Views/CodeEditorView.xaml b/src/Gemini.Modules.CodeEditor/Views/CodeEditorView.xaml
index 5ac77dda9..1d9c27c6e 100644
--- a/src/Gemini.Modules.CodeEditor/Views/CodeEditorView.xaml
+++ b/src/Gemini.Modules.CodeEditor/Views/CodeEditorView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="Gemini.Modules.CodeEditor.Views.CodeEditorView"
+<UserControl x:Class="Gemini.Modules.CodeEditor.Views.CodeEditorView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -6,7 +6,14 @@
              xmlns:local="clr-namespace:Gemini.Modules.CodeEditor.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
+
+    <UserControl.Resources>
+        <ResourceDictionary Source="../Resources/Resources.xaml"/>
+    </UserControl.Resources>
+    
     <Grid>
-		<local:CodeEditor x:Name="CodeEditor" />
+        <local:CodeEditor x:Name="CodeEditor"
+                          LineNumber="{Binding LineNumber, Mode=OneWayToSource}"
+                          ColumnPosition="{Binding ColumnPosition, Mode=OneWayToSource}"/>
     </Grid>
 </UserControl>
diff --git a/src/Gemini/Themes/VS2013/BlueTheme.xaml b/src/Gemini/Themes/VS2013/BlueTheme.xaml
index 4f5f1143f..26e742830 100644
--- a/src/Gemini/Themes/VS2013/BlueTheme.xaml
+++ b/src/Gemini/Themes/VS2013/BlueTheme.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Controls/Merged.xaml" />
@@ -170,6 +170,19 @@
     <SolidColorBrush x:Key="TextBox.Selection.InactiveBackground" Color="#ADD6FF"/>
     <SolidColorBrush x:Key="TextBox.Caret" Color="#212121"/>
 
+    <!--Text Editor - AvalonEdit-->
+    <SolidColorBrush x:Key="Editor.Foreground" Color="#FF000000" />
+    <SolidColorBrush x:Key="Editor.Background" Color="#FFFFFF" />
+    <SolidColorBrush x:Key="Editor.LineNumbersForeground" Color="#ff929292" />
+    <SolidColorBrush x:Key="Editor.CurrentLineBackground" Color="#FFFFFF" />
+    <SolidColorBrush x:Key="Editor.CurrentLineBorder" Color="#EAEAF2" />
+    <SolidColorBrush x:Key="Editor.NonPrintableCharacter" Color="#FFD3D3D3" />
+    <SolidColorBrush x:Key="Editor.LinkTextForeground" Color="#FF007ACC" />
+    <SolidColorBrush x:Key="Editor.LinkTextBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="Editor.SelectionBrush" Color="#ADD6FF" Opacity="0.7"/>
+    <SolidColorBrush x:Key="Editor.SelectionBorder" Color="#50ffffff" />
+    <SolidColorBrush x:Key="Editor.SelectionForeground" Color="#FF000000" />
+
     <!-- Slider -->
     <SolidColorBrush x:Key="SliderThumb.MouseOver.Background" Color="#E0D2AA"/>
     <SolidColorBrush x:Key="SliderThumb.MouseOver.Border" Color="#E2CD93"/>
diff --git a/src/Gemini/Themes/VS2013/DarkTheme.xaml b/src/Gemini/Themes/VS2013/DarkTheme.xaml
index 1d6dc3b54..cfaa78b07 100644
--- a/src/Gemini/Themes/VS2013/DarkTheme.xaml
+++ b/src/Gemini/Themes/VS2013/DarkTheme.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Controls/Merged.xaml" />
@@ -170,6 +170,19 @@
     <SolidColorBrush x:Key="TextBox.Selection.InactiveBackground" Color="#335C87"/>
     <SolidColorBrush x:Key="TextBox.Caret" Color="#F1F1F1"/>
 
+    <!--Text Editor - AvalonEdit-->
+    <SolidColorBrush x:Key="Editor.Foreground" Color="#FFF1F1F1" />
+    <SolidColorBrush x:Key="Editor.Background" Color="#333337" />
+    <SolidColorBrush x:Key="Editor.LineNumbersForeground" Color="#FF929292" />
+    <SolidColorBrush x:Key="Editor.CurrentLineBackground" Color="#333337" />
+    <SolidColorBrush x:Key="Editor.CurrentLineBorder" Color="#464646" />
+    <SolidColorBrush x:Key="Editor.NonPrintableCharacter" Color="#2FFFFFFF" />
+    <SolidColorBrush x:Key="Editor.LinkTextForeground" Color="#FFE5C365" />
+    <SolidColorBrush x:Key="Editor.LinkTextBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="Editor.SelectionBrush" Color="#335C87" Opacity="0.7"/>
+    <SolidColorBrush x:Key="Editor.SelectionBorder" Color="#50ffffff" />
+    <SolidColorBrush x:Key="Editor.SelectionForeground" Color="#FFF1F1F1" />
+    
     <!-- Slider -->
     <SolidColorBrush x:Key="SliderThumb.MouseOver.Background" Color="#404044"/>
     <SolidColorBrush x:Key="SliderThumb.MouseOver.Border" Color="#0099FF"/>
diff --git a/src/Gemini/Themes/VS2013/LightTheme.xaml b/src/Gemini/Themes/VS2013/LightTheme.xaml
index fd6f08be2..b6ecc776e 100644
--- a/src/Gemini/Themes/VS2013/LightTheme.xaml
+++ b/src/Gemini/Themes/VS2013/LightTheme.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Controls/Merged.xaml" />
@@ -170,6 +170,19 @@
     <SolidColorBrush x:Key="TextBox.Selection.InactiveBackground" Color="#ADD6FF"/>
     <SolidColorBrush x:Key="TextBox.Caret" Color="#212121"/>
 
+    <!--Text Editor - AvalonEdit-->
+    <SolidColorBrush x:Key="Editor.Foreground" Color="#FF1E1E1E" />
+    <SolidColorBrush x:Key="Editor.Background" Color="#FFFFFF" />
+    <SolidColorBrush x:Key="Editor.LineNumbersForeground" Color="#FF929292" />
+    <SolidColorBrush x:Key="Editor.CurrentLineBackground" Color="#FFFFFF" />
+    <SolidColorBrush x:Key="Editor.CurrentLineBorder" Color="#EAEAF2" />
+    <SolidColorBrush x:Key="Editor.NonPrintableCharacter" Color="#FFD3D3D3" />
+    <SolidColorBrush x:Key="Editor.LinkTextForeground" Color="#FF007ACC" />
+    <SolidColorBrush x:Key="Editor.LinkTextBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="Editor.SelectionBrush" Color="#ADD6FF" Opacity="0.7"/>
+    <SolidColorBrush x:Key="Editor.SelectionBorder" Color="#50ffffff" />
+    <SolidColorBrush x:Key="Editor.SelectionForeground" Color="#FF1E1E1E" />
+
     <!-- Slider -->
     <SolidColorBrush x:Key="SliderThumb.MouseOver.Background" Color="#DCECFC"/>
     <SolidColorBrush x:Key="SliderThumb.MouseOver.Border" Color="#7Eb4EA"/>

From 366bb48ea22258eb13413cd43748ffda2a2ee897 Mon Sep 17 00:00:00 2001
From: Jong Hyun Kim <diluculo@gmail.com>
Date: Tue, 2 Nov 2021 11:30:30 +0900
Subject: [PATCH 2/2] Replace icons with outlines

---
 .../Resources/Icons/ShowEndOfLine.png           | Bin 226 -> 303 bytes
 .../Resources/Icons/ShowLineNumbers.png         | Bin 362 -> 468 bytes
 .../Resources/Icons/ShowSpaces.png              | Bin 286 -> 282 bytes
 .../Resources/Icons/ShowTabs.png                | Bin 389 -> 381 bytes
 .../Resources/Icons/WordWrap.png                | Bin 200 -> 194 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/Gemini.Modules.CodeEditor/Resources/Icons/ShowEndOfLine.png b/src/Gemini.Modules.CodeEditor/Resources/Icons/ShowEndOfLine.png
index dfc491c5c7b895b67a599d43e17a42c21df0d161..69a4fede146e4663457edd3d1f89b58a494769de 100644
GIT binary patch
literal 303
zcmeAS@N?(olHy`uVBq!ia0vp^f*{Pn1|+R>-G2co&H|6fVg?3oArNM~bhqvgQ1GFr
zi(`mIZ}Ol2|LvKVHgrn-wXgqc^yBC2>CAqt3eyt~+t>Ze`SJ1d^HzEL`hWIyUtauw
zeSO`3_KgcI7$f<)`DW|q+}#mae|J|YkAB>Kw~3z%3KLK0Y6Urn9X5FKe0@Bx0`s!7
zb2!BxC#0tfJa~NAK!9ySYv<u_xwivYRE{2zc=Y&jAseTe^PBhfbv?n%8{2F|9z0%p
zV*;~S+A|U9pb60-Uj#(B7ci)v7AP~@#?QmU!?x4amHYa-c>itQ2iP`l-l!^&%Czxh
x-3y7P?HWLLi|d_q1FB?O#G}Y%U|_(&@G-Vr*lx#z`9RMyc)I$ztaD0e0stP>cuxQT

literal 226
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1quc!E#R*#}EtuWQl?U97{JcPMD)4P~220aDeZ~
za|NG22}%P0k2f|qO6b2}NlM{8-LOOc)UgX^Se8y~l$+AlsP0h1e<;O*cj-fh*^COj
zF3dS>TbMt_a!fWjkj8Lgr<TJTj%R`lH+UKvn**fu52P~$COqJk_|(wI$iTQ#lqI+O
REDz8L44$rjF6*2UngDLfN4x+4

diff --git a/src/Gemini.Modules.CodeEditor/Resources/Icons/ShowLineNumbers.png b/src/Gemini.Modules.CodeEditor/Resources/Icons/ShowLineNumbers.png
index 136818e3f5b2b3de0b03f7aa83314bd84262ce50..0e7a1b6c23600c9fdad3787ee4297c07267955e0 100644
GIT binary patch
literal 468
zcmV;_0W1EAP)<h;3K|Lk000e1NJLTq000pH000pP1^@s6J8eh$00009a7bBm000XT
z000XT0n*)m`~Uy}hDk(0R5*=e{Qv(y1EqikUH{KtzZ{^<3+!xcABZv^<Ps46@$+ZG
zkDosuTz>rd|C>+W|Nr>;(*Y(&2(v(KFL?gxZ-3XZ*9^Pf|72KdE6!jb!vPW(U|?V{
zz~=~dHnsyW?`+^@XY5zyV+9+61PngBf4~3I`SVx}uyb+(QH(55(;hG|{5qIrC2T+S
z;TIHzAOkvkdhi(n_YNp9?a|ciXJBAh2vP`Bj0-Tq#4kMg!JxhTA($O~_$9-l)9*mc
z2kdNYjQB7EaukCC@@k|!UK?=&q$qCq@$={Z`>(%&qW1$R%889)aEkr;>sQ0`Pk-wp
zcRpiy{pTNpB@ZjZ9ABxA3=9kk#6&U75Kww}aN)@heps07@s?qb<YSKf@c#XBd{GPv
z7g!X3`1$KsfPoCh{;q>>z%G&GV+Oh81u;<!3lD)GKYw0m+V%9m#gaS!K}jDJK0ki`
zEP&EDF-SiwiVZG2`Jun?*;jCw1nhkdj&f)wq)!x6UY;;8FaQ7ycQJ6%4yx1u0000<
KMNUMnLSTYFWz1~=

literal 362
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBufiR<}hF1en@V}>vV~B-+G6VC~|EfG$|Nk4G`18DlLx6uq
zgOso2KVzGQPo8W&0kat2H0ATe@c2vYcXsV+xWRPj2&dlz69q%V!b7L0>z5uVvS`?`
z<A<n*Fvkf#piws+&ek_PJixH!zrcjIoD-G!9QH75p2_{9GrET(UyxCtEA+oN^GQpd
z?UIRl3YG%X8BZQ{5YJ&R^yGHA`af9W%KvsJizQ4~|5rEuu(uF%*ur%~RfTEof13cY
z69?)8!~z*C1s*rrSSFPGV`WQ`4rn>z5c2;$hf*V(Px6kV2j<L}amC-s>reliNmm`#
z@IMt~@kt1px{z0*WB)<MlLtP?zG&@EC~RtIWMqg)Oq81b=6fVCC>T6l{an^LB{Ts5
D5FLhG

diff --git a/src/Gemini.Modules.CodeEditor/Resources/Icons/ShowSpaces.png b/src/Gemini.Modules.CodeEditor/Resources/Icons/ShowSpaces.png
index 556711976804bbead4e1c9cfb5c3be5a97953207..d73babc82fdabfb9abfd0f2074c5c29d1d22f7b4 100644
GIT binary patch
literal 282
zcmeAS@N?(olHy`uVBq!ia0vp^f*{Pn1|+R>-G2co&H|6fVg?3oArNM~bhqvgQ1FbW
zi(`mIZ}Ol2|LvKVHgqNlyYWgsY1{DU&sXn;#>RsTo^KefrEfFW%&PnMi#14}LHx(Z
z&&v;Yi|hY;e{0|0|6jAO|NsBv=Vrz!3?CoL+t<rk)P2#2INv|t{(tk{;+KCa+s@6C
zYtxlB7kJycb8~w0SAziUvWN{GSO5R{x_VxUbIMau35y#yCClF2WIlF;DVe!e;OoSX
z$Is7S5U{V{-x<lu3HF_=n~aQjo^IW$@XVzk@Wbcp`mAhhZEQdw;LBxk;M}om4waRM
c4jf=$D09nh+J2Jb5YS%?p00i_>zopr0LDXkZ~y=R

literal 286
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1quc!Ofm7jv*HQZ_gj(Vhj{%|LCaM+S<B&LqLRv
z;I?V^4qS4ZcVO`Y)in`O9`}wMbDQ|%-`!$qW3@F;SI0ju%l0d8s*ewMzc0IZX>Q%B
zwr$pK-TEhP`>e__o)mxKFl+IfK!-hC?{*|E;eINfGvTN}bjboSv#EA|i4D_PU3CiG
zxTBW!nO%LAX?E8z#^4~Q<qOt*D}AqSjXZi#_Ask;&%$)Gl8F~YvtK-(srM*#L48g5
e$!G6HSolB8kyv%SPj3>?`3#<}elF{r5}E)p)^I5R

diff --git a/src/Gemini.Modules.CodeEditor/Resources/Icons/ShowTabs.png b/src/Gemini.Modules.CodeEditor/Resources/Icons/ShowTabs.png
index 5f24c34b52019ad6af1fdcb9aad2eb60732ee9e5..43b18ba182c8454acc730365b222209df3c55c33 100644
GIT binary patch
literal 381
zcmV-@0fPRCP)<h;3K|Lk000e1NJLTq000pH000pP1^@s6J8eh$00009a7bBm000XT
z000XT0n*)m`~Uy}FG)l}R5*=e{Qv(y1Eqk8ViTxk2n#Wae*XFuz`(%pfSrx)0+g@7
zz`&pYR{#nVeE7%Dp9wEsy!ij)=g$v6e*QFoiZxuncK!dZ?b|`(#2FAB5%IsQxCm|#
z$dK;#_W#b#&R|0bg~^3~|NeafG0tAN$WT{R$<M&RaDah<!2nqi)6ZYO41WIlbpRV?
zU|^UaBrN>Ccfte)2~kmGgZ$A0R^a@ZGxl?5&n7A+pawCBiijdyLX=Jd0OXPnh9)Kl
zr<j=FQmOFa{d@W1f&wtd*g&75sjZ!1a$g_9JJ7gyz@{4%Uhm$%Jy=>)#PH(vYnTBS
zp@ExEtal8Un3(vGTyPO;;Rh5|#3VLQTKMtv=Y=0Xe+s}78&r&NVnZ@00A>I-JV=TH
b1_lNIq;fV$;j*uW00000NkvXXu0mjf_N=7i

literal 389
zcmV;00eb$4P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0UAj}K~y+T?U21n
z!(bGKlSsf!Qo+R`Kcdd!CL!?>q=PpiDo8=-=A^hec_)FSfeijk;-)dNZbdq%I3y%K
zNj|C{cnN*r@Sa28^L{5)<|qq7TYTSNbsXoyvaGK>&tI6gY}>wKeqf#mn}igA=>zk&
zs;YhTbu=2?60oajS|7d7vg}=0XGj4JgoKzk3E4+e!!WLkqS#^HGfnf3->1Ubq6w7<
z!*E#F^$qQS<wafBkLlmIWY`-1@NYo#Um)w$I0%BzvMe{~*QjSoLKQm0b=?(SJg4Pq
z^{}d{W%P`To}wr^=v==@7kHl6WBHPHiG@?DCzdCC%Aj+}NC9yiPcc98>Itu<^v%gB
j%STC)e0Q!nGK%s8_i=O}Heu9000000NkvXXu0mjff3c>4

diff --git a/src/Gemini.Modules.CodeEditor/Resources/Icons/WordWrap.png b/src/Gemini.Modules.CodeEditor/Resources/Icons/WordWrap.png
index 1a1d854cd15d99e93fa2a3e509f1e64ca6f9b174..24748ab9687122a8f7e4f6766f2a8a639a2d388e 100644
GIT binary patch
delta 166
zcmV;X09pUY0m1>0B!3BTNLh0L01m?d01m?e$8V@)0001VNkl<ZcwViL!3n@H2t^&O
zIGop#2|7}zNpei_@S#{Mi9~p44*wCQ?bTWvU^xJoc}$BC0M0vvFuVh{W41tmM@o=c
z;VTHp33~5Gt@YAbL^Pn?7yNwrcEX{+u7GerUa-DGDaAWx`X7iV%@!mUmD8?z06$(z
UxaNA4^8f$<07*qoM6N<$f>*gj&Hw-a

delta 172
zcmV;d08{_M0muQ6B!32COGiWi{{a60|De66lK=n!eMv+?R5*>*(6I@FP#DDVpJI_Q
zQdx)tBu%EsBw0Ww5PQe55z?ecmjPVE<^@7X^BzI*nvd_`&mG6^m4$o5DUzMg<^S!o
zg;F+{G2jU)8(eTloxpmBKG4TBXutjp2PlH^Yl8`0fE!f7FC}rrHKxI*Mx61Af!c(i
am9zlSLJmo^Mokd_0000<MNUMnLSTaEaZHE+