Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-05 02:36:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

[Run] Updated tooltip styling and fixed casing (#4877)

Browse Source 
* Added custom tooltip style (with theming support) that represents the UWP tooltip style.

* Removed unnecessary space in text

* Fixed run as admin casing

* Fixed casing for Indexer plugin
This commit is contained in:
Niels Laute
2020-07-10 21:06:57 +02:00
committed by GitHub
parent 412d80efe3
commit ec803d63c8
20 changed files with 68 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Languages/de.xaml
View File

@@ -4,7 +4,7 @@
<system:String x:Key="Microsoft_plugin_indexer_copy_path">Copy path (Ctrl+C)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_open_containing_folder">Open containing folder (Ctrl+Shift+E)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_run_as_administrator">Run As Administrator (Ctrl+Shift+Enter)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_run_as_administrator">Run as administrator (Ctrl+Shift+Enter)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_open_in_console">Open path in console (Ctrl+Shift+C)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_name">Name</system:String>
<system:String x:Key="Microsoft_plugin_indexer_path">Path</system:String>

2
src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Languages/en.xaml
View File

@@ -4,7 +4,7 @@
<system:String x:Key="Microsoft_plugin_indexer_copy_path">Copy path (Ctrl+C)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_open_containing_folder">Open containing folder (Ctrl+Shift+E)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_run_as_administrator">Run As Administrator (Ctrl+Shift+Enter)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_run_as_administrator">Run as administrator (Ctrl+Shift+Enter)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_open_in_console">Open path in console (Ctrl+Shift+C)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_name">Name</system:String>
<system:String x:Key="Microsoft_plugin_indexer_path">Path</system:String>

2
src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Languages/ja.xaml
View File

@@ -4,7 +4,7 @@
<system:String x:Key="Microsoft_plugin_indexer_copy_path">Copy path (Ctrl+C)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_open_containing_folder">Open containing folder (Ctrl+Shift+E)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_run_as_administrator">Run As Administrator (Ctrl+Shift+Enter)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_run_as_administrator">Run as administrator (Ctrl+Shift+Enter)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_open_in_console">Open path in console (Ctrl+Shift+C)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_name">Name</system:String>
<system:String x:Key="Microsoft_plugin_indexer_path">Path</system:String>

2
src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Languages/pl.xaml
View File

@@ -4,7 +4,7 @@
<system:String x:Key="Microsoft_plugin_indexer_copy_path">Copy path (Ctrl+C)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_open_containing_folder">Open containing folder (Ctrl+Shift+E)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_run_as_administrator">Run As Administrator (Ctrl+Shift+Enter)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_run_as_administrator">Run as administrator (Ctrl+Shift+Enter)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_open_in_console">Open path in console (Ctrl+Shift+C)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_name">Name</system:String>
<system:String x:Key="Microsoft_plugin_indexer_path">Path</system:String>

2
src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Languages/tr.xaml
View File

@@ -4,7 +4,7 @@
<system:String x:Key="Microsoft_plugin_indexer_copy_path">Copy path (Ctrl+C)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_open_containing_folder">Open containing folder (Ctrl+Shift+E)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_run_as_administrator">Run As Administrator (Ctrl+Shift+Enter)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_run_as_administrator">Run as administrator (Ctrl+Shift+Enter)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_open_in_console">Open path in console (Ctrl+Shift+C)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_name">Name</system:String>
<system:String x:Key="Microsoft_plugin_indexer_path">Path</system:String>

2
src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Languages/zh-cn.xaml
View File

@@ -4,7 +4,7 @@
<system:String x:Key="Microsoft_plugin_indexer_copy_path">Copy path (Ctrl+C)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_open_containing_folder">Open containing folder (Ctrl+Shift+E)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_run_as_administrator">Run As Administrator (Ctrl+Shift+Enter)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_run_as_administrator">Run as administrator (Ctrl+Shift+Enter)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_open_in_console">Open path in console (Ctrl+Shift+C)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_name">Name</system:String>
<system:String x:Key="Microsoft_plugin_indexer_path">Path</system:String>

2
src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Languages/zh-tw.xaml
View File

@@ -4,7 +4,7 @@
<system:String x:Key="Microsoft_plugin_indexer_copy_path">Copy path (Ctrl+C)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_open_containing_folder">Open containing folder (Ctrl+Shift+E)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_run_as_administrator">Run As Administrator (Ctrl+Shift+Enter)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_run_as_administrator">Run as administrator (Ctrl+Shift+Enter)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_open_in_console">Open path in console (Ctrl+Shift+C)</system:String>
<system:String x:Key="Microsoft_plugin_indexer_name">Name</system:String>
<system:String x:Key="Microsoft_plugin_indexer_path">Path</system:String>

18
src/modules/launcher/Plugins/Microsoft.Plugin.Program/Languages/en.xaml
View File

@@ -8,19 +8,19 @@
<system:String x:Key="wox_plugin_program_add">Add</system:String>
<system:String x:Key="wox_plugin_program_disable">Disable</system:String>
<system:String x:Key="wox_plugin_program_location">Location</system:String>
<system:String x:Key="wox_plugin_program_all_programs">All Programs</system:String>
<system:String x:Key="wox_plugin_program_suffixes">File Suffixes</system:String>
<system:String x:Key="wox_plugin_program_all_programs">All programs</system:String>
<system:String x:Key="wox_plugin_program_suffixes">File suffixes</system:String>
<system:String x:Key="wox_plugin_program_reindex">Reindex</system:String>
<system:String x:Key="wox_plugin_program_indexing">Indexing</system:String>
<system:String x:Key="wox_plugin_program_index_start">Index Start Menu</system:String>
<system:String x:Key="wox_plugin_program_index_registry">Index Registry</system:String>
<system:String x:Key="wox_plugin_program_index_start">Index start menu</system:String>
<system:String x:Key="wox_plugin_program_index_registry">Index registry</system:String>
<system:String x:Key="wox_plugin_program_suffixes_header">Suffixes</system:String>
<system:String x:Key="wox_plugin_program_max_depth_header">Max Depth</system:String>
<system:String x:Key="wox_plugin_program_max_depth_header">Max depth</system:String>
<system:String x:Key="wox_plugin_program_directory">Directory:</system:String>
<system:String x:Key="wox_plugin_program_browse">Browse</system:String>
<system:String x:Key="wox_plugin_program_file_suffixes">File Suffixes:</system:String>
<system:String x:Key="wox_plugin_program_max_search_depth">Maximum Search Depth (-1 is unlimited):</system:String>
<system:String x:Key="wox_plugin_program_file_suffixes">File suffixes:</system:String>
<system:String x:Key="wox_plugin_program_max_search_depth">Maximum search depth (-1 is unlimited):</system:String>
<system:String x:Key="wox_plugin_program_pls_select_program_source">Please select a program source</system:String>
<system:String x:Key="wox_plugin_program_delete_program_source">Are you sure you want to delete the selected program sources?</system:String>
@@ -31,8 +31,8 @@
<system:String x:Key="wox_plugin_program_update_file_suffixes">Successfully updated file suffixes</system:String>
<system:String x:Key="wox_plugin_program_suffixes_cannot_empty">File suffixes can't be empty</system:String>
<system:String x:Key="wox_plugin_program_run_as_different_user">Run As Different User</system:String>
<system:String x:Key="wox_plugin_program_run_as_administrator">Run As Administrator (Ctrl+Shift+Enter)</system:String>
<system:String x:Key="wox_plugin_program_run_as_different_user">Run as different user</system:String>
<system:String x:Key="wox_plugin_program_run_as_administrator">Run as administrator (Ctrl+Shift+Enter)</system:String>
<system:String x:Key="wox_plugin_program_open_containing_folder">Open containing folder (Ctrl+Shift+E)</system:String>
<system:String x:Key="wox_plugin_program_disable_program">Disable this program from displaying</system:String>
<system:String x:Key="wox_plugin_program_open_in_console">Open path in console (Ctrl+Shift+C)</system:String>

12
src/modules/launcher/Plugins/Microsoft.Plugin.Program/Languages/ja.xaml
View File

@@ -10,15 +10,15 @@
<system:String x:Key="wox_plugin_program_suffixes">Index file suffixes</system:String>
<system:String x:Key="wox_plugin_program_reindex">Reindex</system:String>
<system:String x:Key="wox_plugin_program_indexing">Indexing</system:String>
<system:String x:Key="wox_plugin_program_index_start">Index Start Menu</system:String>
<system:String x:Key="wox_plugin_program_index_registry">Index Registry</system:String>
<system:String x:Key="wox_plugin_program_index_start">Index start menu</system:String>
<system:String x:Key="wox_plugin_program_index_registry">Index registry</system:String>
<system:String x:Key="wox_plugin_program_suffixes_header">Suffixes</system:String>
<system:String x:Key="wox_plugin_program_max_depth_header">Max Depth</system:String>
<system:String x:Key="wox_plugin_program_max_depth_header">Max depth</system:String>
<system:String x:Key="wox_plugin_program_directory">Directory:</system:String>
<system:String x:Key="wox_plugin_program_browse">Browse</system:String>
<system:String x:Key="wox_plugin_program_file_suffixes">File Suffixes:</system:String>
<system:String x:Key="wox_plugin_program_max_search_depth">Maximum Search Depth (-1 is unlimited):</system:String>
<system:String x:Key="wox_plugin_program_file_suffixes">File suffixes:</system:String>
<system:String x:Key="wox_plugin_program_max_search_depth">Maximum search depth (-1 is unlimited):</system:String>
<system:String x:Key="wox_plugin_program_pls_select_program_source">Please select a program source</system:String>
<system:String x:Key="wox_plugin_program_delete_program_source">Are your sure to delete {0}?</system:String>
@@ -29,7 +29,7 @@
<system:String x:Key="wox_plugin_program_update_file_suffixes">Sucessfully update file suffixes</system:String>
<system:String x:Key="wox_plugin_program_suffixes_cannot_empty">File suffixes can't be empty</system:String>
<system:String x:Key="wox_plugin_program_run_as_administrator">Run As Administrator (Ctrl+Shift+Enter)</system:String>
<system:String x:Key="wox_plugin_program_run_as_administrator">Run as administrator (Ctrl+Shift+Enter)</system:String>
<system:String x:Key="wox_plugin_program_open_containing_folder">Open containing folder (Ctrl+Shift+E)</system:String>
<system:String x:Key="wox_plugin_program_open_in_console">Open path in console (Ctrl+Shift+C)</system:String>

4
src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/UWP.cs
View File

@@ -298,8 +298,8 @@ namespace Microsoft.Plugin.Program.Programs
result.TitleHighlightData = StringMatcher.FuzzySearch(query, Name).MatchData;
var toolTipTitle = string.Format("{0} : {1}", api.GetTranslation("powertoys_run_plugin_program_file_name"), result.Title);
var toolTipText = string.Format("{0} : {1}", api.GetTranslation("powertoys_run_plugin_program_file_path"), Package.Location);
var toolTipTitle = string.Format("{0}: {1}", api.GetTranslation("powertoys_run_plugin_program_file_name"), result.Title);
var toolTipText = string.Format("{0}: {1}", api.GetTranslation("powertoys_run_plugin_program_file_path"), Package.Location);
result.ToolTipData = new ToolTipData(toolTipTitle, toolTipText);
return result;

4
src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/Win32.cs
View File

@@ -193,8 +193,8 @@ namespace Microsoft.Plugin.Program.Programs
result.Title = Name;
result.TitleHighlightData = StringMatcher.FuzzySearch(query, Name).MatchData;
var toolTipTitle = string.Format("{0} : {1}", api.GetTranslation("powertoys_run_plugin_program_file_name"), result.Title);
var toolTipText = string.Format("{0} : {1}", api.GetTranslation("powertoys_run_plugin_program_file_path"), FullPath);
var toolTipTitle = string.Format("{0}: {1}", api.GetTranslation("powertoys_run_plugin_program_file_name"), result.Title);
var toolTipText = string.Format("{0}: {1}", api.GetTranslation("powertoys_run_plugin_program_file_path"), FullPath);
result.ToolTipData = new ToolTipData(toolTipTitle, toolTipText);
return result;

2
src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Languages/en.xaml
View File

@@ -10,5 +10,5 @@
<system:String x:Key="wox_plugin_cmd_plugin_description">Allows to execute system commands from Wox. Commands should start with ></system:String>
<system:String x:Key="wox_plugin_cmd_cmd_has_been_executed_times">this command has been executed {0} times</system:String>
<system:String x:Key="wox_plugin_cmd_execute_through_shell">execute command through command shell</system:String>
<system:String x:Key="wox_plugin_cmd_run_as_administrator">Run As Administrator (Ctrl+Shift+Enter)</system:String>
<system:String x:Key="wox_plugin_cmd_run_as_administrator">Run as administrator (Ctrl+Shift+Enter)</system:String>
</ResourceDictionary>

38
src/modules/launcher/PowerLauncher/ResultList.xaml
View File

@@ -120,6 +120,27 @@
</Trigger>
</Style.Triggers>
</Style>
<Style TargetType="{x:Type ToolTip}" >
<Setter Property="OverridesDefaultStyle" Value="true" />
<Setter Property="HasDropShadow" Value="True" />
<Setter Property="FontSize" Value="12" />
<Setter Property="Placement" Value="Bottom" />
<Setter Property="VerticalOffset" Value="0" />
<Setter Property="Padding" Value="8" />
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ToolTip}" >
<StackPanel Margin="8,2" >
<Border CornerRadius="4" Background="{DynamicResource ToolTipBackgroundBrushKey}" BorderBrush="{DynamicResource ToolTipBorderBrushKey}" BorderThickness="1">
<ContentPresenter Margin="4" HorizontalAlignment="Center" VerticalAlignment="Top" />
</Border>
</StackPanel>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>
</UserControl.Resources>
@@ -169,21 +190,18 @@
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<Grid.ToolTip>
<ToolTip
Visibility="{Binding Result.ToolTipVisibility}"
BorderThickness="1"
BorderBrush="{DynamicResource ToolTipBorderBrushKey}"
Background="{DynamicResource ToolTipBackgroundBrushKey}">
<StackPanel>
<ToolTip Visibility="{Binding Result.ToolTipVisibility}">
<StackPanel Margin="8,6">
<TextBlock
Style="{DynamicResource CollapsableTextblock}"
Foreground="{DynamicResource ToolTipForegroundBrushKey}" FontWeight="Bold" FontSize="12"
Text="{Binding Result.ToolTipData.Title}"
Foreground="{DynamicResource ToolTipForegroundBrushKey}"
TextWrapping="Wrap" />
<TextBlock
Style="{DynamicResource CollapsableTextblock}"
Foreground="{DynamicResource ToolTipForegroundBrushKey}" FontSize="12"
Text="{Binding Result.ToolTipData.Text}"
Foreground="{DynamicResource ToolTipForegroundBrushKey}"
TextWrapping="Wrap" />
</StackPanel>
</ToolTip>
@@ -217,7 +235,9 @@
<DataTemplate>
<Button Style="{StaticResource IconButtonStyle}" Command="{Binding Command}" VerticalAlignment="Center" Height="42" Width="42" BorderThickness="1" >
<ToolTipService.ToolTip>
<TextBlock Text="{Binding Title}"/>
<ToolTip >
<TextBlock Text="{Binding Title}" Foreground="{DynamicResource ToolTipForegroundBrushKey}" Margin="8,5" FontSize="12"/>
</ToolTip>
</ToolTipService.ToolTip>
<Button.Content>
<TextBlock FontFamily="{Binding FontFamily}" FontSize="16" Text="{Binding Glyph}"/>

