Skip to content

Commit

Permalink
(ICO) icon export: new option for "use merged image as source"
Browse files Browse the repository at this point in the history 
Relates to #453

When exporting an icon file, PhotoDemon previously tried to match each layer to its most appropriate icon frame.  This mirrors similar behavior in GIMP, and it's what allows PD to round-trip icon files correctly.  (e.g. a layer at size 32x32 with 256 colors will be used as the source for a 32x32 8-bit icon frame, if requested)

This behavior can now be overridden in the icon export dialog, with a new "source" toggle to use the merged image as the source for *all* icon frames.  This will be useful when creating a new icon from scratch.

Thank you to @veksha for this idea!
  • Loading branch information
@tannerhelland
tannerhelland committed Oct 27, 2022
1 parent 108d19e commit 6c3dc5a
Show file tree
Hide file tree
Showing 17 changed files with 322 additions and 110 deletions.
22 changes: 16 additions & 6 deletions App/PhotoDemon/Languages/French.xml
View file
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.597</langversion>
<langversion>6.7.598</langversion>
<langstatus>Complete</langstatus>

<author>Jean Jacques Piedfort (orig. Frank Donckers)</author>
Expand Down Expand Up @@ -10573,6 +10573,16 @@ Souhaitez vous sauvegarder votre liste de lots avant de quitter?</translation>
<translation>24-bpp</translation>
</phrase>

<phrase>
<original>icon source</original>
<translation></translation>
</phrase>

<phrase>
<original>treat each layer as a unique icon frame</original>
<translation></translation>
</phrase>

<phrase>
<original>app - Windows 10</original>
<translation>app - Windows 10</translation>
Expand Down Expand Up @@ -10608,7 +10618,7 @@ Souhaitez vous sauvegarder votre liste de lots avant de quitter?</translation>
<translation>utiliser les paramètres originaux du fichier</translation>
</phrase>

<!-- File_Save_ICO.frm contains 18 phrases. 8 were duplicates of existing phrases, so only 10 new phrases were written to file. -->
<!-- File_Save_ICO.frm contains 21 phrases. 9 were duplicates of existing phrases, so only 12 new phrases were written to file. -->

<phrase>
<original>image compression ratio</original>
Expand Down Expand Up @@ -13985,10 +13995,10 @@ Si vous choisissez de désactiver les mises à jour, n'oubliez pas de visiter ph

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

<phrasecount>2643</phrasecount>
<phrasecount>2645</phrasecount>

<!-- As of this build, PhotoDemon contains 5530 phrases. -->
<!-- 2887 are duplicates, so only 2643 unique phrases have been written to file. -->
<!-- These 2643 phrases contain approximately 11431 total words. -->
<!-- As of this build, PhotoDemon contains 5533 phrases. -->
<!-- 2888 are duplicates, so only 2645 unique phrases have been written to file. -->
<!-- These 2645 phrases contain approximately 11441 total words. -->

</pdData>
22 changes: 16 additions & 6 deletions App/PhotoDemon/Languages/German.xml
View file
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.19</langversion>
<langversion>9.0.20</langversion>
<langstatus>Up-to-date</langstatus>

<author>rk (ehem. Frank Donckers, Helmut Kuerbiss)</author>
Expand Down Expand Up @@ -10573,6 +10573,16 @@ Möchten Sie Ihre Batchliste vor dem Beenden speichern?</translation>
<translation>24-bpp</translation>
</phrase>

<phrase>
<original>icon source</original>
<translation></translation>
</phrase>

<phrase>
<original>treat each layer as a unique icon frame</original>
<translation></translation>
</phrase>

<phrase>
<original>app - Windows 10</original>
<translation>App - Windows 10</translation>
Expand Down Expand Up @@ -10608,7 +10618,7 @@ Möchten Sie Ihre Batchliste vor dem Beenden speichern?</translation>
<translation>Original-Dateieinstellungen verwenden</translation>
</phrase>

<!-- File_Save_ICO.frm contains 18 phrases. 8 were duplicates of existing phrases, so only 10 new phrases were written to file. -->
<!-- File_Save_ICO.frm contains 21 phrases. 9 were duplicates of existing phrases, so only 12 new phrases were written to file. -->

<phrase>
<original>image compression ratio</original>
Expand Down Expand Up @@ -13974,10 +13984,10 @@ Wenn Sie sich dennoch dafür entscheiden, Updates zu deaktivieren, vergessen Sie

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

<phrasecount>2643</phrasecount>
<phrasecount>2645</phrasecount>

<!-- As of this build, PhotoDemon contains 5530 phrases. -->
<!-- 2887 are duplicates, so only 2643 unique phrases have been written to file. -->
<!-- These 2643 phrases contain approximately 11431 total words. -->
<!-- As of this build, PhotoDemon contains 5533 phrases. -->
<!-- 2888 are duplicates, so only 2645 unique phrases have been written to file. -->
<!-- These 2645 phrases contain approximately 11441 total words. -->

