mirror of
				https://github.com/smartfrigde/armcord.git
				synced 2024-08-14 23:56:58 +00:00 
			
		
		
		
	Update Electron
This commit is contained in:
		
							parent
							
								
									37c1951a33
								
							
						
					
					
						commit
						35b6ee7a5f
					
				
					 7 changed files with 14 additions and 15 deletions
				
			
		|  | @ -1,7 +1,6 @@ | |||
| import {BrowserWindow, app, ipcMain} from "electron"; | ||||
| import path from "path"; | ||||
| import * as fs from "fs"; | ||||
| import * as os from "os"; | ||||
| import {iconPath} from "../main"; | ||||
| import {Settings, getConfigLocation, setConfigBulk} from "../utils"; | ||||
| let setupWindow: BrowserWindow; | ||||
|  |  | |||
|  | @ -19,7 +19,7 @@ | |||
|             <div id="setup"> | ||||
|                 <div id="logo" class="hidden"></div> | ||||
|                 <div id="page1" class="hidden"> | ||||
|                     <p id="setup_question1">Welcome to the ArmCord Setup</p> | ||||
|                     <p id="setup_question1">Welcome to ArmCord Setup</p> | ||||
|                     <div id="buttons"> | ||||
|                         <button id="full" class="center">Next</button> | ||||
|                     </div> | ||||
|  |  | |||
|  | @ -1,5 +1,5 @@ | |||
| import * as fs from "fs"; | ||||
| import {Menu, Tray, app, dialog, nativeImage} from "electron"; | ||||
| import {Menu, MessageBoxOptions, Tray, app, dialog, nativeImage} from "electron"; | ||||
| import {createInviteWindow, mainWindow} from "./window"; | ||||
| import {getConfig, getConfigLocation, getDisplayVersion, setConfig, setWindowState} from "./utils"; | ||||
| import * as path from "path"; | ||||
|  | @ -145,7 +145,7 @@ app.whenReady().then(async () => { | |||
|     } else { | ||||
|         if ((await getConfig("tray")) == undefined) { | ||||
|             if (process.platform == "win32") { | ||||
|                 const options = { | ||||
|                 const options: MessageBoxOptions = { | ||||
|                     type: "question", | ||||
|                     buttons: ["Yes, please", "No, I don't"], | ||||
|                     defaultId: 1, | ||||
|  |  | |||
|  | @ -2,7 +2,7 @@ | |||
| // I had to add most of the window creation code here to split both into seperete functions
 | ||||
| // WHY? Because I can't use the same code for both due to annoying bug with value `frame` not responding to variables
 | ||||
| // I'm sorry for this mess but I'm not sure how to fix it.
 | ||||
| import {BrowserWindow, app, dialog, nativeImage, shell} from "electron"; | ||||
| import {BrowserWindow, MessageBoxOptions, app, dialog, nativeImage, shell} from "electron"; | ||||
| import path from "path"; | ||||
| import { | ||||
|     checkIfConfigIsBroken, | ||||
|  | @ -106,7 +106,7 @@ async function doAfterDefiningTheWindow(): Promise<void> { | |||
|         } else if (ignoreProtocolWarning) { | ||||
|             shell.openExternal(url); | ||||
|         } else { | ||||
|             const options = { | ||||
|             const options: MessageBoxOptions = { | ||||
|                 type: "question", | ||||
|                 buttons: ["Yes, please", "No, I don't"], | ||||
|                 defaultId: 1, | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue