if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2024-12-27 17:31:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #831 from mattias-symphony/new_screen_snippet_tool

Browse Source 
fix: New screen snippet tool
This commit is contained in:
mattias-symphony 2019-12-17 11:20:39 +01:00 committed by GitHub
commit 3b03298197
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 69 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
installer/win/Symphony-x64.aip
View File

@ -127,9 +127,6 @@
<ROW Component="ProductInformation" ComponentId="{8B92B687-8AE0-4A5C-B6AB-5D1854009CEA}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>
<ROW Component="ScreenShareIndicatorFrame.exe" ComponentId="{85DC2888-EBE5-4084-A084-E076020086D5}" Directory_="APPDIR" Attributes="0" KeyPath="ScreenShareIndicatorFrame.exe"/>
<ROW Component="ScreenSnippet.exe" ComponentId="{B92951AB-9E69-4970-A3B5-B4E5C32F3477}" Directory_="APPDIR" Attributes="0" KeyPath="ScreenSnippet.exe"/>
<ROW Component="ScreenSnippet.resources.dll" ComponentId="{B08D942C-2A3B-43A6-AF7A-1FCC71EFB7D5}" Directory_="jaJP_Dir" Attributes="0" KeyPath="ScreenSnippet.resources.dll"/>
<ROW Component="ScreenSnippet.resources.dll_1" ComponentId="{73A2FD51-947C-40DD-B574-762CDCAA50F2}" Directory_="enUS_Dir" Attributes="0" KeyPath="ScreenSnippet.resources.dll_1"/>
<ROW Component="ScreenSnippet.resources.dll_2" ComponentId="{D2E565B9-B7D4-4F5F-BA05-EB6D80651A5C}" Directory_="frFR_Dir" Attributes="0" KeyPath="ScreenSnippet.resources.dll_2"/>
<ROW Component="Symphony" ComponentId="{A6B4BA2F-2403-4B8E-9303-BF8400A9B1C4}" Directory_="Symphony_Dir" Attributes="0"/>
<ROW Component="Symphony.config" ComponentId="{644A231D-2C96-4D3D-ADB0-7820DA373499}" Directory_="config_Dir" Attributes="0" KeyPath="Symphony.config_1" Type="0"/>
<ROW Component="Symphony.exe" ComponentId="{853053E4-D96C-42FE-9AF1-52FF1F449FFD}" Directory_="APPDIR" Attributes="256" KeyPath="Symphony.exe"/>
@ -166,7 +163,7 @@
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
<ROW Feature="D564007E3BBE4F85950A09B470A7CA65" Title="Visual C++ Redistributable for Visual Studio 2013 x86" Description="Visual C++ Redistributable for Visual Studio 2013 x86" Display="3" Level="1" Attributes="0"/>
<ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_CustomARPName AI_DisableModify Jobber.exe PodUrl ProductInformation ScreenShareIndicatorFrame.exe ScreenSnippet.exe ScreenSnippet.resources.dll ScreenSnippet.resources.dll_1 ScreenSnippet.resources.dll_2 Symphony Symphony.config Symphony.exe _ __1 am.pak appupdate.yml binding.node blink_image_resources_200_percent.pak build.cmd cld.node cld.node_1 d3dcompiler_47.dll dictionary diskusage.node_1 diskusage.node_2 enAU.bdic ffi_bindings.node ffinapi.node ffmpeg.dll index.js index.js_1 index.ts indexvalidatorx64.exe keyboardlayoutmanager.node libEGL.dll libGLESv2.dll libsymphonysearchx64.dll lz4winx64.exe refnapi.node spellchecker.node spellchecker.node_1 tarwin.exe"/>
<ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_CustomARPName AI_DisableModify Jobber.exe PodUrl ProductInformation ScreenShareIndicatorFrame.exe ScreenSnippet.exe Symphony Symphony.config Symphony.exe _ __1 am.pak appupdate.yml binding.node blink_image_resources_200_percent.pak build.cmd cld.node cld.node_1 d3dcompiler_47.dll dictionary diskusage.node_1 diskusage.node_2 enAU.bdic ffi_bindings.node ffinapi.node ffmpeg.dll index.js index.js_1 index.ts indexvalidatorx64.exe keyboardlayoutmanager.node libEGL.dll libGLESv2.dll libsymphonysearchx64.dll lz4winx64.exe refnapi.node spellchecker.node spellchecker.node_1 tarwin.exe"/>
<ATTRIBUTE name="CurrentFeature" value="MainFeature"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
@ -175,12 +172,8 @@
<ROW File="Jobber.exe" Component_="Jobber.exe" FileName="Jobber.exe" Attributes="0" SourcePath="..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\spawn-rx\vendor\jobber\Jobber.exe" SelfReg="false" NextFile="keyboardlayoutmanager.node" DigSign="true"/>
<ROW File="LICENSE.electron.txt" Component_="blink_image_resources_200_percent.pak" FileName="LICENS~1.TXT|LICENSE.electron.txt" Attributes="0" SourcePath="..\..\dist\win-unpacked\LICENSE.electron.txt" SelfReg="false" NextFile="LICENSES.chromium.html"/>
<ROW File="LICENSES.chromium.html" Component_="blink_image_resources_200_percent.pak" FileName="LICENS~1.HTM|LICENSES.chromium.html" Attributes="0" SourcePath="..\..\dist\win-unpacked\LICENSES.chromium.html" SelfReg="false" NextFile="natives_blob.bin"/>
<ROW File="ScreenSnippet.exe" Component_="ScreenSnippet.exe" FileName="SCREEN~1.EXE|ScreenSnippet.exe" Attributes="0" SourcePath="..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\screen-snippet\ScreenSnippet.exe" SelfReg="false" NextFile="indexvalidatorx64.exe" DigSign="true"/>
<ROW File="ScreenShareIndicatorFrame.exe" Component_="ScreenShareIndicatorFrame.exe" FileName="SCREEN~2.EXE|ScreenShareIndicatorFrame.exe" Attributes="0" SourcePath="..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\screen-share-indicator-frame\ScreenShareIndicatorFrame.exe" SelfReg="false" DigSign="true"/>
<ROW File="ScreenSnippet.exe" Component_="ScreenSnippet.exe" FileName="SCREEN~1.EXE|ScreenSnippet.exe" Attributes="0" SourcePath="..\..\node_modules\screen-snippet\bin\Release\ScreenSnippet.exe" SelfReg="false" NextFile="indexvalidatorx64.exe" DigSign="true"/>
<ROW File="ScreenSnippet.exe.config" Component_="blink_image_resources_200_percent.pak" FileName="SCREEN~1.CON|ScreenSnippet.exe.config" Attributes="0" SourcePath="..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\screen-snippet\bin\Release\ScreenSnippet.exe.config" SelfReg="false" NextFile="v8_context_snapshot.bin"/>
<ROW File="ScreenSnippet.resources.dll" Component_="ScreenSnippet.resources.dll" FileName="SCREEN~1.DLL|ScreenSnippet.resources.dll" Attributes="0" SourcePath="..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\screen-snippet\bin\Release\ja-JP\ScreenSnippet.resources.dll" SelfReg="false" NextFile="ScreenSnippet.resources.dll_1"/>
<ROW File="ScreenSnippet.resources.dll_1" Component_="ScreenSnippet.resources.dll_1" FileName="SCREEN~1.DLL|ScreenSnippet.resources.dll" Attributes="0" SourcePath="..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\screen-snippet\bin\Release\en-US\ScreenSnippet.resources.dll" SelfReg="false" NextFile="ScreenSnippet.exe.config"/>
<ROW File="ScreenSnippet.resources.dll_2" Component_="ScreenSnippet.resources.dll_2" FileName="SCREEN~1.DLL|ScreenSnippet.resources.dll" Attributes="0" SourcePath="..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\screen-snippet\bin\Release\fr-FR\ScreenSnippet.resources.dll" SelfReg="false" NextFile="titleBarStyles.css"/>
<ROW File="Symphony.config_1" Component_="Symphony.config" FileName="SYMPHO~1.CON|Symphony.config" Attributes="0" SourcePath="..\..\dist\win-unpacked\config\Symphony.config" SelfReg="false" NextFile="ScreenSnippet.exe"/>
<ROW File="Symphony.exe" Component_="Symphony.exe" FileName="Symphony.exe" Attributes="0" SourcePath="..\..\dist\win-unpacked\Symphony.exe" SelfReg="false" NextFile="am.pak" DigSign="true"/>
<ROW File="am.pak" Component_="am.pak" FileName="am.pak" Attributes="0" SourcePath="..\..\dist\win-unpacked\locales\am.pak" SelfReg="false" NextFile="ar.pak"/>
@ -269,7 +262,7 @@
<ROW File="sv.pak" Component_="am.pak" FileName="sv.pak" Attributes="0" SourcePath="..\..\dist\win-unpacked\locales\sv.pak" SelfReg="false" NextFile="sw.pak"/>
<ROW File="sw.pak" Component_="am.pak" FileName="sw.pak" Attributes="0" SourcePath="..\..\dist\win-unpacked\locales\sw.pak" SelfReg="false" NextFile="ta.pak"/>
<ROW File="ta.pak" Component_="am.pak" FileName="ta.pak" Attributes="0" SourcePath="..\..\dist\win-unpacked\locales\ta.pak" SelfReg="false" NextFile="te.pak"/>
<ROW File="tarwin.exe" Component_="tarwin.exe" FileName="tar-win.exe" Attributes="0" SourcePath="..\..\library\tar-win.exe" SelfReg="false" NextFile="ScreenSnippet.resources.dll" DigSign="true"/>
<ROW File="tarwin.exe" Component_="tarwin.exe" FileName="tar-win.exe" Attributes="0" SourcePath="..\..\library\tar-win.exe" SelfReg="false" NextFile="v8_context_snapshot.bin" DigSign="true"/>
<ROW File="te.pak" Component_="am.pak" FileName="te.pak" Attributes="0" SourcePath="..\..\dist\win-unpacked\locales\te.pak" SelfReg="false" NextFile="th.pak"/>
<ROW File="th.pak" Component_="am.pak" FileName="th.pak" Attributes="0" SourcePath="..\..\dist\win-unpacked\locales\th.pak" SelfReg="false" NextFile="tr.pak"/>
<ROW File="titleBarStyles.css" Component_="Symphony.config" FileName="TITLEB~1.CSS|titleBarStyles.css" Attributes="0" SourcePath="..\..\dist\win-unpacked\config\titleBarStyles.css" SelfReg="false" NextFile="enAU.bdic"/>
@ -277,7 +270,7 @@
<ROW File="tsconfig.json" Component_="build.cmd" FileName="TSCONF~1.JSO|tsconfig.json" Attributes="0" SourcePath="..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\spawn-rx\tsconfig.json" SelfReg="false" NextFile="tslint.json"/>
<ROW File="tslint.json" Component_="build.cmd" FileName="TSLINT~1.JSO|tslint.json" Attributes="0" SourcePath="..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\spawn-rx\tslint.json" SelfReg="false" NextFile="Jobber.exe"/>
<ROW File="uk.pak" Component_="am.pak" FileName="uk.pak" Attributes="0" SourcePath="..\..\dist\win-unpacked\locales\uk.pak" SelfReg="false" NextFile="vi.pak"/>
<ROW File="v8_context_snapshot.bin" Component_="blink_image_resources_200_percent.pak" FileName="V8_CON~1.BIN|v8_context_snapshot.bin" Attributes="0" SourcePath="..\..\dist\win-unpacked\v8_context_snapshot.bin" SelfReg="false" NextFile="ScreenSnippet.resources.dll_2"/>
<ROW File="v8_context_snapshot.bin" Component_="blink_image_resources_200_percent.pak" FileName="V8_CON~1.BIN|v8_context_snapshot.bin" Attributes="0" SourcePath="..\..\dist\win-unpacked\v8_context_snapshot.bin" SelfReg="false" NextFile="titleBarStyles.css"/>
<ROW File="vi.pak" Component_="am.pak" FileName="vi.pak" Attributes="0" SourcePath="..\..\dist\win-unpacked\locales\vi.pak" SelfReg="false" NextFile="zhCN.pak"/>
<ROW File="zhCN.pak" Component_="am.pak" FileName="zh-CN.pak" Attributes="0" SourcePath="..\..\dist\win-unpacked\locales\zh-CN.pak" SelfReg="false" NextFile="zhTW.pak"/>
<ROW File="zhTW.pak" Component_="am.pak" FileName="zh-TW.pak" Attributes="0" SourcePath="..\..\dist\win-unpacked\locales\zh-TW.pak" SelfReg="false" NextFile="app.asar"/>

