if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Adding mac version of screen share indicator frame

Browse Source
This commit is contained in:
Mattias Gustavsson
2020-02-26 10:57:51 +01:00
parent a2e0d544f8
commit f287c76549
4 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
installer/mac/symphony-mac-packager.pkgproj
View File

@@ -55,22 +55,6 @@
<key>UID</key> <key>UID</key>
<integer>0</integer> <integer>0</integer>
</dict> </dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>80</integer>
<key>PATH</key>
<string>../../node_modules/screen-share-indicator-frame/SymphonyScreenShareIndicator</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>493</integer>
<key>TYPE</key>
<integer>3</integer>
<key>UID</key>
<integer>0</integer>
</dict>
</array> </array>
<key>GID</key> <key>GID</key>
<integer>80</integer> <integer>80</integer>

3
package.json
View File

@@ -48,7 +48,8 @@
"library/indexvalidator.exec", "library/indexvalidator.exec",
"library/cryptoLib.dylib", "library/cryptoLib.dylib",
"library/dictionary", "library/dictionary",
"library/lz4.exec" "library/lz4.exec",
"node_modules/screen-share-indicator-frame/SymphonyScreenShareIndicator"
], ],
"mac": { "mac": {
"category": "public.app-category.business", "category": "public.app-category.business",

1
scripts/build-mac.sh
View File

@@ -71,6 +71,7 @@ fi
codesign --force --options runtime -s "Developer ID Application: Symphony Communication Services LLC" library/lz4.exec codesign --force --options runtime -s "Developer ID Application: Symphony Communication Services LLC" library/lz4.exec
codesign --force --options runtime -s "Developer ID Application: Symphony Communication Services LLC" library/indexvalidator.exec codesign --force --options runtime -s "Developer ID Application: Symphony Communication Services LLC" library/indexvalidator.exec
codesign --force --options runtime -s "Developer ID Application: Symphony Communication Services LLC" node_modules/screen-share-indicator-frame/SymphonyScreenShareIndicator
PKG_VERSION=$(node -e "console.log(require('./package.json').version);") PKG_VERSION=$(node -e "console.log(require('./package.json').version);")

5
src/app/window-handler.ts
View File

@@ -129,7 +129,7 @@ export class WindowHandler {
this.screenShareIndicatorFrameUtil = isDevEnv this.screenShareIndicatorFrameUtil = isDevEnv
? path.join(__dirname, ? path.join(__dirname,
'../../../node_modules/screen-share-indicator-frame/SymphonyScreenShareIndicator') '../../../node_modules/screen-share-indicator-frame/SymphonyScreenShareIndicator')
: path.join(path.dirname(app.getPath('exe')), 'SymphonyScreenShareIndicator'); : path.join(path.dirname(app.getPath('exe')), '../node_modules/screen-share-indicator-frame/SymphonyScreenShareIndicator');
} }
this.appMenu = null; this.appMenu = null;
@@ -599,8 +599,8 @@ export class WindowHandler {
}); });
ipcMain.once('screen-source-selected', (_event, source) => { ipcMain.once('screen-source-selected', (_event, source) => {
if (source != null) { if (source != null) {
logger.info(`window-handler: screen-source-selected`, source, id);
if (isWindowsOS) { if (isWindowsOS) {
logger.info(`window-handler: screen-source-selected`, source, id);
const type = source.id.split(':')[0]; const type = source.id.split(':')[0];
if (type === 'window') { if (type === 'window') {
const hwnd = source.id.split(':')[1]; const hwnd = source.id.split(':')[1];
@@ -1057,6 +1057,7 @@ export class WindowHandler {
logger.info(`window handler: execCmd: util: ${util} utilArgs: ${utilArgs}`); logger.info(`window handler: execCmd: util: ${util} utilArgs: ${utilArgs}`);
return new Promise<ChildProcess>((resolve, reject) => { return new Promise<ChildProcess>((resolve, reject) => {
return execFile(util, utilArgs, (error: ExecException | null) => { return execFile(util, utilArgs, (error: ExecException | null) => {
logger.info(`window handler: execCmd: error: ${error}`);
if (error && error.killed) { if (error && error.killed) {
// processs was killed, just resolve with no data. // processs was killed, just resolve with no data.
return reject(error); return reject(error);