Added a button to the location editing dialog for taking coordinates …

…from the cursor on the map
Serg-Norseman · Dec 3, 2024 · f37cedf · f37cedf
1 parent f7ac2d0
commit f37cedf
Show file tree

Hide file tree

Showing 29 changed files with 72 additions and 11 deletions.
diff --git a/locales/Afrikaans.lng b/locales/Afrikaans.lng
@@ -1022,3 +1022,4 @@
 1009=Date designations
 1010=Mourning edges
 1011=Use additional dates
+1012=Cursor coordinates
diff --git a/locales/Belarusian.lng b/locales/Belarusian.lng
@@ -1022,3 +1022,4 @@
 1009=Date designations
 1010=Mourning edges
 1011=Use additional dates
+1012=Cursor coordinates
diff --git a/locales/Chinese Simplified.lng b/locales/Chinese Simplified.lng
@@ -1022,3 +1022,4 @@
 1009=Date designations
 1010=Mourning edges
 1011=Use additional dates
+1012=Cursor coordinates
diff --git a/locales/Czech.lng b/locales/Czech.lng
@@ -1022,3 +1022,4 @@
 1009=Date designations
 1010=Mourning edges
 1011=Use additional dates
+1012=Cursor coordinates
diff --git a/locales/Dutch.lng b/locales/Dutch.lng
@@ -1022,3 +1022,4 @@
 1009=Date designations
 1010=Mourning edges
 1011=Use additional dates
+1012=Cursor coordinates
diff --git a/locales/English.lng b/locales/English.lng
@@ -1022,3 +1022,4 @@
 1009=Date designations
 1010=Mourning edges
 1011=Use additional dates
+1012=Cursor coordinates
diff --git a/locales/French.lng b/locales/French.lng
@@ -1022,3 +1022,4 @@
 1009=Date designations
 1010=Mourning edges
 1011=Use additional dates
+1012=Cursor coordinates
diff --git a/locales/German.lng b/locales/German.lng
@@ -1022,3 +1022,4 @@
 1009=Date designations
 1010=Mourning edges
 1011=Use additional dates
+1012=Cursor coordinates
diff --git a/locales/Hungarian.lng b/locales/Hungarian.lng
@@ -1022,3 +1022,4 @@
 1009=Date designations
 1010=Mourning edges
 1011=Use additional dates
+1012=Cursor coordinates
diff --git a/locales/Icelandic.lng b/locales/Icelandic.lng
@@ -1022,3 +1022,4 @@
 1009=Date designations
 1010=Mourning edges
 1011=Use additional dates
+1012=Cursor coordinates
diff --git a/locales/Italian.lng b/locales/Italian.lng
@@ -1022,3 +1022,4 @@
 1009=Date designations
 1010=Mourning edges
 1011=Use additional dates
+1012=Cursor coordinates
diff --git a/locales/Japanese.lng b/locales/Japanese.lng
@@ -1022,3 +1022,4 @@
 1009=Date designations
 1010=Mourning edges
 1011=Use additional dates
+1012=Cursor coordinates
diff --git a/locales/Kazakh (Cyrillic).lng b/locales/Kazakh (Cyrillic).lng
@@ -1022,3 +1022,4 @@
 1009=Date designations
 1010=Mourning edges
 1011=Use additional dates
+1012=Cursor coordinates
diff --git a/locales/Polish.lng b/locales/Polish.lng
@@ -1022,3 +1022,4 @@
 1009=Date designations
 1010=Mourning edges
 1011=Use additional dates
+1012=Cursor coordinates
diff --git a/locales/Portuguese.lng b/locales/Portuguese.lng
@@ -1022,3 +1022,4 @@
 1009=Date designations
 1010=Mourning edges
 1011=Use additional dates
+1012=Cursor coordinates
diff --git a/locales/Russian.lng b/locales/Russian.lng
@@ -1022,3 +1022,4 @@
 1009=Обозначения дат
 1010=Траурные края
 1011=Использовать дополнительные даты
