From 83a6be654d45cce7f610399220aea0672c5d13f5 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sat, 6 Nov 2021 20:36:47 +0900
Subject: [PATCH 1/6] Adjust Window Button Style

---
 .../UserSettings/Settings.cs                  |  10 +-
 Flow.Launcher/Languages/en.xaml               |  57 +--
 Flow.Launcher/SelectFileManagerWindow.xaml    | 324 +++++++++---------
 3 files changed, 192 insertions(+), 199 deletions(-)

diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index 48a764027..6c6a01f82 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -58,12 +58,16 @@ namespace Flow.Launcher.Infrastructure.UserSettings
             new()
             {
                 Name = "Total Commander",
-                Path = @"C:\Program Files\TOTALCMD\totalcommander.exe"
+                Path = @"C:\Program Files\totalcmd\TOTALCMD64.exe",
+                FileArgument = "\"%d\"",
+                DirectoryArgument = "\"%d\""
             },
             new()
             {
-                Name = "Dopus",
-                Path = @"c:\programe files\dopus\dopus.exe"
+                Name = "Directory Opus",
+                Path = @"C:\Program Files\GPSoftware\Directory Opus\dopus.exe",
+                FileArgument = "\"%d\"",
+                DirectoryArgument = "\"%d\""
             }
         };
 
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 260c69b04..47779cb1a 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -1,7 +1,8 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:system="clr-namespace:System;assembly=mscorlib">
-    <!--MainWindow-->
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:system="clr-namespace:System;assembly=mscorlib">
+    <!--  MainWindow  -->
     <system:String x:Key="registerHotkeyFailed">Failed to register hotkey: {0}</system:String>
     <system:String x:Key="couldnotStartCmd">Could not start {0}</system:String>
     <system:String x:Key="invalidFlowLauncherPluginFileFormat">Invalid Flow Launcher plugin file format</system:String>
@@ -15,7 +16,7 @@
     <system:String x:Key="iconTrayExit">Exit</system:String>
     <system:String x:Key="closeWindow">Close</system:String>
 
-    <!--Setting General-->
+    <!--  Setting General  -->
     <system:String x:Key="flowlauncher_settings">Flow Launcher Settings</system:String>
     <system:String x:Key="general">General</system:String>
     <system:String x:Key="portableMode">Portable Mode</system:String>
@@ -44,7 +45,7 @@
     <system:String x:Key="ShouldUsePinyinToolTip">Allows using Pinyin to search. Pinyin is the standard system of romanized spelling for translating Chinese</system:String>
     <system:String x:Key="shadowEffectNotAllowed">Shadow effect is not allowed while current theme has blur effect enabled</system:String>
 
-    <!--Setting Plugin-->
+    <!--  Setting Plugin  -->
     <system:String x:Key="plugin">Plugins</system:String>
     <system:String x:Key="browserMorePlugins">Find more plugins</system:String>
     <system:String x:Key="enable">On</system:String>
@@ -62,12 +63,12 @@
     <system:String x:Key="plugin_query_time">Query time:</system:String>
 
 
-    <!--Setting Plugin Store-->
+    <!--  Setting Plugin Store  -->
     <system:String x:Key="pluginStore">Plugin Store</system:String>
     <system:String x:Key="refresh">Refresh</system:String>
     <system:String x:Key="install">Install</system:String>
 
-    <!--Setting Theme-->
+    <!--  Setting Theme  -->
     <system:String x:Key="theme">Theme</system:String>
     <system:String x:Key="browserMoreThemes">Theme Gallery</system:String>
     <system:String x:Key="howToCreateTheme">How to create a theme</system:String>
@@ -81,7 +82,7 @@
     <system:String x:Key="ThemeFolder">Theme Folder</system:String>
     <system:String x:Key="OpenThemeFolder">Open Theme Folder</system:String>
 
-    <!--Setting Hotkey-->
+    <!--  Setting Hotkey  -->
     <system:String x:Key="hotkey">Hotkey</system:String>
     <system:String x:Key="flowlauncherHotkey">Flow Launcher Hotkey</system:String>
     <system:String x:Key="flowlauncherHotkeyToolTip">Enter shortcut to show/hide Flow Launcher.</system:String>
@@ -102,7 +103,7 @@
     <system:String x:Key="useGlyphUI">Use Segoe Fluent Icons</system:String>
     <system:String x:Key="useGlyphUIEffect">Use Segoe Fluent Icons for query results where supported</system:String>
 
