Merge branch 'main' of https://github.com/pickle-com/glass
This commit is contained in:
commit
f764ad5362
@ -1,2 +1,2 @@
|
||||
src/assets
|
||||
src/ui/assets
|
||||
node_modules
|
||||
|
2
aec
2
aec
@ -1 +1 @@
|
||||
Subproject commit 9e11f4f95707714464194bdfc9db0222ec5c6163
|
||||
Subproject commit f00bb1fb948053c752b916adfee19f90644a0b2f
|
@ -39,7 +39,7 @@ asarUnpack:
|
||||
|
||||
# Windows configuration
|
||||
win:
|
||||
icon: src/assets/logo.ico
|
||||
icon: src/ui/assets/logo.ico
|
||||
target:
|
||||
- target: nsis
|
||||
arch: x64
|
||||
@ -67,7 +67,7 @@ mac:
|
||||
# The application category type
|
||||
category: public.app-category.utilities
|
||||
# Path to the .icns icon file
|
||||
icon: src/assets/logo.icns
|
||||
icon: src/ui/assets/logo.icns
|
||||
# Minimum macOS version (supports both Intel and Apple Silicon)
|
||||
minimumSystemVersion: '11.0'
|
||||
hardenedRuntime: true
|
||||
|
@ -1,5 +1,5 @@
|
||||
// src/bridge/windowBridge.js
|
||||
const { ipcMain, BrowserWindow } = require('electron');
|
||||
const { ipcMain, shell } = require('electron');
|
||||
const windowManager = require('../window/windowManager');
|
||||
|
||||
module.exports = {
|
||||
@ -15,6 +15,7 @@ module.exports = {
|
||||
ipcMain.handle('open-personalize-page', () => windowManager.openLoginPage());
|
||||
ipcMain.handle('move-window-step', (event, direction) => windowManager.moveWindowStep(direction));
|
||||
ipcMain.on('close-shortcut-editor', () => windowManager.closeWindow('shortcut-settings'));
|
||||
ipcMain.handle('open-external', (event, url) => shell.openExternal(url));
|
||||
|
||||
// Newly moved handlers from windowManager
|
||||
ipcMain.on('header-state-changed', (event, state) => windowManager.handleHeaderStateChanged(state));
|
||||
|
@ -19,6 +19,7 @@ contextBridge.exposeInMainWorld('api', {
|
||||
|
||||
// App Control
|
||||
quitApplication: () => ipcRenderer.invoke('quit-application'),
|
||||
openExternal: (url) => ipcRenderer.invoke('open-external', url),
|
||||
|
||||
// User state listener (used by multiple components)
|
||||
onUserStateChanged: (callback) => ipcRenderer.on('user-state-changed', callback),
|
||||
|
@ -256,6 +256,7 @@ export class ApiKeyHeader extends LitElement {
|
||||
.footer-link {
|
||||
text-decoration: underline;
|
||||
cursor: pointer;
|
||||
-webkit-app-region: no-drag;
|
||||
}
|
||||
.error-message,
|
||||
.success-message {
|
||||
@ -1904,8 +1905,9 @@ export class ApiKeyHeader extends LitElement {
|
||||
}
|
||||
|
||||
openPrivacyPolicy() {
|
||||
if (window.require) {
|
||||
window.require('electron').shell.openExternal('https://pickleglass.com/privacy');
|
||||
console.log('🔊 openPrivacyPolicy ApiKeyHeader');
|
||||
if (window.api?.common) {
|
||||
window.api.common.openExternal('https://pickle.com/privacy-policy');
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -156,6 +156,7 @@ export class WelcomeHeader extends LitElement {
|
||||
.footer-link {
|
||||
text-decoration: underline;
|
||||
cursor: pointer;
|
||||
-webkit-app-region: no-drag;
|
||||
}
|
||||
`;
|
||||
|
||||
@ -177,8 +178,8 @@ export class WelcomeHeader extends LitElement {
|
||||
}
|
||||
|
||||
handleClose() {
|
||||
if (window.require) {
|
||||
window.require('electron').ipcRenderer.invoke('quit-application');
|
||||
if (window.api?.common) {
|
||||
window.api.common.quitApplication();
|
||||
}
|
||||
}
|
||||
|
||||
@ -225,8 +226,9 @@ export class WelcomeHeader extends LitElement {
|
||||
}
|
||||
|
||||
openPrivacyPolicy() {
|
||||
if (window.require) {
|
||||
window.require('electron').shell.openExternal('https://pickleglass.com/privacy');
|
||||
console.log('🔊 openPrivacyPolicy WelcomeHeader');
|
||||
if (window.api?.common) {
|
||||
window.api.common.openExternal('https://pickle.com/privacy-policy');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -640,6 +640,7 @@ function createWindows() {
|
||||
frame: false,
|
||||
transparent: true,
|
||||
vibrancy: false,
|
||||
hasShadow: false,
|
||||
alwaysOnTop: true,
|
||||
skipTaskbar: true,
|
||||
hiddenInMissionControl: true,
|
||||
|
Loading…
x
Reference in New Issue
Block a user