CefSharp has been removed, since the license page was an overkill and…

… didn't go anywhere
vvvvpm · Oct 13, 2019 · bb542a1 · bb542a1
1 parent 37efa86
commit bb542a1
Show file tree

Hide file tree

Showing 9 changed files with 545 additions and 839 deletions.
diff --git a/.gitignore b/.gitignore
@@ -236,3 +236,4 @@ _Pvt_Extensions
 
 # FAKE - F# Make
 .fake/
+vpm.*.7z
diff --git a/src/vpm/ChooseDir.xaml b/src/vpm/ChooseDir.xaml
@@ -3,10 +3,9 @@
              xmlns:controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:cefSharp="clr-namespace:CefSharp.Wpf;assembly=CefSharp.Wpf"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:local="clr-namespace:vpm"
-             mc:Ignorable="d" Height="96" Width="399"
+             mc:Ignorable="d" Height="173" Width="399"
              BorderThickness="0" 
              GlowBrush="Black"
              ResizeMode="CanResizeWithGrip"
@@ -33,9 +32,18 @@
         </ResourceDictionary>
     </controls:MetroWindow.Resources>
     <Grid>
-        <TextBox x:Name="DirBox" Height="23" TextWrapping="Wrap" Text="TextBox" Margin="0,0,28,0" VerticalAlignment="Top" TabIndex="0" Drop="OnDirDrop" AllowDrop="True" PreviewDragOver="OnPrevDragOver"/>
-        <Button x:Name="PickButton" Content="..." HorizontalAlignment="Right" Width="28" Height="26" VerticalAlignment="Top" Click="OnBrowseDir"/>
-        <Button x:Name="OkButton" Content="OK" Margin="0,26,0,0" IsDefault="True" TabIndex="1" Click="OnConfirm"/>
+        <Grid.RowDefinitions>
+            <RowDefinition/>
+            <RowDefinition Height="37"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition/>
+            <ColumnDefinition/>
+        </Grid.ColumnDefinitions>
+        <TextBox x:Name="DirBox" Height="26" TextWrapping="Wrap" Text="TextBox" VerticalAlignment="Top" TabIndex="0" Drop="OnDirDrop" AllowDrop="True" PreviewDragOver="OnPrevDragOver" Grid.ColumnSpan="2"/>
+        <Button x:Name="PickButton" Content="Browse" Click="OnBrowseDir" Grid.Column="1" Grid.Row="1" Margin="6,0,0,0"/>
+        <Button x:Name="OkButton" Content="OK" IsDefault="True" TabIndex="1" Click="OnConfirm" Grid.Row="1" Margin="0,0,6,0"/>
+        <TextBlock Margin="10,31,10,0" TextWrapping="Wrap" Text="The destination folder above is already determined from the registry, if Setup.exe of VVVV associated .v4p files at least once on this computer. If you'd like to use a different folder you can Browse, Drag the folder from Explorer or just Write above." Grid.ColumnSpan="2"/>
 
     </Grid>
 </controls:MetroWindow>
diff --git a/src/vpm/Program.cs b/src/vpm/Program.cs
@@ -116,26 +116,19 @@ static void Main(string[] args)
                 Console.ForegroundColor = ConsoleColor.Green;
                 Console.WriteLine("Initialization complete.");
                 Console.ResetColor();
-
-                VpmConfig.Instance.WinApp.BeginInvoke(() =>
-                {
-                    var winapp = VpmConfig.Instance.WinApp;
-                    var window = VpmConfig.Instance.AgreeWindow = new UserAgree();
-                    winapp.MainWindow = window;
-                    window.Show();
-                });
-                while (!VpmConfig.Instance.AgreementsAgreed)
-                {
-                    Thread.Sleep(10);
-                }
 
-                if (VpmConfig.Instance.InstallationCancelled)
+                if (!VpmConfig.Instance.Arguments.Quiet)
                 {
-                    VpmUtils.CleanUp();
-                    Console.ForegroundColor = ConsoleColor.Green;
-                    Console.WriteLine("Installation is canceled");
-                    Thread.Sleep(5000);
-                    Environment.Exit(0);
+
+                    if (!VpmUtils.PromptYayOrNay(
+                        "Vpm does not ask individual licenses anymore. " +
+                        "It is the user's responsibility to know and fully comply with the licenses " +
+                        "of the currently installed pack and all of its dependencies.\n" +
+                        "Do you agree?"))
+                    {
+                        VpmUtils.CleanUp();
+                        Environment.Exit(0);
+                    }
                 }
 
                 vpack.Install();

diff --git a/src/vpm/UserAgree.xaml b/src/vpm/UserAgree.xaml
diff --git a/src/vpm/UserAgree.xaml.cs b/src/vpm/UserAgree.xaml.cs
diff --git a/src/vpm/packages.config b/src/vpm/packages.config
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="cef.redist.x64" version="3.2987.1601" targetFramework="net461" />
-  <package id="cef.redist.x86" version="3.2987.1601" targetFramework="net461" />
-  <package id="CefSharp.Common" version="57.0.0" targetFramework="net461" />
-  <package id="CefSharp.Wpf" version="57.0.0" targetFramework="net461" />
   <package id="FileAssociation" version="1.0.0.0" targetFramework="net461" />
   <package id="LibGit2Sharp" version="0.24.0-pre20170124092542" targetFramework="net461" />
   <package id="LibGit2Sharp.NativeBinaries" version="1.0.165" targetFramework="net461" />