Skip to content
This repository was archived by the owner on Aug 25, 2024. It is now read-only.

Commit a003510

Browse files
committed
update dependency
1 parent 7450f65 commit a003510

File tree

7 files changed

+13
-15
lines changed

7 files changed

+13
-15
lines changed

build/Program.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ public override void Run(BuildContext context)
116116
@"Clipboar.+\.dll|"
117117
+ @".+\.png|"
118118
+ @"Dapper\.dll|Svg\.dll|Material\.Icons\.dll|"
119-
+ @"Material.Icons.WPF\.dll|"
120119
+ @"ExCSS\.dll|"
121120
+ @"plugin\.json|H\.InputSimulator\.dll|"
122121
+ @"SQLitePCLRaw.+\.dll|Microsoft.+(S|s)qlite\.dll";

src/ClipboardR.Core.Test/ClipboardR.Core.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="Dapper" Version="2.0.151" />
15-
<PackageReference Include="Material.Icons.WPF" Version="2.0.0" />
15+
<PackageReference Include="Material.Icons" Version="2.0.11" />
1616
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0"/>
1717
<PackageReference Include="xunit" Version="2.4.2"/>
1818
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">

src/ClipboardR.Core/ClipboardR.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<ItemGroup>
2121
<PackageReference Include="Dapper" Version="2.0.151" />
2222
<PackageReference Include="Flow.Launcher.Plugin" Version="4.1.1" />
23-
<PackageReference Include="Material.Icons.WPF" Version="2.0.0" />
23+
<PackageReference Include="Material.Icons" Version="2.0.11" />
2424
<PackageReference Include="Microsoft.Data.Sqlite" Version="7.0.10" />
2525
<PackageReference Include="Svg" Version="3.4.4" />
2626
</ItemGroup>

src/ClipboardR.Panels.Test/ClipboardR.Panels.Test.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@
1111
<ProjectReference Include="..\ClipboardR.Panels\ClipboardR.Panels.csproj" />
1212
</ItemGroup>
1313

14+
1415
<ItemGroup>
15-
<PackageReference Include="Material.Icons.WPF" Version="2.0.0" />
16+
<PackageReference Include="Material.Icons" Version="2.0.11" />
1617
</ItemGroup>
1718

1819
</Project>

src/ClipboardR.Panels/ClipboardR.Panels.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<ItemGroup>
2828
<PackageReference Include="Flow.Launcher.Plugin" Version="4.1.1" />
29-
<PackageReference Include="Material.Icons.WPF" Version="2.0.0" />
29+
<PackageReference Include="Material.Icons" Version="2.0.11" />
3030
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
3131
</ItemGroup>
3232

src/ClipboardR/ClipboardR.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<PackageReference Include="Flow.Launcher.Plugin" Version="4.1.1" />
4141
<PackageReference Include="H.InputSimulator" Version="1.4.0">
4242
</PackageReference>
43-
<PackageReference Include="Material.Icons.WPF" Version="2.0.0" />
43+
<PackageReference Include="Material.Icons" Version="2.0.11" />
4444
</ItemGroup>
4545

4646
<ItemGroup>

src/ClipboardR/Main.cs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
using ClipboardR.Core;
1515
using ClipboardR.Panels;
1616
using Material.Icons;
17-
using Material.Icons.WPF;
1817

1918
namespace ClipboardR;
2019

@@ -46,12 +45,14 @@ public class ClipboardR : IPlugin, IDisposable, ISettingProvider, ISavable
4645

4746
private PluginInitContext _context = null!;
4847
private LinkedList<ClipboardData> _dataList = new();
48+
public string RequeryString { get; private set; }
4949

5050
public void Init(PluginInitContext ctx)
5151
{
5252
this._context = ctx;
5353
_context.API.LogDebug(ClassName, "Adding clipboard listener");
5454
this._clipboard.ClipboardChanged += _OnClipboardChange;
55+
RequeryString = _context.CurrentPluginMetadata.ActionKeyword;
5556

5657
ClipDir = new DirectoryInfo(ctx.CurrentPluginMetadata.PluginDirectory);
5758
var imageCacheDirectoryPath = Path.Combine(ClipDir.FullName, "CachedImages");
@@ -169,10 +170,7 @@ public List<Result> Query(Query query)
169170
Score = 1,
170171
Action = _ =>
171172
{
172-
_context.API.ChangeQuery(
173-
_context.CurrentPluginMetadata.ActionKeyword + " clear ",
174-
true
175-
);
173+
_context.API.ChangeQuery(RequeryString + " clear ", true);
176174
return false;
177175
},
178176
}
@@ -214,7 +212,7 @@ private Result ClipDataToResult(ClipboardData o)
214212
VirtualKeyCode.CONTROL,
215213
VirtualKeyCode.VK_V
216214
);
217-
_context.API.ChangeQuery(_context.CurrentPluginMetadata.ActionKeyword, true);
215+
_context.API.ChangeQuery(RequeryString, true);
218216
return true;
219217
},
220218
};
@@ -332,14 +330,14 @@ public void CopyToClipboard(ClipboardData clipboardData)
332330
{
333331
_dataList.Remove(clipboardData);
334332
System.Windows.Forms.Clipboard.SetDataObject(clipboardData.Data);
335-
_context.API.ChangeQuery(_context.CurrentPluginMetadata.ActionKeyword, true);
333+
_context.API.ChangeQuery(RequeryString, true);
336334
}
337335

338336
public void RemoveFromDatalist(ClipboardData clipboardData)
339337
{
340338
_dataList.Remove(clipboardData);
341339
_dbHelper.DeleteOneRecord(clipboardData);
342-
_context.API.ChangeQuery(_context.CurrentPluginMetadata.ActionKeyword, true);
340+
_context.API.ChangeQuery(RequeryString, true);
343341
}
344342

345343
public void PinOneRecord(ClipboardData c)
@@ -351,7 +349,7 @@ public void PinOneRecord(ClipboardData c)
351349
: GetDefaultIcon(c);
352350
_dataList.AddLast(c);
353351
_dbHelper.PinOneRecord(c);
354-
_context.API.ChangeQuery(_context.CurrentPluginMetadata.ActionKeyword, true);
352+
_context.API.ChangeQuery(RequeryString, true);
355353
}
356354

357355
public BitmapImage GetDefaultIcon(ClipboardData data)

0 commit comments

Comments
 (0)