Skip to content

Commit

Permalink
Advanced text tool: "last line of paragraph" behavior...
Browse files Browse the repository at this point in the history
...now user-controllable, with full support for last-line alignment to the left, center, right, or fully justified like the preceding paragraph!

Relates to #428

Photoshop is the only other photo editor (at all, to my knowledge) that provides this level of control over text justification.  Most photo editors don't provide justified alignment at all, and even those that do (GIMP) fail to handle multi-paragraph text layers correctly.

All these cases are now handled correctly in PhotoDemon, and the user has full control over the process.  Big win for us, IMO  👍

(Also, the new setting can of course be persisted to/from PDI files, as expected.)
  • Loading branch information
tannerhelland committed Sep 12, 2022
1 parent 72a49bc commit efceea7
Show file tree
Hide file tree
Showing 22 changed files with 378 additions and 153 deletions.
19 changes: 12 additions & 7 deletions App/PhotoDemon/Languages/French.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<langid>fr-FR</langid>
<langname>Français</langname>
<langversion>6.7.592</langversion>
<langversion>6.7.593</langversion>
<langstatus>Complete</langstatus>

<author>Jean Jacques Piedfort (orig. Frank Donckers)</author>
Expand Down Expand Up @@ -3030,6 +3030,11 @@ Description: %2
<translation>reflection</translation>
</phrase>

<phrase>
<original>last line justify</original>
<translation></translation>
</phrase>

<phrase>
<original>Modify selection</original>
<translation>Modification de la sélection</translation>
Expand All @@ -3052,7 +3057,7 @@ When finished, click the Submit New Issue button. Thank you!</original>
<translation>Instructions pour les rapports de bogues</translation>
</phrase>

<!-- Processor.bas contains 128 phrases. 68 were duplicates of existing phrases, so only 60 new phrases were written to file. -->
<!-- Processor.bas contains 130 phrases. 69 were duplicates of existing phrases, so only 61 new phrases were written to file. -->

<phrase>
<original>automatic</original>
Expand Down Expand Up @@ -12705,7 +12710,7 @@ Vous pouvez alors si besoin
<translation>Cliquer ici pour convertir en calque de texte avancé</translation>
</phrase>

<!-- Toolpanel_Typography.frm contains 60 phrases. 35 were duplicates of existing phrases, so only 25 new phrases were written to file. -->
<!-- Toolpanel_Typography.frm contains 61 phrases. 36 were duplicates of existing phrases, so only 25 new phrases were written to file. -->

<phrase>
<original>click here for detailed instructions (in English)</original>
Expand Down Expand Up @@ -13966,10 +13971,10 @@ Si vous choisissez de désactiver les mises à jour, n'oubliez pas de visiter ph

<!-- Automatic text generation complete. -->

<phrasecount>2640</phrasecount>
<phrasecount>2641</phrasecount>

<!-- As of this build, PhotoDemon contains 5515 phrases. -->
<!-- 2875 are duplicates, so only 2640 unique phrases have been written to file. -->
<!-- These 2640 phrases contain approximately 11421 total words. -->
<!-- As of this build, PhotoDemon contains 5518 phrases. -->
<!-- 2877 are duplicates, so only 2641 unique phrases have been written to file. -->
<!-- These 2641 phrases contain approximately 11424 total words. -->

</pdData>
19 changes: 12 additions & 7 deletions App/PhotoDemon/Languages/German.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<langid>de-DE</langid>
<langname>Deutsch (German)</langname>
<langversion>9.0.1705</langversion>
<langversion>9.0.1706</langversion>
<langstatus>Up-to-date</langstatus>

<author>rk (ehem. Frank Donckers, Helmut Kuerbiss)</author>
Expand Down Expand Up @@ -3030,6 +3030,11 @@ Deskription: %2
<translation>Spiegelung</translation>
</phrase>

<phrase>
<original>last line justify</original>
<translation></translation>
</phrase>

<phrase>
<original>Modify selection</original>
<translation>Auswahl modifizieren</translation>
Expand All @@ -3054,7 +3059,7 @@ Nach Abschluss klicken Sie auf den Button "Neues Problem einreichen". Danke!</tr
<translation>Bug-Bericht-Instruktionen</translation>
</phrase>

<!-- Processor.bas contains 128 phrases. 68 were duplicates of existing phrases, so only 60 new phrases were written to file. -->
<!-- Processor.bas contains 130 phrases. 69 were duplicates of existing phrases, so only 61 new phrases were written to file. -->

