The option to maximize chart windows has been replaced with an option…

… to select a show mode. Fixed scaling of additional symbols on tree diagrams.
Serg-Norseman · Mar 12, 2024 · e2394c8 · e2394c8
1 parent d7127bd
commit e2394c8
Show file tree

Hide file tree

Showing 55 changed files with 354 additions and 80 deletions.
diff --git a/locales/Afrikaans.lng b/locales/Afrikaans.lng
@@ -870,7 +870,7 @@
 866=Use inline images in SVG
 867=Use extended notes
 868=Keep rich names (only advanced users)
-869=Maximize chart windows
+869=Chart windows show mode
 870=Extended tree
 871=Fan chart (only ancestors)
 872=Open in a new window
@@ -952,3 +952,8 @@
 944=Remove top level link?
 945=Help is not available for this language. An English help will be shown.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/Belarusian.lng b/locales/Belarusian.lng
@@ -870,7 +870,7 @@
 866=Use inline images in SVG
 867=Use extended notes
 868=Keep rich names (only advanced users)
-869=Maximize chart windows
+869=Chart windows show mode
 870=Extended tree
 871=Fan chart (only ancestors)
 872=Open in a new window
@@ -952,3 +952,8 @@
 944=Remove top level link?
 945=Help is not available for this language. An English help will be shown.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/Chinese Simplified.lng b/locales/Chinese Simplified.lng
@@ -870,7 +870,7 @@
 866=Use inline images in SVG
 867=Use extended notes
 868=Keep rich names (only advanced users)
-869=Maximize chart windows
+869=Chart windows show mode
 870=Extended tree
 871=Fan chart (only ancestors)
 872=Open in a new window
@@ -952,3 +952,8 @@
 944=Remove top level link?
 945=Help is not available for this language. An English help will be shown.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/Dutch.lng b/locales/Dutch.lng
@@ -870,7 +870,7 @@
 866=Afbeeldingen gebruiken in SVG
 867=Uitgebreide notities gebruiken
 868=Uitgebreide namen behouden (alleen geavanceerde gebruikers)
-869=Grafiekvensters maximaliseren
+869=Chart windows show mode
 870=Verlengde boom
 871=Cirkelgrafiek (alleen voorouders)
 872=Open in nieuw venster
@@ -952,3 +952,8 @@
 944=Remove top level link?
 945=Help is not available for this language. An English help will be shown.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/English.lng b/locales/English.lng
@@ -870,7 +870,7 @@
 866=Use inline images in SVG		; options dialog
 867=Use extended notes				; options dialog
 868=Keep rich names (only advanced users)	; options dialog
-869=Maximize chart windows			; options dialog
+869=Chart windows show mode			; options dialog
 870=Extended tree					; options dialog
 871=Fan chart (only ancestors)
 872=Open in a new window
@@ -952,3 +952,8 @@
 944=Remove top level link?
 945=Help is not available for this language. An English help will be shown.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/Hungarian.lng b/locales/Hungarian.lng
@@ -870,7 +870,7 @@
 866=Használjon beágyazott képeket SVG formátumban
 867=Használjon kiterjesztett jegyzeteket
 868=A gazdag nevek megtartása (csak haladó felhasználók)
-869=Legagyobb ablak méret
+869=Chart windows show mode
 870=Kiterjesztett fa
 871=Rajongói diagram (csak ősök)
 872=Megnyitás új ablakban
@@ -952,3 +952,8 @@
 944=Eltávolítja a legfelső szintű linket?
 945=Ezen a nyelven nem érhető el súgó. Megjelenik egy angol nyelvű súgó.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/Icelandic.lng b/locales/Icelandic.lng
@@ -870,7 +870,7 @@
 866=Use inline images in SVG
 867=Use extended notes
 868=Keep rich names (only advanced users)
-869=Maximize chart windows
+869=Chart windows show mode
 870=Extended tree
 871=Fan chart (only ancestors)
 872=Open in a new window
@@ -952,3 +952,8 @@
 944=Remove top level link?
 945=Help is not available for this language. An English help will be shown.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/Japanese.lng b/locales/Japanese.lng
@@ -870,7 +870,7 @@
 866=SVGでインライン画像を使用する
 867=拡張ノートを使用する
 868=リッチネームを保持する (アドバンスドユーザーのみ)
-869=チャートウィンドウの最大化
+869=Chart windows show mode
 870=拡張系図
 871=ファンチャート (祖先のみ)
 872=新規ウインドウで開く
