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 branch 'master' into SDA-2443-Fix-incorrect-download-file-name

Browse Source
This commit is contained in:
psjostrom 2020-09-11 11:52:17 +02:00 committed by GitHub
commit 1f4974ad18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,7 +110,7 @@ class Script
// https://docs.microsoft.com/en-us/windows/win32/msi/operating-system-property-values
new LaunchCondition("VersionNT>=600 AND WindowsBuild>=6001", "OS not supported"),
// Add registry entry used by protocol handler to launch symphony when opening symphony:// URIs
// Add registry entry used by protocol handler to launch symphony when opening symphony:// URIs
new RegValue(WixSharp.RegistryHive.ClassesRoot, productName + @"\shell\open\command", "", "\"[INSTALLDIR]Symphony.exe\" \"%1\"")
);
@ -123,25 +123,23 @@ class Script
// these when running the installer, but if not specified, the defaults will be used.
project.Properties = new[]
{
new PublicProperty("ALLUSERS", "true"),
new PublicProperty("ALWAYS_ON_TOP", "DISABLED" ),
new PublicProperty("AUTO_LAUNCH_PATH", "[|]"),
new PublicProperty("AUTO_LAUNCH_PATH", ""),
new PublicProperty("AUTO_START", "ENABLED"),
new PublicProperty("BRING_TO_FRONT", "DISABLED"),
new PublicProperty("CUSTOM_TITLE_BAR", "ENABLED"),
new PublicProperty("DEV_TOOLS_ENABLED", "true"),
new PublicProperty("FULL_SCREEN", "true"),
new PublicProperty("FULL_SCREEN_CB", "true"),
new PublicProperty("LOCATION", "true"),
new PublicProperty("MEDIA", "true"),
new PublicProperty("MIDI_SYSEX", "true"),
new PublicProperty("MIDI_SYSEX_CB", "true"),
new PublicProperty("MINIMIZE_ON_CLOSE", "ENABLED"),
new PublicProperty("NOTIFICATIONS", "true"),
new PublicProperty("OPEN_EXTERNAL", "true"),
new PublicProperty("OPEN_EXTERNAL_CB", "true"),
new PublicProperty("POD_URL", "https://my.symphony.com"),
new PublicProperty("POINTER_LOCK", "true"),
new PublicProperty("POINTER_LOCK_CB", "true")
new Property("MSIINSTALLPERUSER", "1")
};
// Define the custom actions we want to run, and at what point of the installation we want to execute them.

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

@ -22,18 +22,26 @@ namespace Symphony
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)
this.backgroundPanel.BackgroundImage = Runtime.Session.GetResourceBitmap("WixUI_Bmp_Dialog");
this.radioButtonCurrentUser.Text = "Only for me (" + getUserName() + ")";
if( Runtime.Session["ALLUSERS"] != "" )
{
this.radioButtonAllUsers.Checked = true;
}
else
{
this.radioButtonCurrentUser.Checked = true;
}
}
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
Runtime.Session["ALLUSERS"] = "2";
Runtime.Session["ALLUSERS"] = "2";
if (radioButtonCurrentUser.Checked)
{
// Install for current user
@ -42,10 +50,10 @@ namespace Symphony
} else if (radioButtonAllUsers.Checked)
{
// Install for all users
Runtime.Session["MSIINSTALLPERUSER"] = ""; // per-machine
Runtime.Session["MSIINSTALLPERUSER"] = ""; // per-machine
Runtime.Session["INSTALLDIR"] = System.Environment.ExpandEnvironmentVariables(@"%PROGRAMFILES%\" + Runtime.ProductName);
}
Shell.GoNext();
}