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

Merge pull request #12 from Demo-Liu/2.0

Browse Source 
2.0正式版
This commit is contained in:
Demo-Liu
2021-07-28 13:43:43 +08:00
committed by GitHub
parent 3c89d93cf7 27e9b56b4d
commit 0107ac8317
5 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
App.config
View File

@@ -24,7 +24,7 @@
</assemblyBinding>
</runtime>
<appSettings>
<add key="Version" value="1.0-beta" />
<add key="Version" value="2.0" />
<add key="GitHubUrl" value="https://github.com/Demo-Liu/GeekDesk" />
<add key="GiteeUrl" value="https://gitee.com/demo_liu/GeekDesk/tree/master" />

1
App.xaml.cs
View File

@@ -3,6 +3,7 @@ using Microsoft.Win32;
using System;
using System.IO;
using System.Windows;
using System.Windows.Media.Animation;
using System.Windows.Threading;
namespace GeekDesk

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

@@ -96,12 +96,12 @@
<TextBlock MaxWidth="80"
Margin="0,5,0,0"
MaxHeight="40"
FontSize="13"
TextWrapping="Wrap"
TextTrimming="WordEllipsis"
TextAlignment="Center"
VerticalAlignment="Center"
Text="{Binding Name}"/>
</StackPanel>
</DataTemplate>
</ListBox.ItemTemplate>

8
Control/UserControls/PannelCard/RightCardControl.xaml.cs
View File

@@ -190,6 +190,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
iconInfo.Name = path;
}
MainWindow.appData.MenuList[appData.AppConfig.SelectedMenuIndex].IconList.Add(iconInfo);
CommonCode.SaveAppData(MainWindow.appData);
}
}
@@ -232,7 +233,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
private void StackPanel_MouseLeave(object sender, MouseEventArgs e)
{
ImgStroyBoard(sender, (int)MainWindowEnum.IMAGE_HEIGHT, (int)MainWindowEnum.IMAGE_WIDTH, 500);
ImgStroyBoard(sender, (int)MainWindowEnum.IMAGE_HEIGHT, (int)MainWindowEnum.IMAGE_WIDTH, 250);
}
@@ -245,6 +246,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
Image img = sp.Children[0] as Image;
DoubleAnimation heightAnimation = new DoubleAnimation();
DoubleAnimation widthAnimation = new DoubleAnimation();
@@ -257,6 +259,10 @@ namespace GeekDesk.Control.UserControls.PannelCard
heightAnimation.Duration = new Duration(TimeSpan.FromMilliseconds(milliseconds));
widthAnimation.Duration = new Duration(TimeSpan.FromMilliseconds(milliseconds));
Timeline.SetDesiredFrameRate(heightAnimation, 60);
Timeline.SetDesiredFrameRate(widthAnimation, 60);
img.BeginAnimation(HeightProperty, heightAnimation);
img.BeginAnimation(WidthProperty, widthAnimation);
}

10
Update.json
View File

@@ -1,9 +1,9 @@
{
"title" : "<22>汾<EFBFBD><E6B1BE><EFBFBD><EFBFBD>",
"subTitle" : "V1.0-beta",
"subTitle" : "V2.0 <20><>ʽ<EFBFBD><CABD>",
"msgTitle" : "<22><><EFBFBD>θ<EFBFBD><CEB8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
"msg" : "['<27><><EFBFBD>²<EFBFBD><EFBFBD><EFBFBD>1','<27><><EFBFBD>²<EFBFBD><EFBFBD><EFBFBD>23']",
"githubUrl" : "https://github.com/Demo-Liu/GeekDesk/releases/tag/1.0-beta",
"giteeUrl" : "https://gitee.com/demo_liu/GeekDesk/releases/1.0-beta",
"version": "1.0-beta"
"msg" : "['<27><><EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>²<EFBFBD><EFBFBD>ٵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD>','<27>޸<EFBFBD><DEB8><EFBFBD>ʷ<EFBFBD><CAB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>񱣴<EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>bug','<27>޸<EFBFBD>ijЩͼ<D0A9><CDBC><EFBFBD><EFBFBD>ȡ<EFBFBD><C8A1>С<EFBFBD><D0A1>bug','<27><><EFBFBD>Ӵ<EFBFBD><D3B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>óɹ<C3B3><C9B9><EFBFBD><EFBFBD>ѹ<EFBFBD><D1B9><EFBFBD>','<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģʽ','<27><><EFBFBD>ӵ<EFBFBD><EFBFBD><EFBFBD>ϵͳ<EFBFBD>˵<EFBFBD>']",
"githubUrl" : "https://github.com/Demo-Liu/GeekDesk/releases/tag/2.0",
"giteeUrl" : "https://gitee.com/demo_liu/GeekDesk/releases/2.0",
"version": "2.0"
}