@@ -952,3 +952,8 @@
 944=トップレベルのリンクを削除しますか？
 945=この言語ではヘルプを利用できません。英語のヘルプが表示されます。
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/Kazakh (Cyrillic).lng b/locales/Kazakh (Cyrillic).lng
@@ -870,7 +870,7 @@
 866=Use inline images in SVG
 867=Use extended notes
 868=Keep rich names (only advanced users)
-869=Maximize chart windows
+869=Chart windows show mode
 870=Extended tree
 871=Fan chart (only ancestors)
 872=Open in a new window
@@ -952,3 +952,8 @@
 944=Remove top level link?
 945=Help is not available for this language. An English help will be shown.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/Portuguese.lng b/locales/Portuguese.lng
@@ -870,7 +870,7 @@
 866=Use inline images in SVG
 867=Use extended notes
 868=Keep rich names (only advanced users)
-869=Maximize chart windows
+869=Chart windows show mode
 870=Extended tree
 871=Fan chart (only ancestors)
 872=Open in a new window
@@ -952,3 +952,8 @@
 944=Remove top level link?
 945=Help is not available for this language. An English help will be shown.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/Serbian (Latin).lng b/locales/Serbian (Latin).lng
@@ -870,7 +870,7 @@
 866=Use inline images in SVG
 867=Use extended notes
 868=Keep rich names (only advanced users)
-869=Maximize chart windows
+869=Chart windows show mode
 870=Extended tree
 871=Fan chart (only ancestors)
 872=Open in a new window
@@ -952,3 +952,8 @@
 944=Remove top level link?
 945=Help is not available for this language. An English help will be shown.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/Spanish.lng b/locales/Spanish.lng
@@ -870,7 +870,7 @@
 866=Use inline images in SVG
 867=Use extended notes
 868=Keep rich names (only advanced users)
-869=Maximize chart windows
+869=Chart windows show mode
 870=Extended tree
 871=Fan chart (only ancestors)
 872=Open in a new window
@@ -952,3 +952,8 @@
 944=Remove top level link?
 945=Help is not available for this language. An English help will be shown.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/czech.lng b/locales/czech.lng
@@ -870,7 +870,7 @@
 866=Použít vložené obrázky ve formátu SVG
 867=Použít rozšířené poznámky
 868=Ponechat zvýrazněné názvy (pouze pokročilí uživatelé)
-869=Maximalizovat okna grafu
+869=Chart windows show mode
 870=Rozšířený strom
 871=Graf vějíř (pouze předci)
 872=Otevřít v novém okně
@@ -952,3 +952,8 @@
 944=Remove top level link?
 945=Help is not available for this language. An English help will be shown.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/french.lng b/locales/french.lng
@@ -870,7 +870,7 @@
 866=Use inline images in SVG
 867=Use extended notes
 868=Keep rich names (only advanced users)
-869=Maximize chart windows
+869=Chart windows show mode
 870=Arbre étendu
 871=Fan chart (only ancestors)
 872=Ouvrir dans une nouvelle fenêtre
@@ -952,3 +952,8 @@
 944=Remove top level link?
 945=Help is not available for this language. An English help will be shown.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/german.lng b/locales/german.lng
@@ -870,7 +870,7 @@
 866=Bilder in SVG-Dateien einbetten
 867=Erweiterte Formatierung von Bemerkungen
 868=Schreibe immer alle Namensbestandteile (nur für fortgeschrittene Benutzer)
-869=Diagrammfenster maximieren
+869=Chart windows show mode
 870=Erweiterter Stammbaum
 871=Fächerdiagramm (nur Vorfahren)
 872=In neuem Fenster öffnen
@@ -952,3 +952,8 @@
 944=Verweis auf oberster Ebene löschen?
 945=Hilfe ist für diese Sprache nicht verfügbar. Es wird eine englische Hilfe angezeigt.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/help_enu/gkhHistory.html b/locales/help_enu/gkhHistory.html
@@ -12,6 +12,8 @@ <h1>Change log</h1>
 
     <p>
         <b>02.03.2024 [v2.29.1 &amp; v3.5.1]</b><ul>
+            <li>The option to maximize chart windows has been replaced with an option to select a show mode.
+            <li>Fixed scaling of additional symbols on tree diagrams.
             <li>Added localization to Afrikaans language [Steyn van der Walt].
             <li>Added call to detailed information about places in the place management tool (pop-up menu).
             <li>Fixed loading of some jpeg images.

