Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions dist-electron/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import "node:fs";
import "node:url";
import "electron";
import "module";
import { M, R, V } from "./main-BHNwIsv4.js";
import { M, R, V } from "./main-YnXY0Ehi.js";
export {
i as MAIN_DIST,
_ as RENDERER_DIST,
D as VITE_DEV_SERVER_URL
M as MAIN_DIST,
R as RENDERER_DIST,
V as VITE_DEV_SERVER_URL
};
4 changes: 0 additions & 4 deletions electron/services/copy/selectedText.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,12 @@ export async function getSelectedText(): Promise<string> {
}

return new Promise((resolve, reject) => {
const previousContent = clipboard.readText();

exec(getCopyCommand(), (error) => {
if (error) {
clipboard.writeText(previousContent);
return reject(error);
}
setTimeout(() => {
const selectedText = clipboard.readText();
clipboard.writeText(previousContent);
resolve(selectedText);
}, 150);
});
Expand Down
2 changes: 1 addition & 1 deletion electron/windows/settingWindow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export function createSettingWindow() {
const target = `${VITE_DEV_SERVER_URL.replace(/\/$/, '')}/#${'/setting'}`;
settingWin.loadURL(target);
} else {
settingWin.loadFile('index.html');
settingWin.loadFile(path.join(RENDERER_DIST, 'index.html'));
settingWin.webContents.once('did-finish-load', () => {
settingWin?.webContents.send('navigate-to', '/setting');
});
Expand Down
20 changes: 16 additions & 4 deletions forge.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,39 @@ import { FuseV1Options, FuseVersion } from '@electron/fuses';
export default {
packagerConfig: {
asar: true,
icons: './src/assets/matmal-icon',
icon: './src/assets/matmal-icon',
executableName: 'matmal',
name: 'MATMAL',
},
rebuildConfig: {},
makers: [
{
name: '@electron-forge/maker-squirrel',
config: {},
config: {
setupIcon: './src/assets/matmal-icon.ico',
},
},
{
name: '@electron-forge/maker-zip',
platforms: ['darwin'],
},
{
name: '@electron-forge/maker-deb',
config: {},
config: {
icon: '/src/assets/matmal-icon.png',
},
},
{
name: '@electron-forge/maker-dmg',
config: {
icon: '/src/assets/matmal-icon.icns',
},
},
{
name: '@electron-forge/maker-rpm',
config: {},
config: {
icon: '/src/assets/matmal-icon.png',
},
},
],
publishers: [
Expand Down
Loading