Seth/Orbis-Suite-3.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More install functionality.

Browse Source
This commit is contained in:
Greg
2022-05-10 23:39:52 -06:00
parent bbb5ab98cb
commit 3a62201e7d
9 changed files with 55 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Windows/Installer/BootstrapperSetup/Bundle.wxs
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
<Bundle Name="Orbis Suite Installer" Version="3.0" Manufacturer="OSM-Made" UpgradeCode="0978d0b2-ffa5-42b2-81ac-0cfd85de9184" IconSourceFile='..\..\..\Assets\OrbisTaskbarApp\OrbisTaskbarApp.ico'>
<Bundle Name="Orbis Suite" Version="3.0" Manufacturer="OSM-Made" UpgradeCode="0978d0b2-ffa5-42b2-81ac-0cfd85de9184" IconSourceFile='..\..\..\Assets\OrbisTaskbarApp\OrbisTaskbarApp.ico'>
<!-- Installer and its dependancies -->
<BootstrapperApplicationRef Id="ManagedBootstrapperApplicationHost">
Windows/Installer/SetupBA/MVVM/View/InitialView.xaml
+39 -4
View File
@@ -17,7 +17,7 @@
<RowDefinition/>
<RowDefinition Height="50"/>
</Grid.RowDefinitions>
<!-- Main View Area -->
<StackPanel Orientation="Vertical">
@@ -59,13 +59,48 @@
Width="75" Height="26"
Margin="0 0 8 0" Click="Cancel_Click"/>
<!-- Next -->
<!-- UnInstall -->
<simpleControls:SimpleButton HorizontalAlignment="Right"
VerticalAlignment="Center"
Grid.Column="1" Grid.Row="1"
Content="Next" x:Name="Next"
Content="UnInstall" x:Name="UnInstall"
Width="75" Height="26"
Margin="0 0 8 0" Click="Next_Click"/>
Margin="0 0 8 0"
Click="UnInstall_Click">
<simpleControls:SimpleButton.Resources>
<Style TargetType="simpleControls:SimpleButton">
<Style.Triggers>
<DataTrigger Binding="{Binding Path=MainVM.InstallEnabled}" Value="true">
<Setter Property="Visibility" Value="Collapsed" />
</DataTrigger>
</Style.Triggers>
</Style>
</simpleControls:SimpleButton.Resources>
</simpleControls:SimpleButton>
<!-- Next -->
<simpleControls:SimpleButton HorizontalAlignment="Right"
VerticalAlignment="Center"
Grid.Column="1" Grid.Row="1"
Content="Next" x:Name="Next"
Width="75" Height="26"
Margin="0 0 8 0" Click="Next_Click">
<simpleControls:SimpleButton.Resources>
<Style TargetType="simpleControls:SimpleButton">
<Style.Triggers>
<DataTrigger Binding="{Binding Path=MainVM.InstallEnabled}" Value="false">
<Setter Property="Visibility" Value="Collapsed" />
</DataTrigger>
</Style.Triggers>
</Style>
</simpleControls:SimpleButton.Resources>
</simpleControls:SimpleButton>
</StackPanel>
</Grid>
</Border>
Windows/Installer/SetupBA/MVVM/View/InitialView.xaml.cs
+7 -2
View File
@@ -29,8 +29,6 @@ namespace SetupBA.MVVM.View
private void Next_Click(object sender, RoutedEventArgs e)
{
var dc = DataContext as InitialViewModel;
// Decide if we are Installing or Uninstalling.
dc.MainVM.CurrentView = dc.MainVM.LicenseVM;
}
@@ -38,5 +36,12 @@ namespace SetupBA.MVVM.View
{
SetupBA.BootstrapperDispatcher.InvokeShutdown();
}
private void UnInstall_Click(object sender, RoutedEventArgs e)
{
var dc = DataContext as InitialViewModel;
dc.MainVM.UninstallExecute();
dc.MainVM.CurrentView = dc.MainVM.InstallVM;
}
}
}
Windows/Installer/SetupBA/MVVM/View/InstallView.xaml
+1 -1
View File
@@ -32,7 +32,7 @@
Name="InstallProgress"
/>
<TextBlock Text="This is what will be installed right now."
<TextBlock Text="{Binding Path=MainVM.Message}"
FontSize="12"
TextWrapping="Wrap"
TextAlignment="Center"
Windows/Installer/SetupBA/MVVM/View/LocationView.xaml
+1 -12
View File
@@ -42,16 +42,6 @@
Width="75" Height="26"
Margin="0 0 8 0" Click="Back_Click"/>
<!-- UnInstall -->
<simpleControls:SimpleButton HorizontalAlignment="Right"
VerticalAlignment="Center"
Grid.Column="1" Grid.Row="1"
Content="UnInstall" x:Name="UnInstall"
Width="75" Height="26"
Margin="0 0 8 0"
Click="UnInstall_Click"
Command="{Binding Path=UnInstallCommand}"/>
<!-- Install -->
<simpleControls:SimpleButton HorizontalAlignment="Right"
VerticalAlignment="Center"
@@ -59,8 +49,7 @@
Content="Install" x:Name="Install"
Width="75" Height="26"
Margin="0 0 8 0"
Click="Install_Click"
Command="{Binding Path=InstallCommanda}"/>
Click="Install_Click"/>
</StackPanel>
</Grid>
</Border>
Windows/Installer/SetupBA/MVVM/View/LocationView.xaml.cs
+1 -14
View File
@@ -36,20 +36,7 @@ namespace SetupBA.MVVM.View
private void Install_Click(object sender, RoutedEventArgs e)
{
var dc = DataContext as LocationViewModel;
dc.MainVM.IsThinking = true;
dc.MainVM.Bootstrapper.Engine.Plan(LaunchAction.Install);
dc.MainVM.CurrentView = dc.MainVM.InstallVM;
}
private void UnInstall_Click(object sender, RoutedEventArgs e)
{
var dc = DataContext as LocationViewModel;
dc.MainVM.IsThinking = true;
dc.MainVM.Bootstrapper.Engine.Plan(LaunchAction.Uninstall);
dc.MainVM.InstallExecute();
dc.MainVM.CurrentView = dc.MainVM.InstallVM;
}
}
Windows/Installer/SetupBA/MVVM/ViewModel/MainViewModel.cs
+3 -3
View File
@@ -193,19 +193,19 @@ namespace SetupBA.MVVM.ViewModel
}
}
private void InstallExecute()
public void InstallExecute()
{
IsThinking = true;
Bootstrapper.Engine.Plan(LaunchAction.Install);
}
private void UninstallExecute()
public void UninstallExecute()
{
IsThinking = true;
Bootstrapper.Engine.Plan(LaunchAction.Uninstall);
}
private void ExitExecute()
public void ExitExecute()
{
SetupBA.BootstrapperDispatcher.InvokeShutdown();
}
Windows/OrbisNeighborHood/Resources/BuildNumber.txt
+1 -1
View File
@@ -1 +1 @@
1017
1018
Windows/OrbisNeighborHood/Resources/BuildString.txt
+1 -1
View File
@@ -1 +1 @@
Version 3.0.1017 Release Build Tuesday May 10 2022 10:28 PM
Version 3.0.1018 Release Build Tuesday May 10 2022 11:06 PM