#21 option to remove ellipses

AntonyCorbett · Jan 10, 2019 · acb9f5c · acb9f5c
1 parent 49be979
commit acb9f5c
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 5 deletions.
diff --git a/OnlyV.ImageCreation/BibleTextImage.cs b/OnlyV.ImageCreation/BibleTextImage.cs
@@ -75,7 +75,8 @@ public BibleTextImage()
             FlowDirection = FlowDirection.LeftToRight;
             AllowAutoFit = true;
             ShowBreakInVerses = true;
-
+            UseContinuationEllipses = true;
+
             TitleDropShadow = true;
             TitleDropShadowColor = Colors.Black;
             TitleDropShadowOpacity = 0.5;
@@ -151,6 +152,8 @@ public Color BackgroundColor
         public bool AllowAutoFit { get; set; }
 
         public bool ShowBreakInVerses { get; set; }
+
+        public bool UseContinuationEllipses { get; set; }
 
         public bool UseTildeParaSeparator { get; set; }
 
@@ -491,13 +494,19 @@ private DrawingVisual DrawBody(
                 {
                     var lineStr = linesForBmp[lineNum];
 
-                    if (lineNum == 0 && lineStr.Length > 0 && !IsEndOfSentenceOrPhrase(linesForPreviousBmp?.LastOrDefault()))
+                    if (UseContinuationEllipses && 
+                        lineNum == 0 && 
+                        lineStr.Length > 0 && 
+                        !IsEndOfSentenceOrPhrase(linesForPreviousBmp?.LastOrDefault()))
                     {
                         // ellipsis at start of this line...
                         lineStr = string.Concat(Ellipsis, lineStr);
                     }
 
-                    if (lineNum == linesForBmp.Length - 1 && moreImagesAfterThis && !IsEndOfSentenceOrPhrase(lineStr))
+                    if (UseContinuationEllipses && 
+                        lineNum == linesForBmp.Length - 1 && 
+                        moreImagesAfterThis && 
+                        !IsEndOfSentenceOrPhrase(lineStr))
                     {
                         // ellipsis at the end of the last line (if appropriate)...
                         lineStr = string.Concat(lineStr, Ellipsis);

diff --git a/OnlyV/AppOptions/Options.cs b/OnlyV/AppOptions/Options.cs
@@ -14,8 +14,8 @@ public Options()
             AutoFit = true;
             ShowVerseBreaks = true;
             UseTildeMarker = true;
-            ShowVerseBreaks = true;
             TextScalingPercentage = 100;
+            UseContinuationEllipses = true;
 
             Sanitize();
         }
@@ -56,6 +56,8 @@ public Options()
 
         public bool SpaceBetweenTitleVerseNumbers { get; set; }
 
+        public bool UseContinuationEllipses { get; set; }
+
         /// <summary>
         /// Validates the data, correcting automatically as required
         /// </summary>

diff --git a/OnlyV/Pages/SettingsPage.xaml b/OnlyV/Pages/SettingsPage.xaml
@@ -184,6 +184,10 @@
                 <CheckBox IsChecked="{Binding SpaceBetweenTitleVerseNumbers, Mode=TwoWay}"
                           Content="{x:Static resx:Resources.TITLE_VERSE_NOS}"
                           Style="{StaticResource SettingsCheckBoxStyle}"/>
+
+                <CheckBox IsChecked="{Binding ShowEllipsesForContinuation, Mode=TwoWay}"
+                          Content="{x:Static resx:Resources.ELLIPSIS_CONTINUATION}"
+                          Style="{StaticResource SettingsCheckBoxStyle}"/>
             </StackPanel>
         </GroupBox>
 

diff --git a/OnlyV/Properties/Resources.Designer.cs b/OnlyV/Properties/Resources.Designer.cs
diff --git a/OnlyV/Properties/Resources.resx b/OnlyV/Properties/Resources.resx
@@ -375,4 +375,7 @@
   <data name="TITLE_VERSE_NOS" xml:space="preserve">
     <value>Space between title verse numbers</value>
   </data>
+  <data name="ELLIPSIS_CONTINUATION" xml:space="preserve">
+    <value>Show ellipses for continuation</value>
+  </data>
 </root>
diff --git a/OnlyV/Services/Images/ImagesService.cs b/OnlyV/Services/Images/ImagesService.cs
@@ -148,10 +148,11 @@ private void ApplyFormatting(
             // formatting...
             bibleTextImage.AllowAutoFit = _optionsService.AutoFit;
             bibleTextImage.ShowBreakInVerses = _optionsService.ShowVerseBreaks;
+            bibleTextImage.UseContinuationEllipses = _optionsService.UseContinuationEllipses;
             bibleTextImage.UseTildeParaSeparator = _optionsService.UseTildeMarker;
             bibleTextImage.TrimPunctuation = _optionsService.TrimPunctuation;
             bibleTextImage.TrimQuotes = _optionsService.TrimQuotes;
-
+            
             // body text...
             bibleTextImage.MainFont.FontFamily = new FontFamily(theme.BodyText.Font.Family);
             bibleTextImage.MainFont.FontSize = AdaptToScaling(theme.BodyText.Font.Size);

diff --git a/OnlyV/Services/Options/IOptionsService.cs b/OnlyV/Services/Options/IOptionsService.cs
@@ -38,6 +38,8 @@ internal interface IOptionsService
 
         bool ShowVerseBreaks { get; set; }
 
+        bool UseContinuationEllipses { get; set; }
+
         bool UseTildeMarker { get; set; }
 
         bool TrimPunctuation { get; set; }

diff --git a/OnlyV/Services/Options/OptionsService.cs b/OnlyV/Services/Options/OptionsService.cs
@@ -213,6 +213,19 @@ public bool ShowVerseBreaks
                 }
             }
         }
+
+        public bool UseContinuationEllipses
+        {
+            get => _options.UseContinuationEllipses;
+            set
+            {
+                if (_options.UseContinuationEllipses != value)
+                {
+                    _options.UseContinuationEllipses = value;
+                    StyleChangedEvent?.Invoke(this, EventArgs.Empty);
+                }
+            }
+        }
 
         public bool UseTildeMarker
         {

diff --git a/OnlyV/ViewModel/SettingsViewModel.cs b/OnlyV/ViewModel/SettingsViewModel.cs
@@ -284,6 +284,19 @@ public bool SpaceBetweenTitleVerseNumbers
                 }
             }
         }
+
+        public bool ShowEllipsesForContinuation
+        {
+            get => _optionsService.UseContinuationEllipses;
+            set
+            {
+                if (_optionsService.UseContinuationEllipses != value)
+                {
+                    _optionsService.UseContinuationEllipses = value;
+                    RaisePropertyChanged();
+                }
+            }
+        }
 
         public IEnumerable<LoggingLevel> LoggingLevels => _loggingLevels;