Merge branch 'release/1.4.0'

Author: ECRomaneli

package-lock.json

@@ -37,12 +37,12 @@
     "clean-css": "^5.3.3",
     "concurrently": "^9.2.1",
     "copy-webpack-plugin": "^14.0.0",
-    "electron": "^41.2.2",
+    "electron": "^41.3.0",
     "electron-builder": "^26.8.1",
     "eslint": "^10.2.1",
     "html-minifier-terser": "^7.2.0",
     "rimraf": "^6.1.3",
-    "terser-webpack-plugin": "^5.4.0",
+    "terser-webpack-plugin": "^5.5.0",
     "ts-loader": "^9.5.7",
     "typescript": "^6.0.3",
     "typescript-eslint": "^8.59.0",
@@ -53,10 +53,10 @@
     "@ecromaneli/search-engine": "^3.0.0",
     "auto-launch": "^5.0.6",
     "electron-context-menu": "^4.1.2",
-    "electron-draggable": "^1.6.1",
+    "electron-draggable": "^1.6.2",
     "electron-findbar": "^3.7.2",
     "electron-store": "^11.0.2",
     "electron-updater": "^6.8.3",
-    "vue": "^3.5.32"
+    "vue": "^3.5.33"
   }
 }

package.json

@@ -20,6 +20,7 @@ class AppState {
   private _defaultAppMenu?: MenuItem[];
   private _globalShortcut = '';
   private _resetBoundsType: ResetBoundType = Storage.getSettings(Settings.RESET_BOUNDS);
+  private _contentProtection = Storage.getSettings<boolean>(Settings.CONTENT_PROTECTION);
   private _systemTheme = this.getSystemTheme();
   private _tray?: Tray;
   private _preferences?: BrowserWindow;
@@ -47,6 +48,8 @@ class AppState {
   set globalShortcut(shortcut: string) { this._globalShortcut = shortcut; }
   set resetBoundsType(type: ResetBoundType) { this._resetBoundsType = type; }
   get resetBoundsType(): ResetBoundType { return this._resetBoundsType; }
+  set contentProtection(enabled: boolean) { this._contentProtection = enabled; }
+  get contentProtection(): boolean { return this._contentProtection; }
   set systemTheme(theme: SystemTheme) { this._systemTheme = theme; }
   get systemTheme(): SystemTheme { return this._systemTheme; }
   set trayContextMenu(menu: MenuItemConstructorOptions[] | undefined) { this.contextMenu.tray = menu; }

src/AppState.ts

@@ -31,6 +31,7 @@ const Settings = {
   DRAG_REFRESH_RATE: 'drag_refresh_rate',
   QUICK_MENU_SHORTCUT: 'quick_menu_shortcut',
   RIGHT_MARGIN_WHEN_MAXIMIZED: 'right_margin_when_maximized',
+  CONTENT_PROTECTION: 'content_protection',
 };
 
 const SyncSettings = {
@@ -81,6 +82,7 @@ DefaultSettings[Settings.RESIZE_REFRESH_RATE] = '';
 DefaultSettings[Settings.DRAG_REFRESH_RATE] = '';
 DefaultSettings[Settings.QUICK_MENU_SHORTCUT] = 'CmdOrCtrl+P';
 DefaultSettings[Settings.RIGHT_MARGIN_WHEN_MAXIMIZED] = 16;
+DefaultSettings[Settings.CONTENT_PROTECTION] = false;
 DefaultSettings[SyncSettings.GIST_ID] = undefined;
 DefaultSettings[SyncSettings.GIST_TOKEN] = undefined;
 

src/data/Constants.ts

@@ -65,6 +65,7 @@ export const de: Strings = {
     muteUnmute: 'Ton Aktivieren/Deaktivieren',
     navbar: 'Navigationsleiste',
     quickMenu: 'Schnellmenü',
+    printToPdf: 'Als PDF drucken...',
   },
 
   dialog: {
@@ -235,6 +236,8 @@ export const de: Strings = {
       keepOpacityDesc: 'Die Unschärfe-Deckkraft ignorieren, wenn das Fenster maximiert ist.',
       allowFullscreen: 'Vollbild erlauben',
       allowFullscreenDesc: 'Erlaubt dem Fenster den Vollbildmodus. Wenn deaktiviert, wird der Inhalt im Vollbild an das Fenster angepasst.',
+      contentProtection: 'Inhaltsschutz',
+      contentProtectionDesc: 'Verhindert, dass Fensterinhalte der App durch Bildschirmfreigabe- oder Screenshot-Tools erfasst werden.',
 
       resetBounds: 'Standardwerte beim Neustart wiederherstellen',
       resetBoundsDesc: 'Beim Neustart der App die Fenster auf den Standardzustand zurücksetzen. Wählen Sie "Keine", um dies zu deaktivieren.',

src/locale/de.ts

@@ -64,6 +64,7 @@ export const en = {
     listPages: 'List Pages',
     muteUnmute: 'Mute / Unmute',
     navbar: 'Navigation Bar',
+    printToPdf: 'Print to PDF...',
   },
 
   dialog: {
@@ -234,6 +235,8 @@ export const en = {
       keepOpacityDesc: 'Ignore the blur opacity if the window is maximized.',
       allowFullscreen: 'Allow fullscreen',
       allowFullscreenDesc: 'Allow the window to enter fullscreen mode. If disabled, the media, when in fullscreen, will fit the window.',
+      contentProtection: 'Content protection',
+      contentProtectionDesc: 'Prevent the app window content from being captured by screen sharing or screenshot tools.',
 
       resetBounds: 'Reset bounds to defaults on restart',
       resetBoundsDesc: 'On restart the app, reset windows to default state. Choose "None" to disable it.',

src/locale/en.ts

@@ -65,6 +65,7 @@ export const es: Strings = {
     muteUnmute: 'Activar/Desactivar Sonido',
     navbar: 'Barra de Navegación',
     quickMenu: 'Menú Rápido',
+    printToPdf: 'Imprimir en PDF...',
   },
 
   dialog: {
@@ -235,6 +236,8 @@ export const es: Strings = {
       keepOpacityDesc: 'Ignorar la opacidad de desenfoque si la ventana está maximizada.',
       allowFullscreen: 'Permitir pantalla completa',
       allowFullscreenDesc: 'Permite que la ventana entre en modo pantalla completa. Si está deshabilitado, el contenido en pantalla completa se ajustará a la ventana.',
+      contentProtection: 'Protección de contenido',
+      contentProtectionDesc: 'Evita que el contenido de las ventanas de la aplicación sea capturado por herramientas de pantalla compartida o capturas de pantalla.',
 
       resetBounds: 'Restablecer valores estándar al reiniciar',
       resetBoundsDesc: 'Al reiniciar la aplicación, restablece las ventanas al estado estándar. Elige "Ninguno" para deshabilitarlo.',

src/locale/es.ts

@@ -65,6 +65,7 @@ export const fr: Strings = {
     muteUnmute: 'Activer/Désactiver le Son',
     navbar: 'Barre de Navigation',
     quickMenu: 'Menu Rapide',
+    printToPdf: 'Imprimer en PDF...',
   },
 
   dialog: {
@@ -235,6 +236,8 @@ export const fr: Strings = {
       keepOpacityDesc: 'Ignorer l\'opacité de défocalisation si la fenêtre est maximisée.',
       allowFullscreen: 'Autoriser le plein écran',
       allowFullscreenDesc: 'Permet à la fenêtre de passer en mode plein écran. Si désactivé, le contenu en plein écran s\'ajustera à la fenêtre.',
+      contentProtection: 'Protection du contenu',
+      contentProtectionDesc: 'Empêche la capture du contenu des fenêtres de l\'application par des outils de partage d\'écran ou de capture d\'écran.',
 
       resetBounds: 'Réinitialiser les valeurs par défaut au redémarrage',
       resetBoundsDesc: 'Au redémarrage de l\'application, réinitialise les fenêtres à l\'état par défaut. Choisissez "Aucun" pour désactiver.',