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

Merge pull request #2803 from onesounds/240625-QtTabBar

Browse source 
Support QTTabBar
This commit is contained in:
Jeremy Wu 2024-07-07 18:01:39 +10:00 committed by GitHub
commit 7ef623af5e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 26 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Flow.Launcher/Languages/en.xaml
View file

@ -289,8 +289,8 @@
<!-- FileManager Setting Dialog --> <!-- FileManager Setting Dialog -->
<system:String x:Key="fileManagerWindow">Select File Manager</system:String> <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 if necessary. The default arguments are &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_tips">Please specify the file location of the file manager you using and add arguments as required. The &quot;%d&quot; represents the directory path to open for, used by the Arg for Folder field and for commands opening specific directories. The &quot;%f&quot; represents the file path to open for, used by the Arg for File field and for commands opening specific files.</system:String>
<system:String x:Key="fileManager_tips2">&quot;%f&quot; is an argument that represent the file path. It is used to emphasize the file/folder name when opening a specific file location in 3rd party file manager. This argument is only available in the &quot;Arg for File&quot; item. If the file manager does not have that function, you can use &quot;%d&quot;.</system:String> <system:String x:Key="fileManager_tips2">For example, if the file manager uses a command such as &quot;totalcmd.exe /A c:\windows&quot; to open the c:\windows directory, the File Manager Path will be totalcmd.exe, and the Arg For Folder will be /A &quot;%d&quot;. Certain file managers like QTTabBar may just require a path to be supplied, in this instance use &quot;%d&quot; as the File Manager Path and leave the rest of the fileds blank.</system:String>
<system:String x:Key="fileManager_name">File Manager</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_profile_name">Profile Name</system:String>
<system:String x:Key="fileManager_path">File Manager Path</system:String> <system:String x:Key="fileManager_path">File Manager Path</system:String>

3
Flow.Launcher/PublicAPIInstance.cs
View file