-    <!--Setting Proxy-->
+    <!--  Setting Proxy  -->
     <system:String x:Key="proxy">HTTP Proxy</system:String>
     <system:String x:Key="enableProxy">Enable HTTP Proxy</system:String>
     <system:String x:Key="server">HTTP Server</system:String>
@@ -118,7 +119,7 @@
     <system:String x:Key="proxyIsCorrect">Proxy configured correctly</system:String>
     <system:String x:Key="proxyConnectFailed">Proxy connection failed</system:String>
 
-    <!--Setting About-->
+    <!--  Setting About  -->
     <system:String x:Key="about">About</system:String>
     <system:String x:Key="website">Website</system:String>
     <system:String x:Key="version">Version</system:String>
@@ -127,27 +128,27 @@
     <system:String x:Key="newVersionTips">New version {0} is available, would you like to restart Flow Launcher to use the update?</system:String>
     <system:String x:Key="checkUpdatesFailed">Check updates failed, please check your connection and proxy settings to api.github.com.</system:String>
     <system:String x:Key="downloadUpdatesFailed">
-        Download updates failed, please check your connection and proxy settings to github-cloud.s3.amazonaws.com, 
+        Download updates failed, please check your connection and proxy settings to github-cloud.s3.amazonaws.com,
         or go to https://github.com/Flow-Launcher/Flow.Launcher/releases to download updates manually.
     </system:String>
     <system:String x:Key="releaseNotes">Release Notes</system:String>
     <system:String x:Key="documentation">Usage Tips:</system:String>
 
-    <!--FileManager Setting Dialog-->
+    <!--  FileManager Setting Dialog  -->
     <system:String x:Key="fileManagerWindow">Select File Manager</system:String>
-    <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>
+    <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>
     <system:String x:Key="fileManager_name">File Manager</system:String>
     <system:String x:Key="fileManager_profile_name">Profile Name</system:String>
-    <system:String x:Key="fileManager_path">Path</system:String>
-    <system:String x:Key="fileManager_directory_arg">Argument For Directory</system:String>
-    <system:String x:Key="fileManager_file_arg">Argument For File Parent Directory</system:String>
+    <system:String x:Key="fileManager_path">File Manager Path</system:String>
+    <system:String x:Key="fileManager_directory_arg">Argument For Folder</system:String>
+    <system:String x:Key="fileManager_file_arg">Arg For Folder Containing File</system:String>
 
-    <!--Priority Setting Dialog-->
+    <!--  Priority Setting Dialog  -->
     <system:String x:Key="changePriorityWindow">Change Priority</system:String>
     <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>
     <system:String x:Key="invalidPriority">Please provide an valid integer for Priority!</system:String>
 
-    <!--Action Keyword Setting Dialog-->
+    <!--  Action Keyword Setting Dialog  -->
     <system:String x:Key="oldActionKeywords">Old Action Keyword</system:String>
     <system:String x:Key="newActionKeywords">New Action Keyword</system:String>
     <system:String x:Key="cancel">Cancel</system:String>
@@ -157,9 +158,9 @@
     <system:String x:Key="newActionKeywordsHasBeenAssigned">This new Action Keyword is already assigned to another plugin, please choose a different one</system:String>
     <system:String x:Key="success">Success</system:String>
     <system:String x:Key="completedSuccessfully">Completed successfully</system:String>
-    <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>
+    <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>
 
-    <!--Custom Query Hotkey Dialog-->
+    <!--  Custom Query Hotkey Dialog  -->
     <system:String x:Key="customeQueryHotkeyTitle">Custom Query Hotkey</system:String>
     <system:String x:Key="customeQueryHotkeyTips">Press the custom hotkey to automatically insert the specified query.</system:String>
     <system:String x:Key="preview">Preview</system:String>
@@ -167,10 +168,10 @@
     <system:String x:Key="invalidPluginHotkey">Invalid plugin hotkey</system:String>
     <system:String x:Key="update">Update</system:String>
 
-    <!--Hotkey Control-->
+    <!--  Hotkey Control  -->
     <system:String x:Key="hotkeyUnavailable">Hotkey Unavailable</system:String>
 
-    <!--Crash Reporter-->
+    <!--  Crash Reporter  -->
     <system:String x:Key="reportWindow_version">Version</system:String>
     <system:String x:Key="reportWindow_time">Time</system:String>
     <system:String x:Key="reportWindow_reproduce">Please tell us how application crashed so we can fix it</system:String>
