tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Use Tmds.DBus.Protocol package

pull/9810/head
affederaffe 3 years ago
parent
6f7f09668b
commit
bdebcca9da
11 changed files with 30 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      .gitmodules
  2. 1
      Avalonia.Desktop.slnf
  3. 8
      Avalonia.sln
  4. 26
      src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj
  5. 1
      src/Avalonia.FreeDesktop/DBusIme/DBusTextInputMethodBase.cs
  6. 1
      src/Avalonia.FreeDesktop/DBusIme/Fcitx/FcitxICWrapper.cs
  7. 1
      src/Avalonia.FreeDesktop/DBusIme/Fcitx/FcitxX11TextInputMethod.cs
  8. 19
      src/Avalonia.FreeDesktop/DBusInterfaces.cs
  9. 1
      src/Avalonia.FreeDesktop/DBusTrayIconImpl.cs
  10. 1
      src/Linux/Tmds.DBus
  11. 2
      src/tools/Tmds.DBus.SourceGenerator

3
.gitmodules
View File

@ -7,9 +7,6 @@
[submodule "nukebuild/il-repack"]
path = nukebuild/il-repack
url = https://github.com/Gillibald/il-repack
[submodule "Tmds.DBus"]
path = src/Linux/Tmds.DBus
url = https://github.com/affederaffe/Tmds.DBus
[submodule "src/tools/Tmds.DBus.SourceGenerator"]
path = src/tools/Tmds.DBus.SourceGenerator
url = https://github.com/affederaffe/Tmds.DBus.SourceGenerator

1
Avalonia.Desktop.slnf
View File

@ -33,7 +33,6 @@
"src\\Avalonia.Themes.Simple\\Avalonia.Themes.Simple.csproj",
"src\\Avalonia.X11\\Avalonia.X11.csproj",
"src\\Linux\\Avalonia.LinuxFramebuffer\\Avalonia.LinuxFramebuffer.csproj",
"src\\Linux\\Tmds.DBus\\src\\Tmds.DBus.Protocol\\Tmds.DBus.Protocol.csproj",
"src\\Markup\\Avalonia.Markup.Xaml.Loader\\Avalonia.Markup.Xaml.Loader.csproj",
"src\\Markup\\Avalonia.Markup.Xaml\\Avalonia.Markup.Xaml.csproj",
"src\\Markup\\Avalonia.Markup\\Avalonia.Markup.csproj",

8
Avalonia.sln
View File

