Skip to content

Commit

Permalink
fix x86 app
Browse files Browse the repository at this point in the history
  • Loading branch information
AigioL committed Feb 27, 2021
1 parent e2dfb97 commit 5236412
Show file tree
Hide file tree
Showing 8 changed files with 100 additions and 80 deletions.
18 changes: 9 additions & 9 deletions SteamToolsV2+.sln
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steam4NET", "references\Ste
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Titanium.Web.Proxy", "references\Titanium-Web-Proxy\src\Titanium.Web.Proxy\Titanium.Web.Proxy.csproj", "{35D60129-6652-4B6E-A04A-9766C3CF1869}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Application.SteamTools.Tools.OpenSourceLibraryList", "System.Application.SteamTools.Tools.OpenSourceLibraryList\System.Application.SteamTools.Tools.OpenSourceLibraryList.csproj", "{CF7C2B80-D393-45EA-A67D-DF46FF17B0F8}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Application.SteamTools.Tools.OpenSourceLibraryList", "System.Application.SteamTools.Tools.OpenSourceLibraryList\System.Application.SteamTools.Tools.OpenSourceLibraryList.csproj", "{CF7C2B80-D393-45EA-A67D-DF46FF17B0F8}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -197,12 +197,12 @@ Global
{D1F15D97-802E-4AA3-A4A5-B890ABE32897}.Release|Any CPU.Build.0 = Release|Any CPU
{D1F15D97-802E-4AA3-A4A5-B890ABE32897}.Release|x86.ActiveCfg = Release|Any CPU
{D1F15D97-802E-4AA3-A4A5-B890ABE32897}.Release|x86.Build.0 = Release|Any CPU
{2FFA5BCE-B3C3-46EA-8830-838C938BF814}.Debug|Any CPU.ActiveCfg = Debug|x86
{2FFA5BCE-B3C3-46EA-8830-838C938BF814}.Debug|Any CPU.Build.0 = Debug|x86
{2FFA5BCE-B3C3-46EA-8830-838C938BF814}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2FFA5BCE-B3C3-46EA-8830-838C938BF814}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2FFA5BCE-B3C3-46EA-8830-838C938BF814}.Debug|x86.ActiveCfg = Debug|x86
{2FFA5BCE-B3C3-46EA-8830-838C938BF814}.Debug|x86.Build.0 = Debug|x86
{2FFA5BCE-B3C3-46EA-8830-838C938BF814}.Release|Any CPU.ActiveCfg = Release|x86
{2FFA5BCE-B3C3-46EA-8830-838C938BF814}.Release|Any CPU.Build.0 = Release|x86
{2FFA5BCE-B3C3-46EA-8830-838C938BF814}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2FFA5BCE-B3C3-46EA-8830-838C938BF814}.Release|Any CPU.Build.0 = Release|Any CPU
{2FFA5BCE-B3C3-46EA-8830-838C938BF814}.Release|x86.ActiveCfg = Release|Any CPU
{2FFA5BCE-B3C3-46EA-8830-838C938BF814}.Release|x86.Build.0 = Release|Any CPU
{4F09B6D1-3F83-45A0-AEC8-0F243E7CD263}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
Expand All @@ -229,12 +229,12 @@ Global
{948C1EA8-12DB-4F8A-A190-8615DFBD9FE4}.Release|Any CPU.Build.0 = Release|Any CPU
{948C1EA8-12DB-4F8A-A190-8615DFBD9FE4}.Release|x86.ActiveCfg = Release|Any CPU
{948C1EA8-12DB-4F8A-A190-8615DFBD9FE4}.Release|x86.Build.0 = Release|Any CPU
{141532E1-540E-4E50-8723-96936C191281}.Debug|Any CPU.ActiveCfg = Debug|x86
{141532E1-540E-4E50-8723-96936C191281}.Debug|Any CPU.Build.0 = Debug|x86
{141532E1-540E-4E50-8723-96936C191281}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{141532E1-540E-4E50-8723-96936C191281}.Debug|Any CPU.Build.0 = Debug|Any CPU
{141532E1-540E-4E50-8723-96936C191281}.Debug|x86.ActiveCfg = Debug|Any CPU
{141532E1-540E-4E50-8723-96936C191281}.Debug|x86.Build.0 = Debug|Any CPU
{141532E1-540E-4E50-8723-96936C191281}.Release|Any CPU.ActiveCfg = Release|x86
{141532E1-540E-4E50-8723-96936C191281}.Release|Any CPU.Build.0 = Release|x86
{141532E1-540E-4E50-8723-96936C191281}.Release|Any CPU.ActiveCfg = Release|Any CPU
{141532E1-540E-4E50-8723-96936C191281}.Release|Any CPU.Build.0 = Release|Any CPU
{141532E1-540E-4E50-8723-96936C191281}.Release|x86.ActiveCfg = Release|Any CPU
{141532E1-540E-4E50-8723-96936C191281}.Release|x86.Build.0 = Release|Any CPU
{60530AF8-4790-4A85-BCE2-C5673E9C601B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,6 @@
<ApplicationManifest>Properties\app.manifest</ApplicationManifest>
</PropertyGroup>

<PropertyGroup Condition=" $(RuntimeIdentifier.Contains(`win`)) Or ('$(OS)' == 'Windows_NT' And !$(DefineConstants.Contains(`PUBLISH`))) ">
<!--因Win平台引入了SAM/Steam4NET仅支持x86架构-->
<Platforms>x86</Platforms>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>

<ItemGroup>
<Compile Include="..\System.Common.CoreLib\Properties\AssemblyInfo.cs">
<Link>Properties\AssemblyInfo.cs</Link>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using Avalonia.Controls;

namespace System.Application.UI
{
public interface INotifyIcon : INotifyIcon<ContextMenu>
{
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<RootNamespace>System</RootNamespace>
<SignAssembly>false</SignAssembly>
<!--(SignAssembly)对此程序集进行签名会导致编译失败(CompileAvaloniaXamlTask)-->
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
//using AppKit;
//using System;
//using System.Collections.Generic;
//using System.Linq;
//using System.Text;
//using System.Threading.Tasks;

//namespace System.Application.UI
//{
// /// <summary>
// /// Represents a Notification Tray Icon (on a OSxMac StatusBarItem)
// /// </summary>
// public class NotifyIcon<TContextMenu> : INotifyIcon<TContextMenu>
// {
// NSStatusItem _item;
// NSStatusItem statusBarItem
// {
// get => _item; set
// {
// _item = value;
// UpdateMenu();
// }
// }

// public event EventHandler<EventArgs>? Click;
// public event EventHandler<EventArgs>? DoubleClick;
// public event EventHandler<EventArgs>? RightClick;
// }
//}
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<RootNamespace>System</RootNamespace>
<!--因Win平台引入了SAM/Steam4NET仅支持x86架构-->
<Platforms>x86</Platforms>
</PropertyGroup>

<ItemGroup>
Expand Down
52 changes: 52 additions & 0 deletions System.Application.SteamTools.Client.Desktop/UI/INotifyIcon.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
namespace System.Application.UI
{
/// <summary>
/// Represents a taskbar notification area icon (aka "tray icon") on Windows,
/// and similar task panel notification icons on Linux and Mac.
/// <para><see cref="https://github.com/sqrldev/SQRLDotNetClient/blob/master/SQRLDotNetClientUI/Models/INotifyIcon.cs"/></para>
/// </summary>
public interface INotifyIcon<TContextMenu>
{
/// <summary>
/// Gets or sets the icon for the notify icon. Either a file system path
/// or a <c>resm:</c> manifest resource path can be specified.
/// </summary>
string IconPath { get; set; }

/// <summary>
/// Gets or sets the tooltip text for the notify icon.
/// </summary>
string ToolTipText { get; set; }

/// <summary>
/// Gets or sets the context- (right-click)-menu for the notify icon.
/// </summary>
TContextMenu ContextMenu { get; set; }

/// <summary>
/// Gets or sets if the notify icon is visible in the
/// taskbar notification area or not.
/// </summary>
bool Visible { get; set; }

/// <summary>
/// Removes the notify icon from the taskbar notification area.
/// </summary>
void Remove();

/// <summary>
/// This event is raised when a user clicks on the notification icon.
/// </summary>
event EventHandler<EventArgs> Click;

/// <summary>
/// This event is raised when a user doubleclicks on the notification icon.
/// </summary>
event EventHandler<EventArgs> DoubleClick;

/// <summary>
/// This event is raised when a user right-clicks on the notification icon.
/// </summary>
event EventHandler<EventArgs> RightClick;
}
}

This file was deleted.

0 comments on commit 5236412

Please sign in to comment.