Prevent unnecessary key transformations, resolves #2704

The database master key settings widget does not actually
need to (re-)transform the master key, it only needs to update
the Key object on the database. Transformation can be deferred
until the Database is persisted to disk. This avoids delays
and unnecessary user interaction with challenge-response
dongles by eliminating redundant key transformations.

.gitignore

@@ -11,6 +11,7 @@ release*/
 
 .DS_Store
 .version
+desktop.ini
 \.scannerwork/
 
 /snap/.snapcraft/

release-tool

@@ -1147,7 +1147,7 @@ appsign() {
                 fi
 
                 logInfo "Signing app using codesign..."
-                codesign --sign "${key}" --verbose --deep ./app/KeePassXC.app
+                codesign --sign "${key}" --verbose --deep --entitlements ${orig_dir}/share/macosx/keepassxc.entitlements ./app/KeePassXC.app
 
                 if [ 0 -ne $? ]; then
                     cd "${orig_dir}"

share/CMakeLists.txt

@@ -45,7 +45,7 @@ install(DIRECTORY icons/application/ DESTINATION ${DATA_INSTALL_DIR}/icons/appli
         FILES_MATCHING PATTERN "*.png" PATTERN "*.svg")
 
 add_custom_target(icons
-                  # SVGZ to PNGs for KeePassXC
+    # SVG to PNGs for KeePassXC
     COMMAND inkscape -z -w 16 -h 16
         icons/application/scalable/apps/keepassxc.svg -e icons/application/16x16/apps/keepassxc.png
     COMMAND inkscape -z -w  24 -h 24
@@ -61,7 +61,7 @@ add_custom_target(icons
     COMMAND inkscape -z -w 256 -h 256
         icons/application/scalable/apps/keepassxc.svg -e icons/application/256x256/apps/keepassxc.png
 
-                  # SVGZ to PNGs for KeePassXC
+    # SVG to PNGs for KeePassXC
     COMMAND inkscape -z -w 16 -h 16
         icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/16x16/apps/keepassxc-dark.png
     COMMAND inkscape -z -w  24 -h 24
@@ -77,7 +77,7 @@ add_custom_target(icons
     COMMAND inkscape -z -w 256 -h 256
         icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/256x256/apps/keepassxc-dark.png
 
-                  # SVGZ to PNGs for KeePassXC
+    # SVG to PNGs for KeePassXC
     COMMAND inkscape -z -w 16 -h 16
         icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/16x16/apps/keepassxc-locked.png
     COMMAND inkscape -z -w  24 -h 24
@@ -93,7 +93,7 @@ add_custom_target(icons
     COMMAND inkscape -z -w 256 -h 256
         icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/256x256/apps/keepassxc-locked.png
 
-                  # SVGZ to PNGs for KeePassXC
+    # SVG to PNGs for KeePassXC
     COMMAND inkscape -z -w 16 -h 16
         icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/16x16/apps/keepassxc-unlocked.png
     COMMAND inkscape -z -w  24 -h 24
@@ -109,7 +109,7 @@ add_custom_target(icons
     COMMAND inkscape -z -w 256 -h 256
         icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/256x256/apps/keepassxc-unlocked.png
 
-                  # SVGZ to PNGs for KeePassXC MIME-Type
+    # SVG to PNGs for KeePassXC MIME-Type
     COMMAND inkscape -z -w 16 -h 16
         icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/16x16/mimetypes/application-x-keepassxc.png
     COMMAND inkscape -z -w 22 -h 22
@@ -121,6 +121,9 @@ add_custom_target(icons
     COMMAND inkscape -z -w 128 -h 128
         icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/128x128/mimetypes/application-x-keepassxc.png
 
+    # Shrink PNGs using pngcrush
+    COMMAND bash ./crushpng.sh icons
+
     # ICNS for MacOS
     COMMAND png2icns macosx/keepassxc.icns
         icons/application/16x16/apps/keepassxc.png
@@ -130,13 +133,8 @@ add_custom_target(icons
         icons/application/256x256/apps/keepassxc.png
 
     # ICO for Windows
-                  COMMAND icotool -c -o windows/keepassxc.ico
-                    icons/application/16x16/apps/keepassxc.png
-                    icons/application/24x24/apps/keepassxc.png
-                    icons/application/32x32/apps/keepassxc.png
-                    icons/application/48x48/apps/keepassxc.png
-                    icons/application/64x64/apps/keepassxc.png
-                    icons/application/128x128/apps/keepassxc.png
-                    icons/application/256x256/apps/keepassxc.png
+    COMMAND bash ./windows/create-ico.sh icons/application/scalable/apps/keepassxc.svg windows/keepassxc.ico
+    COMMAND bash ./windows/create-ico.sh icons/application/scalable/mimetypes/application-x-keepassxc.svg windows/keepassxc-kdbx.ico
+
     VERBATIM
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})

share/about-contributors.html

@@ -1,54 +0,0 @@
-<h3>VIP Patreon Supporters:</h3>
-<ul>
-  <li>John Cook</li>
-  <li>Max Anderson</li>
-</ul>
-<h3>Notable Code Contributions:</h3>
-<ul>
-  <li>droidmonkey</li>
-  <li>phoerious</li>
-  <li>TheZ3ro</li>
-  <li>louib</li>
-  <li>weslly</li>
-  <li>varjolintu (KeePassXC-Browser)</li>
-  <li>hifi (SSH Agent)</li>
-  <li>frostasm</li>
-  <li>fonic (Entry Table View)</li>
-  <li>kylemanna (YubiKey)</li>
-  <li>keithbennett (KeePassHTTP)</li>
-  <li>Typz (KeePassHTTP)</li>
-  <li>denk-mal (KeePassHTTP)</li>
-  <li>angelsl (KDBX 4)</li>
-  <li>seatedscribe (CSV Import)</li>
-  <li>debfx (KeePassX)</li>
-  <li>BlueIce (KeePassX)</li>
-</ul>
-<h3>Patreon Supporters:</h3>
-<ul>
-  <li>Ashura</li>
-  <li>Alexanderjb</li>
-  <li>Andreas Kollmann</li>
-  <li>Richard Ames</li>
-</ul>
-<h3>Translations:</h3>
-<ul>
-  <li><strong>Basque</strong>: azken_tximinoa, Hey_neken</li>
-  <li><strong>Catalan</strong>: capitantrueno, dsoms, mcus, raulua, ZJaume</li>
-  <li><strong>Chinese (China)</strong>: Biggulu, Brandon_c, hoilc, ligyxy, vc5, Small_Ku</li>
-  <li><strong>Chinese (Taiwan)</strong>: BestSteve, MiauLightouch, Small_Ku, yan12125, ymhuang0808</li>
-  <li><strong>Czech</strong>: DanielMilde, JosefVitu, pavelb, tpavelek</li>
-  <li><strong>Danish</strong>: nlkl</li>
-  <li><strong>Dutch</strong>: apie, bartlibert, evanoosten, fvw, KnooL, srgvg, Vistaus, wanderingidea</li>
-  <li><strong>Finnish</strong>: artnay, Jarppi, MawKKe</li>
-  <li><strong>French</strong>: A1RO, aghilas.messara, bisaloo, frgnca, ggtr1138, gilbsgilbs, gtalbot, Gui13, iannick, jlutran, kyodev, logut, MartialBis, narzb, pBouillon, plunkets, Raphi111, Scrat15, tl_pierre, wilfriedroset</li>
-  <li><strong>German</strong>: antsas, BasicBaer, Calyrx, codejunky, DavidHamburg, eth0, for1real, jensrutschmann, joe776, kflesch, MarcEdinger, marcbone, mcliquid, mfernau77, montilo, nursoda, omnisome4, origin_de, pcrcoding, phoerious, rgloor, transi_222, vlenzer, waster</li>
-  <li><strong>Greek</strong>: magkopian, nplatis, tassos.b, xinomilo</li>
-  <li><strong>Hungarian</strong>: bubu, meskobalazs, urbalazs</li>
-  <li><strong>Indonesian</strong>: zk</li>
-  <li><strong>Italian</strong>: amaxis, bovirus, duncanmid, FranzMari, lucaim, Mte90, Peo, TheZ3ro, tosky, VosaxAlo</li>
-  <li><strong>Japanese</strong>: masoo, metalic_cat, p2635, Shinichirou_Yamada, vargas.peniel, vmemjp, yukinakato</li>
-  <li><strong>Korean</strong>: cancantun, peremen</li>
-  <li><strong>Lithuanian</strong>: Moo</li>
-  <li><strong>Polish</strong>: keypress, konradmb, mrerexx, psobczak</li>
-  <li><strong>Portuguese (Brazil)</strong>: danielbibit, fabiom, flaviobn, vitor895, weslly</li>
-</ul>

share/about.html

@@ -1,14 +0,0 @@
-<p>Website: <a href="https://keepassxc.org/" style="text-decoration: underline">https://keepassxc.org</a></p>
-<p>Report bugs at: <a href="https://github.com/keepassxreboot/keepassxc/issues">https://github.com</a></p>
-<p>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</p>
-<h3>Project Maintainers:</h3>
-<ul>
-    <li>Jonathan White (<a href="https://github.com/droidmonkey">droidmonkey</a>)</li>
-    <li>Janek Bevendorff (<a href="https://github.com/phoerious">phoerious</a>)</li>
-    <li><a href="https://github.com/TheZ3ro">TheZ3ro</a></li>
-    <li>Louis-Bertrand (<a href="https://github.com/louib">louib</a>)</li>
-    <li>Weslly Honorato (<a href="https://github.com/weslly">weslly</a>)</li>
-    <li>Toni Spets (<a href="https://github.com/hifi">hifi</a>)</li>
-    <li>Sami V&auml;nttinen (<a href="https://github.com/varjolintu">varjolintu</a>)</li>
-</ul>
-<p>Special thanks from the KeePassXC team go to <a href="https://github.com/debfx">debfx</a> for creating the original KeePassX.</p>

share/crushpng.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+if [[ -z $1 ]]; then
+  echo "You must supply a root folder!"
+  exit 1
+fi
+
+find "$1" -iname '*png' -exec pngcrush -ow -brute {} \;