+1012=Коорд. курсора
diff --git a/locales/Serbian (Latin).lng b/locales/Serbian (Latin).lng
@@ -1022,3 +1022,4 @@
 1009=Date designations
 1010=Mourning edges
 1011=Use additional dates
+1012=Cursor coordinates
diff --git a/locales/Spanish.lng b/locales/Spanish.lng
@@ -1022,3 +1022,4 @@
 1009=Date designations
 1010=Mourning edges
 1011=Use additional dates
+1012=Cursor coordinates
diff --git a/locales/Ukrainian.lng b/locales/Ukrainian.lng
@@ -1022,3 +1022,4 @@
 1009=Date designations
 1010=Mourning edges
 1011=Use additional dates
+1012=Cursor coordinates
diff --git a/locales/help_enu/gkhHistory.html b/locales/help_enu/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>Change log</h1>
 
     <p>
         <b>14.12.2024 [v2.32.0 &amp; v3.8.0]</b><ul>
+            <li>Added a button to the location editing dialog for taking coordinates from the cursor on the map.
             <li>Added protection for empty records (individual, notes and multimedia) in files from other programs.
             <li>Added option in tree diagrams - use additional dates (baptism, burial) if the main ones (births, deaths) are missing.
             <li>Added options in tree diagrams: text paddings, date designations and mourning edges.

diff --git a/locales/help_rus/gkhHistory.html b/locales/help_rus/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>История версий</h1>
 
     <p>
         <b>14.12.2024 [v2.32.0 &amp; v3.8.0]</b><ul>
+            <li>Добавлена кнопка в диалог редактирования локаций для взятия координат по курсору на карте.
             <li>Добавлена защита пустых записей (персональных, заметок и мультимедиа) в файлах из сторонних программ.
             <li>Добавлена опция в диаграммах деревьев - использовать дополнительные даты (крещения и похорон), если отсутствуют основные (рождения, смерти).
             <li>Добавлены опции в диаграммах деревьев: отступа текста, обозначений дат и траурных рамок.

diff --git a/projects/GKCore/GKCore/Controllers/LocationEditDlgController.cs b/projects/GKCore/GKCore/Controllers/LocationEditDlgController.cs
@@ -198,6 +198,14 @@ public void SelectGeoPoint()
             fView.MapBrowser.SetCenter(pt.Latitude, pt.Longitude, -1);
         }
 
+        public void SelectCursorCoords()
+        {
+            var pos = fView.MapBrowser.TargetPosition;
+
+            fView.Latitude.Text = GEDCOMUtils.CoordToStr(pos.Lat);
+            fView.Longitude.Text = GEDCOMUtils.CoordToStr(pos.Lng);
+        }
+
         public void ShowOnMap()
         {
             if (fView.Latitude.Text != "" && fView.Longitude.Text != "") {
@@ -222,6 +230,7 @@ public override void SetLocale()
             GetControl<IButton>("btnSearch").Text = LangMan.LS(LSID.Search);
             GetControl<IButton>("btnSelect").Text = LangMan.LS(LSID.SelectCoords);
             GetControl<IButton>("btnSelectName").Text = LangMan.LS(LSID.SelectName);
+            GetControl<IButton>("btnSelectCursor").Text = LangMan.LS(LSID.CursorCoords);
 
             SetToolTip("btnShowOnMap", LangMan.LS(LSID.ShowOnMapTip));
 

diff --git a/projects/GKCore/GKCore/LangMan.cs b/projects/GKCore/GKCore/LangMan.cs
@@ -1086,8 +1086,9 @@ public enum LSID
         /* 1009 */ DateDesignations,
         /* 1010 */ MourningEdges,
         /* 1011 */ UseAdditionalDates,
+        /* 1012 */ CursorCoords,
 
-        /* 000 */ Last = UseAdditionalDates
+        /* 000 */ Last = CursorCoords
     }
 
 
@@ -2127,6 +2128,7 @@ public static class LangMan
             /* 1009 */ "Date designations",
             /* 1010 */ "Mourning edges",
             /* 1011 */ "Use additional dates",
+            /* 1012 */ "Cursor coordinates",
         };
 
         private static readonly LangManager fLangMan = new LangManager();