@@ -186,16 +187,18 @@
     <system:String x:Key="reportWindow_report_failed">Failed to send report</system:String>
     <system:String x:Key="reportWindow_flowlauncher_got_an_error">Flow Launcher got an error</system:String>
 
-    <!--General Notice-->
+    <!--  General Notice  -->
     <system:String x:Key="pleaseWait">Please wait...</system:String>
 
-    <!--update-->
+    <!--  update  -->
     <system:String x:Key="update_flowlauncher_update_check">Checking for new update</system:String>
     <system:String x:Key="update_flowlauncher_already_on_latest">You already have the latest Flow Launcher version</system:String>
     <system:String x:Key="update_flowlauncher_update_found">Update found</system:String>
     <system:String x:Key="update_flowlauncher_updating">Updating...</system:String>
-    <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.
-        Please manually move your profile data folder from {0} to {1}</system:String>
+    <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.
+        Please manually move your profile data folder from {0} to {1}
+    </system:String>
     <system:String x:Key="update_flowlauncher_new_update">New Update</system:String>
     <system:String x:Key="update_flowlauncher_update_new_version_available">New Flow Launcher release {0} is now available</system:String>
     <system:String x:Key="update_flowlauncher_update_error">An error occurred while trying to install software updates</system:String>
diff --git a/Flow.Launcher/SelectFileManagerWindow.xaml b/Flow.Launcher/SelectFileManagerWindow.xaml
index 5c2521682..f2ea12b23 100644
--- a/Flow.Launcher/SelectFileManagerWindow.xaml
+++ b/Flow.Launcher/SelectFileManagerWindow.xaml
@@ -1,76 +1,93 @@
-<Window x:Class="Flow.Launcher.SelectFileManagerWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:local="clr-namespace:Flow.Launcher"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:ui="http://schemas.modernwpf.com/2019"
-        Title="{DynamicResource fileManagerWindow}"
-        Width="600"
-        Height="500"
-        Background="#f3f3f3"
-        DataContext="{Binding RelativeSource={RelativeSource Self}}"
-        ResizeMode="NoResize"
-        WindowStartupLocation="CenterScreen"
-        mc:Ignorable="d">
+<Window
+    x:Class="Flow.Launcher.SelectFileManagerWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:Flow.Launcher"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="http://schemas.modernwpf.com/2019"
+    Title="{DynamicResource fileManagerWindow}"
+    Width="600"
+    Height="550"
+    Background="#f3f3f3"
+    DataContext="{Binding RelativeSource={RelativeSource Self}}"
+    ResizeMode="NoResize"
+    WindowStartupLocation="CenterScreen"
+    mc:Ignorable="d">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition />
             <RowDefinition Height="80" />
         </Grid.RowDefinitions>
-        <Border Padding="26,26,26,0"
-                Background="#ffffff"
-                BorderBrush="#e5e5e5"
-                BorderThickness="0,0,0,1">
+        <Border
+            Padding="26,26,26,0"
+            Background="#ffffff"
+            BorderBrush="#e5e5e5"
+            BorderThickness="0,0,0,1">
             <Grid>
                 <StackPanel>
                     <StackPanel Grid.Row="0" Margin="0,0,0,12">
-                        <TextBlock Grid.Column="0"
-                                   Margin="0,0,0,0"
-                                   FontFamily="Segoe UI"
-                                   FontSize="20"
-                                   FontWeight="SemiBold"
-                                   Text="{DynamicResource fileManagerWindow}"
-                                   TextAlignment="Left" />
+                        <TextBlock
+                            Grid.Column="0"
+                            Margin="0,0,0,0"
+                            FontFamily="Segoe UI"
+                            FontSize="20"
+                            FontWeight="SemiBold"
+                            Text="{DynamicResource fileManagerWindow}"
+                            TextAlignment="Left" />
                     </StackPanel>
                     <StackPanel>
-                        <TextBlock FontSize="14"
-                                   Foreground="#1b1b1b"
-                                   Text="{DynamicResource fileManager_tips}"
-                                   TextAlignment="Left"
-                                   TextWrapping="WrapWithOverflow" />
+                        <TextBlock
+                            FontSize="14"
+                            Foreground="#1b1b1b"
+                            Text="{DynamicResource fileManager_tips}"
+                            TextAlignment="Left"
+                            TextWrapping="WrapWithOverflow" />
                     </StackPanel>
 
                     <StackPanel Margin="14,28,0,0" Orientation="Horizontal">
