Compare commits

...

7 Commits

22 changed files with 43 additions and 99 deletions

63
.gitattributes vendored
View File

@ -1,63 +0,0 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto
###############################################################################
# Set default behavior for command prompt diff.
#
# This is need for earlier builds of msysgit that does not have it on by
# default for csharp files.
# Note: This is only used by command line
###############################################################################
#*.cs diff=csharp
###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
###############################################################################
#*.sln merge=binary
#*.csproj merge=binary
#*.vbproj merge=binary
#*.vcxproj merge=binary
#*.vcproj merge=binary
#*.dbproj merge=binary
#*.fsproj merge=binary
#*.lsproj merge=binary
#*.wixproj merge=binary
#*.modelproj merge=binary
#*.sqlproj merge=binary
#*.wwaproj merge=binary
###############################################################################
# behavior for image files
#
# image files are treated as binary by default.
###############################################################################
#*.jpg binary
#*.png binary
#*.gif binary
###############################################################################
# diff behavior for common document formats
#
# Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the
# entries below.
###############################################################################
#*.doc diff=astextplain
#*.DOC diff=astextplain
#*.docx diff=astextplain
#*.DOCX diff=astextplain
#*.dot diff=astextplain
#*.DOT diff=astextplain
#*.pdf diff=astextplain
#*.PDF diff=astextplain
#*.rtf diff=astextplain
#*.RTF diff=astextplain

6
.gitignore vendored
View File

@ -3,6 +3,9 @@
##
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
##Idea
/.idea
# User-specific files
*.rsuser
*.suo
@ -361,3 +364,6 @@ MigrationBackup/
# Fody - auto-generated XML schema
FodyWeavers.xsd
# KDE Dolphin
.directory

View File

@ -1,8 +1,8 @@
<Application xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="wheel_mcl.App"
x:Class="toast_mcl.App"
xmlns:sty="using:FluentAvalonia.Styling"
RequestedThemeVariant="Default"
RequestedThemeVariant="Dark"
>
<!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
@ -11,6 +11,6 @@
<sty:FluentAvaloniaTheme />
</Application.Styles>
<Application.Resources>
<FontFamily x:Key="LXGW WenKai">avares://wheel_mcl/Assets/Fonts/LXGWWenKai.ttf#LXGW WenKai</FontFamily>
<FontFamily x:Key="LXGW WenKai">avares://toast_mcl/Assets/Fonts/LXGWWenKai.ttf#LXGW WenKai</FontFamily>
</Application.Resources>
</Application>

View File

@ -3,7 +3,7 @@ using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Markup.Xaml;
using Avalonia.Media;
namespace wheel_mcl
namespace toast_mcl
{
public partial class App : Application
{

View File

@ -2,10 +2,10 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:wheel_mcl;assembly=wheel_mcl"
xmlns:local="clr-namespace:toast_mcl;assembly=toast_mcl"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="wheel_mcl.MainWindow"
Title="wheel_mcl" FontFamily="LXGW WenKai">
x:Class="toast_mcl.MainWindow"
Title="toast_mcl">
<Grid>
<Grid.ColumnDefinitions>

View File

@ -1,6 +1,6 @@
using Avalonia.Controls;
namespace wheel_mcl
namespace toast_mcl
{
public partial class MainWindow : Window
{

View File

@ -1,5 +1,5 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="wheel_mcl.About">
x:Class="toast_mcl.About">
This is About
</UserControl>

View File

@ -2,7 +2,7 @@ using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
namespace wheel_mcl;
namespace toast_mcl;
public partial class About : UserControl
{

View File

@ -1,5 +1,5 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="wheel_mcl.Downloads">
x:Class="toast_mcl.Downloads">
This is Downloads!
</UserControl>

View File

@ -2,7 +2,7 @@ using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
namespace wheel_mcl;
namespace toast_mcl;
public partial class Downloads : UserControl
{

View File

@ -1,5 +1,5 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="wheel_mcl.Home">
x:Class="toast_mcl.Home">
This is Home
</UserControl>

View File

@ -2,7 +2,7 @@ using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
namespace wheel_mcl;
namespace toast_mcl;
public partial class Home : UserControl
{

View File

@ -1,5 +1,5 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="wheel_mcl.Settings">
x:Class="toast_mcl.Settings">
This is Settings
</UserControl>

View File

@ -2,7 +2,7 @@ using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
namespace wheel_mcl;
namespace toast_mcl;
public partial class Settings : UserControl
{

View File

@ -1,5 +1,5 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="wheel_mcl.Tools">
x:Class="toast_mcl.Tools">
This is Tools!
</UserControl>

View File

@ -2,7 +2,7 @@ using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
namespace wheel_mcl;
namespace toast_mcl;
public partial class Tools : UserControl
{

View File

@ -2,7 +2,7 @@
using System;
using System.Runtime.InteropServices;
namespace wheel_mcl
namespace toast_mcl
{
internal class Program
{

View File

@ -6,7 +6,7 @@ public static class AppBuilderExtension
{
public static AppBuilder WithFont_LXGWWenKai(this AppBuilder appBuilder)
{
var uri = "avares://wheel_mcl/Assets/Fonts/LXGWWenKai.ttf#LXGW WenKai";
var uri = "avares://toast_mcl/Assets/Fonts/LXGWWenKai.ttf#LXGW WenKai";
return appBuilder.With(new FontManagerOptions()
{
DefaultFamilyName = uri,

View File

@ -1 +1 @@
# wheel_mcl
# toast_mcl

View File

@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
<!-- This manifest is used on Windows only.
Don't remove it as it might cause problems with window transparency and embedded controls.
For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
<assemblyIdentity version="1.0.0.0" name="wheel_mcl.Desktop"/>
<!-- This manifest is used on Windows only.
Don't remove it as it might cause problems with window transparency and embedded controls.
For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
<assemblyIdentity version="1.0.0.0" name="toast_mcl.Desktop"/>
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!-- A list of the Windows versions that this application has been tested on
and is designed to work with. Uncomment the appropriate elements
and Windows will automatically select the most compatible environment. -->
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!-- A list of the Windows versions that this application has been tested on
and is designed to work with. Uncomment the appropriate elements
and Windows will automatically select the most compatible environment. -->
<!-- Windows 10 -->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
</application>
</compatibility>
<!-- Windows 10 -->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
</application>
</compatibility>
</assembly>

View File

@ -7,6 +7,7 @@
<ApplicationManifest>app.manifest</ApplicationManifest>
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
<RootNamespace>toast_mcl</RootNamespace>
</PropertyGroup>
<ItemGroup>
<None Remove="Assets\Fonts\LXGWWenKai.ttf" />

View File

@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.8.34525.116
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "wheel_mcl", "wheel_mcl.csproj", "{CD9E6832-7FE8-4DF8-8B47-D836EA1DF961}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "toast_mcl", "toast_mcl.csproj", "{CD9E6832-7FE8-4DF8-8B47-D836EA1DF961}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution