Skip to content

Commit 16a07dc

Browse files
taoocerostaooceros
committed
Merge branch 'FileManager' of github.com:onesounds/Flow.Launcher into FileManager
2 parents fb923c4 + af7bab4 commit 16a07dc

File tree

3 files changed

+202
-202
lines changed

3 files changed

+202
-202
lines changed

‎Flow.Launcher.Infrastructure/UserSettings/Settings.cs

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,31 @@ public CustomExplorerViewModel CustomExplorer
5151
{
5252
Name = "Explorer",
5353
Path = "explorer",
54-
FileArgument = "/select, \"%f\"",
5554
DirectoryArgument = "\"%d\"",
55+
FileArgument = "/select, \"%f\"",
5656
Editable = false
5757
},
5858
new()
5959
{
6060
Name = "Total Commander",
61-
Path = @"C:\Program Files\TOTALCMD\totalcommander.exe"
61+
Path = @"C:\Program Files\totalcmd\TOTALCMD64.exe",
62+
DirectoryArgument = "/O /A /S /T \"%d\"",
63+
FileArgument = "/O /A /S /T \"%f\""
64+
},
65+
new()
66+
{
67+
Name = "Directory Opus",
68+
Path = @"C:\Program Files\GPSoftware\Directory Opus\dopusrt.exe",
69+
DirectoryArgument = "/cmd Go \"%d\"",
70+
FileArgument = "/cmd Go \"%f\""
71+
6272
},
6373
new()
6474
{
65-
Name = "Dopus",
66-
Path = @"c:\programe files\dopus\dopus.exe"
75+
Name = "Files",
76+
Path = "Files",
77+
DirectoryArgument = "-select \"%d\"",
78+
FileArgument = "-select \"%f\""
6779
}
6880
};
6981

‎Flow.Launcher/Languages/en.xaml

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3-
xmlns:system="clr-namespace:System;assembly=mscorlib">
4-
<!--MainWindow-->
1+
<ResourceDictionary
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:system="clr-namespace:System;assembly=mscorlib">
5+
<!-- MainWindow -->
56
<system:String x:Key="registerHotkeyFailed">Failed to register hotkey: {0}</system:String>
67
<system:String x:Key="couldnotStartCmd">Could not start {0}</system:String>
78
<system:String x:Key="invalidFlowLauncherPluginFileFormat">Invalid Flow Launcher plugin file format</system:String>
@@ -15,7 +16,7 @@
1516
<system:String x:Key="iconTrayExit">Exit</system:String>
1617
<system:String x:Key="closeWindow">Close</system:String>
1718

18-
<!--Setting General-->
19+
<!-- Setting General -->
1920
<system:String x:Key="flowlauncher_settings">Flow Launcher Settings</system:String>
2021
<system:String x:Key="general">General</system:String>
2122
<system:String x:Key="portableMode">Portable Mode</system:String>
@@ -44,7 +45,7 @@
4445
<system:String x:Key="ShouldUsePinyinToolTip">Allows using Pinyin to search. Pinyin is the standard system of romanized spelling for translating Chinese</system:String>
4546
<system:String x:Key="shadowEffectNotAllowed">Shadow effect is not allowed while current theme has blur effect enabled</system:String>
4647

47-
<!--Setting Plugin-->
48+
<!-- Setting Plugin -->
4849
<system:String x:Key="plugin">Plugins</system:String>
4950
<system:String x:Key="browserMorePlugins">Find more plugins</system:String>
5051
<system:String x:Key="enable">On</system:String>
@@ -62,12 +63,12 @@
6263
<system:String x:Key="plugin_query_time">Query time:</system:String>
6364

6465

65-
<!--Setting Plugin Store-->
66+
<!-- Setting Plugin Store -->
6667
<system:String x:Key="pluginStore">Plugin Store</system:String>
6768
<system:String x:Key="refresh">Refresh</system:String>
6869
<system:String x:Key="install">Install</system:String>
6970

