admin/GeekDesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

⬆️ 升级依赖

Browse Source
This commit is contained in:
BookerLiu
2023-03-20 14:19:56 +08:00
parent c1e83e8a39
commit 80a9975140
6 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Control/UserControls/Config/OtherControl.xaml
View File

@@ -29,11 +29,13 @@
</CheckBox> </CheckBox>
</hc:UniformSpacingPanel> </hc:UniformSpacingPanel>
<hc:UniformSpacingPanel Spacing="10" Margin="20,6,0,0"> <hc:UniformSpacingPanel Spacing="10" Margin="20,6,0,0">
<CheckBox Content="性能模式" IsChecked="{Binding PMModel}" <CheckBox Content="性能模式" IsChecked="{Binding PMModel}"
hc:Poptip.HitMode="None" hc:Poptip.HitMode="None"
hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
hc:Poptip.Content="开启性能模式将取消图标动画效果" hc:Poptip.Content="开启性能模式将取消图标动画效果"
hc:Poptip.Placement="TopLeft"> hc:Poptip.Placement="LeftTop"
hc:Poptip.VerticalOffset="-35"
hc:Poptip.HorizontalOffset="-15">
<CheckBox.Background> <CheckBox.Background>
<LinearGradientBrush EndPoint="1,0" StartPoint="0,0"> <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
<GradientStop Color="#FF9EA3A6"/> <GradientStop Color="#FF9EA3A6"/>
@@ -47,7 +49,9 @@
hc:Poptip.HitMode="None" hc:Poptip.HitMode="None"
hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
hc:Poptip.Content="仅Win11有效" hc:Poptip.Content="仅Win11有效"
hc:Poptip.Placement="TopLeft"> hc:Poptip.Placement="LeftTop"
hc:Poptip.VerticalOffset="-35"
hc:Poptip.HorizontalOffset="-1">
<CheckBox.Background> <CheckBox.Background>
<LinearGradientBrush EndPoint="1,0" StartPoint="0,0"> <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
<GradientStop Color="#FF9EA3A6"/> <GradientStop Color="#FF9EA3A6"/>
@@ -112,8 +116,10 @@
<hc:UniformSpacingPanel Spacing="10" Margin="20,8,0,0"> <hc:UniformSpacingPanel Spacing="10" Margin="20,8,0,0">
<Button Content="备份数据" <Button Content="备份数据"
hc:Poptip.Content="当数据文件损坏时, 以便能够恢复部分数据 (损坏时将有操作提示)" hc:Poptip.Content="当数据文件损坏时, 以便能够恢复部分数据 (损坏时将有操作提示)"
hc:Poptip.Placement="TopLeft" hc:Poptip.Placement="LeftTop"
hc:Poptip.Offset="10" hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
hc:Poptip.VerticalOffset="-35"
hc:Poptip.HorizontalOffset="-15"
Style="{StaticResource Btn1}" Style="{StaticResource Btn1}"
Click="BakDataFile"/> Click="BakDataFile"/>
</hc:UniformSpacingPanel> </hc:UniformSpacingPanel>

4
Control/UserControls/Config/ThemeControl.xaml
View File

@@ -100,7 +100,9 @@
hc:Poptip.HitMode="None" hc:Poptip.HitMode="None"
hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
hc:Poptip.Content="{Binding GradientBGParam.Name, Converter={StaticResource StringAppendConvert}, ConverterParameter=当前设置: \{\}}" hc:Poptip.Content="{Binding GradientBGParam.Name, Converter={StaticResource StringAppendConvert}, ConverterParameter=当前设置: \{\}}"
hc:Poptip.Placement="Top" hc:Poptip.Placement="LeftTop"
hc:Poptip.VerticalOffset="-35"
hc:Poptip.HorizontalOffset="-15"
Click="SysBG_Click" Click="SysBG_Click"
/> />
</StackPanel> </StackPanel>