@ -230,9 +230,10 @@ namespace Flow.Launcher
{ {
using var explorer = new Process(); using var explorer = new Process();
var explorerInfo = _settingsVM.Settings.CustomExplorer; var explorerInfo = _settingsVM.Settings.CustomExplorer;
explorer.StartInfo = new ProcessStartInfo explorer.StartInfo = new ProcessStartInfo
{ {
FileName = explorerInfo.Path, FileName = explorerInfo.Path.Replace("%d", DirectoryPath),
UseShellExecute = true, UseShellExecute = true,
Arguments = FileNameOrFilePath is null Arguments = FileNameOrFilePath is null
? explorerInfo.DirectoryArgument.Replace("%d", DirectoryPath) ? explorerInfo.DirectoryArgument.Replace("%d", DirectoryPath)

50
Flow.Launcher/SelectFileManagerWindow.xaml
View file

@ -57,11 +57,11 @@
</Button> </Button>
</Grid> </Grid>
</StackPanel> </StackPanel>
<StackPanel Margin="26,12,26,0"> <StackPanel Margin="26 12 26 0">
<StackPanel Grid.Row="1" Margin="0,0,0,12"> <StackPanel Grid.Row="1" Margin="0 0 0 12">
<TextBlock <TextBlock
Grid.Column="0" Grid.Column="0"
Margin="0,0,0,0" Margin="0 0 0 0"
FontSize="20" FontSize="20"
FontWeight="SemiBold" FontWeight="SemiBold"
Text="{DynamicResource fileManagerWindow}" Text="{DynamicResource fileManagerWindow}"
@ -73,12 +73,12 @@
Text="{DynamicResource fileManager_tips}" Text="{DynamicResource fileManager_tips}"
TextAlignment="Left" TextAlignment="Left"
TextWrapping="WrapWithOverflow" /> TextWrapping="WrapWithOverflow" />
<TextBlock Margin="0,14,0,0" FontSize="14"> <TextBlock Margin="0 14 0 0" FontSize="14">
<TextBlock Text="{DynamicResource fileManager_tips2}" TextWrapping="WrapWithOverflow" /> <TextBlock Text="{DynamicResource fileManager_tips2}" TextWrapping="WrapWithOverflow" />
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
<StackPanel Margin="14,28,0,0" Orientation="Horizontal"> <StackPanel Margin="14 28 0 0" Orientation="Horizontal">
<TextBlock <TextBlock
Grid.Column="1" Grid.Column="1"
HorizontalAlignment="Left" HorizontalAlignment="Left"
@ -89,7 +89,7 @@
Name="comboBox" Name="comboBox"
Width="200" Width="200"
Height="35" Height="35"
Margin="14,0,0,0" Margin="14 0 0 0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
ItemsSource="{Binding CustomExplorers}" ItemsSource="{Binding CustomExplorers}"
@ -101,11 +101,11 @@
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
</ComboBox> </ComboBox>
<Button <Button
Margin="10,0,0,0" Margin="10 0 0 0"
Click="btnAdd_Click" Click="btnAdd_Click"
Content="{DynamicResource add}" /> Content="{DynamicResource add}" />
<Button <Button
Margin="10,0,0,0" Margin="10 0 0 0"
Click="btnDelete_Click" Click="btnDelete_Click"
Content="{DynamicResource delete}" Content="{DynamicResource delete}"
IsEnabled="{Binding CustomExplorer.Editable}" /> IsEnabled="{Binding CustomExplorer.Editable}" />
@ -113,10 +113,10 @@
</StackPanel> </StackPanel>
<Rectangle <Rectangle
Height="1" Height="1"
Margin="0,20,0,12" Margin="0 20 0 12"
Fill="{StaticResource Color03B}" /> Fill="{StaticResource Color03B}" />
<StackPanel <StackPanel
Margin="0,0,0,0" Margin="0 0 0 0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
DataContext="{Binding CustomExplorer}" DataContext="{Binding CustomExplorer}"
Orientation="Horizontal"> Orientation="Horizontal">
@ -134,7 +134,7 @@
<TextBlock <TextBlock
Grid.Row="0" Grid.Row="0"
Grid.Column="0" Grid.Column="0"
Margin="14,5,20,0" Margin="14 5 20 0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="14" FontSize="14"
@ -144,7 +144,7 @@
Grid.Row="0" Grid.Row="0"
Grid.Column="1" Grid.Column="1"
Width="Auto" Width="Auto"
Margin="10,5,15,0" Margin="10 5 15 0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center" VerticalAlignment="Center"
IsEnabled="{Binding Editable}" IsEnabled="{Binding Editable}"
@ -152,7 +152,7 @@
<TextBlock <TextBlock
Grid.Row="1" Grid.Row="1"
Grid.Column="0" Grid.Column="0"
Margin="14,10,20,0" Margin="14 10 20 0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="14" FontSize="14"
@ -160,7 +160,7 @@
<DockPanel Grid.Row="1" Grid.Column="1"> <DockPanel Grid.Row="1" Grid.Column="1">
<Button <Button
Name="btnBrowseFile" Name="btnBrowseFile"
Margin="0,10,15,0" Margin="0 10 15 0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Click="btnBrowseFile_Click" Click="btnBrowseFile_Click"
@ -178,7 +178,7 @@
</Button> </Button>
<TextBox <TextBox
x:Name="PathTextBox" x:Name="PathTextBox"
Margin="10,10,10,0" Margin="10 10 10 0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center" VerticalAlignment="Center"
IsEnabled="{Binding Editable}" IsEnabled="{Binding Editable}"
@ -187,7 +187,7 @@
<TextBlock <TextBlock
Grid.Row="2" Grid.Row="2"
Grid.Column="0" Grid.Column="0"
Margin="14,10,20,0" Margin="14 10 20 0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="14" FontSize="14"
@ -198,7 +198,7 @@
Grid.Row="2" Grid.Row="2"
Grid.Column="1" Grid.Column="1"
Width="Auto" Width="Auto"
Margin="10,10,15,0" Margin="10 10 15 0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center" VerticalAlignment="Center"
IsEnabled="{Binding Editable}" IsEnabled="{Binding Editable}"
@ -206,7 +206,7 @@
<TextBlock <TextBlock
Grid.Row="3" Grid.Row="3"
Grid.Column="0" Grid.Column="0"
Margin="14,10,20,20" Margin="14 10 20 20"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="14" FontSize="14"
@ -217,7 +217,7 @@
Grid.Row="3" Grid.Row="3"
Grid.Column="1" Grid.Column="1"
Width="Auto" Width="Auto"
Margin="10,10,15,20" Margin="10 10 15 20"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center" VerticalAlignment="Center"
IsEnabled="{Binding Editable}" IsEnabled="{Binding Editable}"
@ -232,18 +232,18 @@
Grid.Row="2" Grid.Row="2"
Background="{DynamicResource PopupButtonAreaBGColor}" Background="{DynamicResource PopupButtonAreaBGColor}"
BorderBrush="{DynamicResource PopupButtonAreaBorderColor}" BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
BorderThickness="0,1,0,0"> BorderThickness="0 1 0 0">
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal"> <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
<Button <Button
x:Name="btnCancel" x:Name="btnCancel"
Width="145" Width="145"
Margin="0,0,5,0" Margin="0 0 5 0"
Click="btnCancel_Click" Click="btnCancel_Click"
Content="{DynamicResource cancel}" /> Content="{DynamicResource cancel}" />
<Button <Button
x:Name="btnDone" x:Name="btnDone"
Width="145" Width="145"
Margin="5,0,0,0" Margin="5 0 0 0"
Click="btnDone_Click" Click="btnDone_Click"
Content="{DynamicResource done}" Content="{DynamicResource done}"
ForceCursor="True"> ForceCursor="True">
@ -256,12 +256,6 @@
<DataTrigger Binding="{Binding Text.Length, ElementName=PathTextBox, UpdateSourceTrigger=PropertyChanged}" Value="0"> <DataTrigger Binding="{Binding Text.Length, ElementName=PathTextBox, UpdateSourceTrigger=PropertyChanged}" Value="0">
<Setter Property="IsEnabled" Value="False" /> <Setter Property="IsEnabled" Value="False" />
</DataTrigger> </DataTrigger>
<DataTrigger Binding="{Binding Text.Length, ElementName=directoryArgTextBox, UpdateSourceTrigger=PropertyChanged}" Value="0">
<Setter Property="IsEnabled" Value="False" />
</DataTrigger>
<DataTrigger Binding="{Binding Text.Length, ElementName=fileArgTextBox, UpdateSourceTrigger=PropertyChanged}" Value="0">
<Setter Property="IsEnabled" Value="False" />
</DataTrigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
</Button.Style> </Button.Style>