<phrase>
<original>automatic</original>
Expand Down Expand Up @@ -12699,7 +12704,7 @@ Möchten Sie Ihre Batchliste vor dem Beenden speichern?</translation>
<translation>Klicken Sie hier, um diesen Layer in erweiterten Text zu konvertieren.</translation>
</phrase>

<!-- Toolpanel_Typography.frm contains 60 phrases. 35 were duplicates of existing phrases, so only 25 new phrases were written to file. -->
<!-- Toolpanel_Typography.frm contains 61 phrases. 36 were duplicates of existing phrases, so only 25 new phrases were written to file. -->

<phrase>
<original>click here for detailed instructions (in English)</original>
Expand Down Expand Up @@ -13955,10 +13960,10 @@ Wenn Sie sich dennoch dafür entscheiden, Updates zu deaktivieren, vergessen Sie

<!-- Automatic text generation complete. -->

<phrasecount>2640</phrasecount>
<phrasecount>2641</phrasecount>

<!-- As of this build, PhotoDemon contains 5515 phrases. -->
<!-- 2875 are duplicates, so only 2640 unique phrases have been written to file. -->
<!-- These 2640 phrases contain approximately 11421 total words. -->
<!-- As of this build, PhotoDemon contains 5518 phrases. -->
<!-- 2877 are duplicates, so only 2641 unique phrases have been written to file. -->
<!-- These 2641 phrases contain approximately 11424 total words. -->

</pdData>
19 changes: 12 additions & 7 deletions App/PhotoDemon/Languages/Indonesian.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<langid>indo-ID</langid>
<langname>Indonesian</langname>
<langversion>8.9.1699</langversion>
<langversion>8.9.1700</langversion>
<langstatus>90% complete</langstatus>

<author>Ari Sohandri Putra</author>
Expand Down Expand Up @@ -3021,6 +3021,11 @@ Deskripsi: %2
<translation></translation>
</phrase>

<phrase>
<original>last line justify</original>
<translation></translation>
</phrase>

<phrase>
<original>Modify selection</original>
<translation></translation>
Expand All @@ -3043,7 +3048,7 @@ When finished, click the Submit New Issue button. Thank you!</original>
<translation>Intruksi Laporan Bug</translation>
</phrase>

<!-- Processor.bas contains 128 phrases. 68 were duplicates of existing phrases, so only 60 new phrases were written to file. -->
<!-- Processor.bas contains 130 phrases. 69 were duplicates of existing phrases, so only 61 new phrases were written to file. -->

<phrase>
<original>automatic</original>
Expand Down Expand Up @@ -12685,7 +12690,7 @@ Would kemudian anda suka untuk menyimpan senarai kumpulan anda sebelum keluar?</
<translation></translation>
</phrase>

<!-- Toolpanel_Typography.frm contains 60 phrases. 35 were duplicates of existing phrases, so only 25 new phrases were written to file. -->
<!-- Toolpanel_Typography.frm contains 61 phrases. 36 were duplicates of existing phrases, so only 25 new phrases were written to file. -->

<phrase>
<original>click here for detailed instructions (in English)</original>
Expand Down Expand Up @@ -13937,10 +13942,10 @@ Jika anda masih memilih untuk melumpuhkan Perbarui, jangan lupa untuk mengunjung

<!-- Automatic text generation complete. -->

<phrasecount>2640</phrasecount>
<phrasecount>2641</phrasecount>

<!-- As of this build, PhotoDemon contains 5515 phrases. -->
<!-- 2875 are duplicates, so only 2640 unique phrases have been written to file. -->
<!-- These 2640 phrases contain approximately 11421 total words. -->
<!-- As of this build, PhotoDemon contains 5518 phrases. -->
<!-- 2877 are duplicates, so only 2641 unique phrases have been written to file. -->
<!-- These 2641 phrases contain approximately 11424 total words. -->

</pdData>
19 changes: 12 additions & 7 deletions App/PhotoDemon/Languages/Italian.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<langid>it-IT</langid>
<langname>Italiano</langname>
<langversion>8.9.1607</langversion>
<langversion>8.9.1608</langversion>
<langstatus>Completa</langstatus>

<author>GioRock, ManfroMarce</author>
Expand Down Expand Up @@ -3029,6 +3029,11 @@ Descrizione: %2
<translation>mirroring</translation>
</phrase>

<phrase>
<original>last line justify</original>
<translation></translation>
</phrase>

<phrase>
<original>Modify selection</original>
<translation>Modificare la selezione</translation>
Expand All @@ -3053,7 +3058,7 @@ When finished, click the Submit New Issue button. Thank you!</original>
<translation>Istruzioni per la segnalazione di bug</translation>
</phrase>

<!-- Processor.bas contains 128 phrases. 68 were duplicates of existing phrases, so only 60 new phrases were written to file. -->
<!-- Processor.bas contains 130 phrases. 69 were duplicates of existing phrases, so only 61 new phrases were written to file. -->

<phrase>
<original>automatic</original>
Expand Down Expand Up @@ -12708,7 +12713,7 @@ Vuoi salvare la tua lista prima di uscire?</translation>
<translation>Clicca qui per convertire questo livello in testo avanzato.</translation>
</phrase>

<!-- Toolpanel_Typography.frm contains 60 phrases. 35 were duplicates of existing phrases, so only 25 new phrases were written to file. -->
<!-- Toolpanel_Typography.frm contains 61 phrases. 36 were duplicates of existing phrases, so only 25 new phrases were written to file. -->

<phrase>
<original>click here for detailed instructions (in English)</original>
Expand Down Expand Up @@ -13964,10 +13969,10 @@ Se si sceglie comunque di disabilitare gli aggiornamenti, non dimenticate di vis

<!-- Automatic text generation complete. -->

<phrasecount>2640</phrasecount>
<phrasecount>2641</phrasecount>

<!-- As of this build, PhotoDemon contains 5515 phrases. -->
<!-- 2875 are duplicates, so only 2640 unique phrases have been written to file. -->
<!-- These 2640 phrases contain approximately 11421 total words. -->
<!-- As of this build, PhotoDemon contains 5518 phrases. -->
<!-- 2877 are duplicates, so only 2641 unique phrases have been written to file. -->
<!-- These 2641 phrases contain approximately 11424 total words. -->

</pdData>
19 changes: 12 additions & 7 deletions App/PhotoDemon/Languages/Macedonian.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<langid>mk-MK</langid>
<langname>Македонски</langname>
<langversion>8.9.1701</langversion>
<langversion>8.9.1702</langversion>
<langstatus>80% complete</langstatus>

<author>Бобан Ѓерасимоски</author>
Expand Down Expand Up @@ -3025,6 +3025,11 @@ Error број %
<translation></translation>
</phrase>

<phrase>
<original>last line justify</original>
<translation></translation>
</phrase>

<phrase>
<original>Modify selection</original>
<translation></translation>
Expand All @@ -3047,7 +3052,7 @@ When finished, click the Submit New Issue button. Thank you!</original>
<translation>инструкциите за пријавување на бубачки</translation>
</phrase>

<!-- Processor.bas contains 128 phrases. 68 were duplicates of existing phrases, so only 60 new phrases were written to file. -->
<!-- Processor.bas contains 130 phrases. 69 were duplicates of existing phrases, so only 61 new phrases were written to file. -->

<phrase>
<original>automatic</original>
Expand Down Expand Up @@ -12691,7 +12696,7 @@ Would сакате да ги зачувате вашата листа сериј
<translation></translation>
</phrase>

<!-- Toolpanel_Typography.frm contains 60 phrases. 35 were duplicates of existing phrases, so only 25 new phrases were written to file. -->
<!-- Toolpanel_Typography.frm contains 61 phrases. 36 were duplicates of existing phrases, so only 25 new phrases were written to file. -->

<phrase>
<original>click here for detailed instructions (in English)</original>
Expand Down Expand Up @@ -13943,10 +13948,10 @@ If сеуште изберете да го исклучите ажурирања

<!-- Automatic text generation complete. -->

<phrasecount>2640</phrasecount>
<phrasecount>2641</phrasecount>

<!-- As of this build, PhotoDemon contains 5515 phrases. -->
<!-- 2875 are duplicates, so only 2640 unique phrases have been written to file. -->
<!-- These 2640 phrases contain approximately 11421 total words. -->
<!-- As of this build, PhotoDemon contains 5518 phrases. -->
<!-- 2877 are duplicates, so only 2641 unique phrases have been written to file. -->
<!-- These 2641 phrases contain approximately 11424 total words. -->

</pdData>
19 changes: 12 additions & 7 deletions App/PhotoDemon/Languages/Master/MASTER.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<langid>en-US</langid>
<langname>English (US) - MASTER COPY</langname>
<langversion>8.9.1705</langversion>
<langversion>9.0.12</langversion>
<langstatus>Automatically generated from PhotoDemon's source code</langstatus>

<author>Tanner Helland</author>
Expand Down Expand Up @@ -2992,6 +2992,11 @@ Description: %2
<translation></translation>
</phrase>

