Skip to content

Commit 9eff270

Browse files
committed
Migrate to iNKORE.UI.WPF.Modern UI Framework
Flow-Launcher/Flow.Launcher#3593
1 parent 3083ace commit 9eff270

6 files changed

Lines changed: 6 additions & 7 deletions

File tree

Flow.Launcher.Plugin.OneNote/Flow.Launcher.Plugin.OneNote.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
<ItemGroup>
3131
<PackageReference Include="Flow.Launcher.Plugin" Version="5.2.0" />
3232
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
33-
<PackageReference Include="ModernWpfUI" Version="0.9.6" />
3433
<PackageReference Include="LinqToOneNote" Version="2.0.0" />
3534
<PackageReference Include="System.Drawing.Common" Version="8.0.6" />
35+
<PackageReference Include="iNKORE.UI.WPF.Modern" Version="0.10.1" />
3636
</ItemGroup>
3737

3838
<ItemGroup>

Flow.Launcher.Plugin.OneNote/UI/DesignTimeStyles.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
66
xmlns:system="clr-namespace:System;assembly=mscorlib"
7-
xmlns:ui="http://schemas.modernwpf.com/2019"
7+
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
88
mc:Ignorable="d">
9-
109
<!--
1110
See Styles.xaml for license
1211
Makes viewing the xaml filled with less errors.

Flow.Launcher.Plugin.OneNote/UI/Styles.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:componentModel="clr-namespace:System.ComponentModel;assembly=PresentationFramework"
5-
xmlns:ui="http://schemas.modernwpf.com/2019">
5+
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern">
66

77
<!--
88
To make the view match Flow Launcher the styles have been yoinked (replicated) from the repository. (https://github.com/Flow-Launcher/Flow.Launcher/blob/dev/Flow.Launcher/SettingWindow.xaml)

Flow.Launcher.Plugin.OneNote/UI/ViewModels/SettingsViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Windows.Input;
66
using Flow.Launcher.Plugin.OneNote.Icons;
77
using Humanizer;
8-
using Modern = ModernWpf.Controls;
8+
using Modern = iNKORE.UI.WPF.Modern.Controls;
99

1010
namespace Flow.Launcher.Plugin.OneNote.UI.ViewModels
1111
{

Flow.Launcher.Plugin.OneNote/UI/Views/NewOneNotePagePreviewPanel.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7-
xmlns:ui="http://schemas.modernwpf.com/2019"
7+
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
88
xmlns:vm="clr-namespace:Flow.Launcher.Plugin.OneNote.UI.ViewModels"
99
d:DataContext="{d:DesignInstance Type=vm:NewOneNotePageViewModel}"
1010
d:DesignHeight="300"

Flow.Launcher.Plugin.OneNote/UI/Views/SettingsView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
xmlns:linq="clr-namespace:System.Linq;assembly=System.Core"
77
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
88
xmlns:sys="clr-namespace:System;assembly=mscorlib"
9-
xmlns:ui="http://schemas.modernwpf.com/2019"
9+
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
1010
xmlns:vm="clr-namespace:Flow.Launcher.Plugin.OneNote.UI.ViewModels"
1111
d:DataContext="{d:DesignInstance Type=vm:SettingsViewModel}"
1212
d:DesignHeight="700"

0 commit comments

Comments
 (0)