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 #395 from Flow-Launcher/FixPluginSettingUIDev

Browse source 
Increase the default width and allow user to resize setting window, and reduce the margin for PluginDirectory
This commit is contained in:
Jeremy Wu 2021-03-31 06:48:57 +11:00 committed by GitHub
commit 923367c0a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 62 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

108
Flow.Launcher/SettingWindow.xaml
View file

@ -13,9 +13,11 @@
mc:Ignorable="d" mc:Ignorable="d"
Icon="Images\app.ico" Icon="Images\app.ico"
Title="{DynamicResource flowlauncher_settings}" Title="{DynamicResource flowlauncher_settings}"
ResizeMode="NoResize" ResizeMode="CanResizeWithGrip"
WindowStartupLocation="CenterScreen" WindowStartupLocation="CenterScreen"
Height="600" Width="800" Height="600" Width="900"
MinWidth="850"
MinHeight="500"
Closed="OnClosed" Closed="OnClosed"
d:DataContext="{d:DesignInstance vm:SettingWindowViewModel}"> d:DataContext="{d:DesignInstance vm:SettingWindowViewModel}">
<Window.InputBindings> <Window.InputBindings>
@ -141,60 +143,58 @@
<ColumnDefinition Width="48" /> <ColumnDefinition Width="48" />
<ColumnDefinition /> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Image Source="{Binding Image, IsAsync=True}" <Image Source="{Binding Image, IsAsync=True}"
Width="48" Height="48" HorizontalAlignment="Left" VerticalAlignment="Top" /> Width="48" Height="48"
<Grid Margin="10,0,0,0" Grid.Column="1" HorizontalAlignment="Stretch"> HorizontalAlignment="Left" VerticalAlignment="Top"
<Grid.RowDefinitions> Grid.RowSpan="2"/>
<RowDefinition /> <Grid Grid.Row="0" Grid.Column="1"
<RowDefinition /> Margin="20,0,0,0">
<RowDefinition /> <TextBlock Text="{Binding PluginPair.Metadata.Name}"
</Grid.RowDefinitions> Grid.Column="0"
<Grid Grid.Row="0"> Cursor="Hand" MouseUp="OnPluginNameClick" FontSize="24"
<Grid.ColumnDefinitions> HorizontalAlignment="Left">
<ColumnDefinition /> <ToolTipService.ToolTip>
<ColumnDefinition /> <TextBlock>
</Grid.ColumnDefinitions> <Run Text="{DynamicResource author}" />
<TextBlock Text="{Binding PluginPair.Metadata.Name}" <Run Text=": " />
Grid.Column="0" <Run Text="{Binding PluginPair.Metadata.Author}" />
Cursor="Hand" MouseUp="OnPluginNameClick" FontSize="24" </TextBlock>
HorizontalAlignment="Left"> </ToolTipService.ToolTip>
<ToolTipService.ToolTip> </TextBlock>
<TextBlock> <ui:ToggleSwitch Grid.Column="1" OffContent="{DynamicResource disable}" OnContent="{DynamicResource enable}"
<Run Text="{DynamicResource author}" /> MaxWidth="110" HorizontalAlignment="Right"
<Run Text=": " /> IsOn="{Binding PluginState}"/>
<Run Text="{Binding PluginPair.Metadata.Author}" />
</TextBlock>
</ToolTipService.ToolTip>
</TextBlock>
<ui:ToggleSwitch Grid.Column="1" OffContent="{DynamicResource disable}" OnContent="{DynamicResource enable}"
MaxWidth="110" HorizontalAlignment="Right"
IsOn="{Binding PluginState}"/>
</Grid>
<TextBlock Text="{Binding PluginPair.Metadata.Description}"
Grid.Row="1" Opacity="0.5" />
<DockPanel Grid.Row="2" Margin="0 10 0 8" HorizontalAlignment="Right">
<TextBlock Text="Priority" Margin="20,0,0,0"/>
<TextBlock Text="{Binding Priority}"
ToolTip="Change Plugin Results Priority"
Margin="5 0 0 0" Cursor="Hand" Foreground="Blue"
MouseUp="OnPluginPriorityClick"/>
<TextBlock Text="{DynamicResource actionKeywords}"
Visibility="{Binding ActionKeywordsVisibility}"
Margin="5 0 0 0"/>
<TextBlock Text="{Binding ActionKeywordsText}"
Visibility="{Binding ActionKeywordsVisibility}"
ToolTip="Change Action Keywords"
Margin="5 0 0 0" Cursor="Hand" Foreground="Blue"
MouseUp="OnPluginActionKeywordsClick" MaxWidth="100" />
<TextBlock Text="{DynamicResource plugin_init_time}" Margin="10 0 0 0" MaxWidth="100"/>
<TextBlock Text="{Binding InitilizaTime}" Margin="5 0 0 0" MaxWidth="100"/>
<TextBlock Text="{DynamicResource plugin_query_time}" Margin="10 0 0 0" MaxWidth="100"/>
<TextBlock Text="{Binding QueryTime}" Margin="5 0 0 0" MaxWidth="100"/>
<TextBlock Text="{DynamicResource pluginDirectory}"
MaxWidth="100" Cursor="Hand" Margin="40 0 0 0"
MouseUp="OnPluginDirecotyClick" Foreground="Blue" />
</DockPanel>
</Grid> </Grid>
<TextBlock Margin="20,0,0,0"
Text="{Binding PluginPair.Metadata.Description}"
Grid.Row="1" Opacity="0.5" Grid.Column="2" />
<DockPanel Grid.ColumnSpan="2" Grid.Row="2" Margin="0 10 0 8" HorizontalAlignment="Right">
<TextBlock Text="Priority" Margin="15,0,0,0" MaxWidth="100"/>
<TextBlock Text="{Binding Priority}"
ToolTip="Change Plugin Results Priority"
Margin="5 0 0 0" Cursor="Hand" Foreground="Blue"
MouseUp="OnPluginPriorityClick"/>
<TextBlock Text="{DynamicResource actionKeywords}"
Visibility="{Binding ActionKeywordsVisibility}"
Margin="5 0 0 0"/>
<TextBlock Text="{Binding ActionKeywordsText}"
Visibility="{Binding ActionKeywordsVisibility}"
ToolTip="Change Action Keywords"
Margin="5 0 0 0" Cursor="Hand" Foreground="Blue"
MouseUp="OnPluginActionKeywordsClick" MaxWidth="100" />
<TextBlock Text="{DynamicResource plugin_init_time}" Margin="10 0 0 0" MaxWidth="100"/>
<TextBlock Text="{Binding InitilizaTime}" Margin="5 0 0 0" MaxWidth="100"/>
<TextBlock Text="{DynamicResource plugin_query_time}" Margin="10 0 0 0" MaxWidth="100"/>
<TextBlock Text="{Binding QueryTime}" Margin="5 0 0 0" MaxWidth="100"/>
<TextBlock Text="{DynamicResource pluginDirectory}"
MaxWidth="120" Cursor="Hand" Margin="10,0,0,0"
MouseUp="OnPluginDirecotyClick" Foreground="Blue" />
</DockPanel>
</Grid> </Grid>
</ContentControl> </ContentControl>

