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

Fix merge

Browse source
This commit is contained in:
Vic 2022-10-25 14:41:46 +08:00
parent 184aa57db9
commit 0a19b02792
2 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml.cs
View file

@ -27,14 +27,14 @@ namespace Flow.Launcher.Plugin.Program
btnAdd.Content = _context.API.GetTranslation("flowlauncher_plugin_program_add");
}
public AddProgramSource(ProgramSource edit, Settings settings)
public AddProgramSource(ProgramSource source, Settings settings)
{
InitializeComponent();
_updating = source;
_editing = source;
_settings = settings;
update = true;
Chkbox.IsChecked = _updating.Enabled;
Directory.Text = _updating.Location;
Chkbox.IsChecked = _editing.Enabled;
Directory.Text = _editing.Location;
}
private void BrowseButton_Click(object sender, RoutedEventArgs e)
@ -72,8 +72,8 @@ namespace Flow.Launcher.Plugin.Program
}
else
{
_updating.Location = path;
_updating.Enabled = Chkbox.IsChecked ?? true; // Fixme, need to add to disabled source if not custom source
_editing.Location = path;
_editing.Enabled = Chkbox.IsChecked ?? true; // Fixme, need to add to disabled source if not custom source
}
DialogResult = true;

18
Plugins/Flow.Launcher.Plugin.Program/Main.cs
View file

@ -194,16 +194,24 @@ namespace Flow.Launcher.Plugin.Program
{
_uwps.First(x => x.UniqueIdentifier == programToDelete.UniqueIdentifier)
.Enabled = false;
var t1 = Task.Run(() =>
{
IndexWin32Programs();
_settings.DisabledProgramSources.Add(new DisabledProgramSource(programToDelete));
_settings.LastIndexTime = DateTime.Today;
});
}
if (_win32s.Any(x => x.UniqueIdentifier == programToDelete.UniqueIdentifier))
else if (_win32s.Any(x => x.UniqueIdentifier == programToDelete.UniqueIdentifier))
{
_win32s.First(x => x.UniqueIdentifier == programToDelete.UniqueIdentifier)
.Enabled = false;
var t1 = Task.Run(() =>
{
IndexUwpPrograms();
_settings.DisabledProgramSources.Add(new DisabledProgramSource(programToDelete));
_settings.LastIndexTime = DateTime.Today;
});
}
_settings.DisabledProgramSources.Add(new DisabledProgramSource(programToDelete));
}
public static void StartProcess(Func<ProcessStartInfo, Process> runProcess, ProcessStartInfo info)