-                        <TextBlock Grid.Column="1"
-                                   HorizontalAlignment="Left"
-                                   VerticalAlignment="Center"
-                                   FontSize="14"
-                                   Text="{DynamicResource fileManager_name}" />
-                        <ComboBox Name="comboBox"
-                                  Width="200"
-                                  Height="35"
-                                  Margin="14,0,0,0"
-                                  HorizontalAlignment="Left"
-                                  VerticalAlignment="Center"
-                                  ItemsSource="{Binding CustomExplorers}"
-                                  SelectedIndex="{Binding SelectedCustomExplorerIndex}">
+                        <TextBlock
+                            Grid.Column="1"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            Text="{DynamicResource fileManager_name}" />
+                        <ComboBox
+                            Name="comboBox"
+                            Width="200"
+                            Height="35"
+                            Margin="14,0,0,0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            ItemsSource="{Binding CustomExplorers}"
+                            SelectedIndex="{Binding SelectedCustomExplorerIndex}">
                             <ComboBox.ItemTemplate>
                                 <DataTemplate>
                                     <TextBlock Text="{Binding Name}" />
                                 </DataTemplate>
                             </ComboBox.ItemTemplate>
                         </ComboBox>
-                        <Button Click="btnAdd_Click" Content="{DynamicResource add}" />
-                        <Button Click="btnDelete_Click" Content="{DynamicResource delete}" IsEnabled="{Binding CustomExplorer.Editable}" />
+                        <Button
+                            Margin="10,0,0,0"
+                            Click="btnAdd_Click"
+                            Content="{DynamicResource add}" />
+                        <Button
+                            Margin="10,0,0,0"
+                            Click="btnDelete_Click"
+                            Content="{DynamicResource delete}"
+                            IsEnabled="{Binding CustomExplorer.Editable}" />
 
                     </StackPanel>
-                    <Rectangle Height="1" Margin="0,20,0,12" Fill="#cecece" />
-                    <StackPanel Margin="0,0,0,0"
-                                HorizontalAlignment="Stretch"
-                                DataContext="{Binding CustomExplorer}"
-                                Orientation="Horizontal">
-                        <Grid Width="500">
+                    <Rectangle
+                        Height="1"
+                        Margin="0,20,0,12"
+                        Fill="#cecece" />
+                    <StackPanel
+                        Margin="0,0,0,0"
+                        HorizontalAlignment="Stretch"
+                        DataContext="{Binding CustomExplorer}"
+                        Orientation="Horizontal">
+                        <Grid Width="535">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="250" />
                                 <ColumnDefinition />
@@ -81,128 +98,97 @@
                                 <RowDefinition />
                                 <RowDefinition />
                             </Grid.RowDefinitions>
-                            <TextBlock Grid.Row="0"
-                                       Grid.Column="0"
-                                       Margin="14,0,0,0"
-                                       HorizontalAlignment="Left"
-                                       VerticalAlignment="Center"
-                                       FontSize="14"
-                                       Text="{DynamicResource fileManager_profile_name}" />
-                            <TextBox Grid.Row="0"
-                                     Grid.Column="1"
-                                     Width="Auto"
-                                     Margin="10,0,15,0"
-                                     HorizontalAlignment="Stretch"
-                                     VerticalAlignment="Center"
-                                     IsEnabled="{Binding Editable}"
-                                     Text="{Binding Name}">
-                                <TextBox.Style>
-                                    <Style TargetType="TextBox">
-                                        <Setter Property="Background" Value="#ffffff" />
-                                        <Setter Property="Height" Value="34" />
-                                        <Setter Property="FontSize" Value="14" />
-                                        <Setter Property="Padding" Value="6,6,0,0" />
-                                        <Setter Property="VerticalAlignment" Value="Center" />
-                                        <Setter Property="BorderBrush" Value="#000000" />
-                                    </Style>
-                                </TextBox.Style>
-                            </TextBox>
-                            <TextBlock Grid.Row="1"
-                                       Grid.Column="0"
-                                       Margin="14,0,0,0"
-                                       HorizontalAlignment="Left"
-                                       VerticalAlignment="Center"
-                                       FontSize="14"
-                                       Text="{DynamicResource fileManager_path}" />
-                            <TextBox Grid.Row="1"
-                                     Grid.Column="1"
-                                     Width="Auto"
-                                     Margin="10,0,15,0"
-                                     HorizontalAlignment="Stretch"
-                                     VerticalAlignment="Center"
-                                     IsEnabled="{Binding Editable}"
-                                     Text="{Binding Path}">
-                                <TextBox.Style>
-                                    <Style TargetType="TextBox">
-                                        <Setter Property="Background" Value="#ffffff" />
-                                        <Setter Property="Height" Value="34" />
-                                        <Setter Property="FontSize" Value="14" />
-                                        <Setter Property="Padding" Value="6,6,0,0" />
-                                        <Setter Property="VerticalAlignment" Value="Center" />
-                                        <Setter Property="BorderBrush" Value="#000000" />
-                                    </Style>
-                                </TextBox.Style>
-                            </TextBox>
-                            <TextBlock Grid.Row="2"
-                                       Grid.Column="0"
-                                       Margin="14,15,0,0"
-                                       HorizontalAlignment="Left"
-                                       VerticalAlignment="Center"
-                                       FontSize="14"
-                                       Text="{DynamicResource fileManager_directory_arg}" />
-                            <TextBox Grid.Row="2"
-                                     Grid.Column="1"
-                                     Width="Auto"
-                                     Margin="10,15,15,0"
-                                     HorizontalAlignment="Stretch"
-                                     VerticalAlignment="Center"
-                                     IsEnabled="{Binding Editable}"
-                                     Text="{Binding DirectoryArgument}">
-                                <TextBox.Style>
-                                    <Style TargetType="TextBox">
-                                        <Setter Property="Background" Value="#ffffff" />
-                                        <Setter Property="Height" Value="34" />
-                                        <Setter Property="FontSize" Value="14" />
-                                        <Setter Property="Padding" Value="6,6,0,0" />
-                                        <Setter Property="VerticalAlignment" Value="Center" />
-                                        <Setter Property="BorderBrush" Value="#000000" />
-                                    </Style>
-                                </TextBox.Style>
-                            </TextBox>
-                            <TextBlock Grid.Row="3"
-                                       Grid.Column="0"
-                                       Margin="14,15,0,0"
-                                       HorizontalAlignment="Left"
-                                       VerticalAlignment="Center"
-                                       FontSize="14"
-                                       Text="{DynamicResource fileManager_file_arg}" />
-                            <TextBox Grid.Row="3"
-                                     Grid.Column="1"
-                                     Width="Auto"
-                                     Margin="10,15,15,0"
-                                     HorizontalAlignment="Stretch"
-                                     VerticalAlignment="Center"
-                                     IsEnabled="{Binding Editable}"
-                                     Text="{Binding FileArgument}">
-                                <TextBox.Style>
-                                    <Style TargetType="TextBox">
-                                        <Setter Property="Background" Value="#ffffff" />
-                                        <Setter Property="Height" Value="34" />
-                                        <Setter Property="FontSize" Value="14" />
-                                        <Setter Property="Padding" Value="6,6,0,0" />
-                                        <Setter Property="VerticalAlignment" Value="Center" />
-                                        <Setter Property="BorderBrush" Value="#000000" />
-                                    </Style>
-                                </TextBox.Style>
-                            </TextBox>
+                            <TextBlock
+                                Grid.Row="0"
+                                Grid.Column="0"
+                                Margin="14,5,0,0"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                FontSize="14"
+                                Text="{DynamicResource fileManager_profile_name}" />
+                            <TextBox
+                                Grid.Row="0"
+                                Grid.Column="1"
+                                Width="Auto"
+                                Margin="10,5,15,0"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Center"
+                                IsEnabled="{Binding Editable}"
+                                Text="{Binding Name}" />
+                            <TextBlock
+                                Grid.Row="1"
+                                Grid.Column="0"
+                                Margin="14,10,0,0"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                FontSize="14"
+                                Text="{DynamicResource fileManager_path}" />
+                            <TextBox
+                                Grid.Row="1"
+                                Grid.Column="1"
+                                Width="Auto"
+                                Margin="10,10,15,0"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Center"
+                                IsEnabled="{Binding Editable}"
+                                Text="{Binding Path}" />
+                            <TextBlock
+                                Grid.Row="2"
+                                Grid.Column="0"
+                                Margin="14,10,0,0"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                FontSize="14"
+                                Text="{DynamicResource fileManager_directory_arg}" />
+                            <TextBox
+                                Grid.Row="2"
+                                Grid.Column="1"
+                                Width="Auto"
+                                Margin="10,10,15,0"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Center"
+                                IsEnabled="{Binding Editable}"
+                                Text="{Binding DirectoryArgument}" />
+                            <TextBlock
+                                Grid.Row="3"
+                                Grid.Column="0"
+                                Margin="14,10,0,0"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                FontSize="14"
+                                Text="{DynamicResource fileManager_file_arg}" />
+                            <TextBox
+                                Grid.Row="3"
+                                Grid.Column="1"
+                                Width="Auto"
+                                Margin="10,10,15,0"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Center"
+                                IsEnabled="{Binding Editable}"
+                                Text="{Binding FileArgument}" />
                         </Grid>
                     </StackPanel>
                 </StackPanel>
             </Grid>
         </Border>