2
Plugins/Flow.Launcher.Plugin.ProcessKiller/plugin.json
View file

@ -2,7 +2,7 @@
"ID":"b64d0a79-329a-48b0-b53f-d658318a1bf6", "ID":"b64d0a79-329a-48b0-b53f-d658318a1bf6",
"ActionKeyword":"kill", "ActionKeyword":"kill",
"Name":"Process Killer", "Name":"Process Killer",
"Description":"kill running processes from Flow", "Description":"Kill running processes from Flow",
"Author":"Flow-Launcher", "Author":"Flow-Launcher",
"Version":"1.2.2", "Version":"1.2.2",
"Language":"csharp", "Language":"csharp",

2
Plugins/Flow.Launcher.Plugin.Shell/plugin.json
View file

@ -2,7 +2,7 @@
"ID": "D409510CD0D2481F853690A07E6DC426", "ID": "D409510CD0D2481F853690A07E6DC426",
"ActionKeyword": ">", "ActionKeyword": ">",
"Name": "Shell", "Name": "Shell",
"Description": "Provide executing commands from Flow Launcher. Commands should start with >", "Description": "Provide executing commands from Flow Launcher",
"Author": "qianlifeng", "Author": "qianlifeng",
"Version": "1.2.0", "Version": "1.2.0",
"Language": "csharp", "Language": "csharp",

