Skip to content

Commit edcf521

Browse files
committed
fix: ipcRenderer on event usage
1 parent 4eef748 commit edcf521

3 files changed

Lines changed: 108 additions & 60 deletions

File tree

main.ts

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -975,7 +975,7 @@ app.on('ready', async () => {
975975
statusAutoIdle: store.get('statusAutoIdle') ?? false,
976976
statusAutoIdleMinutes: store.get('statusAutoIdleMinutes') || 10,
977977
statusAutoDnd: store.get('statusAutoDnd') ?? false,
978-
channelUIMode: store.get('channelUIMode') || 'auto',
978+
channelUIMode: store.get('channelUIMode') || 'classic',
979979
closeToTray: store.get('closeToTray') ?? false,
980980
dontShowDisclaimer: store.get('dontShowDisclaimer') ?? false,
981981
font: store.get('font') || '',
@@ -993,16 +993,16 @@ app.on('ready', async () => {
993993
mixMode: store.get('mixMode') || 'all',
994994
// Voice settings
995995
speakingMode: store.get('speakingMode') || 'key',
996-
defaultSpeakingKey: store.get('defaultSpeakingKey') || '',
996+
defaultSpeakingKey: store.get('defaultSpeakingKey') || 'v',
997997
// Privacy settings
998998
notSaveMessageHistory: store.get('notSaveMessageHistory') ?? true,
999999
// Hotkeys Settings
1000-
hotKeyOpenMainWindow: store.get('hotKeyOpenMainWindow') || '',
1000+
hotKeyOpenMainWindow: store.get('hotKeyOpenMainWindow') || 'F1',
10011001
hotKeyScreenshot: store.get('hotKeyScreenshot') || '',
1002-
hotKeyIncreaseVolume: store.get('hotKeyIncreaseVolume') || '',
1003-
hotKeyDecreaseVolume: store.get('hotKeyDecreaseVolume') || '',
1004-
hotKeyToggleSpeaker: store.get('hotKeyToggleSpeaker') || '',
1005-
hotKeyToggleMicrophone: store.get('hotKeyToggleMicrophone') || '',
1002+
hotKeyIncreaseVolume: store.get('hotKeyIncreaseVolume') || 'Ctrl+m',
1003+
hotKeyDecreaseVolume: store.get('hotKeyDecreaseVolume') || 'Shift+m',
1004+
hotKeyToggleSpeaker: store.get('hotKeyToggleSpeaker') || 'Alt+m',
1005+
hotKeyToggleMicrophone: store.get('hotKeyToggleMicrophone') || 'Alt+v',
10061006
// SoundEffect settings
10071007
disableAllSoundEffect: store.get('disableAllSoundEffect') ?? false,
10081008
enterVoiceChannelSound: store.get('enterVoiceChannelSound') ?? true,
@@ -1108,7 +1108,7 @@ app.on('ready', async () => {
11081108
});
11091109

11101110
ipcMain.on('get-default-speaking-key', (event) => {
1111-
event.returnValue = store.get('defaultSpeakingKey') || '';
1111+
event.returnValue = store.get('defaultSpeakingKey') || 'v';
11121112
});
11131113

11141114
// Privacy
@@ -1118,23 +1118,23 @@ app.on('ready', async () => {
11181118

11191119
// HotKey
11201120
ipcMain.on('get-hot-key-open-main-window', (event) => {
1121-
event.returnValue = store.get('hotKeyOpenMainWindow') || '';
1121+
event.returnValue = store.get('hotKeyOpenMainWindow') || 'F1';
11221122
});
11231123

11241124
ipcMain.on('get-hot-key-increase-volume', (event) => {
1125-
event.returnValue = store.get('hotKeyIncreaseVolume') || '';
1125+
event.returnValue = store.get('hotKeyIncreaseVolume') || 'Ctrl+m';
11261126
});
11271127

11281128
ipcMain.on('get-hot-key-decrease-volume', (event) => {
1129-
event.returnValue = store.get('hotKeyDecreaseVolume') || '';
1129+
event.returnValue = store.get('hotKeyDecreaseVolume') || 'Shift+m';
11301130
});
11311131

11321132
ipcMain.on('get-hot-key-toggle-speaker', (event) => {
1133-
event.returnValue = store.get('hotKeyToggleSpeaker') || '';
1133+
event.returnValue = store.get('hotKeyToggleSpeaker') || 'Alt+m';
11341134
});
11351135

11361136
ipcMain.on('get-hot-key-toggle-microphone', (event) => {
1137-
event.returnValue = store.get('hotKeyToggleMicrophone') || '';
1137+
event.returnValue = store.get('hotKeyToggleMicrophone') || 'Alt+v';
11381138
});
11391139

11401140
// SoundEffect
@@ -1318,7 +1318,7 @@ app.on('ready', async () => {
13181318
});
13191319

13201320
ipcMain.on('set-default-speaking-key', (_, key) => {
1321-
store.set('defaultSpeakingKey', key || '');
1321+
store.set('defaultSpeakingKey', key || 'v');
13221322
BrowserWindow.getAllWindows().forEach((window) => {
13231323
window.webContents.send('default-speaking-key', key);
13241324
});
@@ -1334,35 +1334,35 @@ app.on('ready', async () => {
13341334

13351335
// HotKey
13361336
ipcMain.on('set-hot-key-open-main-window', (_, key) => {
1337-
store.set('hotKeyOpenMainWindow', key || '');
1337+
store.set('hotKeyOpenMainWindow', key || 'F1');
13381338
BrowserWindow.getAllWindows().forEach((window) => {
13391339
window.webContents.send('hot-key-open-main-window', key);
13401340
});
13411341
});
13421342

13431343
ipcMain.on('set-hot-key-increase-volume', (_, key) => {
1344-
store.set('hotKeyIncreaseVolume', key || '');
1344+
store.set('hotKeyIncreaseVolume', key || 'Ctrl+m');
13451345
BrowserWindow.getAllWindows().forEach((window) => {
13461346
window.webContents.send('hot-key-increase-volume', key);
13471347
});
13481348
});
13491349

13501350
ipcMain.on('set-hot-key-decrease-volume', (_, key) => {
1351-
store.set('hotKeyDecreaseVolume', key || '');
1351+
store.set('hotKeyDecreaseVolume', key || 'Shift+m');
13521352
BrowserWindow.getAllWindows().forEach((window) => {
13531353
window.webContents.send('hot-key-decrease-volume', key);
13541354
});
13551355
});
13561356

13571357
ipcMain.on('set-hot-key-toggle-speaker', (_, key) => {
1358-
store.set('hotKeyToggleSpeaker', key || '');
1358+
store.set('hotKeyToggleSpeaker', key || 'Alt+m');
13591359
BrowserWindow.getAllWindows().forEach((window) => {
13601360
window.webContents.send('hot-key-toggle-speaker', key);
13611361
});
13621362
});
13631363

13641364
ipcMain.on('set-hot-key-toggle-microphone', (_, key) => {
1365-
store.set('hotKeyToggleMicrophone', key || '');
1365+
store.set('hotKeyToggleMicrophone', key || 'Alt+v');
13661366
BrowserWindow.getAllWindows().forEach((window) => {
13671367
window.webContents.send('hot-key-toggle-microphone', key);
13681368
});

src/components/pages/Server.tsx

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -320,14 +320,27 @@ const ServerPageComponent: React.FC<ServerPageProps> = React.memo(({ user, frien
320320
}, [t, serverName, serverOnlineMembers]);
321321

322322
useEffect(() => {
323-
setSpeakMode(ipc.systemSettings.speakingMode.get());
324-
setSpeakHotKey(ipc.systemSettings.defaultSpeakingKey.get());
325-
setChannelUIMode(ipc.systemSettings.channelUIMode.get());
323+
const changeSpeakingMode = (speakingMode: SpeakingMode) => {
324+
console.info('[ServerPage] speak mode updated: ', speakingMode);
325+
setSpeakMode(speakingMode);
326+
};
327+
const changeDefaultSpeakingKey = (key: string) => {
328+
console.info('[ServerPage] default speaking key updated: ', key);
329+
setSpeakHotKey(key);
330+
};
331+
const changeChannelUIMode = (channelUIMode: ChannelUIMode) => {
332+
console.info('[ServerPage] channel UI mode updated: ', channelUIMode);
333+
setChannelUIMode(channelUIMode);
334+
};
335+
336+
changeSpeakingMode(ipc.systemSettings.speakingMode.get());
337+
changeDefaultSpeakingKey(ipc.systemSettings.defaultSpeakingKey.get());
338+
changeChannelUIMode(ipc.systemSettings.channelUIMode.get());
326339

327340
const unsubscribe = [
328-
ipc.systemSettings.speakingMode.onUpdate(setSpeakMode),
329-
ipc.systemSettings.defaultSpeakingKey.onUpdate(setSpeakHotKey),
330-
ipc.systemSettings.channelUIMode.onUpdate(setChannelUIMode),
341+
ipc.systemSettings.speakingMode.onUpdate(changeSpeakingMode),
342+
ipc.systemSettings.defaultSpeakingKey.onUpdate(changeDefaultSpeakingKey),
343+
ipc.systemSettings.channelUIMode.onUpdate(changeChannelUIMode),
331344
];
332345
return () => unsubscribe.forEach((unsub) => unsub());
333346
}, []);

0 commit comments

Comments
 (0)