4
src/modules/launcher/PowerLauncher/Themes/Dark.xaml
View File

@@ -44,7 +44,7 @@
<Color x:Key="ScrollBarLineButtonBackgroundPointerOver">#FF313131</Color>
<Color x:Key="ScrollBarLineButtonBackgroundPointerPressed">#FFa4a4a4</Color>
<SolidColorBrush x:Key="ToolTipBorderBrushKey" Color="#FFFFFFFF" />
<SolidColorBrush x:Key="ToolTipBorderBrushKey" Color="#5B000000" />
<SolidColorBrush x:Key="ToolTipForegroundBrushKey" Color="#FFFFFFFF" />
<SolidColorBrush x:Key="ToolTipBackgroundBrushKey" Color="#FF171717" />
<SolidColorBrush x:Key="ToolTipBackgroundBrushKey" Color="#FF2B2B2B" />
</ResourceDictionary>

4
src/modules/launcher/PowerLauncher/Themes/HighContrast1.xaml
View File

@@ -44,7 +44,7 @@
<Color x:Key="ScrollBarLineButtonBackgroundPointerOver">#FF000000</Color>
<Color x:Key="ScrollBarLineButtonBackgroundPointerPressed">#FF000000</Color>
<SolidColorBrush x:Key="ToolTipBorderBrushKey" Color="#FFFFFFFF" />
<SolidColorBrush x:Key="ToolTipBorderBrushKey" Color="#5B000000" />
<SolidColorBrush x:Key="ToolTipForegroundBrushKey" Color="#FFFFFFFF" />
<SolidColorBrush x:Key="ToolTipBackgroundBrushKey" Color="#FF171717" />
<SolidColorBrush x:Key="ToolTipBackgroundBrushKey" Color="#FF2B2B2B" />
</ResourceDictionary>