3
Control/UserControls/PannelCard/RightCardControl.xaml
View File

@@ -170,7 +170,6 @@
<ListBox.Template> <ListBox.Template>
<ControlTemplate TargetType="ListBox"> <ControlTemplate TargetType="ListBox">
<hc:ScrollViewer x:Name="WrapScroll" <hc:ScrollViewer x:Name="WrapScroll"
Orientation="Vertical"
HorizontalScrollBarVisibility="Hidden" HorizontalScrollBarVisibility="Hidden"
VerticalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"
IsInertiaEnabled="True" IsInertiaEnabled="True"
@@ -296,7 +295,7 @@
> >
<ListBox.Template> <ListBox.Template>
<ControlTemplate TargetType="ListBox"> <ControlTemplate TargetType="ListBox">
<hc:ScrollViewer Orientation="Vertical" <hc:ScrollViewer
HorizontalScrollBarVisibility="Hidden" HorizontalScrollBarVisibility="Hidden"
VerticalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"
IsInertiaEnabled="True" IsInertiaEnabled="True"

4
GeekDesk.csproj
View File

@@ -85,8 +85,8 @@
<Reference Include="Gma.System.MouseKeyHook, Version=5.6.130.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Gma.System.MouseKeyHook, Version=5.6.130.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\MouseKeyHook.5.6.0\lib\net40\Gma.System.MouseKeyHook.dll</HintPath> <HintPath>packages\MouseKeyHook.5.6.0\lib\net40\Gma.System.MouseKeyHook.dll</HintPath>
</Reference> </Reference>
<Reference Include="HandyControl, Version=3.3.0.0, Culture=neutral, PublicKeyToken=45be8712787a1e5b, processorArchitecture=MSIL"> <Reference Include="HandyControl, Version=3.4.0.0, Culture=neutral, PublicKeyToken=45be8712787a1e5b, processorArchitecture=MSIL">
<HintPath>packages\HandyControl.3.3.0\lib\net472\HandyControl.dll</HintPath> <HintPath>packages\HandyControl.3.4.0\lib\net472\HandyControl.dll</HintPath>
</Reference> </Reference>
<Reference Include="KeyMouseHook, Version=1.0.6.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="KeyMouseHook, Version=1.0.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\KeyMouseHook.1.0.6\lib\net40\KeyMouseHook.dll</HintPath> <HintPath>packages\KeyMouseHook.1.0.6\lib\net40\KeyMouseHook.dll</HintPath>

6
Util/CommonCode.cs
View File

@@ -43,6 +43,12 @@ namespace GeekDesk.Util
{ {
BinaryFormatter bf = new BinaryFormatter(); BinaryFormatter bf = new BinaryFormatter();
appData = bf.Deserialize(fs) as AppData; appData = bf.Deserialize(fs) as AppData;
//将菜单密码写入文件
if (!string.IsNullOrEmpty(appData.AppConfig.MenuPassword))
{
SavePassword(appData.AppConfig.MenuPassword);
}
} }
} }
catch catch

2
packages.config
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="CommonServiceLocator" version="2.0.6" targetFramework="net452" requireReinstallation="true" /> <package id="CommonServiceLocator" version="2.0.6" targetFramework="net452" requireReinstallation="true" />
<package id="HandyControl" version="3.3.0" targetFramework="net472" /> <package id="HandyControl" version="3.4.0" targetFramework="net472" />
<package id="KeyMouseHook" version="1.0.6" targetFramework="net472" developmentDependency="true" /> <package id="KeyMouseHook" version="1.0.6" targetFramework="net472" developmentDependency="true" />
<package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="net472" developmentDependency="true" /> <package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="net472" developmentDependency="true" />
<package id="Microsoft.Extensions.Logging.Abstractions" version="2.1.1" targetFramework="net472" /> <package id="Microsoft.Extensions.Logging.Abstractions" version="2.1.1" targetFramework="net472" />