Merge pull request #1184 from Ordisoftware/dev

Dev
Ordisoftware · Jun 22, 2022 · f033437 · f033437
2 parents 35b8f12 + 5e7888e
commit f033437
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/Documents/Parashot/Parashot-Lettriqs-EN.txt b/Documents/Parashot/Parashot-Lettriqs-EN.txt
@@ -39,8 +39,8 @@ Bamidbar = Solitude of the Waters of the Student whose Will is Clarified
 Nasho = Cohesion Power of Knowledge
 Behah'alotka = Temple of the Breath which Interacts and Transmits the Light of the Matter which Envelops
 Shela'h Leka = Strength of the Instruction of the Creature who Elevates his Power
-Qora'h = Betrayal and Conspiracy for Failure (to make victims and profit from them)
-'Houqat = Loyalty and Truth for Success (to make everyone win in the long term by protecting life and property without harming criminals)
+Qora'h = Betrayal and Conspiracy for Failure {to make victims and profit from them}
+'Houqat = Loyalty and Truth for Success {to make everyone win in the long term by protecting life and property without harming criminals}
 Balaq = Solitude of a False Existence
 Pin'has = Expression of the Power of the Creative Creature
 Mat'ot = Protective Matrix of Musical Communication

diff --git a/Documents/Parashot/Parashot-Lettriqs-FR.txt b/Documents/Parashot/Parashot-Lettriqs-FR.txt
@@ -39,8 +39,8 @@ Bamidbar = Solitude des Eaux de l'Étudiant dont la Volonté est Clarifiée
 Nasho = Pouvoir de Cohésion du Savoir
 Behah'alotka = Temple du Souffle qui Interagit et Transmet la Lumière de la Matière qui Enveloppe
 Shela'h Leka = Force de l'Instruction de la Créature qui Élève sa Puissance
-Qora'h = Trahison et Conspiration pour l'Échec (pour faire des victimes et en tirer profit)
-'Houqat = Fidélité et Vérité pour la Réussite (pour faire gagner tout le monde au long terme en protégeant la vie et les biens sans nuire aux criminels)
+Qora'h = Trahison et Conspiration pour l'Échec {pour faire des victimes et en tirer profit}
+'Houqat = Fidélité et Vérité pour la Réussite {pour faire gagner tout le monde au long terme en protégeant la vie et les biens sans nuire aux criminels}
 Balaq = Solitude d'une Existence Mensongère
 Pin'has = Expression du Pouvoir de la Créature Créatrice
 Mat'ot = Matrice Protectrice de la Communication Musicale

diff --git a/Documents/Parashot/Parashot-Translations-EN.txt b/Documents/Parashot/Parashot-Translations-EN.txt
@@ -39,7 +39,7 @@ Bamidbar = Despite loneliness
 Nasho = He supported
 Behah'alotka = When you brought forth [light = luminous flux = photons = cloud-grains] of you {with the seven lamps (great plexus-chakras)}
 Shela'h Leka = Free [some slave victims] according to you {your understanding of the Doctrine and your abilities}
-Qora'h = One who is cold (without heart {without love for others and the law to protect people's life and property})
+Qora'h = One who is cold (without heart) {without love for others and the law to protect people's life and property}
 'Houqat = Legislation
 Balaq = The one who robs [the victims, of their health and their property]
 Pin'has = The one who speaks of the future by conjecture

diff --git a/Documents/Parashot/Parashot-Translations-FR.txt b/Documents/Parashot/Parashot-Translations-FR.txt
@@ -39,7 +39,7 @@ Bamidbar = Malgré solitude
 Nasho = Il a soutenu
 Behah'alotka = Lorsque tu as fait jaillir [lumière = flux lumineux = photons = grains-nuées] à toi {avec les sept lampes (grands plexus-chakras)}
 Shela'h Leka = Libère [des victimes esclaves] selon toi {ta compréhension de la Doctrine et tes capacités}
-Qora'h = Celui qui est froid (sans coeur {sans amour pour autrui et la loi visant à protéger la vie et les biens des gens})
+Qora'h = Celui qui est froid (sans coeur) {sans amour pour autrui et la loi visant à protéger la vie et les biens des gens}
 'Houqat = Législation
 Balaq = Celui qui dépouille [les victimes, de leur santé et de leurs biens]
 Pin'has = Celui qui parle de l'avenir par conjectures

diff --git a/Project/Source/Forms/Boxes/Tools/NavigationForm.cs b/Project/Source/Forms/Boxes/Tools/NavigationForm.cs
@@ -63,9 +63,9 @@ public DateTime Date
         LabelMoonriseValue.Text = row.MoonriseAsString;
         LabelMoonsetValue.Text = row.MoonsetAsString;
         LabelMoonriseValue.Visible = row.Moonrise is not null;
-        LabelMoonrise.Visible = LabelMoonriseValue.Visible;
+        LabelMoonrise.Visible = row.Moonrise is not null;
         LabelMoonsetValue.Visible = row.Moonset is not null;
-        LabelMoonset.Visible = LabelMoonsetValue.Visible;
+        LabelMoonset.Visible = row.Moonset is not null;
         //
         LabelEventSeasonValue.Text = AppTranslations.SeasonChanges.GetLang(row.SeasonChange);
         if ( LabelEventSeasonValue.Text.Length == 0 )

diff --git a/Project/Source/Forms/MainForm/UI/MainForm.GoToDate.cs b/Project/Source/Forms/MainForm/UI/MainForm.GoToDate.cs
@@ -87,7 +87,8 @@ public void GoToDate(DateTime date,
       if ( bringToFront )
         SystemManager.TryCatch(() =>
         {
-          if ( !Visible && !onlyIfOpened )
+          if ( onlyIfOpened ) return;
+          if ( !Visible )
             MenuShowHide_Click(null, null);
           else
           if ( WindowState == FormWindowState.Minimized && !onlyIfNotMinimized )