13
installer/win/Symphony-x86.aip
View File

@ -126,9 +126,6 @@
<ROW Component="ProductInformation" ComponentId="{8B92B687-8AE0-4A5C-B6AB-5D1854009CEA}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>
<ROW Component="ScreenShareIndicatorFrame.exe" ComponentId="{85DC2888-EBE5-4084-A084-E076020086D5}" Directory_="APPDIR" Attributes="0" KeyPath="ScreenShareIndicatorFrame.exe"/>
<ROW Component="ScreenSnippet.exe" ComponentId="{66D4F5CB-F7ED-48CD-B65B-D1C4DAEEB0B7}" Directory_="APPDIR" Attributes="0" KeyPath="ScreenSnippet.exe"/>
<ROW Component="ScreenSnippet.resources.dll" ComponentId="{8E8BD8FC-9036-4D3E-8B35-6427A22F7526}" Directory_="enUS_Dir" Attributes="0" KeyPath="ScreenSnippet.resources.dll"/>
<ROW Component="ScreenSnippet.resources.dll_1" ComponentId="{467BC7AB-B539-4C5C-AC0D-150D4B5B1DC1}" Directory_="jaJP_Dir" Attributes="0" KeyPath="ScreenSnippet.resources.dll_1"/>
<ROW Component="ScreenSnippet.resources.dll_2" ComponentId="{5F6F3B07-7B53-4300-981A-63528739331D}" Directory_="frFR_Dir" Attributes="0" KeyPath="ScreenSnippet.resources.dll_2"/>
<ROW Component="Symphony" ComponentId="{A6B4BA2F-2403-4B8E-9303-BF8400A9B1C4}" Directory_="Symphony_Dir" Attributes="0"/>
<ROW Component="Symphony.config" ComponentId="{DBC82D0C-B96E-4939-A950-53020CEB1B7F}" Directory_="config_Dir" Attributes="0" KeyPath="Symphony.config" Type="0"/>
<ROW Component="Symphony.exe" ComponentId="{853053E4-D96C-42FE-9AF1-52FF1F449FFD}" Directory_="APPDIR" Attributes="256" KeyPath="Symphony.exe"/>
@ -165,7 +162,7 @@
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
<ROW Feature="D564007E3BBE4F85950A09B470A7CA65" Title="Visual C++ Redistributable for Visual Studio 2013 x86" Description="Visual C++ Redistributable for Visual Studio 2013 x86" Display="3" Level="1" Attributes="0"/>
<ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_CustomARPName AI_DisableModify Jobber.exe PodUrl ProductInformation ScreenShareIndicatorFrame.exe ScreenSnippet.exe ScreenSnippet.resources.dll ScreenSnippet.resources.dll_1 ScreenSnippet.resources.dll_2 Symphony Symphony.config Symphony.exe _ __1 am.pak appupdate.yml binding.node blink_image_resources_200_percent.pak build.cmd cld.node cld.node_2 d3dcompiler_47.dll dictionary diskusage.node_1 diskusage.node_2 enAU.bdic ffi_bindings.node ffinapi.node ffmpeg.dll index.js index.js_1 index.ts indexvalidatorx86.exe keyboardlayoutmanager.node libEGL.dll libGLESv2.dll libsymphonysearchx86.dll lz4winx86.exe refnapi.node spellchecker.node spellchecker.node_1 tarwin.exe"/>
<ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_CustomARPName AI_DisableModify Jobber.exe PodUrl ProductInformation ScreenShareIndicatorFrame.exe ScreenSnippet.exe Symphony Symphony.config Symphony.exe _ __1 am.pak appupdate.yml binding.node blink_image_resources_200_percent.pak build.cmd cld.node cld.node_2 d3dcompiler_47.dll dictionary diskusage.node_1 diskusage.node_2 enAU.bdic ffi_bindings.node ffinapi.node ffmpeg.dll index.js index.js_1 index.ts indexvalidatorx86.exe keyboardlayoutmanager.node libEGL.dll libGLESv2.dll libsymphonysearchx86.dll lz4winx86.exe refnapi.node spellchecker.node spellchecker.node_1 tarwin.exe"/>
<ATTRIBUTE name="CurrentFeature" value="MainFeature"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
@ -174,12 +171,8 @@
<ROW File="Jobber.exe" Component_="Jobber.exe" FileName="Jobber.exe" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\resources\app.asar.unpacked\node_modules\spawn-rx\vendor\jobber\Jobber.exe" SelfReg="false" NextFile="keyboardlayoutmanager.node" DigSign="true"/>
<ROW File="LICENSE.electron.txt" Component_="blink_image_resources_200_percent.pak" FileName="LICENS~1.TXT|LICENSE.electron.txt" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\LICENSE.electron.txt" SelfReg="false" NextFile="LICENSES.chromium.html"/>
<ROW File="LICENSES.chromium.html" Component_="blink_image_resources_200_percent.pak" FileName="LICENS~1.HTM|LICENSES.chromium.html" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\LICENSES.chromium.html" SelfReg="false" NextFile="natives_blob.bin"/>
<ROW File="ScreenSnippet.exe" Component_="ScreenSnippet.exe" FileName="SCREEN~1.EXE|ScreenSnippet.exe" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\resources\app.asar.unpacked\node_modules\screen-snippet\ScreenSnippet.exe" SelfReg="false" NextFile="v8_context_snapshot.bin" DigSign="true"/>
<ROW File="ScreenShareIndicatorFrame.exe" Component_="ScreenShareIndicatorFrame.exe" FileName="SCREEN~2.EXE|ScreenShareIndicatorFrame.exe" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\resources\app.asar.unpacked\node_modules\screen-share-indicator-frame\ScreenShareIndicatorFrame.exe" SelfReg="false" DigSign="true"/>
<ROW File="ScreenSnippet.exe" Component_="ScreenSnippet.exe" FileName="SCREEN~1.EXE|ScreenSnippet.exe" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\resources\app.asar.unpacked\node_modules\screen-snippet\bin\Release\ScreenSnippet.exe" SelfReg="false" NextFile="ScreenSnippet.resources.dll" DigSign="true"/>
<ROW File="ScreenSnippet.exe.config" Component_="blink_image_resources_200_percent.pak" FileName="SCREEN~1.CON|ScreenSnippet.exe.config" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\resources\app.asar.unpacked\node_modules\screen-snippet\bin\Release\ScreenSnippet.exe.config" SelfReg="false" NextFile="v8_context_snapshot.bin"/>
<ROW File="ScreenSnippet.resources.dll" Component_="ScreenSnippet.resources.dll" FileName="SCREEN~1.DLL|ScreenSnippet.resources.dll" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\resources\app.asar.unpacked\node_modules\screen-snippet\bin\Release\en-US\ScreenSnippet.resources.dll" SelfReg="false" NextFile="ScreenSnippet.resources.dll_1"/>
<ROW File="ScreenSnippet.resources.dll_1" Component_="ScreenSnippet.resources.dll_1" FileName="SCREEN~1.DLL|ScreenSnippet.resources.dll" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\resources\app.asar.unpacked\node_modules\screen-snippet\bin\Release\ja-JP\ScreenSnippet.resources.dll" SelfReg="false" NextFile="ScreenSnippet.exe.config"/>
<ROW File="ScreenSnippet.resources.dll_2" Component_="ScreenSnippet.resources.dll_2" FileName="SCREEN~1.DLL|ScreenSnippet.resources.dll" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\resources\app.asar.unpacked\node_modules\screen-snippet\bin\Release\fr-FR\ScreenSnippet.resources.dll" SelfReg="false" NextFile="titleBarStyles.css"/>
<ROW File="Symphony.config" Component_="Symphony.config" FileName="SYMPHO~1.CON|Symphony.config" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\config\Symphony.config" SelfReg="false" NextFile="am.pak"/>
<ROW File="Symphony.exe" Component_="Symphony.exe" FileName="Symphony.exe" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\Symphony.exe" SelfReg="false" NextFile="d3dcompiler_47.dll" DigSign="true"/>
<ROW File="am.pak" Component_="am.pak" FileName="am.pak" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\locales\am.pak" SelfReg="false" NextFile="ar.pak"/>
@ -276,7 +269,7 @@
<ROW File="tsconfig.json" Component_="build.cmd" FileName="TSCONF~1.JSO|tsconfig.json" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\resources\app.asar.unpacked\node_modules\spawn-rx\tsconfig.json" SelfReg="false" NextFile="tslint.json"/>
<ROW File="tslint.json" Component_="build.cmd" FileName="TSLINT~1.JSO|tslint.json" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\resources\app.asar.unpacked\node_modules\spawn-rx\tslint.json" SelfReg="false" NextFile="Jobber.exe"/>
<ROW File="uk.pak" Component_="am.pak" FileName="uk.pak" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\locales\uk.pak" SelfReg="false" NextFile="vi.pak"/>
<ROW File="v8_context_snapshot.bin" Component_="blink_image_resources_200_percent.pak" FileName="V8_CON~1.BIN|v8_context_snapshot.bin" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\v8_context_snapshot.bin" SelfReg="false" NextFile="ScreenSnippet.resources.dll_2"/>
<ROW File="v8_context_snapshot.bin" Component_="blink_image_resources_200_percent.pak" FileName="V8_CON~1.BIN|v8_context_snapshot.bin" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\v8_context_snapshot.bin" SelfReg="false" NextFile="titleBarStyles.css"/>
<ROW File="vi.pak" Component_="am.pak" FileName="vi.pak" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\locales\vi.pak" SelfReg="false" NextFile="zhCN.pak"/>
<ROW File="zhCN.pak" Component_="am.pak" FileName="zh-CN.pak" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\locales\zh-CN.pak" SelfReg="false" NextFile="zhTW.pak"/>
<ROW File="zhTW.pak" Component_="am.pak" FileName="zh-TW.pak" Attributes="0" SourcePath="..\..\dist\win-ia32-unpacked\locales\zh-TW.pak" SelfReg="false" NextFile="app.asar"/>

