mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-01-18 22:43:31 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Fix #565

Browse Source 
1. Fix resultlistbox visibility
2. Fix #565
3. Remove unused convertor
This commit is contained in:
bao-qian 2016-04-24 17:06:23 +01:00
parent c2de80f532
commit 07fe141f8a
7 changed files with 7 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Wox/Converters/OpacityModeConverter.cs
View File

@ -1,40 +0,0 @@
using System;
using System.Globalization;
using Wox.Core.UserSettings;
namespace Wox.Converters
{
public class OpacityModeConverter : ConvertorBase<OpacityModeConverter>
{
public override object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
if (!(value is OpacityMode)) return value.ToString();
var mode = (OpacityMode) value;
switch (mode)
{
case OpacityMode.Normal:
return "Normal Window";
case OpacityMode.LayeredWindow:
{
if (Environment.OSVersion.Version.Major < 5)
return "Layered Window (not supported by your Windows)";
if (Environment.OSVersion.Version.Major == 5)
return "Layered Window (not recommended on your Windows)";
return "Layered Window";
}
case OpacityMode.DWM:
{
if (Environment.OSVersion.Version.Major < 6)
return "DWM-Enabled Window (not supported by your Windows)";
return "DWM-Enabled Window";
}
}
return value.ToString();
}
public override object ProvideValue(IServiceProvider serviceProvider)
{
return this;
}
}
}

18
Wox/Converters/StringEmptyConverter.cs
View File

@ -1,18 +0,0 @@
using System;
using System.Globalization;
namespace Wox.Converters
{
public class StringEmptyConverter : ConvertorBase<StringEmptyConverter>
{
public override object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
return string.IsNullOrEmpty((string)value) ? parameter : value;
}
public override object ProvideValue(IServiceProvider serviceProvider)
{
return this;
}
}
}

45
Wox/Converters/StringNullOrEmptyToVisibilityConverter.cs
View File

@ -1,45 +0,0 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Windows;
using Wox.Plugin;
namespace Wox.Converters
{
public class StringNullOrEmptyToVisibilityConverter : ConvertorBase<StringNullOrEmptyToVisibilityConverter>
{
public override object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
return string.IsNullOrEmpty(value as string) ? Visibility.Collapsed : Visibility.Visible;
}
public override object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
return null;
}
public override object ProvideValue(IServiceProvider serviceProvider)
{
return this;
}
}
public class ContextMenuEmptyToWidthConverter : ConvertorBase<ContextMenuEmptyToWidthConverter>
{
public override object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
List<Result> results = value as List<Result>;
return results == null || results.Count == 0 ? 0 : 17;
}
public override object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
return null;
}
public override object ProvideValue(IServiceProvider serviceProvider)
{
return this;
}
}
}

1
Wox/ResultListBox.xaml
View File

@ -45,7 +45,6 @@
VerticalAlignment="Center" ToolTip="{Binding Title}" x:Name="tbTitle"
Text="{Binding Title}" />
<TextBlock Style="{DynamicResource ItemSubTitleStyle}" ToolTip="{Binding SubTitle}"
Visibility="{Binding SubTitle, Converter={converters:StringNullOrEmptyToVisibilityConverter}}"
Grid.Row="1" x:Name="tbSubTitle" Text="{Binding SubTitle}" />
</Grid>
</Grid>

4
Wox/SettingWindow.xaml
View File

@ -79,7 +79,6 @@
<TextBlock VerticalAlignment="Center" ToolTip="{Binding Metadata.Name}"
x:Name="tbTitle" Text="{Binding Metadata.Name}" />
<TextBlock ToolTip="{Binding Metadata.Description}"
Visibility="{Binding Metadata.Description, Converter={converters:StringNullOrEmptyToVisibilityConverter}}"
Grid.Row="1" x:Name="tbSubTitle"
Text="{Binding Metadata.Description}" Opacity="0.5" />
</Grid>
@ -115,8 +114,7 @@
x:Name="pluginAuthor" Text="{DynamicResource author}" />
</DockPanel>
<TextBlock Grid.Row="1" x:Name="pluginSubTitle" Opacity="0.5"
ToolTip="{Binding Source=pluginSubTitle, Path=Text}"
Visibility="{Binding Source=pluginSubTitle, Path=Text, Converter={converters:StringNullOrEmptyToVisibilityConverter}}" />
ToolTip="{Binding Source=pluginSubTitle, Path=Text}"/>
<DockPanel Grid.Row="2" Margin="0 10 0 8">
<CheckBox x:Name="cbDisablePlugin" Click="CbDisablePlugin_OnClick">
<TextBlock Text="{DynamicResource disable}" />

6
Wox/ViewModel/MainViewModel.cs
View File

@ -389,6 +389,7 @@ namespace Wox.ViewModel
else
{
Results.Clear();
ResultListBoxVisibility = Visibility.Collapsed;
}
}
}
@ -565,6 +566,11 @@ namespace Wox.ViewModel
{
ResultListBoxVisibility = Visibility.Visible;
}
else
{
ResultListBoxVisibility = Visibility.Collapsed;
}
}
#endregion

3
Wox/Wox.csproj
View File

@ -124,9 +124,6 @@
<Compile Include="CommandArgs\ToggleCommandArg.cs" />
<Compile Include="Converters\ConvertorBase.cs" />
<Compile Include="Converters\ImagePathConverter.cs" />
<Compile Include="Converters\OpacityModeConverter.cs" />
<Compile Include="Converters\StringEmptyConverter.cs" />
<Compile Include="Converters\StringNullOrEmptyToVisibilityConverter.cs" />
<Compile Include="Helper\VisibilityExtensions.cs" />
<Compile Include="Helper\SingletonWindowOpener.cs" />
<Compile Include="ImageLoader\ImageCache.cs" />