diff --git a/projects/GKv2/GEDKeeper2/GKUI/Forms/LocationEditDlg.Designer.cs b/projects/GKv2/GEDKeeper2/GKUI/Forms/LocationEditDlg.Designer.cs
diff --git a/projects/GKv2/GEDKeeper2/GKUI/Forms/LocationEditDlg.cs b/projects/GKv2/GEDKeeper2/GKUI/Forms/LocationEditDlg.cs
@@ -149,6 +149,11 @@ private void btnSelectName_Click(object sender, EventArgs e)
             fController.SelectName();
         }
 
+        private void btnSelectCursor_Click(object sender, EventArgs e)
+        {
+            fController.SelectCursorCoords();
+        }
+
         private void ListGeoCoords_Click(object sender, EventArgs e)
         {
             fController.SelectGeoPoint();

diff --git a/projects/GKv3/GEDKeeper3/GKUI/Forms/LocationEditDlg.cs b/projects/GKv3/GEDKeeper3/GKUI/Forms/LocationEditDlg.cs
@@ -162,6 +162,11 @@ private void btnSelectName_Click(object sender, EventArgs e)
             fController.SelectName();
         }
 
+        private void btnSelectCursor_Click(object sender, EventArgs e)
+        {
+            fController.SelectCursorCoords();
+        }
+
         private void ListGeoCoords_Click(object sender, EventArgs e)
         {
             fController.SelectGeoPoint();

diff --git a/projects/GKv3/GEDKeeper3/GKUI/Forms/LocationEditDlg.xeto b/projects/GKv3/GEDKeeper3/GKUI/Forms/LocationEditDlg.xeto
@@ -42,6 +42,7 @@
                           <Button x:Name="btnSearch" Style="funcBtn" Click="btnSearch_Click" />
                           <Button x:Name="btnSelect" Style="funcBtn" Click="btnSelect_Click" />
                           <Button x:Name="btnSelectName" Style="funcBtn" Click="btnSelectName_Click" />
+                          <Button x:Name="btnSelectCursor" Style="funcBtn" Click="btnSelectCursor_Click" />
                           <Button x:Name="btnShowOnMap" Style="funcBtn" Click="btnShowOnMap_Click" />
                         </StackLayout>
                       </TableRow>

diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/LocationEditDlg.xaml b/projects/GKvX/GEDKeeperX/GKUI/Forms/LocationEditDlg.xaml
@@ -36,6 +36,7 @@
                                         <Button x:Name="btnSearch" Style="{StaticResource funcBtn}" Clicked="btnSearch_Click" />
                                         <Button x:Name="btnSelect" Style="{StaticResource funcBtn}" Clicked="btnSelect_Click" />
                                         <Button x:Name="btnSelectName" Style="{StaticResource funcBtn}" Clicked="btnSelectName_Click" />
+                                        <Button x:Name="btnSelectCursor" Style="{StaticResource funcBtn}" Clicked="btnSelectCursor_Click" />
                                         <Button x:Name="btnShowOnMap" Style="{StaticResource funcBtn}" Clicked="btnShowOnMap_Click" />
                                     </StackLayout>
                                 </StackLayout>

diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/LocationEditDlg.xaml.cs b/projects/GKvX/GEDKeeperX/GKUI/Forms/LocationEditDlg.xaml.cs
@@ -111,6 +111,11 @@ private void btnSelectName_Click(object sender, EventArgs e)
             fController.SelectName();
         }
 
+        private void btnSelectCursor_Click(object sender, EventArgs e)
+        {
+            fController.SelectCursorCoords();
+        }
+
         private void ListGeoCoords_Click(object sender, EventArgs e)
         {
             fController.SelectGeoPoint();