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

SDA-2389 Fixed TAB/SPACE issues

Browse Source
This commit is contained in:
Mattias Gustavsson 2020-09-04 15:19:15 +02:00
parent 23bdb4fa60
commit 1a3925dc3e
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,8 +11,8 @@ namespace Symphony
private void ExitDlg_Load(object sender, System.EventArgs e) private void ExitDlg_Load(object sender, System.EventArgs e)
{ {
// Exit installation on completion (don't wait for user to confirm) // Exit installation on completion (don't wait for user to confirm)
// After installation exits, the app will be auto launched, but that is specified in Symphony.cs // After installation exits, the app will be auto launched, but that is specified in Symphony.cs
Shell.Exit(); Shell.Exit();
} }

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

@ -5,9 +5,9 @@ namespace Symphony
{ {
public partial class WelcomeDlg : WixSharp.UI.Forms.ManagedForm, IManagedDialog public partial class WelcomeDlg : WixSharp.UI.Forms.ManagedForm, IManagedDialog
{ {
// Helper function to retrive the user name of the current user. The user name returned from // Helper function to retrive the user name of the current user. The user name returned from
// windows can be on the form DOMAIN\USER or USER@DOMAIN. This function strips away the domain // windows can be on the form DOMAIN\USER or USER@DOMAIN. This function strips away the domain
// name and separator, and returns the undecorated user name only. // name and separator, and returns the undecorated user name only.
private string getUserName() private string getUserName()
{ {
var name = System.Security.Principal.WindowsIdentity.GetCurrent().Name; var name = System.Security.Principal.WindowsIdentity.GetCurrent().Name;
@ -22,26 +22,26 @@ namespace Symphony
void dialog_Load(object sender, System.EventArgs e) void dialog_Load(object sender, System.EventArgs e)
{ {
// Populate the dynamic UI elements that can't be set at compile time (background image and // Populate the dynamic UI elements that can't be set at compile time (background image and
// the label containing user name) // the label containing user name)
this.backgroundPanel.BackgroundImage = Runtime.Session.GetResourceBitmap("WixUI_Bmp_Dialog"); this.backgroundPanel.BackgroundImage = Runtime.Session.GetResourceBitmap("WixUI_Bmp_Dialog");
this.radioButtonCurrentUser.Text = "Only for me (" + getUserName() + ")"; this.radioButtonCurrentUser.Text = "Only for me (" + getUserName() + ")";
} }
void next_Click(object sender, System.EventArgs e) void next_Click(object sender, System.EventArgs e)
{ {
// To enable Wix to use the "MSIINSTALLPERUSER" property being set below, ALLUSERS must be set to 2 // To enable Wix to use the "MSIINSTALLPERUSER" property being set below, ALLUSERS must be set to 2
Runtime.Session["ALLUSERS"] = "2"; Runtime.Session["ALLUSERS"] = "2";
if (radioButtonCurrentUser.Checked) if (radioButtonCurrentUser.Checked)
{ {
// Install for current user // Install for current user
Runtime.Session["MSIINSTALLPERUSER"] = "1"; // per-user Runtime.Session["MSIINSTALLPERUSER"] = "1"; // per-user
Runtime.Session["INSTALLDIR"] = System.Environment.ExpandEnvironmentVariables(@"%LOCALAPPDATA%\Apps\" + Runtime.ProductName); Runtime.Session["INSTALLDIR"] = System.Environment.ExpandEnvironmentVariables(@"%LOCALAPPDATA%\Apps\" + Runtime.ProductName);
} else if (radioButtonAllUsers.Checked) } else if (radioButtonAllUsers.Checked)
{ {
// Install for all users // Install for all users
Runtime.Session["MSIINSTALLPERUSER"] = ""; // per-machine Runtime.Session["MSIINSTALLPERUSER"] = ""; // per-machine
Runtime.Session["INSTALLDIR"] = System.Environment.ExpandEnvironmentVariables(@"%PROGRAMFILES%\" + Runtime.ProductName); Runtime.Session["INSTALLDIR"] = System.Environment.ExpandEnvironmentVariables(@"%PROGRAMFILES%\" + Runtime.ProductName);
} }