finished for now

lacymorrow · Jun 3, 2023 · 9dfd4fd · 9dfd4fd
1 parent 709a7e5
commit 9dfd4fd
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 29 deletions.
diff --git a/src/main.js b/src/main.js
@@ -190,8 +190,18 @@ module.exports = async () => {
 	// app.on(...)
 	register.appEvents()
 
+	// Quit app when all windows are closed; Fix for Linux tray
+	app.on( 'before-quit', _ => {
+
+		// https://electronjs.org/docs/api/app#event-before-quit
+		// https://electronjs.org/docs/api/tray#traydestroy
+		tray.instance?.destroy()
+
+	} )
+
 	// wait for app.on('ready')
 	await app.whenReady()
+	//  Remove tray in Linux to fully quit
 
 	console.timeLog( 'init' )
 

diff --git a/src/main/crossover.js b/src/main/crossover.js
@@ -7,7 +7,6 @@ const keyboard = require( './keyboard' )
 const log = require( './log' )
 const save = require( './save' )
 const set = require( './set' )
-const tray = require( './tray' )
 const sound = require( './sound' )
 const windows = require( './windows' )
 const reset = require( './reset' )
@@ -17,15 +16,6 @@ const preferences = Preferences.init()
 
 let previousPreferences = preferences.preferences
 
-//  Remove tray in Linux to fully quit
-app.on( 'before-quit', _ => {
-
-	// https://electronjs.org/docs/api/app#event-before-quit
-	// https://electronjs.org/docs/api/tray#traydestroy
-	tray.instance?.destroy()
-
-} )
-
 const quit = () => app.quit()
 
 const changeCrosshair = src => windows.each( win => set.crosshair( src, win ) )

diff --git a/src/main/preferences.js b/src/main/preferences.js
@@ -105,7 +105,7 @@ const preferencesConfig = {
 						label: 'Welcome to CrossOver',
 						fields: [
 							{
-								content: '<p>Use <code>CTRL+ALT+SHIFT+X</code> to lock CrossOver in place and hide the background window.</p>',
+								content: '<p><b>Use <code>CTRL+ALT+SHIFT+X</code> to lock CrossOver in place and hide the background window.</b></p>',
 								type: 'message',
 							},
 						],
@@ -133,6 +133,16 @@ const preferencesConfig = {
 								treatPackageAsDirectory: false, // (macos) Treat packages, such as .app folders, as a directory instead of a file.
 								dontAddToRecent: true, // (windows) Do not add the item being opened to the recent documents list.
 							},
+							{
+								label: 'Reticle',
+								key: 'reticle',
+								type: 'radio',
+								options: [
+									{ label: 'Dot', value: 'dot' },
+									{ label: 'Cross', value: 'cross' },
+									{ label: 'No reticle', value: 'off' },
+								],
+							},
 							{
 								label: 'Crosshair Size',
 								key: 'size',
@@ -148,14 +158,12 @@ const preferencesConfig = {
 								max: 100,
 							},
 							{
-								label: 'Reticle',
-								key: 'reticle',
-								type: 'radio',
-								options: [
-									{ label: 'Dot', value: 'dot' },
-									{ label: 'Cross', value: 'cross' },
-									{ label: 'No reticle', value: 'off' },
-								],
+								label: 'Reticle Scale',
+								key: 'reticleScale',
+								type: 'slider',
+								min: 1,
+								max: 500,
+								help: 'Reticle scale percentage (compared to crosshair)',
 							},
 							{
 								label: 'Reticle Color',
@@ -164,14 +172,6 @@ const preferencesConfig = {
 								format: 'hex', // Can be hex, hsl or rgb
 								help: 'Center reticle color',
 							},
-							{
-								label: 'Reticle Scale',
-								key: 'reticleScale',
-								type: 'slider',
-								min: 1,
-								max: 500,
-								help: 'Reticle scale percentage (compared to crosshair)',
-							},
 							{
 								heading: 'SVG Customization Options',
 							},
@@ -211,7 +211,7 @@ const preferencesConfig = {
 		},
 		{
 			id: 'actions',
-			label: 'Crosshair Actions',
+			label: 'Mouse Actions',
 			icon: 'turtle',
 			form: {
 				groups: [

diff --git a/src/main/tray.js b/src/main/tray.js
@@ -41,9 +41,11 @@ const init = () => {
 	}
 
 	tray.instance = new Tray( getIconPath() )
+
+	console.log( preferencesMenuItems )
 	const contextMenu = Menu.buildFromTemplate( [
 		showAppMenuItem,
-		...preferencesMenuItems,
+		preferencesMenuItems,
 		openCustomImageMenuItem,
 		resetMenuItem,
 		{ role: 'quit' },