docs improvement

README.md

@@ -16,7 +16,7 @@ Modern GUI with customizable color themes.
 
 #### Command Line Interface
 
-mpv.net supports mpvs property based command line switches.
+mpv.net supports mpv's property based command line switches.
 
 
 #### High quality video output
@@ -165,14 +165,6 @@ The command palette based playlist showing my favorite artist of the stax record
 ![Playlist](docs/img/Playlist.png)
 
 
-#### Setup
-
-The setup dialog to register file associations, create a start menu item and
-add mpv.net to the PATH environment variable (per user)
-
-![Setup](docs/img/Setup.png)
-
-
 Related apps
 ------------
 

docs/Changelog.md

@@ -4,8 +4,8 @@ not yet released
 - Various conf editor improvements. (hooke007)
 - Custom conf folder location feature removed
   (a directory sym link can be used instead).
-- Inno Setup replaced with MS Store MSIX setup,
+- Inno Setup replaced with MS Store MSIX setup.
-  winget and chocolatey support will follow shortly.
+- Fix script-opts files being ingnored.
 
 
 5.5.0.4 Beta (2021-11-05)

docs/Manual.md

@@ -562,7 +562,7 @@ features are supported that have an own implementation in mpv.net.
 A window free mode is currently not supported, the main window is always
 visible, even when mpv.net is started from the terminal and music is played.
 
-The documentation of mpvs window features can be found here:
+The documentation of mpv's window features can be found here:
 
 https://mpv.io/manual/master/#window
 
@@ -643,7 +643,7 @@ If the input.conf file does not exists mpv.net generates it with the following d
 
 <https://github.com/stax76/mpv.net/tree/master/src/Resources/input.conf.txt>
 
-input.conf defines mpvs key and mouse bindings and mpv.net uses
+input.conf defines mpv's key and mouse bindings and mpv.net uses
 comments to define the context menu.
 
 

docs/Privacy.md

@@ -0,0 +1,2 @@
+
+mpv.net does not collect any personal information.

src/Misc/CorePlayer.cs

@@ -140,7 +140,6 @@ namespace mpvnet
 
             SetPropertyString("watch-later-options", "mute");
             SetPropertyString("screenshot-directory", "~~desktop/");
-            SetPropertyString("script-opts", "osc-scalewindowed=1.5,osc-hidetimeout=2000,console-scale=1.5");
             SetPropertyString("osd-playing-msg", "${filename}");
             SetPropertyString("wid", MainForm.Hwnd.ToString());
             SetPropertyString("osc", "yes");

src/Misc/MainForm.cs

@@ -1138,10 +1138,10 @@ namespace mpvnet
             base.OnDragDrop(e);
 
             if (e.Data.GetDataPresent(DataFormats.FileDrop))
-                Core.LoadFiles(e.Data.GetData(DataFormats.FileDrop) as String[], true, Control.ModifierKeys.HasFlag(Keys.Control));
+                Core.LoadFiles(e.Data.GetData(DataFormats.FileDrop) as String[], true, ModifierKeys.HasFlag(Keys.Control));
           
             if (e.Data.GetDataPresent(DataFormats.Text))
-                Core.LoadFiles(new[] { e.Data.GetData(DataFormats.Text).ToString() }, true, Control.ModifierKeys.HasFlag(Keys.Control));
+                Core.LoadFiles(new[] { e.Data.GetData(DataFormats.Text).ToString() }, true, ModifierKeys.HasFlag(Keys.Control));
         }
 
         protected override void OnLostFocus(EventArgs e)

src/Package/Package.appxmanifest

@@ -9,9 +9,9 @@
   IgnorableNamespaces="uap rescap">
 
 	<Identity
-    Name="0351c0fc-9274-46ee-941b-728b74e8c5d5"
+	  Name="5664FrankSkare.mpv.net"
-    Publisher="CN=frank"
+	  Publisher="CN=6A1A1E69-736C-4C77-B310-7B6D38E32617"
-    Version="1.0.0.0" />
+	  Version="5.6.0.0" />
 
 	<Properties>
 		<DisplayName>mpv.net</DisplayName>
@@ -51,7 +51,6 @@
 
 				<uap:Extension Category="windows.fileTypeAssociation">
 					<uap:FileTypeAssociation Name="videotypes">
-            <uap:Logo>Images\mpvnetExtensions.png</uap:Logo>
 						<uap:SupportedFileTypes>
 							<uap:FileType>.264</uap:FileType>
 							<uap:FileType>.265</uap:FileType>
@@ -87,7 +86,6 @@
 
 				<uap:Extension Category="windows.fileTypeAssociation">
 					<uap:FileTypeAssociation Name="audiotypes">
-            <uap:Logo>Images\mpvnetExtensions.png</uap:Logo>
 						<uap:SupportedFileTypes>
 							<uap:FileType>.aac</uap:FileType>
 							<uap:FileType>.ac3</uap:FileType>
@@ -112,19 +110,9 @@
 					</uap:FileTypeAssociation>
 				</uap:Extension>
 
-        <uap:Extension Category="windows.fileTypeAssociation">
+				<uap:Extension Category="windows.protocol">
-          <uap:FileTypeAssociation Name="imagetypes">
+					<uap:Protocol Name="ytdl" />
-            <uap:Logo>Images\mpvnetExtensions.png</uap:Logo>
-            <uap:SupportedFileTypes>
-              <uap:FileType>.bmp</uap:FileType>
-              <uap:FileType>.gif</uap:FileType>
-              <uap:FileType>.jpg</uap:FileType>
-              <uap:FileType>.png</uap:FileType>
-              <uap:FileType>.webp</uap:FileType>
-            </uap:SupportedFileTypes>
-          </uap:FileTypeAssociation>
 				</uap:Extension>
-        
 			</Extensions>
 
 		</Application>

src/Package/mpv.net.package.wapproj

@@ -56,6 +56,42 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
     <EntryPointProjectUniqueName>..\mpv.net.csproj</EntryPointProjectUniqueName>
+    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
+    <GenerateTestArtifacts>True</GenerateTestArtifacts>
+    <AppxBundlePlatforms>neutral</AppxBundlePlatforms>
+    <GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
+    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">
@@ -86,6 +122,7 @@
     <Content Include="Images\Square44x44Logo.targetsize-24_altform-unplated.png" />
     <Content Include="Images\StoreLogo.png" />
     <Content Include="Images\Wide310x150Logo.scale-200.png" />
+    <None Include="Package.StoreAssociation.xml" />
   </ItemGroup>
   <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
   <ItemGroup>

src/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.5.0.4")]
+[assembly: AssemblyVersion("5.6.0.0")]
-[assembly: AssemblyFileVersion("5.5.0.4")]
+[assembly: AssemblyFileVersion("5.6.0.0")]

src/Resources/input.conf.txt

@@ -171,7 +171,6 @@ l       ab-loop                                     #menu: Tools > Set/clear A-B
 L       cycle-values loop-file inf no               #menu: Tools > Toggle infinite file looping
 _       playlist-shuffle                            #menu: Tools > Shuffle Playlist
 Ctrl+h  cycle-values hwdec auto no                  #menu: Tools > Toggle Hardware Decoding
-_ script-message mpv.net show-setup-dialog          #menu: Tools > Setup...
 
 _ script-message mpv.net shell-execute https://mpv.io                    #menu: Help > Website mpv
 _ script-message mpv.net shell-execute https://github.com/stax76/mpv.net #menu: Help > Website mpv.net

src/mpv.net.csproj

@@ -13,6 +13,21 @@
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup />
   <PropertyGroup />
@@ -254,7 +269,18 @@
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.8">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.8 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.