Merge pull request #49 from Ordisoftware/dev

Dev

Author: Ordisoftware

Documents/Alphabet-en.txt

@@ -100,7 +100,7 @@ Negative: Interruption
 Verb: Exist
 Structure: Hand
 Function: Love
-Meanings: Flame, Energy,Spiritual Core,Seed,Center,Purity,Peace,Abnegation,Spermatozoa
+Meanings: Flame,Energy,Spiritual Core,Seed,Center,Purity,Peace,Abnegation,Spermatozoa
 
 KAF
 ValueSimple: 20

Documents/Alphabet-fr.txt

@@ -100,7 +100,7 @@ Negative: Interruption
 Verb: Exister
 Structure: Main
 Function: Amour
-Meanings: Flamme, �nergie,Noyau spirituel,Germe,Centre,Puret�,Paix,Abn�gation,Spermatozo�de
+Meanings: Flamme,�nergie,Noyau spirituel,Germe,Centre,Puret�,Paix,Abn�gation,Spermatozo�de
 
 KAF
 ValueSimple: 20

Project/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut
 // en utilisant '*', comme indiqué ci-dessous :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.8.0.0")]
-[assembly: AssemblyFileVersion("2.8.0.0")]
+[assembly: AssemblyVersion("2.9.0.0")]
+[assembly: AssemblyFileVersion("2.9.0.0")]

Project/Source/Forms/MainForm/MainForm.Analyse.cs

@@ -11,7 +11,7 @@
 /// You may add additional accurate notices of copyright ownership.
 /// </license>
 /// <created> 2016-04 </created>
-/// <edited> 2019-08 </edited>
+/// <edited> 2019-10 </edited>
 using System;
 using System.Data;
 using System.Drawing;
@@ -49,31 +49,25 @@ private void DoAnalyse()
         combobox.Location = new Point(155, 16 + dy);
         combobox.SelectedIndexChanged += MeaningComboBox_SelectedIndexChanged;
         EditAnalyze.Controls.Add(combobox);
-        combobox.Items.Add(l.Positive);
-        combobox.Items.Add(l.Negative);
-        combobox.Items.Add(l.Verb);
-        combobox.Items.Add(l.Structure);
-        combobox.Items.Add(l.Function);
-        SelectedMeanings += l.Name + ": ";
-        SelectedMeanings += l.Positive + ", ";
-        SelectedMeanings += l.Negative + ", ";
-        SelectedMeanings += l.Verb + ", ";
-        SelectedMeanings += l.Structure + ", ";
-        SelectedMeanings += l.Function + ", ";
+        combobox.Items.Add(l.Positive.Trim());
+        combobox.Items.Add(l.Negative.Trim());
+        combobox.Items.Add(l.Verb.Trim());
+        combobox.Items.Add(l.Structure.Trim());
+        combobox.Items.Add(l.Function.Trim());
+        SelectedMeanings += l.Name.Trim() + ": ";
+        SelectedMeanings += l.Positive.Trim() + ", ";
+        SelectedMeanings += l.Negative.Trim() + ", ";
+        SelectedMeanings += l.Verb.Trim() + ", ";
+        SelectedMeanings += l.Structure.Trim() + ", ";
+        SelectedMeanings += l.Function.Trim() + ", ";
         foreach ( var meaning in l.GetMeaningsRows() )
         {
-          combobox.Items.Add(meaning.Meaning);
-          SelectedMeanings += meaning.Meaning + ", ";
+          var str = meaning.Meaning.Trim();
+          combobox.Items.Add(str);
+          SelectedMeanings += str + ",";
         }
         dy += 30;
-        try
-        {
-          SelectedMeanings = SelectedMeanings.Remove(SelectedMeanings.Length - 2, 1);
-        }
-        catch
-        {
-        }
-        SelectedMeanings += Environment.NewLine;
+        SelectedMeanings = SelectedMeanings.TrimEnd(',') + Environment.NewLine;
       }
       EditGematria.Text = sum.ToString();
       ActionCopyToClipboardMeanings.Enabled = EditAnalyze.Controls.Count > 0;

Project/Source/Forms/MainForm/MainForm.DB.CreateData.cs

@@ -11,7 +11,7 @@
 /// You may add additional accurate notices of copyright ownership.
 /// </license>
 /// <created> 2019-01 </created>
-/// <edited> 2019-09 </edited>
+/// <edited> 2019-10 </edited>
 using System;
 using System.Data.Odbc;
 using System.Globalization;
@@ -53,7 +53,7 @@ public void CreateDataIfNotExists(bool reset)
           int p = data.IndexOf(name, indexStart);
           string s = data.Substring(p + name.Length, data.IndexOf("\r\n", p) - p - name.Length);
           indexStart = data.IndexOf("\r\n", p) + 2;
-          return s;
+          return s.Trim();
         };
         Func<string, int> getIntValue = (name) =>
         {
@@ -78,7 +78,7 @@ public void CreateDataIfNotExists(bool reset)
             var rowMeaning = DataSet.Meanings.NewMeaningsRow();
             rowMeaning.ID = Guid.NewGuid().ToString();
             rowMeaning.LetterCode = rowLetter.Code;
-            rowMeaning.Meaning = meaning;
+            rowMeaning.Meaning = meaning.Trim();
             DataSet.Meanings.AddMeaningsRow(rowMeaning);
           }
           DataSet.Letters.AddLettersRow(rowLetter);

README.md

@@ -69,6 +69,10 @@ Watch the [video](https://www.youtube.com/watch?v=WPVF8pj9I3E).
 
 ## Changelog
 
+#### 2019.10.27 - Version 2.9
+
+- Improve meanings by trimming leading and trailing spaces.
+
 #### 2019.10.21 - Version 2.8
 
 - Fix french translation of parameters labels lost in previous version.

Setup/OrdisoftwareHebrewLettersSetup.iss

@@ -3,7 +3,7 @@
 
 #define MyAppName "Hebrew Letters"
 #define MyAppNameNoSpace "HebrewLetters"
-#define MyAppVersion "2.8"
+#define MyAppVersion "2.9"
 #define MyAppPublisher "Ordisoftware"
 #define MyAppURL "http://www.ordisoftware.com/projects/hebrew-letters"
 #define MyAppExeName "Ordisoftware.HebrewLetters.exe"