-        <StackPanel Grid.Row="1" HorizontalAlignment="Center" Orientation="Horizontal">
-            <Button x:Name="btnCancel"
-                    Width="100"
-                    Height="30"
-                    Margin="0,0,5,0"
-                    Click="btnCancel_Click"
-                    Content="{DynamicResource cancel}" />
-            <Button x:Name="btnDone"
-                    Width="100"
-                    Height="30"
-                    Margin="5,0,0,0"
-                    Click="btnDone_Click"
-                    Content="{DynamicResource done}" />
+        <StackPanel
+            Grid.Row="1"
+            HorizontalAlignment="Center"
+            Orientation="Horizontal">
+            <Button
+                x:Name="btnCancel"
+                Width="100"
+                Height="30"
+                Margin="0,0,5,0"
+                Click="btnCancel_Click"
+                Content="{DynamicResource cancel}" />
+            <Button
+                x:Name="btnDone"
+                Width="100"
+                Height="30"
+                Margin="5,0,0,0"
+                Click="btnDone_Click"
+                Content="{DynamicResource done}" />
         </StackPanel>
     </Grid>
 </Window>

From 0c5442c618ab81c4bc3083f865316bb9c35c2871 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sat, 6 Nov 2021 21:20:39 +0900
Subject: [PATCH 2/6] Change the window size to responsive

---
 Flow.Launcher/SelectFileManagerWindow.xaml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Flow.Launcher/SelectFileManagerWindow.xaml b/Flow.Launcher/SelectFileManagerWindow.xaml
index f2ea12b23..527b91171 100644
--- a/Flow.Launcher/SelectFileManagerWindow.xaml
+++ b/Flow.Launcher/SelectFileManagerWindow.xaml
@@ -7,14 +7,13 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="http://schemas.modernwpf.com/2019"
     Title="{DynamicResource fileManagerWindow}"
-    Width="600"
-    Height="550"
     Background="#f3f3f3"
     DataContext="{Binding RelativeSource={RelativeSource Self}}"
     ResizeMode="NoResize"
+    SizeToContent="WidthAndHeight"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
-    <Grid>
+    <Grid Width="600">
         <Grid.RowDefinitions>
             <RowDefinition />
             <RowDefinition Height="80" />
@@ -152,7 +151,7 @@
                             <TextBlock
                                 Grid.Row="3"
                                 Grid.Column="0"
-                                Margin="14,10,0,0"
+                                Margin="14,10,0,20"
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Center"
                                 FontSize="14"
@@ -161,7 +160,7 @@
                                 Grid.Row="3"
                                 Grid.Column="1"
                                 Width="Auto"
-                                Margin="10,10,15,0"
+                                Margin="10,10,15,20"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Center"
                                 IsEnabled="{Binding Editable}"

From 1856f7ff43a77dadbbc1945929b394649da1ca57 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sat, 6 Nov 2021 21:22:37 +0900
Subject: [PATCH 3/6] Change 2nd Argument textbox label

---
 Flow.Launcher/Languages/en.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 47779cb1a..10265cc1f 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -141,7 +141,7 @@
     <system:String x:Key="fileManager_profile_name">Profile Name</system:String>
     <system:String x:Key="fileManager_path">File Manager Path</system:String>
     <system:String x:Key="fileManager_directory_arg">Argument For Folder</system:String>
