Skip to content

Commit 23bb996

Browse files
Start migration from WPF to Avalonia (this tool can now run on multiple OSs)
1 parent d78cd82 commit 23bb996

28 files changed

+447
-335
lines changed

Tests/Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0-windows</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

WatchOnlyBitcoinWallet/AboutWindow.xaml renamed to WatchOnlyBitcoinWallet/AboutWindow.axaml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
<Window x:Class="WatchOnlyBitcoinWallet.AboutWindow"
2-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2+
xmlns="https://github.com/avaloniaui"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
Title="About" Height="303" Width="327" ResizeMode="NoResize" ShowInTaskbar="False" WindowStartupLocation="CenterOwner" FontSize="14" Icon="myICO.ico">
4+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
5+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6+
Title="About" Height="303" Width="327" ShowInTaskbar="False"
7+
WindowStartupLocation="CenterOwner" FontSize="14"
8+
Icon="/Assets/Icon.png">
9+
510
<Grid>
6-
<TextBlock x:Name="txtGithubLink" HorizontalAlignment="Left" Margin="86,130,0,0" TextWrapping="Wrap" VerticalAlignment="Top">
11+
<!--<TextBlock x:Name="txtGithubLink" HorizontalAlignment="Left" Margin="86,130,0,0" TextWrapping="Wrap" VerticalAlignment="Top">
712
<Hyperlink NavigateUri="https://github.com/Coding-Enthusiast/Watch-Only-Bitcoin-Wallet" RequestNavigate="Hyperlink_RequestNavigate">
813
Github Repository Link
914
</Hyperlink>
@@ -25,6 +30,6 @@
2530
2631
<TextBlock HorizontalAlignment="Left" Margin="63,10,0,0" TextWrapping="Wrap" Text="Coding Enthusiast" VerticalAlignment="Top" FontFamily="Comic Sans MS" FontSize="22" FontWeight="Bold" TextAlignment="Center"/>
2732
<TextBlock HorizontalAlignment="Left" Margin="10,46,0,0" TextWrapping="Wrap" Text="Watch Only Bitcoin Wallet" VerticalAlignment="Top" FontFamily="Comic Sans MS" FontSize="22" Width="292" FontWeight="Bold" TextAlignment="Center"/>
28-
<TextBlock x:Name="txtVersion" HorizontalAlignment="Left" Margin="10,82,0,0" TextWrapping="Wrap" Text="Version" VerticalAlignment="Top" FontFamily="Comic Sans MS" FontSize="22" Width="292" FontWeight="Bold" TextAlignment="Center"/>
33+
<TextBlock x:Name="txtVersion" HorizontalAlignment="Left" Margin="10,82,0,0" TextWrapping="Wrap" Text="Version" VerticalAlignment="Top" FontFamily="Comic Sans MS" FontSize="22" Width="292" FontWeight="Bold" TextAlignment="Center"/>-->
2934
</Grid>
3035
</Window>
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
// WatchOnlyBitcoinWallet
2+
// Copyright (c) 2016 Coding Enthusiast
3+
// Distributed under the MIT software license, see the accompanying
4+
// file LICENCE or http://www.opensource.org/licenses/mit-license.php.
5+
6+
using System.Diagnostics;
7+
using System.Reflection;
8+
using Avalonia.Controls;
9+
10+
namespace WatchOnlyBitcoinWallet
11+
{
12+
public partial class AboutWindow : Window
13+
{
14+
private const string DonationAddress = "1Q9swRQuwhTtjZZ2yguFWk7m7pszknkWyk";
15+
16+
public AboutWindow()
17+
{
18+
InitializeComponent();
19+
//DonationHyperLink.NavigateUri = new System.Uri(string.Format("bitcoin:{0}", DonationAddress));
20+
//txtVersion.Text = string.Format("Version {0}", Assembly.GetExecutingAssembly().GetName().Version);
21+
//txtDonate.Text = DonationAddress;
22+
}
23+
24+
//private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e)
25+
//{
26+
// Process.Start(new ProcessStartInfo(e.Uri.AbsoluteUri));
27+
// e.Handled = true;
28+
//}
29+
}
30+
}

WatchOnlyBitcoinWallet/AboutWindow.xaml.cs

Lines changed: 0 additions & 34 deletions
This file was deleted.

WatchOnlyBitcoinWallet/App.axaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Application xmlns="https://github.com/avaloniaui"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3+
xmlns:local="clr-namespace:WatchOnlyBitcoinWallet"
4+
xmlns:vm="clr-namespace:WatchOnlyBitcoinWallet.ViewModels"
5+
xmlns:views="clr-namespace:WatchOnlyBitcoinWallet.Views"
6+
x:Class="WatchOnlyBitcoinWallet.App"
7+
RequestedThemeVariant="Default">
8+
9+
<Application.Styles>
10+
<FluentTheme/>
11+
</Application.Styles>
12+
13+
<Application.Resources>
14+
15+
</Application.Resources>
16+
</Application>
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
// WatchOnlyBitcoinWallet
2+
// Copyright (c) 2016 Coding Enthusiast
3+
// Distributed under the MIT software license, see the accompanying
4+
// file LICENCE or http://www.opensource.org/licenses/mit-license.php.
5+
6+
using Avalonia;
7+
using Avalonia.Controls.ApplicationLifetimes;
8+
using Avalonia.Markup.Xaml;
9+
using WatchOnlyBitcoinWallet.ViewModels;
10+
11+
namespace WatchOnlyBitcoinWallet
12+
{
13+
public partial class App : Application
14+
{
15+
public override void Initialize()
16+
{
17+
AvaloniaXamlLoader.Load(this);
18+
}
19+
20+
public override void OnFrameworkInitializationCompleted()
21+
{
22+
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
23+
{
24+
desktop.MainWindow = new MainWindow
25+
{
26+
DataContext = new MainWindowViewModel()
27+
};
28+
}
29+
30+
base.OnFrameworkInitializationCompleted();
31+
}
32+
}
33+
}

WatchOnlyBitcoinWallet/App.xaml

Lines changed: 0 additions & 8 deletions
This file was deleted.

WatchOnlyBitcoinWallet/App.xaml.cs

Lines changed: 0 additions & 13 deletions
This file was deleted.
84 KB
Loading
File renamed without changes.

0 commit comments

Comments
 (0)