if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1096 from mattias-symphony/SDA-2511

Browse Source 
fix: SDA-2511 Making back button work from InstallDir screen
This commit is contained in:
mattias-symphony
2020-10-19 08:02:02 +02:00
committed by GitHub
parent 6d9cfa1225 bc2240a897
commit 5710be3e23
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
installer/win/WixSharpInstaller/CloseDlg.cs
View File

@@ -5,6 +5,8 @@ namespace Symphony
{
public partial class CloseDlg : WixSharp.UI.Forms.ManagedForm, IManagedDialog
{
const int WelcomeDlgIndex = 0;
const int InstallDirIndex = 1;
public CloseDlg()
{
@@ -20,11 +22,6 @@ namespace Symphony
// If it is running, disable the "next" button
this.next.Enabled = false;
}
else
{
// If it is not running, skip this dialog
Shell.GoNext();
}
// Populate the dynamic UI elements that can't be set at compile time (background image and
// the enabled/disabled state of the `Close Symphony` button)
@@ -35,17 +32,17 @@ namespace Symphony
{
// The "Close Symphony" button is just to get users consent to close the app.
// Actually closing the app will be done later in the flow.
Shell.GoNext();
Shell.GoTo(InstallDirIndex);
}
void back_Click(object sender, System.EventArgs e)
{
Shell.GoPrev();
Shell.GoTo(WelcomeDlgIndex);
}
void next_Click(object sender, System.EventArgs e)
{
Shell.GoNext();
Shell.GoTo(InstallDirIndex);
}
void cancel_Click(object sender, System.EventArgs e)

4
installer/win/WixSharpInstaller/Symphony.cs
View File

@@ -205,10 +205,10 @@ class Script
// Define our own installation flow, using a mix of custom dialogs (defined in their own files) and built-in dialogs
project.ManagedUI = new ManagedUI();
project.ManagedUI.InstallDialogs.Add<Symphony.WelcomeDlg>()
.Add<Symphony.CloseDlg>()
.Add(Dialogs.InstallDir)
.Add(Dialogs.Progress)
.Add<Symphony.ExitDlg>();
.Add<Symphony.ExitDlg>()
.Add<Symphony.CloseDlg>();
project.ManagedUI.ModifyDialogs.Add<Symphony.MaintenanceDlg>()
.Add(Dialogs.MaintenanceType)
.Add(Dialogs.Progress)

13
installer/win/WixSharpInstaller/WelcomeDlg.cs
View File

@@ -54,7 +54,18 @@ namespace Symphony
Runtime.Session["INSTALLDIR"] = Runtime.Session["PROGRAMSFOLDER"] + @"\Symphony\" + Runtime.ProductName;
}
Shell.GoNext();
// Detect if Symphony is running
bool isRunning = System.Diagnostics.Process.GetProcessesByName("Symphony").Length > 0;
if (isRunning)
{
// If it is running, continue to the "Close Symphony" screen
Shell.GoTo<Symphony.CloseDlg>();
}
else
{
// If it is not running, proceed to InstallDir dialog
Shell.GoNext();
}
}
void cancel_Click(object sender, System.EventArgs e)