70-
<!--Setting Theme-->
71+
<!-- Setting Theme -->
7172
<system:String x:Key="theme">Theme</system:String>
7273
<system:String x:Key="browserMoreThemes">Theme Gallery</system:String>
7374
<system:String x:Key="howToCreateTheme">How to create a theme</system:String>
@@ -81,7 +82,7 @@
8182
<system:String x:Key="ThemeFolder">Theme Folder</system:String>
8283
<system:String x:Key="OpenThemeFolder">Open Theme Folder</system:String>
8384

84-
<!--Setting Hotkey-->
85+
<!-- Setting Hotkey -->
8586
<system:String x:Key="hotkey">Hotkey</system:String>
8687
<system:String x:Key="flowlauncherHotkey">Flow Launcher Hotkey</system:String>
8788
<system:String x:Key="flowlauncherHotkeyToolTip">Enter shortcut to show/hide Flow Launcher.</system:String>
@@ -102,7 +103,7 @@
102103
<system:String x:Key="useGlyphUI">Use Segoe Fluent Icons</system:String>
103104
<system:String x:Key="useGlyphUIEffect">Use Segoe Fluent Icons for query results where supported</system:String>
104105

105-
<!--Setting Proxy-->
106+
<!-- Setting Proxy -->
106107
<system:String x:Key="proxy">HTTP Proxy</system:String>
107108
<system:String x:Key="enableProxy">Enable HTTP Proxy</system:String>
108109
<system:String x:Key="server">HTTP Server</system:String>
@@ -118,7 +119,7 @@
118119
<system:String x:Key="proxyIsCorrect">Proxy configured correctly</system:String>
119120
<system:String x:Key="proxyConnectFailed">Proxy connection failed</system:String>
120121

121-
<!--Setting About-->
122+
<!-- Setting About -->
122123
<system:String x:Key="about">About</system:String>
123124
<system:String x:Key="website">Website</system:String>
124125
<system:String x:Key="version">Version</system:String>
@@ -127,27 +128,27 @@
127128
<system:String x:Key="newVersionTips">New version {0} is available, would you like to restart Flow Launcher to use the update?</system:String>
128129
<system:String x:Key="checkUpdatesFailed">Check updates failed, please check your connection and proxy settings to api.github.com.</system:String>
129130
<system:String x:Key="downloadUpdatesFailed">
130-
Download updates failed, please check your connection and proxy settings to github-cloud.s3.amazonaws.com,
131+
Download updates failed, please check your connection and proxy settings to github-cloud.s3.amazonaws.com,
131132
or go to https://github.com/Flow-Launcher/Flow.Launcher/releases to download updates manually.
132133
</system:String>
133134
<system:String x:Key="releaseNotes">Release Notes</system:String>
134135
<system:String x:Key="documentation">Usage Tips:</system:String>
135136

136-
<!--FileManager Setting Dialog-->
137+
<!-- FileManager Setting Dialog -->
137138
<system:String x:Key="fileManagerWindow">Select File Manager</system:String>
138-
<system:String x:Key="fileManager_tips">Please specify the file location of the file manager you using and add arguments (optional) if necessary.</system:String>
139+
<system:String x:Key="fileManager_tips">Please specify the file location of the file manager you using and add arguments if necessary. The default arguments is &quot;%d&quot;, and a path is entered at that location. For example, If a command is required such as &quot;totalcmd.exe /A c:\windows&quot;, Argument is /A &quot;%d&quot;.</system:String>
139140
<system:String x:Key="fileManager_name">File Manager</system:String>
140141
<system:String x:Key="fileManager_profile_name">Profile Name</system:String>
141-
<system:String x:Key="fileManager_path">Path</system:String>
142-
<system:String x:Key="fileManager_directory_arg">Argument For Directory</system:String>
143-
<system:String x:Key="fileManager_file_arg">Argument For File Parent Directory</system:String>
142+
<system:String x:Key="fileManager_path">File Manager Path</system:String>
143+
<system:String x:Key="fileManager_directory_arg">Arguments For Folder</system:String>
144+
<system:String x:Key="fileManager_file_arg">Arguments For File</system:String>
144145

145-
<!--Priority Setting Dialog-->
146+
<!-- Priority Setting Dialog -->
146147
<system:String x:Key="changePriorityWindow">Change Priority</system:String>
147148
<system:String x:Key="priority_tips">Greater the number, the higher the result will be ranked. Try setting it as 5. If you want the results to be lower than any other plugin's, provide a negative number</system:String>
148149
<system:String x:Key="invalidPriority">Please provide an valid integer for Priority!</system:String>
149150

