Skip to content

Commit

Permalink
[2.0.0.16 Preview 8]
Browse files Browse the repository at this point in the history 
[修复]
1. 修复桌面窗口设置位置时不跟随移动的问题。
<br>
[修改]
1. 将登录模块升级到最新。
  • Loading branch information
@LeoChen98
LeoChen98 committed Dec 18, 2019
1 parent f0962ea commit 5591489
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 78 deletions.
5 changes: 3 additions & 2 deletions BiliUPDesktopTool/BiliUPDesktopTool.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@
<StartupObject>BiliUPDesktopTool.Program</StartupObject>
</PropertyGroup>
<ItemGroup>
<Reference Include="BiliAccount, Version=1.1.1.4, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\BiliAccount.1.1.1.4\lib\net45\BiliAccount.dll</HintPath>
<Reference Include="BiliAccount, Version=2.0.0.7, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\BiliAccount.2.0.0.7\lib\net45\BiliAccount.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=1.2.0.246, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
Expand All @@ -165,6 +165,7 @@
<Reference Include="System.Management" />
<Reference Include="System.Net" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
Expand Down
4 changes: 2 additions & 2 deletions BiliUPDesktopTool/Class/Bas.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ internal class Bas
/// <summary>
/// 主程序Build
/// </summary>
public const int _Build = 15;
public const int _Build = 16;

/// <summary>
/// 主程序版本号
/// </summary>
public const string _Version = "2.0.0.15 Preview 7";
public const string _Version = "2.0.0.16 Preview 8";

#endregion Public Fields

Expand Down
4 changes: 2 additions & 2 deletions BiliUPDesktopTool/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@
// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.0.15")]
[assembly: AssemblyFileVersion("2.0.0.15")]
[assembly: AssemblyVersion("2.0.0.16")]
[assembly: AssemblyFileVersion("2.0.0.16")]
[assembly: Guid("B31C3B29-E506-4603-9F46-CF7106B77116")]
2 changes: 1 addition & 1 deletion BiliUPDesktopTool/Window/DesktopWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:BiliUPDesktopTool"
mc:Ignorable="d"
Title="B站up主桌面助手" Height="300" Width="350" WindowStyle="None" ShowInTaskbar="False" Loaded="Window_Loaded" AllowsTransparency="True" Icon="/BiliUPDesktopTool;component/icon.ico" Background="{x:Null}" Top="{Binding DesktopWnd_Top, Source={x:Static local:Skin.Instance}}" Left="{Binding DesktopWnd_Left, Source={x:Static local:Skin.Instance}}" Opacity="{Binding DesktopWnd_Opacity,Source={x:Static local:Skin.Instance}}">
Title="B站up主桌面助手" Height="300" Width="350" WindowStyle="None" ShowInTaskbar="False" Loaded="Window_Loaded" AllowsTransparency="True" Icon="/BiliUPDesktopTool;component/icon.ico" Background="{x:Null}" Top="{Binding DesktopWnd_Top, Source={x:Static local:Skin.Instance},Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Left="{Binding DesktopWnd_Left, Source={x:Static local:Skin.Instance},Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Opacity="{Binding DesktopWnd_Opacity,Source={x:Static local:Skin.Instance},Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
<local:DataViewerPanel x:Name="ViewerPanel" HorizontalAlignment="Left" Height="300" Margin="0" VerticalAlignment="Top" Width="350" Tag="Desktop" Background="{Binding DesktopWnd_Bg, Source={x:Static local:Skin.Instance}}" />
</Window>
42 changes: 0 additions & 42 deletions BiliUPDesktopTool/Window/DesktopWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,54 +14,12 @@ public DesktopWindow()
{
InitializeComponent();

//BindingInit();
}

#endregion Public Constructors

#region Private Methods

/// <summary>
/// 初始化数据绑定
/// </summary>
private void BindingInit()
{
//绑定窗体Top
Binding bind_top = new Binding
{
Source = Skin.Instance,
Mode = BindingMode.TwoWay,
Path = new PropertyPath("DesktopWnd_Top")
};
SetBinding(TopProperty, bind_top);

//绑定窗体Left
Binding bind_left = new Binding
{
Source = Skin.Instance,
Mode = BindingMode.TwoWay,
Path = new PropertyPath("DesktopWnd_Left")
};
SetBinding(LeftProperty, bind_left);

//绑定窗体透明度
Binding bind_opacity = new Binding
{
Source = Skin.Instance,
Mode = BindingMode.TwoWay,
Path = new PropertyPath("DesktopWnd_Opacity")
};
SetBinding(OpacityProperty, bind_opacity);

//绑定背景
Binding bind_background = new Binding
{
Source = Skin.Instance,
Mode = BindingMode.TwoWay,
Path = new PropertyPath("DesktopWnd_Bg")
};
ViewerPanel.SetBinding(BackgroundProperty, bind_background);
}

private void Window_Loaded(object sender, RoutedEventArgs e)
{
Expand Down
2 changes: 1 addition & 1 deletion BiliUPDesktopTool/Window/DesktopWindowSetter.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:BiliUPDesktopTool"
mc:Ignorable="d"
Title="桌面数据展示位置设置窗口 - B站up主桌面工具" Height="300" Width="350" WindowStyle="None" AllowsTransparency="True" Cursor="SizeAll" Background="#66000000" MouseDown="Window_MouseDown" Icon="/BiliUPDesktopTool;component/icon.ico">
Title="桌面数据展示位置设置窗口 - B站up主桌面工具" Height="300" Width="350" WindowStyle="None" AllowsTransparency="True" Cursor="SizeAll" Background="#66000000" MouseDown="Window_MouseDown" Icon="/BiliUPDesktopTool;component/icon.ico" Left="{Binding DesktopWnd_Left,Source={x:Static local:Skin.Instance},Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Top="{Binding DesktopWnd_Top,Source={x:Static local:Skin.Instance},Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
<Border BorderBrush="Black" BorderThickness="1">
<Grid>
<Label x:Name="Notice" FontSize="24" Margin="0,40,9.8,89.6" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Foreground="#FFD6D6D6">
Expand Down
27 changes: 0 additions & 27 deletions BiliUPDesktopTool/Window/DesktopWindowSetter.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,39 +31,12 @@ public DesktopWindowSetter()

//建立备份
_Backup = new double[2] { Skin.Instance.DesktopWnd_Top, Skin.Instance.DesktopWnd_Left };

//初始化数据绑定
BindingInit();
}

#endregion Public Constructors

#region Private Methods

/// <summary>
/// 初始化数据绑定
/// </summary>
private void BindingInit()
{
//绑定窗体Top
Binding bind_top = new Binding
{
Source = Skin.Instance,
Mode = BindingMode.TwoWay,
Path = new PropertyPath("DesktopWnd_Top")
};
SetBinding(TopProperty, bind_top);

//绑定窗体Left
Binding bind_left = new Binding
{
Source = Skin.Instance,
Mode = BindingMode.TwoWay,
Path = new PropertyPath("DesktopWnd_Left")
};
SetBinding(LeftProperty, bind_left);
}

private void Btn_cancel_Click(object sender, RoutedEventArgs e)
{
Skin.Instance.DesktopWnd_Top = _Backup[0];
Expand Down
2 changes: 1 addition & 1 deletion BiliUPDesktopTool/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="BiliAccount" version="1.1.1.4" targetFramework="net45" />
<package id="BiliAccount" version="2.0.0.7" targetFramework="net45" />
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net45" />
<package id="SharpZipLib" version="1.2.0" targetFramework="net45" />
</packages>

0 comments on commit 5591489

Please sign in to comment.