diff --git a/locales/help_rus/gkhHistory.html b/locales/help_rus/gkhHistory.html
@@ -12,6 +12,8 @@ <h1>История версий</h1>
 
     <p>
         <b>02.03.2024 [v2.29.1 &amp; v3.5.1]</b><ul>
+            <li>Опция максимизации окон диаграмм заменена на опцию выбора режима отображения.
+            <li>Исправлено масштабирование дополнительных обозначений на диаграммах деревьев.
             <li>Добавлена локализация на язык африкаанс [Steyn van der Walt].
             <li>Добавлен вызов детальной информации о местах в инструмент управления местами (всплывающее меню).
             <li>Исправлена загрузка некоторых изображений jpeg.

diff --git a/locales/italian.lng b/locales/italian.lng
@@ -870,7 +870,7 @@
 866=Use inline images in SVG
 867=Use extended notes
 868=Keep rich names (only advanced users)
-869=Maximize chart windows
+869=Chart windows show mode
 870=Extended tree
 871=Fan chart (only ancestors)
 872=Open in a new window
@@ -952,3 +952,8 @@
 944=Remove top level link?
 945=Help is not available for this language. An English help will be shown.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/polish.lng b/locales/polish.lng
@@ -870,7 +870,7 @@
 866=Use inline images in SVG
 867=Use extended notes
 868=Keep rich names (only advanced users)
-869=Maximize chart windows
+869=Chart windows show mode
 870=Extended tree
 871=Fan chart (only ancestors)
 872=Open in a new window
@@ -952,3 +952,8 @@
 944=Remove top level link?
 945=Help is not available for this language. An English help will be shown.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/russian.lng b/locales/russian.lng
@@ -870,7 +870,7 @@
 866=Встраивать изображения в SVG
 867=Использовать расширенные заметки
 868=Сохранять "насыщенные" имена (только продвинутые пользователи)
-869=Разворачивать окна диаграмм
+869=Режим окон диаграмм
 870=Расширенные деревья
 871=Веерная диаграмма (только предки)
 872=Открыть в новом окне
@@ -952,3 +952,8 @@
 944=Удалить ссылку на верхний уровень?
 945=Справка недоступна для этого языка. Будет показана справка на английском языке.
 946=Адрес (№№ улицы и дома)
+
+947=Обычный
+948=Максимизировать
+949=Левая половина
+950=Правая половина
diff --git a/locales/ukrainian.lng b/locales/ukrainian.lng
@@ -870,7 +870,7 @@
 866=Використовувати вбудовані зображення у SVG
 867=Використовувати розширені нотатки
 868=Keep rich names (only advanced users)
-869=Maximize chart windows
+869=Chart windows show mode
 870=Extended tree
 871=Fan chart (only ancestors)
 872=Open in a new window
@@ -952,3 +952,8 @@
 944=Remove top level link?
 945=Help is not available for this language. An English help will be shown.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/projects/GKCore/GKCore/AppHost.cs b/projects/GKCore/GKCore/AppHost.cs
@@ -559,6 +559,36 @@ public void WidgetClose(IWidget widget)
 
         public abstract ExtRect GetActiveScreenWorkingArea();
 
+        public abstract void SetWindowBounds(IWindow window, ExtRect bounds);
+
+        public void SetWindowBounds(IWindow window, ChartWindowsShowMode mode)
+        {
+            var scrBounds = GetActiveScreenWorkingArea();
+
+            switch (mode) {
+                case ChartWindowsShowMode.Default:
+                    break;
+
+                case ChartWindowsShowMode.Maximize:
+                    SetWindowBounds(window, scrBounds);
+                    break;
+
+                case ChartWindowsShowMode.LeftHalf: {
+                        int half = scrBounds.Width / 2;
+                        var halfBounds = new ExtRect(scrBounds.Left, scrBounds.Top, half, scrBounds.Height);
+                        SetWindowBounds(window, halfBounds);
+                    }
+                    break;
+
+                case ChartWindowsShowMode.RightHalf: {
+                        int half = scrBounds.Width / 2;
+                        var halfBounds = new ExtRect(scrBounds.Left + half, scrBounds.Top, half, scrBounds.Height);
+                        SetWindowBounds(window, halfBounds);
+                    }
+                    break;
+            }
+        }
+
         public virtual void WidgetLocate(IWidgetForm view, WidgetLocation location)
         {
             // May have a desktop-only implementation