Skip to content

Commit 0e91d29

Browse files
committed
Merge branch 'FileManager' of https://github.com/onesounds/Flow.Launcher into FileManager
2 parents 1b4aa19 + e09248f commit 0e91d29

File tree

6 files changed

+6
-7
lines changed

6 files changed

+6
-7
lines changed

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ public string Language
4040
public bool UseGlyphIcons { get; set; } = true;
4141

4242
public int CustomExplorerIndex { get; set; } = 0;
43+
44+
[JsonIgnore]
4345
public CustomExplorerViewModel CustomExplorer
4446
{
4547
get => CustomExplorerList[CustomExplorerIndex < CustomExplorerList.Count ? CustomExplorerIndex : 0];

Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public interface IPublicAPI
192192
void SaveSettingJsonStorage<T>() where T : new();
193193

194194
/// <summary>
195-
/// Open Directory in explorer configured by user
195+
/// Open directory in an explorer configured by user via Flow's Settings. The default is Windows Explorer
196196
/// </summary>
197197
/// <param name="DirectoryPath">Directory Path to open</param>
198198
/// <param name="FileName">Extra FileName Info</param>

Flow.Launcher/SelectFileManagerWindow.xaml.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818

1919
namespace Flow.Launcher
2020
{
21-
/// <summary>
22-
/// SelectFileManagerWindow.xaml에 대한 상호 작용 논리
23-
/// </summary>
2421
public partial class SelectFileManagerWindow : Window, INotifyPropertyChanged
2522
{
2623
private int selectedCustomExplorerIndex;

Plugins/Flow.Launcher.Plugin.Explorer/plugin.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"Name": "Explorer",
1111
"Description": "Search and manage files and folders. Explorer utilises Windows Index Search",
1212
"Author": "Jeremy Wu",
13-
"Version": "1.9.1",
13+
"Version": "1.10.0",
1414
"Language": "csharp",
1515
"Website": "https://github.com/Flow-Launcher/Flow.Launcher",
1616
"ExecuteFileName": "Flow.Launcher.Plugin.Explorer.dll",

Plugins/Flow.Launcher.Plugin.Program/plugin.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Name": "Program",
55
"Description": "Search programs in Flow.Launcher",
66
"Author": "qianlifeng",
7-
"Version": "1.6.1",
7+
"Version": "1.7.0",
88
"Language": "csharp",
99
"Website": "https://github.com/Flow-Launcher/Flow.Launcher",
1010
"ExecuteFileName": "Flow.Launcher.Plugin.Program.dll",

Plugins/Flow.Launcher.Plugin.Sys/plugin.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Name": "System Commands",
55
"Description": "Provide System related commands. e.g. shutdown,lock, setting etc.",
66
"Author": "qianlifeng",
7-
"Version": "1.4.1",
7+
"Version": "1.5.0",
88
"Language": "csharp",
99
"Website": "https://github.com/Flow-Launcher/Flow.Launcher",
1010
"ExecuteFileName": "Flow.Launcher.Plugin.Sys.dll",

0 commit comments

Comments
 (0)