1
0
mirror of https://github.com/laurent22/joplin.git synced 2025-08-24 20:19:10 +02:00

Compare commits

...

4 Commits

Author SHA1 Message Date
palerdot
10468c912a fix(desktop): hide splash screen for tray start 2023-04-26 15:11:47 +05:30
palerdot
a6d8478679 register hide-splash event before creating main window 2023-04-25 15:06:48 +05:30
palerdot
7f82501a19 feat(desktop): splash screen 2023-04-25 15:01:36 +05:30
palerdot
4973f3c082 splash screen assets 2023-04-24 12:46:05 +05:30
4 changed files with 47 additions and 0 deletions

View File

@@ -65,6 +65,21 @@ export default class ElectronAppWrapper {
return this.initialCallbackUrl_;
}
private async createSplashScreen() {
const splash = new BrowserWindow({
width: 500,
height: 300,
transparent: true,
frame: false,
alwaysOnTop: true,
});
await splash.loadFile('splash.html');
splash.center();
return splash;
}
public createWindow() {
// Set to true to view errors if the application does not start
const debugEarlyBugs = this.env_ === 'dev' || this.isDebugMode_;
@@ -355,6 +370,12 @@ export default class ElectronAppWrapper {
const alreadyRunning = this.ensureSingleInstance();
if (alreadyRunning) return;
const splash = await this.createSplashScreen();
ipcMain.on('hide-splash', () => {
splash.destroy();
});
this.createWindow();
this.electronApp_.on('before-quit', () => {

View File

@@ -45,6 +45,7 @@ import libCommands from '@joplin/lib/commands/index';
import { homedir } from 'os';
import getDefaultPluginsInfo from '@joplin/lib/services/plugins/defaultPlugins/desktopDefaultPluginsInfo';
const electronContextMenu = require('./services/electron-context-menu');
const ipcRenderer = require('electron').ipcRenderer;
// import populateDatabase from '@joplin/lib/services/debug/populateDatabase';
const commands = mainScreenCommands
@@ -489,6 +490,8 @@ class Application extends BaseApplication {
void AlarmService.garbageCollect();
}, 1000 * 60 * 60);
ipcRenderer.send('hide-splash');
if (Setting.value('startMinimized') && Setting.value('showTrayIcon')) {
// Keep it hidden
} else {

View File

@@ -0,0 +1,11 @@
<svg id="joplin-icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 1980 1080" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" style="background-color:#043873">
<style><![CDATA[
#joplin-icon-s-g1 {animation: joplin-icon-s-g1_c_o 500ms linear 1 normal forwards}@keyframes joplin-icon-s-g1_c_o { 0% {opacity: 0} 100% {opacity: 1}}
]]></style>
<defs><linearGradient id="joplin-icon-u-path28-fill" x1="4753.95" y1="366.05" x2="366.04" y2="4753.96" spreadMethod="pad" gradientUnits="userSpaceOnUse" gradientTransform="translate(0 0)"><stop id="joplin-icon-u-path28-fill-0" offset="0%" stop-color="#004caf"/><stop id="joplin-icon-u-path28-fill-1" offset="100%" stop-color="#1f95f8"/></linearGradient></defs><g id="joplin-icon-s-g1" transform="translate(.000001 0)" opacity="0"><g id="joplin-icon-s-g2" transform="translate(89.731006 0)"><g id="joplin-icon-s-g3" transform="translate(37.781477 0)"><g id="joplin-icon-s-g4"><g id="joplin-icon-s-g5"><g id="joplin-icon-u-g10" transform="matrix(.8 0 0-.8 335.310601 744.8)"><g id="joplin-icon-u-g12" transform="matrix(.1 0 0 0.1 0 0)"><g id="joplin-icon-u-g14"><g id="joplin-icon-u-g16"><path id="joplin-icon-u-path28" d="M3873.89,0h-2627.78C560.754,0,0,560.75,0,1246.11v2627.77C0,4559.25,560.754,5120,1246.11,5120h2627.78C4559.25,5120,5120,4559.25,5120,3873.88v-2627.77C5120,560.75,4559.25,0,3873.89,0" fill="url(#joplin-icon-u-path28-fill)"/></g></g><path id="joplin-icon-u-path30" d="M3961.59,4435.23h-1391.41c-13.15,0-23.78-10.64-23.78-23.77v-441.84c0-14.87,12.04-26.92,26.92-26.92h190.77c77.16,0,139.73-59.35,146.43-134.77v-302.93-168.77-1607.48-11.39h-.05c.48-16.84-.19-33.4-1.83-49.71-.18-2.38-.5-4.73-.79-7.09-1.1-9.53-2.32-19.01-4.17-28.29-1.01-5.29-2.44-10.44-3.71-15.65-1.71-6.93-3.09-13.97-5.22-20.75-12.58-40.27-32.47-77.62-59.98-110.5-1.01-1.17-2.26-2.25-3.26-3.41-8.39-9.72-17.2-19.19-26.95-28.06-9.84-8.95-20.26-17.27-31.21-25-77.84-55.14-182.61-79.4-299.67-68.2-149.26,14.03-297.34,81.72-417.03,190.62-119.67,108.89-194.08,243.62-209.48,379.41-13.85,121.48,22.55,228.38,102.42,301.05.21.16.4.31.56.48c3.09,2.77,6.49,5.2,9.67,7.87c57.16,47.89,131.67,76.91,216.7,84.91.96.09,1.88.24,2.79.32c8.95.79,18.07,1.15,27.27,1.49c4.81.16,9.56.5,14.44.54c1.62.02,3.16.19,4.78.19c2.9,0,5.91-.38,8.81-.42c13.4-.21,26.9-.76,40.67-1.94c1.74-.14,3.4-.08,5.19-.24c1.27-.13,2.53-.41,3.8-.54c78-7.82,155.23-31.11,228.52-66.4c1.53-.07,3.3-.54,5.51-1.76c22.34-12.34,26.62.9,27.28,9.65v382.24v282.82c0,19.05-13.25,35.9-31.83,39.99-394.76,86.88-782.08-3.55-1055.38-252.34-238.75-217.18-354.24-530.58-316.82-859.79c33.39-293.23,183.91-574.94,423.88-793.33c233.89-212.79,531.69-345.86,838.88-374.801c42.33-3.918,84.86-5.938,126.36-5.938c293.38,0,565.61,100.598,766.54,283.379c190.34,173.3,304.35,411.27,321.08,670.16l1.55,1697.91h.17v453.97h.06v7.92c1.72,80.12,67.05,144.58,147.61,144.58h190.77c14.86,0,26.92,12.05,26.92,26.92v441.84c0,13.13-10.63,23.77-23.78,23.77" fill="#fff"/></g></g></g></g></g></g><text id="joplin-icon-s-text1" dx="0" dy="0" font-family="&quot;joplin-icon:::Montserrat&quot;" font-size="200" font-weight="500" transform="translate(993.43468 610.410935)" fill="#fff" stroke-width="0"><tspan id="joplin-icon-s-tspan1" y="0" font-weight="500" stroke-width="0"><![CDATA[
Joplin
]]></tspan></text></g>
<style><![CDATA[
@font-face {font-family: 'joplin-icon:::Montserrat';font-style: normal;font-weight: 500;src: url(data:font/ttf;charset=utf-8;base64,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GhslAAAAAAwAlgADAAEECQAAALABBAADAAEECQABACIA4gADAAEECQACAA4A1AADAAEECQADADYAngADAAEECQAEACIA4gADAAEECQAFABoAhAADAAEECQAGACIAYgADAAEECQAOADQALgADAAEECQEAAAwAIgADAAEECQEFAAwAFgADAAEECQETAAwACgADAAEECQEUAAoAAABSAG8AbQBhAG4ASQB0AGEAbABpAGMATQBlAGQAaQB1AG0AVwBlAGkAZwBoAHQAaAB0AHQAcAA6AC8ALwBzAGMAcgBpAHAAdABzAC4AcwBpAGwALgBvAHIAZwAvAE8ARgBMAE0AbwBuAHQAcwBlAHIAcgBhAHQALQBNAGUAZABpAHUAbQBWAGUAcgBzAGkAbwBuACAAOAAuADAAMAAwADgALgAwADAAMAA7AFUATABBADsATQBvAG4AdABzAGUAcgByAGEAdAAtAE0AZQBkAGkAdQBtAFIAZQBnAHUAbABhAHIATQBvAG4AdABzAGUAcgByAGEAdAAgAE0AZQBkAGkAdQBtAEMAbwBwAHkAcgBpAGcAaAB0ACAAMgAwADEAMQAgAFQAaABlACAATQBvAG4AdABzAGUAcgByAGEAdAAgAFAAcgBvAGoAZQBjAHQAIABBAHUAdABoAG8AcgBzACAAKABoAHQAdABwAHMAOgAvAC8AZwBpAHQAaAB1AGIALgBjAG8AbQAvAEoAdQBsAGkAZQB0AGEAVQBsAGEALwBNAG8AbgB0AHMAZQByAHIAYQB0ACkAAA==) format('truetype');}
]]></style>
</svg>

After

Width:  |  Height:  |  Size: 6.5 KiB

View File

@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>JoplinSplashScreen</title>
</head>
<body>
<img src="./build/images/splash-image.svg" alt="joplin-icon">
</body>
</html>