@ -231,9 +231,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog.Browser.Blaz
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUIDemo", "samples\ReactiveUIDemo\ReactiveUIDemo.csproj", "{75C47156-C5D8-44BC-A5A7-E8657C2248D6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tmds.DBus.Protocol", "src\Linux\Tmds.DBus\src\Tmds.DBus.Protocol\Tmds.DBus.Protocol.csproj", "{29E25263-3CC3-4D55-A042-00BA136867D4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tmds.DBus.SourceGenerator", "src\tools\Tmds.DBus.SourceGenerator\Tmds.DBus.SourceGenerator\Tmds.DBus.SourceGenerator.csproj", "{5E9C0032-E460-4BC1-BCC7-6448F34DD679}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GpuInterop", "samples\GpuInterop\GpuInterop.csproj", "{C810060E-3809-4B74-A125-F11533AF9C1B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Controls.ItemsRepeater", "src\Avalonia.Controls.ItemsRepeater\Avalonia.Controls.ItemsRepeater.csproj", "{EE0F0DD4-A70D-472B-BD5D-B7D32D0E9386}"
@ -551,10 +550,6 @@ Global
{75C47156-C5D8-44BC-A5A7-E8657C2248D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{75C47156-C5D8-44BC-A5A7-E8657C2248D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{75C47156-C5D8-44BC-A5A7-E8657C2248D6}.Release|Any CPU.Build.0 = Release|Any CPU
{29E25263-3CC3-4D55-A042-00BA136867D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{29E25263-3CC3-4D55-A042-00BA136867D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{29E25263-3CC3-4D55-A042-00BA136867D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{29E25263-3CC3-4D55-A042-00BA136867D4}.Release|Any CPU.Build.0 = Release|Any CPU
{5E9C0032-E460-4BC1-BCC7-6448F34DD679}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5E9C0032-E460-4BC1-BCC7-6448F34DD679}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5E9C0032-E460-4BC1-BCC7-6448F34DD679}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -635,7 +630,6 @@ Global
{15B93A4C-1B46-43F6-B534-7B25B6E99932} = {9B9E3891-2366-4253-A952-D08BCEB71098}
{90B08091-9BBD-4362-B712-E9F2CC62B218} = {9B9E3891-2366-4253-A952-D08BCEB71098}
{75C47156-C5D8-44BC-A5A7-E8657C2248D6} = {9B9E3891-2366-4253-A952-D08BCEB71098}
{29E25263-3CC3-4D55-A042-00BA136867D4} = {86C53C40-57AA-45B8-AD42-FAE0EFDF0F2B}
{5E9C0032-E460-4BC1-BCC7-6448F34DD679} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637}
{C810060E-3809-4B74-A125-F11533AF9C1B} = {9B9E3891-2366-4253-A952-D08BCEB71098}
{F4E36AA8-814E-4704-BC07-291F70F45193} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}

26
src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj
View File

@ -11,11 +11,17 @@
<Compile Include="..\Shared\IsExternalInit.cs" Link="IsExternalInit.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Tmds.DBus.Protocol" Version="0.13.0" />
</ItemGroup>
<ItemGroup>
<CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="DBusGeneratorMode" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
<ProjectReference Include="..\Avalonia.Dialogs\Avalonia.Dialogs.csproj" />
<ProjectReference Include="..\Linux\Tmds.DBus\src\Tmds.DBus.Protocol\Tmds.DBus.Protocol.csproj" />
<!--<PackageReference Include="Tmds.DBus.Protocol" Version="0.11.1-151-9f126c13809fceab8388328aff84b0d8e89b2aae" />-->
<ProjectReference Include="..\tools\Tmds.DBus.SourceGenerator\Tmds.DBus.SourceGenerator\Tmds.DBus.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
</ItemGroup>
@ -23,4 +29,20 @@
<InternalsVisibleTo Include="Avalonia.X11, PublicKey=$(AvaloniaPublicKey)" />
</ItemGroup>
<ItemGroup>
<AdditionalFiles Include="DBusXml/DBus.xml" DBusGeneratorMode="Proxy" />
<AdditionalFiles Include="DBusXml/StatusNotifierWatcher.xml" DBusGeneratorMode="Proxy" />
<AdditionalFiles Include="DBusXml/com.canonical.AppMenu.Registrar.xml" DBusGeneratorMode="Proxy" />
<AdditionalFiles Include="DBusXml/org.fcitx.Fcitx.InputContext.xml" DBusGeneratorMode="Proxy" />
<AdditionalFiles Include="DBusXml/org.fcitx.Fcitx.InputMethod.xml" DBusGeneratorMode="Proxy" />
<AdditionalFiles Include="DBusXml/org.fcitx.Fcitx.InputContext1.xml" DBusGeneratorMode="Proxy" />
<AdditionalFiles Include="DBusXml/org.fcitx.Fcitx.InputMethod1.xml" DBusGeneratorMode="Proxy" />
<AdditionalFiles Include="DBusXml/org.freedesktop.IBus.Portal.xml" DBusGeneratorMode="Proxy" />
<AdditionalFiles Include="DBusXml/org.freedesktop.portal.FileChooser.xml" DBusGeneratorMode="Proxy" />
<AdditionalFiles Include="DBusXml/org.freedesktop.portal.Request.xml" DBusGeneratorMode="Proxy" />
<AdditionalFiles Include="DBusXml/org.freedesktop.portal.Settings.xml" DBusGeneratorMode="Proxy" />
<AdditionalFiles Include="DBusXml/DBusMenu.xml" DBusGeneratorMode="Handler" />
<AdditionalFiles Include="DBusXml/StatusNotifierItem.xml" DBusGeneratorMode="Handler" />
</ItemGroup>
</Project>

1
src/Avalonia.FreeDesktop/DBusIme/DBusTextInputMethodBase.cs
View File

@ -6,6 +6,7 @@ using Avalonia.Input.Raw;
using Avalonia.Input.TextInput;
using Avalonia.Logging;
using Tmds.DBus.Protocol;
using Tmds.DBus.SourceGenerator;
namespace Avalonia.FreeDesktop.DBusIme
{

1
src/Avalonia.FreeDesktop/DBusIme/Fcitx/FcitxICWrapper.cs
View File

@ -1,5 +1,6 @@
using System;
using System.Threading.Tasks;
using Tmds.DBus.SourceGenerator;
namespace Avalonia.FreeDesktop.DBusIme.Fcitx
{

1
src/Avalonia.FreeDesktop/DBusIme/Fcitx/FcitxX11TextInputMethod.cs
View File

@ -5,6 +5,7 @@ using Avalonia.Input;
using Avalonia.Input.Raw;
using Avalonia.Input.TextInput;
using Tmds.DBus.Protocol;
using Tmds.DBus.SourceGenerator;
namespace Avalonia.FreeDesktop.DBusIme.Fcitx
{

19
src/Avalonia.FreeDesktop/DBusInterfaces.cs
View File

@ -1,19 +0,0 @@
using Tmds.DBus.SourceGenerator;
namespace Avalonia.FreeDesktop
{
[DBusInterface("./DBusXml/DBus.xml")]
[DBusInterface("./DBusXml/StatusNotifierWatcher.xml")]
[DBusInterface("./DBusXml/com.canonical.AppMenu.Registrar.xml")]
[DBusInterface("./DBusXml/org.fcitx.Fcitx.InputContext.xml")]
[DBusInterface("./DBusXml/org.fcitx.Fcitx.InputMethod.xml")]
[DBusInterface("./DBusXml/org.fcitx.Fcitx.InputContext1.xml")]
[DBusInterface("./DBusXml/org.fcitx.Fcitx.InputMethod1.xml")]
[DBusInterface("./DBusXml/org.freedesktop.IBus.Portal.xml")]
[DBusInterface("./DBusXml/org.freedesktop.portal.FileChooser.xml")]
[DBusInterface("./DBusXml/org.freedesktop.portal.Request.xml")]
[DBusInterface("./DBusXml/org.freedesktop.portal.Settings.xml")]
[DBusHandler("./DBusXml/DBusMenu.xml")]
[DBusHandler("./DBusXml/StatusNotifierItem.xml")]
internal class DBusInterfaces { }
}

1
src/Avalonia.FreeDesktop/DBusTrayIconImpl.cs
View File

@ -4,6 +4,7 @@ using Avalonia.Controls.Platform;
using Avalonia.Logging;
using Avalonia.Platform;
using Tmds.DBus.Protocol;
using Tmds.DBus.SourceGenerator;
namespace Avalonia.FreeDesktop
{

1
src/Linux/Tmds.DBus

@ -1 +0,0 @@
Subproject commit e86bcf1bc2d86338ab61663a4ae48dbc0bd7e02d

2
src/tools/Tmds.DBus.SourceGenerator

@ -1 +1 @@
Subproject commit 309159609e09f3f0ae77f0abd761360049761700
Subproject commit 3e76fbf5be03b8e1360e74b8878c541d9de808cd
Write Preview
Loading…
Cancel
Save