prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add disable portable mode programatically

Browse source
This commit is contained in:
Jeremy Wu 2020-03-03 05:58:31 +11:00
parent 61845dd0db
commit 2531f71402
3 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Wox.Core/Configuration/Portable.cs
View file

@ -1,3 +1,4 @@
using Microsoft.Win32;
using Squirrel;
using System;
using Wox.Infrastructure;
@ -16,12 +17,13 @@ namespace Wox.Core.Configuration
public Portable()
{
//NEED TO DYNAMICALLY GET WOX'S LOCATION OTHERWISE SHORTCUTS WONT WORK
applicationName = Constant.Wox;
exeName = applicationName + ".exe";
rootAppDirectory = Constant.RootDirectory;
portabilityUpdater = new UpdateManager(string.Empty, applicationName, rootAppDirectory);
portabilityUpdater = new UpdateManager(string.Empty, applicationName, rootAppDirectory);
roamingDataPath = Constant.RoamingDataPath;
roamingDataPath = Constant.RoamingDataPath;
portableDataPath = Constant.PortableDataPath;
}
@ -31,7 +33,7 @@ namespace Wox.Core.Configuration
{
MoveUserDataFolder(portableDataPath, roamingDataPath);
CreateShortcuts();
CreateUninstallerEntry();
CreateUninstallerEntry(); //DOES NOT CREATE THE UNINSTALLER ICON!!!!!!
// always dispose UpdateManager???????????
// CHANGE TO PRIVATE/INTERNAL METHODS
@ -108,7 +110,17 @@ namespace Wox.Core.Configuration
public void CreateUninstallerEntry()
{
portabilityUpdater.CreateUninstallerRegistryEntry();
var uninstallRegSubKey = @"Software\Microsoft\Windows\CurrentVersion\Uninstall";
// NB: Sometimes the Uninstall key doesn't exist
using (var parentKey =
RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, RegistryView.Default)
.CreateSubKey("Uninstall", RegistryKeyPermissionCheck.ReadWriteSubTree)) {; }
var key = RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, RegistryView.Default)
.CreateSubKey(uninstallRegSubKey + "\\" + applicationName, RegistryKeyPermissionCheck.ReadWriteSubTree);
key.SetValue("DisplayIcon", Constant.ApplicationDirectory + "\\app.ico", RegistryValueKind.String);
portabilityUpdater.CreateUninstallerRegistryEntry().Wait();
}
}
}

2
Wox.Infrastructure/Wox.cs
View file

@ -13,7 +13,7 @@ namespace Wox.Infrastructure
private static readonly Assembly Assembly = Assembly.GetExecutingAssembly();
public static readonly string ProgramDirectory = Directory.GetParent(Assembly.Location.NonNull()).ToString();
public static readonly string ExecutablePath = Path.Combine(ProgramDirectory, Wox + ".exe");
private static readonly string ApplicationDirectory = Directory.GetParent(ProgramDirectory).ToString();
public static readonly string ApplicationDirectory = Directory.GetParent(ProgramDirectory).ToString();
public static readonly string RootDirectory = Directory.GetParent(ApplicationDirectory).ToString();
public const string PortableFolderName = "UserData";

5
Wox/ViewModel/SettingWindowViewModel.cs
View file

@ -55,6 +55,11 @@ namespace Wox.ViewModel
_portable.EnablePortableMode();
}
public void DisablePortableMode()
{
_portable.DisablePortableMode();
}
public void Save()
{
_storage.Save();