Added setting to allow users to always open items in a new OneNote window.

Odotocodot · Odotocodot · commit d541fa755327 · 2026-04-25T19:35:23.000+01:00
Also refactor `IconGeneratorInfo`. Closes #40
diff --git a/Changelog.md b/Changelog.md
@@ -2,7 +2,7 @@
 
 ## 3.1.0
 
-- :star: **Recent pages** is dead, long live **sort by last modified**  ([#32](https://github.com/Odotocodot/Flow.Launcher.Plugin.OneNote/issues/32))
+- :star: **Recent pages** is dead, long live **sort by last modified**.  ([#32](https://github.com/Odotocodot/Flow.Launcher.Plugin.OneNote/issues/32))
   - Using the **sort by last modified** keyword, as the name implies, allows you to sort results by last modified. But unlike **recent pages** you can now use it in multiple places, i.e. with **title search**, **scoped search** and **notebook explorer**. Note it must be placed after the aforementioned keywords.
   - Examples:\
     (`#` = **sort by last modified** keyword, `*` = **title search** keyword, `nb:\` = **notebook explorer** keyword, `>` = **scoped search** keyword)
@@ -11,7 +11,7 @@
     - ```on: nb:\PathToItem\#{your search query}```
     - ```on: nb:\PathToItem\>#{your search query}```
     - ```on: nb:\PathToItem\*#{your search query}```  
-
+- Added a setting to allow users to always open items in a new OneNote window. ([#40](https://github.com/Odotocodot/Flow.Launcher.Plugin.OneNote/issues/40))
 
 ## 3.0.1 - 2026-03-13
 
diff --git a/Flow.Launcher.Plugin.OneNote/Icons/IconGeneratorInfo.cs b/Flow.Launcher.Plugin.OneNote/Icons/IconGeneratorInfo.cs
@@ -3,30 +3,27 @@
 
 namespace Flow.Launcher.Plugin.OneNote.Icons
 {
-	public struct IconGeneratorInfo
+	public readonly struct IconGeneratorInfo
 	{
 		public readonly string prefix = string.Empty;
 		public readonly Color? color;
-		
-		public IconGeneratorInfo(IOneNoteItem item)
+
+		private IconGeneratorInfo(string prefix, Color? color = null)
+		{
+			this.prefix = prefix;
+			this.color = color;
+		}
+
+		public static IconGeneratorInfo Create(IOneNoteItem item)
 		{
-			switch (item)
+			return item switch
 			{
-				case Notebook n:
-					prefix = IconConstants.Notebook;
-					color = n.Color;
-					break;
-				case SectionGroup sg:
-					prefix = sg.IsRecycleBin ? IconConstants.RecycleBin : IconConstants.SectionGroup;
-					break;
-				case Section s:
-					prefix = IconConstants.Section;
-					color = s.Color;
-					break;
-				case Page:
-					prefix = IconConstants.Page;
-					break;
-			}
+				Notebook n => new (IconConstants.Notebook, n.Color),
+				SectionGroup sg => new (sg.IsRecycleBin ? IconConstants.RecycleBin : IconConstants.SectionGroup),
+				Section s => new (IconConstants.Section, s.Color),
+				Page => new (IconConstants.Page),
+				_ => new (),
+			};
 		}
 	}
 }
diff --git a/Flow.Launcher.Plugin.OneNote/ResultCreator.cs b/Flow.Launcher.Plugin.OneNote/ResultCreator.cs
@@ -11,22 +11,12 @@
 
 namespace Flow.Launcher.Plugin.OneNote
 {
-    public class ResultCreator
+    public class ResultCreator(PluginInitContext context, Settings settings, IconProvider iconProvider)
     {
-        private readonly PluginInitContext context;
-        private readonly Settings settings;
-        private readonly IconProvider iconProvider;
-
         private const string PathSeparator = " > ";
         private const string BulletPoint = "\u2022  ";
         private const string TrianglePoint = "\u2023  ";
         private string ActionKeyword => context.CurrentPluginMetadata.ActionKeyword;
-        public ResultCreator(PluginInitContext context, Settings settings, IconProvider iconProvider)
-        {
-            this.settings = settings;
-            this.iconProvider = iconProvider;
-            this.context = context;
-        }
 
         private static string GetNicePath(IOneNoteItem item, string separator = PathSeparator) => item.GetRelativePath(false, separator); 
 
@@ -104,7 +94,7 @@ public List<Result> EmptyQuery()
                     PreviewPanel = GetNewPagePreviewPanel(null, null),
                     Action = _ =>
                     {
-                        OneNoteApp.CreateQuickNote(OpenMode.ExistingOrNewWindow);
+                        OneNoteApp.CreateQuickNote(settings.AlwaysOpenInNewWindow ? OpenMode.NewWindow : OpenMode.ExistingOrNewWindow);
                         WindowHelper.FocusOneNote();
                         return true;
                     },
@@ -142,7 +132,7 @@ public Result CreateOneNoteItemResult(IOneNoteItem item, bool actionIsAutoComple
             var toolTip = string.Empty;
             var subTitle = GetNicePath(item);
             var autoCompleteText = GetAutoCompleteText(item);
-            var iconInfo = new IconGeneratorInfo(item);
+            var iconInfo = IconGeneratorInfo.Create(item);
             
             switch (item)
             {
@@ -213,7 +203,7 @@ public Result CreateOneNoteItemResult(IOneNoteItem item, bool actionIsAutoComple
                     await Task.Run(() =>
                     {
                         item.Sync();
-                        item.Open();
+                        OneNoteApp.Open(item, settings.AlwaysOpenInNewWindow);
                     });
                     WindowHelper.FocusOneNote();
                     return true;
@@ -233,7 +223,7 @@ public Result CreateRecentItemResult(IOneNoteItem item, bool actionIsAutoComplet
             return result;
         }
 
-        //When name can have invalid chars
+        //When new name can have invalid chars
         private Result CreateNewItemResult<TNew, TParent>(string newName, TParent? parent, string iconPath, Func<TParent?, string, OpenMode, TNew> createFunc)
             where TNew : IOneNoteItem, INameInvalidCharacters
             where TParent : IOneNoteItem
@@ -261,7 +251,10 @@ private Result CreateNewItemResult<TNew, TParent>(string newName, TParent? paren
                         return false;
 
                     bool showOneNote = !c.SpecialKeyState.CtrlPressed;
-                    createFunc(parent, newName, showOneNote ? OpenMode.ExistingOrNewWindow : OpenMode.None);
+                    bool newWindow = settings.AlwaysOpenInNewWindow;
+
+                    OpenMode openMode = showOneNote ? newWindow ? OpenMode.NewWindow : OpenMode.ExistingOrNewWindow : OpenMode.None;
+                    createFunc(parent, newName, openMode);
 
                     context.API.ReQuery();
 
@@ -291,18 +284,27 @@ public List<Result> ContextMenu(Result selectedResult)
             var results = new List<Result>();
             if (selectedResult.ContextData is IOneNoteItem item)
             {
-                var result = CreateOneNoteItemResult(item, false);
-                result.Title = $"Open and sync \"{item.Name}\"";
-                result.SubTitle = string.Empty;
-                result.Score = 30;
-                result.AddSelectedCount = false;
-                result.ContextData = null;
-                results.Add(result);
+                Result.IconDelegate icon = iconProvider.GetIcon(IconGeneratorInfo.Create(item));                
+                results.Add(new Result
+                {
+                    Title =  $"Open and sync \"{item.Name}\"",
+                    Icon = icon,
+                    Score = 30,
+                    AddSelectedCount = false,
+                    Action = _ =>
+                    {
+                        OneNoteApp.Open(item);
+                        OneNoteApp.SyncItem(item);
+                        WindowHelper.FocusOneNote();
+                        return true;
+                    }
+                });
+                
                 
                 results.Add(new Result
                 {
                     Title = $"Open \"{item.Name}\" in new OneNote window",
-                    Icon = result.Icon,
+                    Icon = icon,
                     Score = 20,
                     AddSelectedCount = false,
                     Action = _ =>
@@ -381,7 +383,7 @@ Result EmptyCollectionResult(string title, string iconPath, string? subTitle = n
         }
 
         private Lazy<System.Windows.Controls.UserControl> GetNewPagePreviewPanel(Section? section, string? pageTitle)
-            => new(() => new NewOneNotePagePreviewPanel(context, section, pageTitle));
+            => new(() => new NewOneNotePagePreviewPanel(context, settings, section, pageTitle));
 
         public static List<Result> NoMatchesFound()
         {
diff --git a/Flow.Launcher.Plugin.OneNote/Settings.cs b/Flow.Launcher.Plugin.OneNote/Settings.cs
@@ -10,6 +10,7 @@ public class Settings : UI.Model
 		private bool createColoredIcons = true;
 		private int maxResults = 30;
 		private bool useMaxResults = true;
+		private bool alwaysOpenInNewWindow = false;
 		private IconTheme iconTheme = IconTheme.Color;
 		public Keywords Keywords { get; init; } = new Keywords();
 
@@ -54,5 +55,11 @@ public IconTheme IconTheme
 			get => iconTheme;
 			set => SetProperty(ref iconTheme, value);
 		}
+
+		public bool AlwaysOpenInNewWindow
+		{
+			get => alwaysOpenInNewWindow;
+			set => alwaysOpenInNewWindow = value;
+		}
 	}
 }
diff --git a/Flow.Launcher.Plugin.OneNote/UI/ViewModels/NewOneNotePageViewModel.cs b/Flow.Launcher.Plugin.OneNote/UI/ViewModels/NewOneNotePageViewModel.cs
@@ -12,10 +12,12 @@ public class NewOneNotePageViewModel : Model
 		private string pageContent = string.Empty;
 		private readonly Section? section;
 		private readonly PluginInitContext context;
+		private readonly Settings settings;
 
-		public NewOneNotePageViewModel(PluginInitContext context, Section? section, string? pageTitle)
+		public NewOneNotePageViewModel(PluginInitContext context, Settings settings, Section? section, string? pageTitle)
 		{
 			this.context = context;
+			this.settings = settings;
 			this.section = section;
 			PageTitle = pageTitle;
 			CreateCommand = new RelayCommand(() => CreatePage(false));
@@ -33,6 +35,7 @@ private void CreatePage(bool openImmediately)
 			{
 				page = OneNoteApp.CreatePage(section, PageTitle);
 			}
+			
 			var xmlWrap = $"""
 						<one:Outline>
 							<one:Position x="36.0" y="86.4000015258789" z="0"/>
@@ -52,7 +55,7 @@ private void CreatePage(bool openImmediately)
 			context.API.ReQuery();
 			if (openImmediately)
 			{
-				page.Open();
+				OneNoteApp.Open(page, settings.AlwaysOpenInNewWindow);
 				context.API.HideMainWindow();
 				WindowHelper.FocusOneNote();
 			}
diff --git a/Flow.Launcher.Plugin.OneNote/UI/Views/NewOneNotePagePreviewPanel.xaml.cs b/Flow.Launcher.Plugin.OneNote/UI/Views/NewOneNotePagePreviewPanel.xaml.cs
@@ -8,9 +8,9 @@ namespace Flow.Launcher.Plugin.OneNote.UI.Views
 {
 	public partial class NewOneNotePagePreviewPanel : UserControl
 	{
-		public NewOneNotePagePreviewPanel(PluginInitContext context, Section? section, string? pageTitle)
+		public NewOneNotePagePreviewPanel(PluginInitContext context, Settings settings, Section? section, string? pageTitle)
 		{
-			DataContext = new NewOneNotePageViewModel(context, section, pageTitle);
+			DataContext = new NewOneNotePageViewModel(context, settings, section, pageTitle);
 			InitializeComponent();
 		}
 		private void NewOneNotePagePreviewPanel_OnLoaded(object sender, RoutedEventArgs e)
diff --git a/Flow.Launcher.Plugin.OneNote/UI/Views/SettingsView.xaml b/Flow.Launcher.Plugin.OneNote/UI/Views/SettingsView.xaml
@@ -76,6 +76,47 @@
         </Border>
         <!--#endregion-->
 
+        <!--#region Always Open In New Window-->
+        <Border Style="{DynamicResource SettingGroupBox}">
+            <ItemsControl Style="{StaticResource SettingGrid}">
+                <StackPanel Style="{StaticResource TextPanel}">
+                    <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="Always open items in a new OneNote window" />
+                </StackPanel>
+                <ui:ToggleSwitch
+                    Grid.Column="2"
+                    IsOn="{Binding Settings.AlwaysOpenInNewWindow}"
+                    Style="{DynamicResource SideToggleSwitch}" />
+                <ui:FontIcon Glyph="&#xe8a7;" Style="{StaticResource Glyph}" />
+            </ItemsControl>
+        </Border>
+        <!--#endregion-->
+
+        <!--#region Max Results-->
+        <Border Style="{DynamicResource SettingGroupBox}">
+            <ItemsControl Style="{StaticResource SettingGrid}">
+                <StackPanel Style="{StaticResource TextPanel}">
+                    <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="Limit the of results" />
+                    <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="The max number of results to show when searching, can improve performance. Turn off to always show all results" />
+                </StackPanel>
+                <StackPanel Grid.Column="2" Orientation="Horizontal">
+                    <ui:NumberBox
+                        Width="140"
+                        MinWidth="140"
+                        Margin="0,4,22,4"
+                        VerticalAlignment="Center"
+                        IsEnabled="{Binding Settings.UseMaxResults}"
+                        Maximum="100000"
+                        Minimum="1"
+                        SmallChange="5"
+                        SpinButtonPlacementMode="Compact"
+                        Value="{Binding Settings.MaxResults}" />
+                    <ui:ToggleSwitch IsOn="{Binding Settings.UseMaxResults}" Style="{DynamicResource SideToggleSwitch}" />
+                </StackPanel>
+                <ui:FontIcon Glyph="&#xe8fd;" Style="{StaticResource Glyph}" />
+            </ItemsControl>
+        </Border>
+        <!--#endregion-->
+
         <!--#region Coloured icons-->
         <Border Style="{DynamicResource SettingGroupBox}">
             <ItemsControl Style="{StaticResource SettingGrid}">
@@ -155,31 +196,6 @@
             </ItemsControl>
         </Border>
         <!--#endregion-->
-        
-        <!--#region Max Results-->
-        <Border Style="{DynamicResource SettingGroupBox}">
-            <ItemsControl Style="{StaticResource SettingGrid}">
-                <StackPanel Style="{StaticResource TextPanel}">
-                    <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="Limit the of results" />
-                    <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="The max number of results to show when searching, can improve performance. Turn off to always show all results" />
-                </StackPanel>
-                <StackPanel Grid.Column="2" Orientation="Horizontal">
-                    <ui:NumberBox
-                        Width="140"
-                        MinWidth="140"
-                        Margin="0,4,22,4"
-                        IsEnabled="{Binding Settings.UseMaxResults}"
-                        Maximum="100000"
-                        Minimum="1"
-                        SmallChange="5"
-                        SpinButtonPlacementMode="Compact"
-                        Value="{Binding Settings.MaxResults}" />
-                    <ui:ToggleSwitch IsOn="{Binding Settings.UseMaxResults}" Style="{DynamicResource SideToggleSwitch}" />
-                </StackPanel>
-                <ui:FontIcon Glyph="&#xe8fd;" Style="{StaticResource Glyph}" />
-            </ItemsControl>
-        </Border>
-        <!--#endregion-->
 
         <!--#region Keywords-->
         <Border CornerRadius="0,0,9,9" Style="{DynamicResource SettingGroupBox}">

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ public class Settings : UI.Model`
`10`	`10`	`private bool createColoredIcons = true;`
`11`	`11`	`private int maxResults = 30;`
`12`	`12`	`private bool useMaxResults = true;`
	`13`	`+ private bool alwaysOpenInNewWindow = false;`
`13`	`14`	`private IconTheme iconTheme = IconTheme.Color;`
`14`	`15`	`public Keywords Keywords { get; init; } = new Keywords();`
`15`	`16`
`@@ -54,5 +55,11 @@ public IconTheme IconTheme`
`54`	`55`	`get => iconTheme;`
`55`	`56`	`set => SetProperty(ref iconTheme, value);`
`56`	`57`	`}`
	`58`	`+`
	`59`	`+ public bool AlwaysOpenInNewWindow`
	`60`	`+ {`
	`61`	`+ get => alwaysOpenInNewWindow;`
	`62`	`+ set => alwaysOpenInNewWindow = value;`
	`63`	`+ }`
`57`	`64`	`}`
`58`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,12 @@ public class NewOneNotePageViewModel : Model`
`12`	`12`	`private string pageContent = string.Empty;`
`13`	`13`	`private readonly Section? section;`
`14`	`14`	`private readonly PluginInitContext context;`
	`15`	`+ private readonly Settings settings;`
`15`	`16`
`16`		`- public NewOneNotePageViewModel(PluginInitContext context, Section? section, string? pageTitle)`
	`17`	`+ public NewOneNotePageViewModel(PluginInitContext context, Settings settings, Section? section, string? pageTitle)`
`17`	`18`	`{`
`18`	`19`	`this.context = context;`
	`20`	`+ this.settings = settings;`
`19`	`21`	`this.section = section;`
`20`	`22`	`PageTitle = pageTitle;`
`21`	`23`	`CreateCommand = new RelayCommand(() => CreatePage(false));`
`@@ -33,6 +35,7 @@ private void CreatePage(bool openImmediately)`
`33`	`35`	`{`
`34`	`36`	`page = OneNoteApp.CreatePage(section, PageTitle);`
`35`	`37`	`}`
	`38`	`+`
`36`	`39`	`var xmlWrap = $"""`
`37`	`40`	`<one:Outline>`
`38`	`41`	`<one:Position x="36.0" y="86.4000015258789" z="0"/>`
`@@ -52,7 +55,7 @@ private void CreatePage(bool openImmediately)`
`52`	`55`	`context.API.ReQuery();`
`53`	`56`	`if (openImmediately)`
`54`	`57`	`{`
`55`		`- page.Open();`
	`58`	`+ OneNoteApp.Open(page, settings.AlwaysOpenInNewWindow);`
`56`	`59`	`context.API.HideMainWindow();`
`57`	`60`	`WindowHelper.FocusOneNote();`
`58`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@ namespace Flow.Launcher.Plugin.OneNote.UI.Views`
`8`	`8`	`{`
`9`	`9`	`public partial class NewOneNotePagePreviewPanel : UserControl`
`10`	`10`	`{`
`11`		`- public NewOneNotePagePreviewPanel(PluginInitContext context, Section? section, string? pageTitle)`
	`11`	`+ public NewOneNotePagePreviewPanel(PluginInitContext context, Settings settings, Section? section, string? pageTitle)`
`12`	`12`	`{`
`13`		`- DataContext = new NewOneNotePageViewModel(context, section, pageTitle);`
	`13`	`+ DataContext = new NewOneNotePageViewModel(context, settings, section, pageTitle);`
`14`	`14`	`InitializeComponent();`
`15`	`15`	`}`
`16`	`16`	`private void NewOneNotePagePreviewPanel_OnLoaded(object sender, RoutedEventArgs e)`