4
src/modules/launcher/PowerLauncher/Themes/HighContrast2.xaml
View File

@@ -44,7 +44,7 @@
<Color x:Key="ScrollBarLineButtonBackgroundPointerOver">#FF000000</Color>
<Color x:Key="ScrollBarLineButtonBackgroundPointerPressed">#FF000000</Color>
<SolidColorBrush x:Key="ToolTipBorderBrushKey" Color="#FFFFFFFF" />
<SolidColorBrush x:Key="ToolTipBorderBrushKey" Color="#5B000000" />
<SolidColorBrush x:Key="ToolTipForegroundBrushKey" Color="#FFFFFFFF" />
<SolidColorBrush x:Key="ToolTipBackgroundBrushKey" Color="#FF171717" />
<SolidColorBrush x:Key="ToolTipBackgroundBrushKey" Color="#FF2B2B2B" />
</ResourceDictionary>

4
src/modules/launcher/PowerLauncher/Themes/HighContrastBlack.xaml
View File

@@ -43,7 +43,7 @@
<Color x:Key="ScrollBarLineButtonBackgroundPointerOver">#FF000000</Color>
<Color x:Key="ScrollBarLineButtonBackgroundPointerPressed">#FF000000</Color>
<SolidColorBrush x:Key="ToolTipBorderBrushKey" Color="#FFFFFFFF" />
<SolidColorBrush x:Key="ToolTipBorderBrushKey" Color="#5B000000" />
<SolidColorBrush x:Key="ToolTipForegroundBrushKey" Color="#FFFFFFFF" />
<SolidColorBrush x:Key="ToolTipBackgroundBrushKey" Color="#FF171717" />
<SolidColorBrush x:Key="ToolTipBackgroundBrushKey" Color="#FF2B2B2B" />
</ResourceDictionary>

