package-lock.json

@@ -1,12 +1,12 @@
 {
 		"name": "ation",
-		"version": "0.4.0",
+		"version": "0.3.3",
 		"lockfileVersion": 2,
 		"requires": true,
 		"packages": {
 				"": {
 						"name": "ation",
-						"version": "0.4.0",
+						"version": "0.3.3",
 						"license": "MIT",
 						"dependencies": {
 								"font-list": "^1.4.5",

src/MainMenu.js

@@ -57,7 +57,7 @@ class MainMenu {
 				role : "windowMenu"
 			}
 		];
-		template[process.platform === "darwin" ? 1 : 0].submenu.push({
+		template[1].submenu.push({
 			id      : "recent-files",
 			label   : "Recent files",
 			enabled : this.app.recentFiles.length > 0,

src/SettingsManager.js

@@ -8,23 +8,17 @@ const path                   = require("path");
 class SettingsManager {
 	app;
 	data;
-	locked;
 
 	constructor(app) {
-		this.app    = app;
+		this.app  = app;
-		this.data   = null;
+		this.data = null;
-		this.locked = false;
 
 		if (!SettingsManager.CheckFileSystem()) {
 			if (!fsn.existsSync(SettingsManager.Folder))
 				fsn.mkdirSync(SettingsManager.Folder);
 			fsn.writeFileSync(SettingsManager.File, "{}");
 		}
-		try {
+		this.data = JSON.parse(fsn.readFileSync(SettingsManager.File, {encoding : "utf-8"}));
-			this.data = JSON.parse(fsn.readFileSync(SettingsManager.File, {encoding : "utf-8"})) ?? {};
-		} catch (error) {
-			this.data = {};
-		}
 
 		ipcMain.handle("SettingsManager::get",    (_, key, defaultValue = null) => this.get(key, defaultValue));
 		ipcMain.handle("SettingsManager::set",    (_, key, value) => this.set(key, value));
@@ -47,15 +41,9 @@ class SettingsManager {
 		this.app.windowManager.mainWindow?.send("SettingsManager::change", this.data);
 	}
 
-	async save() {
+	save() {
-		if (this.locked) {
+		fs.writeFile(SettingsManager.File, JSON.stringify(this.data, null, 4));
-			setTimeout(async () => await this.save(), 200);
-			return;
-		}
-		this.locked = true;
-		await fs.writeFile(SettingsManager.File, JSON.stringify(this.data, null, 4));
 		this.change();
-		this.locked = false;
 	}
 
 	async reset() {

src/WindowManager.js

@@ -24,15 +24,9 @@ class WindowManager {
 	}
 
 	init() {
-		const shouldRestore = this.app.settingsManager.get("restoreWindow", false);
-		const width       = shouldRestore ? this.app.settingsManager.get("windowWidth", 800) : 800;
-		const height      = shouldRestore ? this.app.settingsManager.get("windowHeight", 600) : 600;
-
 		this.mainWindow = WindowManager._CreateWindow({
 			fullscreen      : false,
-			fullscreenable  : true,
+			fullscreenable  : true
-			width,
-			height
 		});
 		this.windows.settings = WindowManager._CreateWindow({
 			height         : 300,
@@ -42,12 +36,6 @@ class WindowManager {
 			show           : false
 		}, this.mainWindow, false);
 
-		this.mainWindow.on("resize", () => {
-			const [width, height] = this.mainWindow.getSize();			
-			this.app.settingsManager.set("windowWidth", width);
-			this.app.settingsManager.set("windowHeight", height);
-		});
-
 		// on windows and linux we need to hide the main menu in the settings
 		// window, because it would look odd.
 		if (["win32", "linux"].includes(process.platform)) {

src/ui/src/assets/css/_fonts.scss

@@ -1,31 +0,0 @@
-@font-face {
-	font-family: "Iosevka";
-	src: url("#{$font-path}/iosevka/Iosevka-Regular.ttf");
-}
-@font-face {
-	font-family: "Iosevka";
-	src: url("#{$font-path}/iosevka/Iosevka-Italic.ttf");
-	font-style: italic;
-}
-@font-face {
-	font-family: "Iosevka";
-	src: url("#{$font-path}/iosevka/Iosevka-Bold.ttf");
-	font-weight: bold;
-}
-@font-face {
-	font-family: "Iosevka";
-	src: url("#{$font-path}/iosevka/Iosevka-BoldItalic.ttf");
-	font-weight: bold;
-	font-style: italic;
-}
-@font-face {
-	font-family: "Iosevka";
-	src: url("#{$font-path}/iosevka/Iosevka-Light.ttf");
-	font-weight: 100;
-}
-@font-face {
-	font-family: "Iosevka";
-	src: url("#{$font-path}/iosevka/Iosevka-LightItalic.ttf");
-	font-weight: 100;
-	font-style: italic;
-}

src/ui/src/assets/css/_forms.scss

@@ -52,67 +52,3 @@ select {
 		}
 	}
 }
-
-$size    : 20px;
-$spacing : 3px;
-
-.toggle {
-	position: relative;
-	display: inline-block;
-	width: calc(($size + $spacing)  * 2);
-	height: calc($size + 2 * $spacing);
-	vertical-align: middle;
-	margin: 0;
-
-	input {
-		opacity: 0;
-		width: 0;
-		height: 0;
-
-		&:checked {
-			& + .slider {
-				background-color: color(hightlight);
-			}
-		}
-
-		&:checked + .slider::before {
-			transform: translateX($size);
-		}
-	}
-
-	.slider {
-		position: absolute;
-		cursor: pointer;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background-color: color(fadedForeground);
-		-webkit-transition: .4s;
-		transition: .4s;
-
-		&::before {
-			position: absolute;
-			content: "";
-			height: $size;
-			width: $size;
-			left: $spacing;
-			bottom: $spacing;
-			background-color: color(sidebarBackground);
-			-webkit-transition: .4s;
-			transition: .4s;
-		}
-
-		&.round {
-			border-radius: calc($size * 2);
-
-			&::before {
-				border-radius: 50%;
-			}
-		}
-	}
-
-	& + label {
-		vertical-align: middle;
-	}
-}

src/ui/src/assets/css/_settings.scss

@@ -73,10 +73,6 @@
 					align-self: flex-start;
 				}
 			}
-		
-			&.mb {
-				margin-bottom: 2rem;
-			}
 		}
 	}
 

src/ui/src/assets/css/_variables.scss

@@ -17,5 +17,3 @@ $colors : (
 		--color-#{$colorName} : #{$colorValue};
 	}
 }
-
-$font-path : "../fonts";

src/ui/src/assets/css/ation.scss

@@ -5,7 +5,6 @@
 @import "forms";
 @import "toolbar";
 @import "settings";
-@import "fonts";
 
 @import "window";
 @import "noFile";
@@ -39,7 +38,6 @@ body {
 	app-region: drag;
 	height: 30px;
 	width: 100%;
-	user-select: none;
 }
 
 ::selection {

src/ui/src/components/Toolbar.js

@@ -1,4 +1,4 @@
-import React, {useContext, useEffect, useRef} from "react";
+import React, {useContext} from "react";
 
 import {Folder2Open, Cast, InfoCircle, XSquare, LayoutSplit} from "react-bootstrap-icons";
 
@@ -8,7 +8,6 @@ import Mode         from "../models/Mode";
 import {ReactComponent as Logo} from "../assets/images/logo_ation.svg";
 
 const Toolbar = ({openFile, setShowTips, version, toggleEdit}) => {
-	const toolbar                         = useRef();
 	const {setMode, setSlide, slideCount} = useContext(SlideContext);
 
 	const present = () => {
@@ -17,30 +16,12 @@ const Toolbar = ({openFile, setShowTips, version, toggleEdit}) => {
 		document.documentElement.requestFullscreen();
 	};
 
-	const toggleMaximize = event => {
+	const toggleMaximize = () => {
-		if (event.target !== toolbar.current)
-			return;
 		window.api.maximize();
-		event.stopPropagation();
 	};
 
-	// prevent text selection on doubleclick
-	useEffect(() => {
-		const tBar = toolbar.current;
-		const doubleClickListener = event => {
-			if (event.detail > 1)
-				event.preventDefault();
-		};
-
-		tBar?.addEventListener("mousedown", doubleClickListener);
-
-		return () => {
-			tBar?.removeEventListener("mousedown", doubleClickListener);
-		};
-	}, [toolbar]);
-
 	return (
-		<nav className="toolbar" onDoubleClick={toggleMaximize} ref={toolbar}>
+		<nav className="toolbar" onDoubleClick={toggleMaximize}>
 			<button onClick={openFile} title="Open file [⌘+O]"><Folder2Open /></button>	
 			<button onClick={present} title="Start presentation [F5]"><Cast /></button>	
 			<Logo />

src/ui/src/components/settings/General.js

@@ -1,36 +1,15 @@
-import React, {useState, useEffect} from "react";
+import React from "react";
-
-import Toggle from "../shared/Toggle";
 
 const General = () => {
-	const [restoreWindow, setRestoreWindow] = useState(false);
-
-	useEffect(() => {
-		(async () => {
-			setRestoreWindow(await window.appSettings.get("restoreWindow", false));
-		})(setRestoreWindow);
-	}, []);
-
-	const changeRestoreWindow = event => {
-		const value = event.target.checked === true;
-		setRestoreWindow(value);
-		window.appSettings.set("restoreWindow", value);
-	};
 
 	const reset = () => {
 		window.appSettings.reset();
 	}
 
 	return (
-		<>
+		<section style={{textAlign : "center"}}>
-			<section className="grid mb">
+			<button className="danger" onClick={reset}>reset all settings to default</button>
-				<label>Restore window size:</label>
+		</section>
-				<Toggle checked={restoreWindow} onChange={changeRestoreWindow} />
-			</section>
-			<section style={{textAlign : "center"}}>
-				<button className="danger" onClick={reset}>reset all settings to default</button>
-			</section>
-		</>
 	);
 };
 

src/ui/src/components/shared/Toggle.js

@@ -1,12 +0,0 @@
-import React from "react";
-
-const Toggle = ({...props}) => {
-	return (
-		<label className="toggle">
-			  <input type="checkbox" {...props} />
-			  <span className="slider round"></span>
-		</label>			
-	);
-};
-
-export default Toggle;