File transfer updates.

immense · Apr 29, 2020 · 4215d16 · 4215d16
1 parent e39af04
commit 4215d16
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 9 deletions.
diff --git a/ScreenCast.Core/Services/FileTransferService.cs b/ScreenCast.Core/Services/FileTransferService.cs
@@ -165,12 +165,13 @@ private void ShowTransferComplete()
                 if (EnvironmentHelper.IsWindows)
                 {
                     messageBoxPending = true;
-                    var result = Win32Interop.ShowMessageBox(IntPtr.Zero,
+                    var result = Win32Interop.ShowMessageBox(User32.GetDesktopWindow(),
                                     "File transfer complete.  Show folder?",
                                     "Transfer Complete",
                                     User32.MessageBoxType.MB_YESNO | 
                                     User32.MessageBoxType.MB_ICONINFORMATION |
-                                    User32.MessageBoxType.MB_TOPMOST);
+                                    User32.MessageBoxType.MB_TOPMOST |
+                                    User32.MessageBoxType.MB_SYSTEMMODAL);
 
                     if (result == User32.MessageBoxResult.IDYES)
                     {

diff --git a/Server/Pages/RemoteControl.cshtml b/Server/Pages/RemoteControl.cshtml
@@ -181,8 +181,8 @@
     </div>
 
     <div id="fileTransferDiv" hidden="hidden">
-        <span id="fileTransferNameSpan" class="mr-1" style="vertical-align: middle;"></span>
-        <progress id="fileTransferProgress" style="vertical-align: middle;"></progress>
+        <span id="fileTransferNameSpan" class="mr-1 font-weight-bold" style="vertical-align: middle;"></span>
+        <progress id="fileTransferProgress" style="vertical-align: middle; width: 100%"></progress>
     </div>
 
     <footer>

diff --git a/Server/Server.csproj b/Server/Server.csproj
@@ -15,9 +15,13 @@
 
   <ItemGroup>
     <Compile Remove="Areas\Identity\Services\**" />
+    <Compile Remove="wwwroot\lib\%40types\popper\**" />
     <Content Remove="Areas\Identity\Services\**" />
+    <Content Remove="wwwroot\lib\%40types\popper\**" />
     <EmbeddedResource Remove="Areas\Identity\Services\**" />
+    <EmbeddedResource Remove="wwwroot\lib\%40types\popper\**" />
     <None Remove="Areas\Identity\Services\**" />
+    <None Remove="wwwroot\lib\%40types\popper\**" />
   </ItemGroup>
 
   <ItemGroup>
@@ -137,7 +141,6 @@
     <TypeScriptCompile Include="wwwroot\lib\%40types\jquery\legacy.d.ts" />
     <TypeScriptCompile Include="wwwroot\lib\%40types\jquery\misc.d.ts" />
     <TypeScriptCompile Include="wwwroot\lib\%40types\sizzle\index.d.ts" />
-    <TypeScriptCompile Include="wwwroot\lib\%40types\popper\index.d.ts" />
     <TypeScriptCompile Include="wwwroot\scripts\Chat.ts" />
     <TypeScriptCompile Include="wwwroot\scripts\CommandCompletion.ts" />
     <TypeScriptCompile Include="wwwroot\scripts\Commands\BashCommands.ts" />

diff --git a/Server/wwwroot/lib/@types/bootstrap/index.d.ts b/Server/wwwroot/lib/@types/bootstrap/index.d.ts
@@ -6,7 +6,7 @@
 
 /// <reference types="jquery"/>
 
-import * as Popper from "popper.js";
+import * as Popper from "../popper.js/index";
 
 export as namespace Bootstrap;
 

diff --git a/Server/wwwroot/scripts/RemoteControl/FileUploader.js b/Server/wwwroot/scripts/RemoteControl/FileUploader.js
diff --git a/Server/wwwroot/scripts/RemoteControl/FileUploader.js.map b/Server/wwwroot/scripts/RemoteControl/FileUploader.js.map
diff --git a/Server/wwwroot/scripts/RemoteControl/FileUploader.ts b/Server/wwwroot/scripts/RemoteControl/FileUploader.ts
@@ -13,7 +13,7 @@ export async function UploadFiles(fileList: FileList) {
 
     try {
         for (var i = 0; i < fileList.length; i++) {
-            FileTransferNameSpan.innerHTML = fileList[i].name + ":";
+            FileTransferNameSpan.innerHTML = fileList[i].name;
             var buffer = await fileList[i].arrayBuffer();
             await MainRc.MessageSender.SendFile(new Uint8Array(buffer), fileList[i].name);
         }