Merge pull request #1238 from stevencohn/move-emojis

Move emojis
stevencohn · Dec 24, 2023 · 0512629 · 0512629
2 parents ce0b488 + 5a04fe7
commit 0512629
Show file tree

Hide file tree

Showing 78 changed files with 1,696 additions and 584 deletions.
diff --git a/OneMore/AddInCommands.cs b/OneMore/AddInCommands.cs
@@ -51,11 +51,6 @@ public async Task AddFormulaCmd(IRibbonControl control)
 			=> await factory.Run<AddFormulaCommand>();
 
 
-		[Command("ribEmojiButton_Label", Keys.None, "ribEditMenu")]
-		public async Task EmojiCmd(IRibbonControl control)
-			=> await factory.Run<EmojiCommand>();
-
-
 		public async Task AnalyzeCmd(IRibbonControl control)
 			=> await factory.Run<AnalyzeCommand>();
 
@@ -450,6 +445,11 @@ public async Task InsertDoubleLineCmd(IRibbonControl control)
 			=> await factory.Run<InsertLineCommand>('═');
 
 
+		[Command("ribInsertEmojiButton_Label", Keys.Alt | Keys.F12, "ribSnippetsMenu")]
+		public async Task InsertEmojiCmd(IRibbonControl control)
+			=> await factory.Run<InsertEmojiCommand>();
+
+
 		[Command("ribInsertExpandButton_Label", Keys.None, "ribSnippetsMenu")]
 		public async Task InsertExpandCmd(IRibbonControl control)
 			=> await factory.Run<InsertExpandCommand>();

diff --git a/OneMore/Commands/Extras/SortCommand.cs b/OneMore/Commands/Extras/SortCommand.cs
@@ -116,8 +116,10 @@ private void SortPages(SortBy sorting, bool ascending, bool children)
 			var tree = new List<PageNode>();
 			MakePageTree(tree, pages, 0, 1);
 
+			using var emojis = new Emojis();
+
 			var cleaner = new Func<XElement, string>((e) => sorting == SortBy.Name
-				? Emojis.RemoveEmojis(e.Attribute("name").Value)
+				? emojis.RemoveEmojis(e.Attribute("name").Value)
 				: sorting == SortBy.Created
 					? e.Attribute("dateTime").Value
 					: e.Attribute("lastModifiedTime").Value

diff --git a/OneMore/Commands/Favorites/FavoritesDialog.Designer.cs b/OneMore/Commands/Favorites/FavoritesDialog.Designer.cs
diff --git a/OneMore/Commands/Favorites/FavoritesDialog.resx b/OneMore/Commands/Favorites/FavoritesDialog.resx
@@ -123,12 +123,6 @@
   <metadata name="locationColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="nameColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="locationColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="contextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>