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

更新版本信息

Browse Source
This commit is contained in:
liufei
2021-09-15 10:12:44 +08:00
parent 3d877092e5
commit b097001e6c
6 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
App.config
View File

@@ -28,7 +28,7 @@
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<appSettings> <appSettings>
<add key="Version" value="2.3.11" /> <add key="Version" value="2.3.20" />
<add key="GitHubUrl" value="https://github.com/Demo-Liu/GeekDesk" /> <add key="GitHubUrl" value="https://github.com/Demo-Liu/GeekDesk" />
<add key="GiteeUrl" value="https://gitee.com/demo_liu/GeekDesk/tree/master" /> <add key="GiteeUrl" value="https://gitee.com/demo_liu/GeekDesk/tree/master" />
<add key="GitHubUpdateUrl" value="https://demo-liu.github.io/GeekDesk/Update.json" /> <add key="GitHubUpdateUrl" value="https://demo-liu.github.io/GeekDesk/Update.json" />

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

@@ -7,13 +7,13 @@
xmlns:local="clr-namespace:GeekDesk.Control.UserControls.PannelCard" xmlns:local="clr-namespace:GeekDesk.Control.UserControls.PannelCard"
xmlns:hc="https://handyorg.github.io/handycontrol" xmlns:hc="https://handyorg.github.io/handycontrol"
mc:Ignorable="d" mc:Ignorable="d"
Background="AliceBlue" Background="Transparent"
d:DesignHeight="400" d:DesignWidth="500"> d:DesignHeight="400" d:DesignWidth="500">
<UserControl.Resources> <UserControl.Resources>
<cvt:UpdateTypeConvert x:Key="UpdateTypeConvert"/> <cvt:UpdateTypeConvert x:Key="UpdateTypeConvert"/>
</UserControl.Resources> </UserControl.Resources>
<Grid MouseDown="DragMove" Background="AliceBlue"> <Grid MouseDown="DragMove">
<hc:SimplePanel Margin="20,50,20,20" > <hc:SimplePanel Margin="20,50,20,20" >
<StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Top"> <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Top">
<Image Source="/Resource/Image/About.png" Width="400" Height="100"/> <Image Source="/Resource/Image/About.png" Width="400" Height="100"/>

32
Control/Windows/ConfigWindow.xaml
View File

@@ -18,23 +18,27 @@
<Window.Resources> <Window.Resources>
<Style x:Key="MenuStyle" TargetType="hc:SideMenuItem" BasedOn="{StaticResource SideMenuItemBaseStyle}"> <Style x:Key="MenuStyle" TargetType="hc:SideMenuItem" BasedOn="{StaticResource SideMenuItemBaseStyle}">
<Style.Setters> <Style.Setters>
<Setter Property="Background" Value="AliceBlue"/> <Setter Property="Background" Value="Transparent"/>
</Style.Setters> </Style.Setters>
<Style.Triggers> <Style.Triggers>
<Trigger Property="IsMouseOver" Value="True"> <Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="#FFE2E2E2"/> <Setter Property="Background" Value="Transparent"/>
</Trigger> </Trigger>
<Trigger Property="IsSelected" Value="True"> <Trigger Property="IsSelected" Value="True">
<Setter Property="Background" Value="#FFDAD7D7"/> <Setter Property="Background" Value="Transparent"/>
</Trigger> </Trigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
</Window.Resources> </Window.Resources>
<Border CornerRadius="8" BorderThickness="0"> <Border CornerRadius="8" BorderThickness="0">
<Border.Background> <Border.Background>
<SolidColorBrush Color="AliceBlue" Opacity="0.9"/> <!--<SolidColorBrush Color="AliceBlue" Opacity="0.9"/>-->
<LinearGradientBrush>
<GradientStop Color="#009A98" Offset="0"/>
<GradientStop Color="#00CA68" Offset="1"/>
</LinearGradientBrush>
</Border.Background> </Border.Background>
<Grid> <Grid Background="Transparent" MouseDown="DragMove">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
@@ -43,14 +47,13 @@
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<hc:Card Grid.Row="0" Grid.Column="0"> <hc:Card Grid.Row="0" Grid.Column="0" Background="Transparent" BorderThickness="0">
<hc:SideMenu BorderThickness="1" <hc:SideMenu BorderThickness="0"
AutoSelect="True" AutoSelect="True"
> >
<hc:SideMenu.Background> <hc:SideMenu.Background>
<SolidColorBrush Color="AliceBlue"/> <SolidColorBrush Color="#00FFFFFF"/>
</hc:SideMenu.Background> </hc:SideMenu.Background>
<hc:SideMenu.ItemContainerStyle> <hc:SideMenu.ItemContainerStyle>
<Style TargetType="hc:SideMenuItem" BasedOn="{StaticResource MenuStyle}"/> <Style TargetType="hc:SideMenuItem" BasedOn="{StaticResource MenuStyle}"/>
</hc:SideMenu.ItemContainerStyle> </hc:SideMenu.ItemContainerStyle>
@@ -63,7 +66,7 @@
<hc:SideMenuItem.Icon> <hc:SideMenuItem.Icon>
<Button Background="Transparent" <Button Background="Transparent"
IsEnabled="False" IsEnabled="False"
Opacity="1" Opacity="0.9"
BorderThickness="0" BorderThickness="0"
hc:IconElement.Geometry="{StaticResource About}" hc:IconElement.Geometry="{StaticResource About}"
hc:IconElement.Height="18" hc:IconElement.Height="18"
@@ -120,8 +123,11 @@
</hc:SideMenuItem> </hc:SideMenuItem>
</hc:SideMenu> </hc:SideMenu>
</hc:Card> </hc:Card>
<hc:ScrollViewer Grid.Row="0" Grid.Column="1"> <hc:ScrollViewer Grid.Row="0" Grid.Column="1" BorderThickness="0">
<hc:Card x:Name="RightCard" Height="480"> <hc:Card x:Name="RightCard" Height="480" BorderThickness="0">
<hc:Card.Background>
<SolidColorBrush Opacity="0"/>
</hc:Card.Background>
</hc:Card> </hc:Card>
</hc:ScrollViewer> </hc:ScrollViewer>