2
Plugins/Flow.Launcher.Plugin.Sys/Languages/en.xaml
View file

@ -18,6 +18,8 @@
<system:String x:Key="flowlauncher_plugin_sys_hibernate">Hibernate computer</system:String> <system:String x:Key="flowlauncher_plugin_sys_hibernate">Hibernate computer</system:String>
<system:String x:Key="flowlauncher_plugin_sys_save_all_settings">Save all Flow Launcher settings</system:String> <system:String x:Key="flowlauncher_plugin_sys_save_all_settings">Save all Flow Launcher settings</system:String>
<system:String x:Key="flowlauncher_plugin_sys_reload_plugin_data">Refreshes plugin data with new content</system:String> <system:String x:Key="flowlauncher_plugin_sys_reload_plugin_data">Refreshes plugin data with new content</system:String>
<system:String x:Key="flowlauncher_plugin_sys_open_log_location">Open Flow Launcher's log location</system:String>
<system:String x:Key="flowlauncher_plugin_sys_check_for_update">Check for new Flow Launcher update</system:String>
<!--Dialogs--> <!--Dialogs-->
<system:String x:Key="flowlauncher_plugin_sys_dlgtitle_success">Success</system:String> <system:String x:Key="flowlauncher_plugin_sys_dlgtitle_success">Success</system:String>

4
Plugins/Flow.Launcher.Plugin.Sys/Main.cs
View file

@ -261,7 +261,7 @@ namespace Flow.Launcher.Plugin.Sys
new Result new Result
{ {
Title = "Check For Update", Title = "Check For Update",
SubTitle = "Check for new Flow Launcher update", SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_check_for_update"),
IcoPath = "Images\\checkupdate.png", IcoPath = "Images\\checkupdate.png",
Action = c => Action = c =>
{ {
@ -273,7 +273,7 @@ namespace Flow.Launcher.Plugin.Sys
new Result new Result
{ {
Title = "Open Log Location", Title = "Open Log Location",
SubTitle = "Open Log Position", SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_open_log_location"),
IcoPath = "Images\\app.png", IcoPath = "Images\\app.png",
Action = c => Action = c =>
{ {

4
Plugins/Flow.Launcher.Plugin.Sys/plugin.json
View file

@ -2,9 +2,9 @@
"ID": "CEA08895D2544B019B2E9C5009600DF4", "ID": "CEA08895D2544B019B2E9C5009600DF4",
"ActionKeyword": "*", "ActionKeyword": "*",
"Name": "System Commands", "Name": "System Commands",
"Description": "Provide System related commands. e.g. shutdown,lock,setting etc.", "Description": "Provide System related commands. e.g. shutdown,lock, setting etc.",
"Author": "qianlifeng", "Author": "qianlifeng",
"Version": "1.2.2", "Version": "1.2.3",
"Language": "csharp", "Language": "csharp",
"Website": "https://github.com/Flow-Launcher/Flow.Launcher", "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
"ExecuteFileName": "Flow.Launcher.Plugin.Sys.dll", "ExecuteFileName": "Flow.Launcher.Plugin.Sys.dll",