diff --git a/settings.html b/settings.html index 7d07cfc..ff1b575 100644 --- a/settings.html +++ b/settings.html @@ -5,6 +5,17 @@ Settings +
+
+
ED Safari v0.1.0
+ +
+ + +
+
+
+
diff --git a/src/assets/index.css b/src/assets/index.css index 529604e..94e13d5 100755 --- a/src/assets/index.css +++ b/src/assets/index.css @@ -200,4 +200,8 @@ div b.active.landable { #titlebar .btn-settings { background: transparent url('./../icons/gear.svg') center/1em auto no-repeat; +} + +#titlebar .btn-back { + background: transparent url('./../icons/arrow-left.svg') center/1em auto no-repeat; } \ No newline at end of file diff --git a/src/icons/arrow-left-square.svg:Zone.Identifier b/src/icons/arrow-left-square.svg:Zone.Identifier new file mode 100644 index 0000000..e27ba46 --- /dev/null +++ b/src/icons/arrow-left-square.svg:Zone.Identifier @@ -0,0 +1,4 @@ +[ZoneTransfer] +ZoneId=3 +ReferrerUrl=https://icons.getbootstrap.com/icons/arrow-left-square/ +HostUrl=https://icons.getbootstrap.com/assets/icons/arrow-left-square.svg diff --git a/src/icons/arrow-left.svg b/src/icons/arrow-left.svg new file mode 100644 index 0000000..9d88501 --- /dev/null +++ b/src/icons/arrow-left.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/icons/arrow-left.svg:Zone.Identifier b/src/icons/arrow-left.svg:Zone.Identifier new file mode 100644 index 0000000..cb66c2a --- /dev/null +++ b/src/icons/arrow-left.svg:Zone.Identifier @@ -0,0 +1,4 @@ +[ZoneTransfer] +ZoneId=3 +ReferrerUrl=https://icons.getbootstrap.com/icons/arrow-left/ +HostUrl=https://icons.getbootstrap.com/assets/icons/arrow-left.svg diff --git a/src/main.js b/src/main.js index bd67bfb..0171e1f 100755 --- a/src/main.js +++ b/src/main.js @@ -56,12 +56,25 @@ const loadSettings = (event) => { } } +// Set up main page handler. +const loadMain = (event) => { + const webContents = event.sender; + const window = BrowserWindow.fromWebContents(webContents); + + if (MAIN_WINDOW_VITE_DEV_SERVER_URL) { + mainWindow.loadURL(MAIN_WINDOW_VITE_DEV_SERVER_URL); + } else { + mainWindow.loadFile(path.join(__dirname, `../renderer/${MAIN_WINDOW_VITE_NAME}/index.html`)); + } +} + // This method will be called when Electron has finished // initialization and is ready to create browser windows. // Some APIs can only be used after this event occurs. app.on('ready', () => { ipcMain.on('CLOSE_WINDOW', closeWindow); ipcMain.on('LOAD_SETTINGS', loadSettings); + ipcMain.on('LOAD_MAIN', loadMain); createWindow(); }); diff --git a/src/renderer.js b/src/renderer.js index ab5005e..dddf818 100755 --- a/src/renderer.js +++ b/src/renderer.js @@ -33,10 +33,10 @@ import './icons/flaticon.css' import './assets/ldom.min' const { app, ipcRenderer } = require('electron') + import { Safari } from './models/Safari' import { UI } from './models/UI' import { Body } from './models/Body' -import { sep } from 'path' import { EDSM } from './models/EDSM' // Grab app.isPackaged from main process diff --git a/src/settings.js b/src/settings.js index e68ea35..37cd79e 100644 --- a/src/settings.js +++ b/src/settings.js @@ -1,4 +1,18 @@ import 'bootstrap/dist/css/bootstrap.css' import './assets/index.css' + import './assets/ldom.min' +const { ipcRenderer } = require('electron') + +/* -------------------------------------------------------------------- close window handler ---- */ + +$('#closeBtn').on('click', () => { + ipcRenderer.send('CLOSE_WINDOW') +}) + +/* ---------------------------------------------------------------- load main window handler ---- */ + +$('#backBtn').on('click', () => { + ipcRenderer.send('LOAD_MAIN') +}) \ No newline at end of file