</pdData>
22 changes: 16 additions & 6 deletions App/PhotoDemon/Languages/Indonesian.xml
View file
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.1704</langversion>
<langversion>8.9.1705</langversion>
<langstatus>90% complete</langstatus>

<author>Ari Sohandri Putra</author>
Expand Down Expand Up @@ -10559,6 +10559,16 @@ Would kemudian anda suka untuk menyimpan senarai kumpulan anda sebelum keluar?</
<translation></translation>
</phrase>

<phrase>
<original>icon source</original>
<translation></translation>
</phrase>

<phrase>
<original>treat each layer as a unique icon frame</original>
<translation></translation>
</phrase>

<phrase>
<original>app - Windows 10</original>
<translation></translation>
Expand Down Expand Up @@ -10594,7 +10604,7 @@ Would kemudian anda suka untuk menyimpan senarai kumpulan anda sebelum keluar?</
<translation></translation>
</phrase>

<!-- File_Save_ICO.frm contains 18 phrases. 8 were duplicates of existing phrases, so only 10 new phrases were written to file. -->
<!-- File_Save_ICO.frm contains 21 phrases. 9 were duplicates of existing phrases, so only 12 new phrases were written to file. -->

<phrase>
<original>image compression ratio</original>
Expand Down Expand Up @@ -13956,10 +13966,10 @@ Jika anda masih memilih untuk melumpuhkan Perbarui, jangan lupa untuk mengunjung

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

<phrasecount>2643</phrasecount>
<phrasecount>2645</phrasecount>

<!-- As of this build, PhotoDemon contains 5530 phrases. -->
<!-- 2887 are duplicates, so only 2643 unique phrases have been written to file. -->
<!-- These 2643 phrases contain approximately 11431 total words. -->
<!-- As of this build, PhotoDemon contains 5533 phrases. -->
<!-- 2888 are duplicates, so only 2645 unique phrases have been written to file. -->
<!-- These 2645 phrases contain approximately 11441 total words. -->

</pdData>
22 changes: 16 additions & 6 deletions App/PhotoDemon/Languages/Italian.xml
View file
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.1612</langversion>
<langversion>8.9.1613</langversion>
<langstatus>Completa</langstatus>

<author>GioRock, ManfroMarce</author>
Expand Down Expand Up @@ -10577,6 +10577,16 @@ Vuoi salvare la tua lista prima di uscire?</translation>
<translation>24-bpp</translation>
</phrase>

<phrase>
<original>icon source</original>
<translation></translation>
</phrase>

<phrase>
<original>treat each layer as a unique icon frame</original>
<translation></translation>
</phrase>

<phrase>
<original>app - Windows 10</original>
<translation>app - Windows 10</translation>
Expand Down Expand Up @@ -10612,7 +10622,7 @@ Vuoi salvare la tua lista prima di uscire?</translation>
<translation>utilizzare le impostazioni del file originale</translation>
</phrase>

<!-- File_Save_ICO.frm contains 18 phrases. 8 were duplicates of existing phrases, so only 10 new phrases were written to file. -->
<!-- File_Save_ICO.frm contains 21 phrases. 9 were duplicates of existing phrases, so only 12 new phrases were written to file. -->

<phrase>
<original>image compression ratio</original>
Expand Down Expand Up @@ -13983,10 +13993,10 @@ Se si sceglie comunque di disabilitare gli aggiornamenti, non dimenticate di vis

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

<phrasecount>2643</phrasecount>
<phrasecount>2645</phrasecount>

<!-- As of this build, PhotoDemon contains 5530 phrases. -->
<!-- 2887 are duplicates, so only 2643 unique phrases have been written to file. -->
<!-- These 2643 phrases contain approximately 11431 total words. -->
<!-- As of this build, PhotoDemon contains 5533 phrases. -->
<!-- 2888 are duplicates, so only 2645 unique phrases have been written to file. -->
<!-- These 2645 phrases contain approximately 11441 total words. -->

</pdData>
22 changes: 16 additions & 6 deletions App/PhotoDemon/Languages/Macedonian.xml
View file
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.1706</langversion>
<langversion>8.9.1707</langversion>
<langstatus>80% complete</langstatus>

<author>Бобан Ѓерасимоски</author>
Expand Down Expand Up @@ -10565,6 +10565,16 @@ Would сакате да ги зачувате вашата листа сериј
<translation></translation>
</phrase>

<phrase>
<original>icon source</original>
<translation></translation>
</phrase>

<phrase>
<original>treat each layer as a unique icon frame</original>
<translation></translation>
</phrase>

<phrase>
<original>app - Windows 10</original>
<translation></translation>
Expand Down Expand Up @@ -10600,7 +10610,7 @@ Would сакате да ги зачувате вашата листа сериј
<translation></translation>
</phrase>