13
Control/Windows/ConfigWindow.xaml.cs
View File

@@ -63,6 +63,19 @@ namespace GeekDesk.Control.Windows
} }
} }
/// <summary>
/// 移动窗口
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void DragMove(object sender, System.Windows.Input.MouseButtonEventArgs e)
{
if (e.LeftButton == MouseButtonState.Pressed)
{
this.DragMove();
}
}
private static System.Windows.Window window = null; private static System.Windows.Window window = null;
public static void Show(AppConfig appConfig, MainWindow mainWindow) public static void Show(AppConfig appConfig, MainWindow mainWindow)
{ {

4
Properties/AssemblyInfo.cs
View File

@@ -49,5 +49,5 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示: //通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.3.1.1")] [assembly: AssemblyVersion("2.3.2.0")]
[assembly: AssemblyFileVersion("2.3.1.1")] [assembly: AssemblyFileVersion("2.3.2.0")]

6
Update.json
View File

@@ -1,9 +1,9 @@
{ {
"title": "<22>汾<EFBFBD><E6B1BE><EFBFBD><EFBFBD>", "title": "<22>汾<EFBFBD><E6B1BE><EFBFBD><EFBFBD>",
"subTitle": "V2.3.11 <20><>ʽ<EFBFBD><CABD>", "subTitle": "V2.3.20 <20><>ʽ<EFBFBD><CABD>",
"msgTitle": "<22><><EFBFBD>θ<EFBFBD><CEB8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", "msgTitle": "<22><><EFBFBD>θ<EFBFBD><CEB8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
"msg": "['2.3.10<EFBFBD>汾<EFBFBD>и<EFBFBD>Сbug,<2C><><EFBFBD>Խ<EFBFBD><D4BD><EFBFBD><EFBFBD>Ÿ<EFBFBD><C5B8><EFBFBD><EFBFBD><EFBFBD>2.3.11<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˼<EFBFBD><EFBFBD>dei<EFBFBD>ǣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϲ<EFBFBD><EFBFBD><EFBFBD>Ļ<EFBFBD>ȥ<EFBFBD><EFBFBD><EFBFBD>ҵ<EFBFBD><EFBFBD><EFBFBD>Star<EFBFBD><EFBFBD>(*^__^*)','<27>޸<EFBFBD><DEB8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><CABE><EFBFBD>ú<EFBFBD>,<2C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ؿ<EFBFBD><D8BF>ٵ<EFBFBD><D9B5><EFBFBD><EFBFBD><EFBFBD>','<27>޸<EFBFBD><DEB8>޷<EFBFBD>ɾ<EFBFBD><C9BE><EFBFBD><EFBFBD>ʷ<EFBFBD><CAB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>BUG','<27><><EFBFBD>Ӷ<EFBFBD>ʱ<EFBFBD>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD><EFBFBD>,<2C><><EFBFBD>ڿ<EFBFBD>ռ<EFBFBD>ø<EFBFBD>С<EFBFBD><D0A1><EFBFBD>ڴ<EFBFBD>','<27>޸<EFBFBD><DEB8><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڵ㴰<DAB5>ڵ<EFBFBD>BUG','<27><><EFBFBD><EFBFBD><EFBFBD>Զ<EFBFBD><D4B6><EFBFBD>ͼ<EFBFBD><CDBC><EFBFBD><EFBFBD>С','<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD><CAB9>CRON<4F><4E><EFBFBD><EFBFBD>ʽ<EFBFBD>Զ<EFBFBD><D4B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƶ<EFBFBD><C6B5>']", "msg": "['']",
"githubUrl": "https://github.com/Demo-Liu/GeekDesk/releases/tag", "githubUrl": "https://github.com/Demo-Liu/GeekDesk/releases/tag",
"giteeUrl": "https://gitee.com/demo_liu/GeekDesk/releases", "giteeUrl": "https://gitee.com/demo_liu/GeekDesk/releases",
"version": "2.3.11" "version": "2.3.20"
} }