<phrase>
<original>last line justify</original>
<translation></translation>
</phrase>

<phrase>
<original>Modify selection</original>
<translation></translation>
Expand All @@ -3014,7 +3019,7 @@ When finished, click the Submit New Issue button. Thank you!</original>
<translation></translation>
</phrase>

<!-- Processor.bas contains 128 phrases. 68 were duplicates of existing phrases, so only 60 new phrases were written to file. -->
<!-- Processor.bas contains 130 phrases. 69 were duplicates of existing phrases, so only 61 new phrases were written to file. -->

<phrase>
<original>automatic</original>
Expand Down Expand Up @@ -12642,7 +12647,7 @@ Would you like to save your batch list before exiting?</original>
<translation></translation>
</phrase>

<!-- Toolpanel_Typography.frm contains 60 phrases. 35 were duplicates of existing phrases, so only 25 new phrases were written to file. -->
<!-- Toolpanel_Typography.frm contains 61 phrases. 36 were duplicates of existing phrases, so only 25 new phrases were written to file. -->

<phrase>
<original>click here for detailed instructions (in English)</original>
Expand Down Expand Up @@ -13888,10 +13893,10 @@ If you still choose to disable updates, don't forget to visit photodemon.org fro

<!-- Automatic text generation complete. -->

<phrasecount>2640</phrasecount>
<phrasecount>2641</phrasecount>

<!-- As of this build, PhotoDemon contains 5515 phrases. -->
<!-- 2875 are duplicates, so only 2640 unique phrases have been written to file. -->
<!-- These 2640 phrases contain approximately 11421 total words. -->
<!-- As of this build, PhotoDemon contains 5518 phrases. -->
<!-- 2877 are duplicates, so only 2641 unique phrases have been written to file. -->
<!-- These 2641 phrases contain approximately 11424 total words. -->

</pdData>
Binary file modified App/PhotoDemon/Languages/Master/Phrases.db
Binary file not shown.
19 changes: 12 additions & 7 deletions App/PhotoDemon/Languages/Polish.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<langid>pl-PL</langid>
<langname>Polski</langname>
<langversion>9.0.0</langversion>
<langversion>9.0.1</langversion>
<langstatus>100% complete</langstatus>

<author>Ryszard</author>
Expand Down Expand Up @@ -3027,6 +3027,11 @@ Opis: %2
<translation>Lustro</translation>
</phrase>

<phrase>
<original>last line justify</original>
<translation></translation>
</phrase>

<phrase>
<original>Modify selection</original>
<translation>Zmień zaznaczenie</translation>
Expand All @@ -3051,7 +3056,7 @@ Po zakończeniu kliknij przycisk "Prześlij nowe zgłoszenie".</translation>
<translation>Instrukcje do raportu o błędzie</translation>
</phrase>

<!-- Processor.bas contains 128 phrases. 68 were duplicates of existing phrases, so only 60 new phrases were written to file. -->
<!-- Processor.bas contains 130 phrases. 69 were duplicates of existing phrases, so only 61 new phrases were written to file. -->

<phrase>
<original>automatic</original>
Expand Down Expand Up @@ -12701,7 +12706,7 @@ Dziękujemy!</translation>
<translation>Kliknij tutaj, aby przekonwertować tę warstwę na tekst zaawansowany.</translation>
</phrase>

<!-- Toolpanel_Typography.frm contains 60 phrases. 35 were duplicates of existing phrases, so only 25 new phrases were written to file. -->
<!-- Toolpanel_Typography.frm contains 61 phrases. 36 were duplicates of existing phrases, so only 25 new phrases were written to file. -->

<phrase>
<original>click here for detailed instructions (in English)</original>
Expand Down Expand Up @@ -13955,10 +13960,10 @@ Jeśli nadal decydujesz się na wyłączenie aktualizacji, nie zapomnij odwiedzi

<!-- Automatic text generation complete. -->

<phrasecount>2640</phrasecount>
<phrasecount>2641</phrasecount>

<!-- As of this build, PhotoDemon contains 5515 phrases. -->
<!-- 2875 are duplicates, so only 2640 unique phrases have been written to file. -->
<!-- These 2640 phrases contain approximately 11421 total words. -->
<!-- As of this build, PhotoDemon contains 5518 phrases. -->
<!-- 2877 are duplicates, so only 2641 unique phrases have been written to file. -->
<!-- These 2641 phrases contain approximately 11424 total words. -->

</pdData>
Loading

0 comments on commit efceea7

Please sign in to comment.