Merge branch 'develop' into develop

Author: perfectra1n

.github/workflows/main.yml

@@ -8,6 +8,7 @@ on:
     paths-ignore:
       - "docs/**"
       - "bin/**"
+  workflow_dispatch:    
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.gitignore

@@ -16,4 +16,10 @@ data-test/
 tmp/
 .eslintcache
 
-out/
+out/
+
+images/app-icons/png/16x16.png
+images/app-icons/png/32x32.png
+images/app-icons/png/512x512.png
+images/app-icons/png/1024x1024.png
+images/app-icons/mac/*.png

README.md

@@ -12,7 +12,7 @@ See [screenshots](https://triliumnext.github.io/Docs/Wiki/screenshot-tour) for q
 
 [The original Trilium project is in maintenance mode](https://github.com/zadam/trilium/issues/4620)
 
-## 🗭 Discuss with us
+## 💬 Discuss with us
 
 Feel free to join our official discussions and community. We are focused on the development on Trilium, and would love to hear what features, suggestions, or issues you may have!
 

bin/create-icons.sh

@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+
+if ! command -v magick &> /dev/null; then
+  echo "This tool requires ImageMagick to be installed in order to create the icons."
+  exit 1
+fi
+
+if ! command -v inkscape &> /dev/null; then
+  echo "This tool requires Inkscape to be render sharper SVGs than ImageMagick."
+  exit 1
+fi
+
+if ! command -v icnsutil &> /dev/null; then
+  echo "This tool requires icnsutil to be installed in order to generate macOS icons."
+  exit 1
+fi
+
+script_dir=$(realpath $(dirname $0))
+cd "${script_dir}/../images/app-icons"
+inkscape -w 180 -h 180 "../icon-color.svg" -o "./ios/apple-touch-icon.png"
+
+# Build PNGs
+inkscape -w 128 -h 128 "../icon-color.svg" -o "./png/128x128.png"
+inkscape -w 256 -h 256 "../icon-color.svg" -o "./png/256x256.png"
+inkscape -w 256 -h 256 "../icon-purple.svg" -o "./png/256x256-dev.png"
+
+# Build Mac .icns
+declare -a sizes=("16" "32" "512" "1024")
+for size in "${sizes[@]}"; do
+  inkscape -w $size -h $size "../icon-color.svg" -o "./png/${size}x${size}.png"
+done
+
+mkdir -p fakeapp.app
+npx iconsur set fakeapp.app -l -i "png/1024x1024.png" -o "mac/1024x1024.png" -s 0.8
+declare -a sizes=("16x16" "32x32" "128x128" "512x512")
+for size in "${sizes[@]}"; do
+  magick "mac/1024x1024.png" -resize "${size}" "mac/${size}.png"
+done
+icnsutil compose -f "mac/icon.icns" ./mac/*.png
+
+# Build Windows icon
+magick -background none "../icon-color.svg" -define icon:auto-resize=16,32,48,64,128,256 "./win/icon.ico"
+
+# Build Squirrel splash image
+magick "./png/256x256.png" -background "#ffffff" -gravity center -extent 640x480 "./win/setup-banner.gif"

db/demo.zip

@@ -277,6 +277,66 @@ <h1 id="title">Branch prefixes</h1>
 
 
 
+        </li>
+    
+        <li>
+            
+<p>
+    
+
+    
+    <a class="type-text" href="WKn3hLGmKmiH.html">CKEditor</a>
+    
+</p>
+
+
+<ul>
+    
+        <li>
+            
+<p>
+    
+
+    
+    <a class="type-text" href="MUGBo4n67kBI.html">Environment setup</a>
+    
+</p>
+
+
+
+        </li>
+    
+        <li>
+            
+<p>
+    
+
+    
+    <a class="type-text" href="icQBu8R1ij57.html">Building &amp; updating</a>
+    
+</p>
+
+
+
+        </li>
+    
+        <li>
+            
+<p>
+    
+
+    
+    <a class="type-text" href="zpR91YHYs6lL.html">Differences from upstream</a>
+    
+</p>
+
+
+
+        </li>
+    
+</ul>
+
+
         </li>
 
 </ul>

docs/1l1f6WZbaBEZ.html

@@ -312,6 +312,66 @@ <h1 id="title">Widgets</h1>
 
 
 
+        </li>
+    
+        <li>
+            
+<p>
+    
+
+    
+    <a class="type-text" href="WKn3hLGmKmiH.html">CKEditor</a>
+    
+</p>
+
+
+<ul>
+    
+        <li>
+            
+<p>
+    
+
+    
+    <a class="type-text" href="MUGBo4n67kBI.html">Environment setup</a>
+    
+</p>
+
+
+
+        </li>
+    
+        <li>
+            
+<p>
+    
+
+    
+    <a class="type-text" href="icQBu8R1ij57.html">Building &amp; updating</a>
+    
+</p>
+
+
+
+        </li>
+    
+        <li>
+            
+<p>
+    
+
+    
+    <a class="type-text" href="zpR91YHYs6lL.html">Differences from upstream</a>
+    
+</p>
+
+
+
+        </li>
+    
+</ul>
+
+
         </li>
 
 </ul>

docs/1pOWnHdGAuWR.html

@@ -288,6 +288,66 @@ <h1 id="title">Scripting</h1>
 
 
 
+        </li>
+    
+        <li>
+            
+<p>
+    
+
+    
+    <a class="type-text" href="WKn3hLGmKmiH.html">CKEditor</a>
+    
+</p>
+
+
+<ul>
+    
+        <li>
+            
+<p>
+    
+
+    
+    <a class="type-text" href="MUGBo4n67kBI.html">Environment setup</a>
+    
+</p>
+
+
+
+        </li>
+    
+        <li>
+            
+<p>
+    
+
+    
+    <a class="type-text" href="icQBu8R1ij57.html">Building &amp; updating</a>
+    
+</p>
+
+
+
+        </li>
+    
+        <li>
+            
+<p>
+    
+
+    
+    <a class="type-text" href="zpR91YHYs6lL.html">Differences from upstream</a>
+    
+</p>
+
+
+
+        </li>
+    
+</ul>
+
+
         </li>
 
 </ul>

docs/3eTu21fjtZkj.html

@@ -279,6 +279,66 @@ <h2>Server-side</h2><ul><li>There are two themes embedded in the application:<ul
 
 
 
+        </li>
+    
+        <li>
+            
+<p>
+    
+
+    
+    <a class="type-text" href="WKn3hLGmKmiH.html">CKEditor</a>
+    
+</p>
+
+
+<ul>
+    
+        <li>
+            
+<p>
+    
+
+    
+    <a class="type-text" href="MUGBo4n67kBI.html">Environment setup</a>
+    
+</p>
+
+
+
+        </li>
+    
+        <li>
+            
+<p>
+    
+
+    
+    <a class="type-text" href="icQBu8R1ij57.html">Building &amp; updating</a>
+    
+</p>
+
+
+
+        </li>
+    
+        <li>
+            
+<p>
+    
+
+    
+    <a class="type-text" href="zpR91YHYs6lL.html">Differences from upstream</a>
+    
+</p>
+
+
+
+        </li>
+    
+</ul>
+
+
         </li>
 
 </ul>