Skip to content

Commit a3a0d17

Browse files
authored
1901 scanner (#1908)
* plugins folder * POC - yeah it works * up * favorites * simple dialog * optimize * caps * ren * caps * caps * localize * localize * props * props * profiles * verbose stop
1 parent 1d7ffca commit a3a0d17

37 files changed

+5181
-23
lines changed

OneMore/AddInCommands.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -842,6 +842,11 @@ public async Task SaveSnippetCmd(IRibbonControl control)
842842
=> await factory.Run<SaveSnippetCommand>();
843843

844844

845+
[Command("ribScanButton_Label", Keys.None, "ribFileMenu")]
846+
public async Task ScanCmd(IRibbonControl control)
847+
=> await factory.Run<ScanCommand>();
848+
849+
845850
[Command("ribScanHashtagsButton_Label", Keys.Control | Keys.Alt | Keys.F9, "ribSearchMenu")]
846851
public async Task ScanHashtagsCmd(IRibbonControl control)
847852
=> await factory.Run<ScanHashtagsCommand>();

OneMore/Commands/Favorites/FavoritesDialog.cs

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace River.OneMoreAddIn.Commands.Favorites
66
{
7+
using Microsoft.Office.Core;
78
using System;
89
using System.ComponentModel;
910
using System.Drawing;
@@ -16,6 +17,8 @@ namespace River.OneMoreAddIn.Commands.Favorites
1617

1718
internal partial class FavoritesDialog : UI.MoreForm
1819
{
20+
private readonly IRibbonUI ribbon;
21+
1922

2023
public FavoritesDialog()
2124
{
@@ -43,11 +46,17 @@ public FavoritesDialog()
4346
}
4447

4548

49+
public FavoritesDialog(IRibbonUI ribbon) : this()
50+
{
51+
this.ribbon = ribbon;
52+
}
53+
54+
4655
private async void BindOnLoad(object sender, EventArgs e)
4756
{
4857
//Native.SwitchToThisWindow(Handle, false);
4958

50-
await using var provider = new FavoritesProvider(null);
59+
await using var provider = new FavoritesProvider(ribbon);
5160
var favorites = provider.LoadFavorites();
5261

5362
gridView.AutoGenerateColumns = false;
@@ -446,7 +455,7 @@ private async void AddCurrentPage(object sender, EventArgs e)
446455
{
447456
await AddIn.Self.AddFavoritePageCmd(null);
448457

449-
await using var provider = new FavoritesProvider(null);
458+
await using var provider = new FavoritesProvider(ribbon);
450459
var favorites = provider.LoadFavorites();
451460
source.Add(favorites[favorites.Count - 1]);
452461
MoveBottom();
@@ -501,7 +510,7 @@ private void ShowMenu(object sender, EventArgs e)
501510

502511
private async void CheckFavorites(object sender, EventArgs e)
503512
{
504-
await using var provider = new FavoritesProvider(null);
513+
await using var provider = new FavoritesProvider(ribbon);
505514

506515
var list = ((BindingList<Favorite>)gridView.DataSource).ToList();
507516
await provider.ValidateFavorites(list);
@@ -519,7 +528,7 @@ private void ManageFavorites(object sender, EventArgs e)
519528

520529
private async void SortFavorites(object sender, EventArgs e)
521530
{
522-
await using var provider = new FavoritesProvider(null);
531+
await using var provider = new FavoritesProvider(ribbon);
523532
var list = provider.SortFavorites();
524533
gridView.DataSource = new BindingList<Favorite>(list);
525534
}

OneMore/Commands/Favorites/FavoritesProvider.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,7 @@ public async Task ValidateFavorites(List<Favorite> favorites)
242242
root.Add(favorite.Root);
243243
}
244244

245-
await using var provider = new FavoritesProvider(ribbon);
246-
provider.SaveFavorites(root);
245+
SaveFavorites(root);
247246
}
248247
else
249248
{

OneMore/Commands/Favorites/GotoFavoriteCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public override async Task Execute(params object[] args)
2525

2626
if (string.IsNullOrWhiteSpace(uri))
2727
{
28-
using var dialog = new FavoritesDialog();
28+
using var dialog = new FavoritesDialog(ribbon);
2929
if (dialog.ShowDialog(owner) == DialogResult.Cancel)
3030
{
3131
return;
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)