v/deskreen
1
0
Fork 0
mirror of https://github.com/pavlobu/deskreen.git synced 2025-05-29 13:50:08 -07:00
Code Issues Projects Releases Wiki Activity

fix language change without remote

Browse Source
This commit is contained in:
Pavlo Buidenkov 2022-05-30 17:37:16 +02:00
parent df3a37f7b8
commit 747d275add
5 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/components/LanguageSelector/index.tsx
View File

@ -1,17 +1,13 @@
import React, { useContext, useEffect, useState } from 'react'; import React, { useContext, useEffect, useState } from 'react';
import { remote } from 'electron'; import { ipcRenderer } from 'electron';
import { HTMLSelect } from '@blueprintjs/core'; import { HTMLSelect } from '@blueprintjs/core';
import i18n from 'i18next'; import i18n from 'i18next';
import SharingSessionService from '../../features/SharingSessionService';
import { SettingsContext } from '../../containers/SettingsProvider'; import { SettingsContext } from '../../containers/SettingsProvider';
import i18n_client, { import i18n_client, {
getLangFullNameToLangISOKeyMap, getLangFullNameToLangISOKeyMap,
getLangISOKeyToLangFullNameMap, getLangISOKeyToLangFullNameMap,
} from '../../configs/i18next.config.client'; } from '../../configs/i18next.config.client';
import { IpcEvents } from '../../main/IpcEvents.enum';
const sharingSessionService = remote.getGlobal(
'sharingSessionService'
) as SharingSessionService;
export default function LanguageSelector() { export default function LanguageSelector() {
const { setCurrentLanguageHook } = useContext(SettingsContext); const { setCurrentLanguageHook } = useContext(SettingsContext);
@ -38,10 +34,7 @@ export default function LanguageSelector() {
getLangFullNameToLangISOKeyMap().get(event.currentTarget.value) || getLangFullNameToLangISOKeyMap().get(event.currentTarget.value) ||
'English'; 'English';
i18n.changeLanguage(newLang); i18n.changeLanguage(newLang);
// TODO: call sharing sessions service here to notify all connected clients about language change ipcRenderer.invoke(IpcEvents.AppLanguageChanged);
sharingSessionService.sharingSessions.forEach((sharingSession) => {
sharingSession?.appLanguageChanged();
});
} }
}; };

2
app/components/TopPanel.tsx
View File

@ -235,7 +235,7 @@ export default function TopPanel(props: any) {
{renderSettingsButton()} {renderSettingsButton()}
</div> </div>
</div> </div>
{isConnectedDevicesDrawerOpen ? ( {isSettingsOpen ? (
<SettingsOverlay <SettingsOverlay
isSettingsOpen={isSettingsOpen} isSettingsOpen={isSettingsOpen}
handleClose={handleSettingsClose} handleClose={handleSettingsClose}

24
app/features/PeerConnection/index.ts
View File

@ -61,19 +61,23 @@ export default class PeerConnection {
} }
notifyClientWithNewLanguage() { notifyClientWithNewLanguage() {
this.sendEncryptedMessage({ setTimeout(() => {
type: 'APP_LANGUAGE', this.sendEncryptedMessage({
payload: { type: 'APP_LANGUAGE',
value: getAppLanguage(), payload: {
}, value: getAppLanguage(),
}); },
});
}, 1000);
} }
notifyClientWithNewColorTheme() { notifyClientWithNewColorTheme() {
this.sendEncryptedMessage({ setTimeout(() => {
type: 'APP_THEME', this.sendEncryptedMessage({
payload: { value: getAppTheme() }, type: 'APP_THEME',
}); payload: { value: getAppTheme() },
});
}, 1000);
} }
async setDesktopCapturerSourceID(id: string) { async setDesktopCapturerSourceID(id: string) {

1
app/main/IpcEvents.enum.ts
View File

@ -12,4 +12,5 @@ export enum IpcEvents {
GetConnectedDevices = 'get-connected-devices-list', GetConnectedDevices = 'get-connected-devices-list',
DisconnectDeviceById = 'disconnect-device-by-id', DisconnectDeviceById = 'disconnect-device-by-id',
DisconnectAllDevices = 'disconnect-all-devices', DisconnectAllDevices = 'disconnect-all-devices',
AppLanguageChanged = 'app-language-changed',
} }

8
app/main/ipcMainHandlers.ts
View File

@ -179,4 +179,12 @@ export default function initIpcMainHandlers(
ipcMain.handle(IpcEvents.DisconnectAllDevices, () => { ipcMain.handle(IpcEvents.DisconnectAllDevices, () => {
getDeskreenGlobal().connectedDevicesService.disconnectAllDevices(); getDeskreenGlobal().connectedDevicesService.disconnectAllDevices();
}); });
ipcMain.handle(IpcEvents.AppLanguageChanged, () => {
getDeskreenGlobal().sharingSessionService.sharingSessions.forEach(
(sharingSession) => {
sharingSession?.appLanguageChanged();
}
);
});
} }