4
package-lock.json generated
View File

@ -13065,8 +13065,8 @@
"optional": true
},
"screen-snippet": {
"version": "1.0.3",
"resolved": "git+https://github.com/symphonyoss/ScreenSnippet.git#84d3edb6656e2dbf5d8438336c51f80b0be1c8ad",
"version": "1.0.0",
"resolved": "git+https://github.com/symphonyoss/ScreenSnippet2.git#4bd0f9b76d3d99f341b344ef4d9264a0a6bc62a8",
"optional": true
},
"semver": {

4
package.json
View File

@ -132,8 +132,8 @@
"shell-path": "2.1.0"
},
"optionalDependencies": {
"screen-snippet": "git+https://github.com/symphonyoss/ScreenSnippet.git#v1.0.8",
"screen-share-indicator-frame": "https://github.com/symphonyoss/ScreenShareIndicatorFrame.git#v1.0.0",
"screen-snippet": "git+https://github.com/symphonyoss/ScreenSnippet2.git#v1.0.0",
"screen-share-indicator-frame": "git+https://github.com/symphonyoss/ScreenShareIndicatorFrame.git#v1.0.0",
"swift-search": "2.0.1"
}
}

3
src/app/main-api-handler.ts
View File

@ -124,6 +124,9 @@ ipcMain.on(apiName.symphonyApi, (event: Electron.IpcMainEvent, arg: IApiArgs) =>
case apiCmds.openScreenSnippet:
screenSnippet.capture(event.sender);
break;
case apiCmds.closeScreenSnippet:
screenSnippet.cancelCapture();
break;
case apiCmds.closeWindow:
windowHandler.closeWindow(arg.windowType, arg.winKey);
break;

19
src/app/screen-snippet-handler.ts
View File

@ -25,7 +25,7 @@ class ScreenSnippet {
this.tempDir = os.tmpdir();
this.captureUtil = isMac ? '/usr/sbin/screencapture' : isDevEnv
? path.join(__dirname,
'../../node_modules/screen-snippet/bin/Release/ScreenSnippet.exe')
'../../../node_modules/screen-snippet/ScreenSnippet.exe')
: path.join(path.dirname(app.getPath('exe')), 'ScreenSnippet.exe');
if (isLinux) {
@ -67,6 +67,22 @@ class ScreenSnippet {
}
}
/**
* Cancels a screen capture and closes the snippet window
*
* @param webContents {Electron.webContents}
*/
public async cancelCapture() {
logger.info(`screen-snippet-handler: Cancel screen capture!`);
this.focusedWindow = BrowserWindow.getFocusedWindow();
try {
await this.execCmd(this.captureUtil, []);
} catch (error) {
logger.error(`screen-snippet-handler: screen capture cancel failed with error: ${error}!`);
}
}
/**
* Kills the child process when the application is reloaded
*/
@ -88,6 +104,7 @@ class ScreenSnippet {
* @example execCmd('-i -s', '/user/desktop/symphonyImage-1544025391698.png')
*/
private execCmd(captureUtil: string, captureUtilArgs: ReadonlyArray<string>): Promise<ChildProcess> {
logger.info(`screen-snippet-handlers: execCmd ${captureUtil} ${captureUtilArgs}`);
return new Promise<ChildProcess>((resolve, reject) => {
return this.child = execFile(captureUtil, captureUtilArgs, (error: ExecException | null) => {
if (error && error.killed) {

1
src/common/api-interface.ts
View File

@ -21,6 +21,7 @@ export enum apiCmds {
setIsInMeeting = 'set-is-in-meeting',
setLocale = 'set-locale',
openScreenSnippet = 'open-screen-snippet',
closeScreenSnippet = 'close-screen-snippet',
keyPress = 'key-press',
closeWindow = 'close-window',
openScreenSharingIndicator = 'open-screen-sharing-indicator',

12
src/demo/index.html
View File

@ -124,6 +124,7 @@
<button id='snippet'>get snippet</button>
<p>snippet output:</p>
<image id='snippet-img'/>
<button id='cancel-snippet'>cancel snippet</button>
<hr>
<p>Logs:</p>
@ -199,6 +200,7 @@
setIsInMeeting: 'set-is-in-meeting',
setLocale: 'set-locale',
openScreenSnippet: 'open-screen-snippet',
closeScreenSnippet: 'close-screen-snippet',
keyPress: 'key-press',
closeWindow: 'close-window',
openScreenSharingIndicator: 'open-screen-sharing-indicator',
@ -322,6 +324,16 @@
}
});
const cancelSnippetButton = document.getElementById('cancel-snippet');
cancelSnippetButton.addEventListener('click', () => {
if (window.ssf) {
const screenSnippet = new window.ssf.ScreenSnippet();
screenSnippet.cancelCapture();
} else {
postMessage(apiCmds.closeScreenSnippet)
}
});
let win;
const openWinButton = document.getElementById('open-win');

3
src/renderer/app-bridge.ts
View File

@ -115,6 +115,9 @@ export class AppBridge {
case apiCmds.openScreenSnippet:
ssf.openScreenSnippet(this.callbackHandlers.onScreenSnippetCallback);
break;
case apiCmds.closeScreenSnippet:
ssf.closeScreenSnippet();
break;
case apiCmds.registerBoundsChange:
ssf.registerBoundsChange(this.callbackHandlers.onRegisterBoundsChangeCallback);
break;

10
src/renderer/screen-snippet-bc-handler.ts
View File

@ -24,4 +24,14 @@ export class ScreenSnippetBcHandler {
});
});
}
/**
* cancel capture method to support backward compatibility
*
* @deprecated user closeScreenSnippet instead
*/
public cancel() {
ipcRenderer.send(apiName.symphonyApi, {
cmd: apiCmds.closeScreenSnippet,
});
}
}

11
src/renderer/ssf-api.ts
View File

@ -332,6 +332,17 @@ export class SSFApi {
}
}
/**
* Cancel a screen capture in progress
*
* @param screenSnippetCallback {function}
*/
public closeScreenSnippet(): void {
local.ipcRenderer.send(apiName.symphonyApi, {
cmd: apiCmds.closeScreenSnippet,
});
}
/**
* Sets the count on the tray icon to the given number.
*