Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PTRun][OneNote] Improve the OneNote plugin #36813

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
+1,793 −104
Open

[PTRun][OneNote] Improve the OneNote plugin #36813

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
fc27ed0
Add Odotocodot.OneNote.Linq package reference
Odotocodot Dec 23, 2024
5f948c9
Pull files from old branch
Odotocodot Dec 23, 2024
1a890da
Add plugin icons
Odotocodot Dec 23, 2024
bce3da5
Refactor classes
Odotocodot Dec 23, 2024
1ba5893
Remove unused package references
Odotocodot Dec 23, 2024
925db78
Move user facing strings to resources
Odotocodot Dec 30, 2024
190773d
Simplify result tooltips
Odotocodot Jan 1, 2025
8557a40
Small code clean up
Odotocodot Jan 2, 2025
168275b
Remove unused package references
Odotocodot Jan 2, 2025
d7cf996
Update plugin.json
Odotocodot Jan 2, 2025
abd317d
Add words to spell checker
Odotocodot Jan 2, 2025
88d9e32
Fix incorrect query text
Odotocodot Jan 6, 2025
1554fdd
Refactor creating new OneNote item results
Odotocodot Jan 6, 2025
22403c5
Update Directory.Packages.props
Odotocodot Jan 18, 2025
3e7ff6d
Merge branch 'main' into feature/improve-onenote-plugin-2
Odotocodot Feb 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix incorrect query text
  • Loading branch information
@Odotocodot
Odotocodot committed Jan 18, 2025
commit 88d9e3238e9c57279658eff3387af627012e0218
30 changes: 16 additions & 14 deletions ...dules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.OneNote/Components/ResultCreator.cs
View file
Original file line number Diff line number Diff line change
@@ -72,7 +72,12 @@ private string GetTitle(IOneNoteItem item, List<int>? highlightData)
return title;
}

private string GetQueryTextDisplay(IOneNoteItem item) => $"{Keywords.NotebookExplorer}{GetNicePath(item, Keywords.NotebookExplorerSeparator)}{Keywords.NotebookExplorerSeparator}";
private string GetQueryTextDisplay(IOneNoteItem? parent)
{
return parent is null
? $"{Keywords.NotebookExplorer}"
: $"{Keywords.NotebookExplorer}{GetNicePath(parent, Keywords.NotebookExplorerSeparator)}{Keywords.NotebookExplorerSeparator}";
}

internal List<Result> EmptyQuery(Query query)
{
@@ -174,7 +179,7 @@ internal Result CreateOneNoteItemResult(IOneNoteItem item, bool actionIsAutoComp

break;
case OneNotePage page:
queryTextDisplay = !actionIsAutoComplete ? string.Empty : queryTextDisplay[..^1];
queryTextDisplay = !actionIsAutoComplete ? page.Name : queryTextDisplay[..^1];

actionIsAutoComplete = false;

@@ -233,7 +238,7 @@ internal Result CreateNewPageResult(string newPageName, OneNoteSection section)
{
Title = string.Format(CultureInfo.CurrentCulture, CreatePage, newPageName),
SubTitle = string.Format(CultureInfo.CurrentCulture, Path, GetNicePath(section) + PathSeparator + newPageName),
QueryTextDisplay = $"{GetQueryTextDisplay}{newPageName}",
QueryTextDisplay = $"{GetQueryTextDisplay(section)}{newPageName}",
IcoPath = _iconProvider.NewPage,
Action = ResultAction(() =>
{
@@ -254,7 +259,7 @@ internal Result CreateNewSectionResult(string newSectionName, IOneNoteItem paren
SubTitle = validTitle
? string.Format(CultureInfo.CurrentCulture, Path, GetNicePath(parent) + PathSeparator + newSectionName)
: string.Format(CultureInfo.CurrentCulture, SectionNamesCannotContain, string.Join(' ', OneNoteApplication.InvalidSectionChars)),
QueryTextDisplay = $"{GetQueryTextDisplay}{newSectionName}",
QueryTextDisplay = $"{GetQueryTextDisplay(parent)}{newSectionName}",
IcoPath = _iconProvider.NewSection,
Action = ResultAction(() =>
{
@@ -292,7 +297,7 @@ internal Result CreateNewSectionGroupResult(string newSectionGroupName, IOneNote
SubTitle = validTitle
? string.Format(CultureInfo.CurrentCulture, Path, GetNicePath(parent) + PathSeparator + newSectionGroupName)
: string.Format(CultureInfo.CurrentCulture, SectionGroupNamesCannotContain, string.Join(' ', OneNoteApplication.InvalidSectionGroupChars)),
QueryTextDisplay = $"{GetQueryTextDisplay}{newSectionGroupName}",
QueryTextDisplay = $"{GetQueryTextDisplay(parent)}{newSectionGroupName}",
IcoPath = _iconProvider.NewSectionGroup,
Action = ResultAction(() =>
{
@@ -330,7 +335,7 @@ internal Result CreateNewNotebookResult(string newNotebookName)
SubTitle = validTitle
? string.Format(CultureInfo.CurrentCulture, Location, OneNoteApplication.GetDefaultNotebookLocation())
: string.Format(CultureInfo.CurrentCulture, NotebookNamesCannotContain, string.Join(' ', OneNoteApplication.InvalidNotebookChars)),
QueryTextDisplay = $"{GetQueryTextDisplay}{newNotebookName}",
QueryTextDisplay = $"{GetQueryTextDisplay(null)}{newNotebookName}",
IcoPath = _iconProvider.NewNotebook,
Action = ResultAction(() =>
{
@@ -426,25 +431,22 @@ internal List<Result> NoItemsInCollection(IOneNoteItem? parent, List<Result> res
results.Add(NoItemsInCollectionResult(Resources.CreateSection, _iconProvider.NewSection));
results.Add(NoItemsInCollectionResult(Resources.CreateSectionGroup, _iconProvider.NewSectionGroup));
break;
case OneNoteSection section:
case OneNoteSection section when !section.IsDeletedPages && !section.Locked:
// Can create page
if (!section.Locked)
{
results.Add(NoItemsInCollectionResult(Resources.CreatePage, _iconProvider.NewPage));
}

results.Add(NoItemsInCollectionResult(Resources.CreatePage, _iconProvider.NewPage));
break;
default:
break;
}

return results;

static Result NoItemsInCollectionResult(string title, string iconPath)
Result NoItemsInCollectionResult(string title, string iconPath)
{
return new Result
{
Title = title,
Title = string.Format(CultureInfo.CurrentCulture, title, string.Empty),
QueryTextDisplay = $"{GetQueryTextDisplay(parent)}",
SubTitle = Resources.NoItemsFoundTypeValidName,
IcoPath = iconPath,
};
8 changes: 2 additions & 6 deletions ...ugins/Microsoft.PowerToys.Run.Plugin.OneNote/Components/SearchManager.NotebookExplorer.cs
View file
Original file line number Diff line number Diff line change
@@ -167,12 +167,8 @@ private void AddCreateNewOneNoteItemResults(string newItemName, IOneNoteItem? pa
results.Add(_resultCreator.CreateNewSectionResult(newItemName, parent));
results.Add(_resultCreator.CreateNewSectionGroupResult(newItemName, parent));
break;
case OneNoteSection section:
if (!section.Locked)
{
results.Add(_resultCreator.CreateNewPageResult(newItemName, section));
}

case OneNoteSection section when !section.Locked:
results.Add(_resultCreator.CreateNewPageResult(newItemName, section));
break;
default:
break;