<!-- File_Save_ICO.frm contains 18 phrases. 8 were duplicates of existing phrases, so only 10 new phrases were written to file. -->
<!-- File_Save_ICO.frm contains 21 phrases. 9 were duplicates of existing phrases, so only 12 new phrases were written to file. -->

<phrase>
<original>image compression ratio</original>
Expand Down Expand Up @@ -13962,10 +13972,10 @@ If сеуште изберете да го исклучите ажурирања

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

<phrasecount>2643</phrasecount>
<phrasecount>2645</phrasecount>

<!-- As of this build, PhotoDemon contains 5530 phrases. -->
<!-- 2887 are duplicates, so only 2643 unique phrases have been written to file. -->
<!-- These 2643 phrases contain approximately 11431 total words. -->
<!-- As of this build, PhotoDemon contains 5533 phrases. -->
<!-- 2888 are duplicates, so only 2645 unique phrases have been written to file. -->
<!-- These 2645 phrases contain approximately 11441 total words. -->

</pdData>
22 changes: 16 additions & 6 deletions App/PhotoDemon/Languages/Master/MASTER.xml
View file
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>9.0.35</langversion>
<langversion>9.0.39</langversion>
<langstatus>Automatically generated from PhotoDemon's source code</langstatus>

<author>Tanner Helland</author>
Expand Down Expand Up @@ -10516,6 +10516,16 @@ Would you like to save your batch list before exiting?</original>
<translation></translation>
</phrase>

<phrase>
<original>icon source</original>
<translation></translation>
</phrase>

<phrase>
<original>treat each layer as a unique icon frame</original>
<translation></translation>
</phrase>

<phrase>
<original>app - Windows 10</original>
<translation></translation>
Expand Down Expand Up @@ -10551,7 +10561,7 @@ Would you like to save your batch list before exiting?</original>
<translation></translation>
</phrase>

<!-- File_Save_ICO.frm contains 18 phrases. 8 were duplicates of existing phrases, so only 10 new phrases were written to file. -->
<!-- File_Save_ICO.frm contains 21 phrases. 9 were duplicates of existing phrases, so only 12 new phrases were written to file. -->

<phrase>
<original>image compression ratio</original>
Expand Down Expand Up @@ -13907,10 +13917,10 @@ If you still choose to disable updates, don't forget to visit photodemon.org fro

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

<phrasecount>2643</phrasecount>
<phrasecount>2645</phrasecount>

<!-- As of this build, PhotoDemon contains 5530 phrases. -->
<!-- 2887 are duplicates, so only 2643 unique phrases have been written to file. -->
<!-- These 2643 phrases contain approximately 11431 total words. -->
<!-- As of this build, PhotoDemon contains 5533 phrases. -->
<!-- 2888 are duplicates, so only 2645 unique phrases have been written to file. -->
<!-- These 2645 phrases contain approximately 11441 total words. -->

</pdData>
Binary file modified App/PhotoDemon/Languages/Master/Phrases.db
View file
Binary file not shown.
22 changes: 16 additions & 6 deletions App/PhotoDemon/Languages/Polish.xml
View file
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.5</langversion>
<langversion>9.0.6</langversion>
<langstatus>100% complete</langstatus>

<author>Ryszard</author>
Expand Down Expand Up @@ -10570,6 +10570,16 @@ Dziękujemy!</translation>
<translation>24-bpp</translation>
</phrase>

<phrase>
<original>icon source</original>
<translation></translation>
</phrase>

<phrase>
<original>treat each layer as a unique icon frame</original>
<translation></translation>
</phrase>

<phrase>
<original>app - Windows 10</original>
<translation>Windows 10</translation>
Expand Down Expand Up @@ -10605,7 +10615,7 @@ Dziękujemy!</translation>
<translation>Użyj oryginalnych ustawień pliku</translation>
</phrase>

<!-- File_Save_ICO.frm contains 18 phrases. 8 were duplicates of existing phrases, so only 10 new phrases were written to file. -->
<!-- File_Save_ICO.frm contains 21 phrases. 9 were duplicates of existing phrases, so only 12 new phrases were written to file. -->

<phrase>
<original>image compression ratio</original>
Expand Down Expand Up @@ -13974,10 +13984,10 @@ Jeśli nadal decydujesz się na wyłączenie aktualizacji, nie zapomnij odwiedzi

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

<phrasecount>2643</phrasecount>
<phrasecount>2645</phrasecount>

<!-- As of this build, PhotoDemon contains 5530 phrases. -->
<!-- 2887 are duplicates, so only 2643 unique phrases have been written to file. -->
<!-- These 2643 phrases contain approximately 11431 total words. -->
<!-- As of this build, PhotoDemon contains 5533 phrases. -->
<!-- 2888 are duplicates, so only 2645 unique phrases have been written to file. -->
<!-- These 2645 phrases contain approximately 11441 total words. -->

</pdData>
Loading

0 comments on commit 6c3dc5a

Please sign in to comment.