-    <system:String x:Key="fileManager_file_arg">Arg For Folder Containing File</system:String>
+    <system:String x:Key="fileManager_file_arg">Argument For File</system:String>
 
     <!--  Priority Setting Dialog  -->
     <system:String x:Key="changePriorityWindow">Change Priority</system:String>

From 9eb8d53acdc2fb6513943a1625983d0ac7609984 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sat, 6 Nov 2021 21:25:11 +0900
Subject: [PATCH 4/6] Adjust popup layout

---
 Flow.Launcher/SelectFileManagerWindow.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Flow.Launcher/SelectFileManagerWindow.xaml b/Flow.Launcher/SelectFileManagerWindow.xaml
index 527b91171..8f5c5079a 100644
--- a/Flow.Launcher/SelectFileManagerWindow.xaml
+++ b/Flow.Launcher/SelectFileManagerWindow.xaml
@@ -86,9 +86,9 @@
                         HorizontalAlignment="Stretch"
                         DataContext="{Binding CustomExplorer}"
                         Orientation="Horizontal">
-                        <Grid Width="535">
+                        <Grid Width="545">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="250" />
+                                <ColumnDefinition Width="220" />
                                 <ColumnDefinition />
                             </Grid.ColumnDefinitions>
                             <Grid.RowDefinitions>

From a7f46cee96088ebf666de81b04a22bface8d0d14 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sat, 6 Nov 2021 22:49:30 +0900
Subject: [PATCH 5/6] Add argument setting for file managers and Adjust Label
 Text

---
 .../UserSettings/Settings.cs                   | 18 +++++++++++++-----
 Flow.Launcher/Languages/en.xaml                |  4 ++--
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index 6c6a01f82..570cdb2c9 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -51,23 +51,31 @@ namespace Flow.Launcher.Infrastructure.UserSettings
             {
                 Name = "Explorer",
                 Path = "explorer",
-                FileArgument = "/select, \"%f\"",
                 DirectoryArgument = "\"%d\"",
+                FileArgument = "/select, \"%f\"",
                 Editable = false
             },
             new()
             {
                 Name = "Total Commander",
                 Path = @"C:\Program Files\totalcmd\TOTALCMD64.exe",
-                FileArgument = "\"%d\"",
-                DirectoryArgument = "\"%d\""
+                DirectoryArgument = "/O /A /S /T \"%d\"",
+                FileArgument = "/O /A /S /T \"%f\""
             },
             new()
             {
                 Name = "Directory Opus",
                 Path = @"C:\Program Files\GPSoftware\Directory Opus\dopus.exe",
-                FileArgument = "\"%d\"",
-                DirectoryArgument = "\"%d\""
+                DirectoryArgument = "/cmd Go \"%d\"",
+                FileArgument = "/cmd Go \"%f\""
+                
+            },
+            new()
+            {
+                Name = "Files",
+                Path = "Files",
+                DirectoryArgument = "-select \"%d\"",
+                FileArgument = "-select \"%f\""
             }
         };
 
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 10265cc1f..3884d6997 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -140,8 +140,8 @@
     <system:String x:Key="fileManager_name">File Manager</system:String>
     <system:String x:Key="fileManager_profile_name">Profile Name</system:String>
     <system:String x:Key="fileManager_path">File Manager Path</system:String>
-    <system:String x:Key="fileManager_directory_arg">Argument For Folder</system:String>
-    <system:String x:Key="fileManager_file_arg">Argument For File</system:String>
+    <system:String x:Key="fileManager_directory_arg">Arguments For Folder</system:String>
+    <system:String x:Key="fileManager_file_arg">Arguments For File</system:String>
 
     <!--  Priority Setting Dialog  -->
     <system:String x:Key="changePriorityWindow">Change Priority</system:String>

From af7bab4d26c266bab0573d9cef2a51a28970ffeb Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sat, 6 Nov 2021 22:51:57 +0900
Subject: [PATCH 6/6] fix directory opus default path

---
 Flow.Launcher.Infrastructure/UserSettings/Settings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index 570cdb2c9..cb6ab10bf 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -65,7 +65,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings
             new()
             {
                 Name = "Directory Opus",
-                Path = @"C:\Program Files\GPSoftware\Directory Opus\dopus.exe",
+                Path = @"C:\Program Files\GPSoftware\Directory Opus\dopusrt.exe",
                 DirectoryArgument = "/cmd Go \"%d\"",
                 FileArgument = "/cmd Go \"%f\""