150-
<!--Action Keyword Setting Dialog-->
151+
<!-- Action Keyword Setting Dialog -->
151152
<system:String x:Key="oldActionKeywords">Old Action Keyword</system:String>
152153
<system:String x:Key="newActionKeywords">New Action Keyword</system:String>
153154
<system:String x:Key="cancel">Cancel</system:String>
@@ -157,20 +158,20 @@
157158
<system:String x:Key="newActionKeywordsHasBeenAssigned">This new Action Keyword is already assigned to another plugin, please choose a different one</system:String>
158159
<system:String x:Key="success">Success</system:String>
159160
<system:String x:Key="completedSuccessfully">Completed successfully</system:String>
160-
<system:String x:Key="actionkeyword_tips">Enter the action keyword you need to start the plug-in. Use * if you don't want to specify an action keyword. In the case, The plug-in works without keywords. </system:String>
161+
<system:String x:Key="actionkeyword_tips">Enter the action keyword you need to start the plug-in. Use * if you don't want to specify an action keyword. In the case, The plug-in works without keywords.</system:String>
161162

162-
<!--Custom Query Hotkey Dialog-->
163+
<!-- Custom Query Hotkey Dialog -->
163164
<system:String x:Key="customeQueryHotkeyTitle">Custom Query Hotkey</system:String>
164165
<system:String x:Key="customeQueryHotkeyTips">Press the custom hotkey to automatically insert the specified query.</system:String>
165166
<system:String x:Key="preview">Preview</system:String>
166167
<system:String x:Key="hotkeyIsNotUnavailable">Hotkey is unavailable, please select a new hotkey</system:String>
167168
<system:String x:Key="invalidPluginHotkey">Invalid plugin hotkey</system:String>
168169
<system:String x:Key="update">Update</system:String>
169170

170-
<!--Hotkey Control-->
171+
<!-- Hotkey Control -->
171172
<system:String x:Key="hotkeyUnavailable">Hotkey Unavailable</system:String>
172173

173-
<!--Crash Reporter-->
174+
<!-- Crash Reporter -->
174175
<system:String x:Key="reportWindow_version">Version</system:String>
175176
<system:String x:Key="reportWindow_time">Time</system:String>
176177
<system:String x:Key="reportWindow_reproduce">Please tell us how application crashed so we can fix it</system:String>
@@ -186,16 +187,18 @@
186187
<system:String x:Key="reportWindow_report_failed">Failed to send report</system:String>
187188
<system:String x:Key="reportWindow_flowlauncher_got_an_error">Flow Launcher got an error</system:String>
188189

189-
<!--General Notice-->
190+
<!-- General Notice -->
190191
<system:String x:Key="pleaseWait">Please wait...</system:String>
191192

192-
<!--update-->
193+
<!-- update -->
193194
<system:String x:Key="update_flowlauncher_update_check">Checking for new update</system:String>
194195
<system:String x:Key="update_flowlauncher_already_on_latest">You already have the latest Flow Launcher version</system:String>
195196
<system:String x:Key="update_flowlauncher_update_found">Update found</system:String>
196197
<system:String x:Key="update_flowlauncher_updating">Updating...</system:String>
197-
<system:String x:Key="update_flowlauncher_fail_moving_portable_user_profile_data">Flow Launcher was not able to move your user profile data to the new update version.
198-
Please manually move your profile data folder from {0} to {1}</system:String>
198+
<system:String x:Key="update_flowlauncher_fail_moving_portable_user_profile_data">
199+
Flow Launcher was not able to move your user profile data to the new update version.
200+
Please manually move your profile data folder from {0} to {1}
201+
</system:String>
199202
<system:String x:Key="update_flowlauncher_new_update">New Update</system:String>
200203
<system:String x:Key="update_flowlauncher_update_new_version_available">New Flow Launcher release {0} is now available</system:String>
201204
<system:String x:Key="update_flowlauncher_update_error">An error occurred while trying to install software updates</system:String>

0 commit comments

Comments
 (0)