4
src/modules/launcher/PowerLauncher/Themes/HighContrastWhite.xaml
View File

@@ -43,7 +43,7 @@
<Color x:Key="ScrollBarLineButtonBackgroundPointerOver">#FF000000</Color>
<Color x:Key="ScrollBarLineButtonBackgroundPointerPressed">#FF000000</Color>
<SolidColorBrush x:Key="ToolTipBorderBrushKey" Color="#FF000000" />
<SolidColorBrush x:Key="ToolTipBorderBrushKey" Color="#FFD0D0D0" />
<SolidColorBrush x:Key="ToolTipForegroundBrushKey" Color="#FF000000" />
<SolidColorBrush x:Key="ToolTipBackgroundBrushKey" Color="#FFF2F2F2" />
<SolidColorBrush x:Key="ToolTipBackgroundBrushKey" Color="#FFFBFBFB" />
</ResourceDictionary>

4
src/modules/launcher/PowerLauncher/Themes/Light.xaml
View File

@@ -43,7 +43,7 @@
<Color x:Key="ScrollBarLineButtonBackgroundPointerOver">#FFd2d2d2</Color>
<Color x:Key="ScrollBarLineButtonBackgroundPointerPressed">#FF5d5d5d</Color>
<SolidColorBrush x:Key="ToolTipBorderBrushKey" Color="#FF000000" />
<SolidColorBrush x:Key="ToolTipBorderBrushKey" Color="#FFD0D0D0" />
<SolidColorBrush x:Key="ToolTipForegroundBrushKey" Color="#FF000000" />
<SolidColorBrush x:Key="ToolTipBackgroundBrushKey" Color="#FFF2F2F2" />
<SolidColorBrush x:Key="ToolTipBackgroundBrushKey" Color="#FFFBFBFB" />
</ResourceDictionary>

BIN
src/modules/powerrename/ui/PowerRename.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 81 KiB

After

Width:  |  Height:  |  Size: 98 KiB