added search keywords to items

jensroth-git · jensroth-git · commit 4122f269035b · 2022-11-08T12:08:40.000+01:00
diff --git a/WinLaunch/MainWindow.xaml.cs b/WinLaunch/MainWindow.xaml.cs
@@ -481,8 +481,8 @@ private void Grid_ContextMenuOpening(object sender, ContextMenuEventArgs e)
             if (SBM.LockItems)
                 e.Handled = true;
 
-            if (Settings.CurrentSettings.TabletMode)
-                e.Handled = true;
+            //if (Settings.CurrentSettings.TabletMode)
+            //    e.Handled = true;
         }
     }
 }
diff --git a/WinLaunch/MainWindow/Events.cs b/WinLaunch/MainWindow/Events.cs
@@ -212,12 +212,6 @@ private void MainCanvas_MouseDown(object sender, MouseButtonEventArgs e)
             if (FadingOut)
                 return;
 
-            //if (e.MiddleButton == MouseButtonState.Pressed && Settings.CurrentSettings.MiddleMouseActivation == MiddleMouseButtonAction.Nothing)
-            //{
-            //    //show / hide toolbar
-            //    ToggleToolbar();
-            //}
-
             if (Settings.CurrentSettings.DeskMode)
             {
                 //steal focus on mouse down so the keyboard works
diff --git a/WinLaunch/MainWindow/ItemManagement.cs b/WinLaunch/MainWindow/ItemManagement.cs
@@ -98,7 +98,7 @@ private void AddDefaultApps()
                 var directoryFiles = Directory.GetFiles(directory);
 
                 //create a folder and add all items
-                SBItem Folder = new SBItem(Path.GetFileName(directory), "Folder", null, "", SBItem.FolderIcon);
+                SBItem Folder = new SBItem(Path.GetFileName(directory), "", "Folder", null, "", SBItem.FolderIcon);
                 Folder.IsFolder = true;
 
                 int GridIndex = 0;
@@ -333,7 +333,7 @@ private SBItem PrepareFile(string File)
                     bmps = MiscUtils.GetFileThumbnail(File);
                 }
 
-                return new SBItem(Name, Path, null, "", bmps);
+                return new SBItem(Name, "", Path, null, "", bmps);
             }
             catch (Exception ex)
             {
diff --git a/WinLaunch/Properties/Resources.Designer.cs b/WinLaunch/Properties/Resources.Designer.cs
diff --git a/WinLaunch/Properties/Resources.bg-BG.resx b/WinLaunch/Properties/Resources.bg-BG.resx
@@ -384,6 +384,9 @@
   <data name="Screen" xml:space="preserve">
     <value>Екран</value>
   </data>
+  <data name="SearchKeywords" xml:space="preserve">
+    <value>Ключови думи за търсене:</value>
+  </data>
   <data name="SelectBackground" xml:space="preserve">
     <value>Избери фоново изображение</value>
   </data>
diff --git a/WinLaunch/Properties/Resources.da-DK.resx b/WinLaunch/Properties/Resources.da-DK.resx
@@ -384,6 +384,9 @@
   <data name="Screen" xml:space="preserve">
     <value>Skærm</value>
   </data>
+  <data name="SearchKeywords" xml:space="preserve">
+    <value>Søgeord:</value>
+  </data>
   <data name="SelectBackground" xml:space="preserve">
     <value>Vælg baggrundsbillede</value>
   </data>
diff --git a/WinLaunch/Properties/Resources.de-DE.resx b/WinLaunch/Properties/Resources.de-DE.resx
@@ -384,6 +384,9 @@
   <data name="Screen" xml:space="preserve">
     <value>Bildschirm</value>
   </data>
+  <data name="SearchKeywords" xml:space="preserve">
+    <value>Suche Schlüsselwörter:</value>
+  </data>
   <data name="SelectBackground" xml:space="preserve">
     <value>Wähle ein Hintergrundbild</value>
   </data>
diff --git a/WinLaunch/Properties/Resources.en-US.resx b/WinLaunch/Properties/Resources.en-US.resx
@@ -384,6 +384,9 @@
   <data name="Screen" xml:space="preserve">
     <value>Screen</value>
   </data>
+  <data name="SearchKeywords" xml:space="preserve">
+    <value>Search keywords:</value>
+  </data>
   <data name="SelectBackground" xml:space="preserve">
     <value>Select background image</value>
   </data>
diff --git a/WinLaunch/Properties/Resources.es-ES.resx b/WinLaunch/Properties/Resources.es-ES.resx
@@ -384,6 +384,9 @@
   <data name="Screen" xml:space="preserve">
     <value>Pantalla</value>
   </data>
+  <data name="SearchKeywords" xml:space="preserve">
+    <value>Buscar palabras clave:</value>
+  </data>
   <data name="SelectBackground" xml:space="preserve">
     <value>Seleccionar imagen de fondo</value>
   </data>
diff --git a/WinLaunch/Properties/Resources.fr-FR.resx b/WinLaunch/Properties/Resources.fr-FR.resx
@@ -384,6 +384,9 @@
   <data name="Screen" xml:space="preserve">
     <value>Ecran</value>
   </data>
+  <data name="SearchKeywords" xml:space="preserve">
+    <value>Rechercher des mots-clés:</value>
+  </data>
   <data name="SelectBackground" xml:space="preserve">
     <value>Choix d'une image de fond</value>
   </data>
diff --git a/WinLaunch/Properties/Resources.he-IL.resx b/WinLaunch/Properties/Resources.he-IL.resx
@@ -384,6 +384,9 @@
   <data name="Screen" xml:space="preserve">
     <value>מסך</value>
   </data>
+  <data name="SearchKeywords" xml:space="preserve">
+    <value>חיפוש מילות מפתח:</value>
+  </data>
   <data name="SelectBackground" xml:space="preserve">
     <value>בחר תמונת רקע</value>
   </data>
diff --git a/WinLaunch/Properties/Resources.hu-HU.resx b/WinLaunch/Properties/Resources.hu-HU.resx
@@ -384,6 +384,9 @@
   <data name="Screen" xml:space="preserve">
     <value>Képernyő</value>
   </data>
+  <data name="SearchKeywords" xml:space="preserve">
+    <value>Keresési kulcsszavak:</value>
+  </data>
   <data name="SelectBackground" xml:space="preserve">
     <value>Háttérkép választása</value>
   </data>
diff --git a/WinLaunch/Properties/Resources.id-ID.resx b/WinLaunch/Properties/Resources.id-ID.resx
@@ -384,6 +384,9 @@
   <data name="Screen" xml:space="preserve">
     <value>Layar</value>
   </data>
+  <data name="SearchKeywords" xml:space="preserve">
+    <value>Mencari kata kunci:</value>
+  </data>
   <data name="SelectBackground" xml:space="preserve">
     <value>Pilih gambar latar belakang</value>
   </data>
diff --git a/WinLaunch/Properties/Resources.it-IT.resx b/WinLaunch/Properties/Resources.it-IT.resx
@@ -384,6 +384,9 @@
   <data name="Screen" xml:space="preserve">
     <value>Schermo</value>
   </data>
+  <data name="SearchKeywords" xml:space="preserve">
+    <value>Parole chiave di ricerca:</value>
+  </data>
   <data name="SelectBackground" xml:space="preserve">
     <value>Seleziona l'immagine di sfondo</value>
   </data>
diff --git a/WinLaunch/Properties/Resources.ja-JP.resx b/WinLaunch/Properties/Resources.ja-JP.resx
@@ -384,6 +384,9 @@
   <data name="Screen" xml:space="preserve">
     <value>画面</value>
   </data>
+  <data name="SearchKeywords" xml:space="preserve">
+    <value>検索キーワード:</value>
+  </data>
   <data name="SelectBackground" xml:space="preserve">
     <value>背景画像の選択</value>
   </data>
diff --git a/WinLaunch/Properties/Resources.pl-PL.resx b/WinLaunch/Properties/Resources.pl-PL.resx
@@ -384,6 +384,9 @@
   <data name="Screen" xml:space="preserve">
     <value>Ekran</value>
   </data>
+  <data name="SearchKeywords" xml:space="preserve">
+    <value>Wyszukaj słowa kluczowe:</value>
+  </data>
   <data name="SelectBackground" xml:space="preserve">
     <value>Wybierz obraz tła</value>
   </data>
diff --git a/WinLaunch/Properties/Resources.pt-BR.resx b/WinLaunch/Properties/Resources.pt-BR.resx
@@ -384,6 +384,9 @@
   <data name="Screen" xml:space="preserve">
     <value>Tela</value>
   </data>
+  <data name="SearchKeywords" xml:space="preserve">
+    <value>Procure palavras-chave:</value>
+  </data>
   <data name="SelectBackground" xml:space="preserve">
     <value>Selecione uma imagem para papel de parede</value>
   </data>
diff --git a/WinLaunch/Properties/Resources.resx b/WinLaunch/Properties/Resources.resx
@@ -385,6 +385,9 @@
   <data name="Screen" xml:space="preserve">
     <value>Screen</value>
   </data>
+  <data name="SearchKeywords" xml:space="preserve">
+    <value>Search keywords:</value>
+  </data>
   <data name="SelectBackground" xml:space="preserve">
     <value>Select background image</value>
   </data>
diff --git a/WinLaunch/Properties/Resources.ru-RU.resx b/WinLaunch/Properties/Resources.ru-RU.resx
@@ -384,6 +384,9 @@
   <data name="Screen" xml:space="preserve">
     <value>Экран</value>
   </data>
+  <data name="SearchKeywords" xml:space="preserve">
+    <value>Ключевые слова для поиска:</value>
+  </data>
   <data name="SelectBackground" xml:space="preserve">
     <value>Выбрать фоновое изображение</value>
   </data>
diff --git a/WinLaunch/Properties/Resources.tr-TR.resx b/WinLaunch/Properties/Resources.tr-TR.resx
@@ -384,6 +384,9 @@
   <data name="Screen" xml:space="preserve">
     <value>Ekran</value>
   </data>
+  <data name="SearchKeywords" xml:space="preserve">
+    <value>Arama Kelimeleri:</value>
+  </data>
   <data name="SelectBackground" xml:space="preserve">
     <value>Arka plan resmi seç</value>
   </data>
diff --git a/WinLaunch/Properties/Resources.uk-UA.resx b/WinLaunch/Properties/Resources.uk-UA.resx
@@ -384,6 +384,9 @@
   <data name="Screen" xml:space="preserve">
     <value>Екран</value>
   </data>
+  <data name="SearchKeywords" xml:space="preserve">
+    <value>Ключові слова пошуку:</value>
+  </data>
   <data name="SelectBackground" xml:space="preserve">
     <value>Виберіть фонове зображення</value>
   </data>
diff --git a/WinLaunch/Properties/Resources.zh-CN.resx b/WinLaunch/Properties/Resources.zh-CN.resx
@@ -384,6 +384,9 @@
   <data name="Screen" xml:space="preserve">
     <value>屏幕</value>
   </data>
+  <data name="SearchKeywords" xml:space="preserve">
+    <value>搜索关键字：</value>
+  </data>
   <data name="SelectBackground" xml:space="preserve">
     <value>选择背景图像</value>
   </data>
diff --git a/WinLaunch/Springboard/Folders.cs b/WinLaunch/Springboard/Folders.cs
@@ -532,7 +532,7 @@ public void MoveItemOutOfFolder(SBItem Item, SBItem Folder)
         public void CreateNewFolder(SBItem ItemA, SBItem ItemB, string folderName = "NewFolder")
         {
             //Create Folder
-            SBItem Folder = new SBItem(folderName, "Folder", null, "", SBItem.FolderIcon);
+            SBItem Folder = new SBItem(folderName, "", "Folder", null, "", SBItem.FolderIcon);
             Folder.IsFolder = true;
 
             int GridIndex = Math.Min(ItemA.GridIndex, ItemB.GridIndex);
diff --git a/WinLaunch/Springboard/ItemCollection.cs b/WinLaunch/Springboard/ItemCollection.cs
@@ -265,7 +265,7 @@ private void TranslateToSerializableFormat(List<ICItem> ItemList)
 
             foreach (SBItem item in Items)
             {
-                ICItem NewItem = new ICItem(item.GridIndex, item.Page, item.ApplicationPath, item.IconPath, item.Name, item.Arguments, item.RunAsAdmin, item.IsFolder, item.ShowMiniatures);
+                ICItem NewItem = new ICItem(item.GridIndex, item.Page, item.ApplicationPath, item.IconPath, item.Name, item.Keywords, item.Arguments, item.RunAsAdmin, item.IsFolder, item.ShowMiniatures);
                 ItemList.Add(NewItem);
 
                 if (item.IC.Items.Count != 0)
@@ -288,15 +288,15 @@ private void DeserializeToItems(List<ICItem> ItemList)
                     SBItem SBitem;
                     if (item.IsFolder)
                     {
-                        SBitem = new SBItem(item.Name, item.Application, item.IconPath, item.Arguments, SBItem.FolderIcon);
+                        SBitem = new SBItem(item.Name, item.Keywords, item.Application, item.IconPath, item.Arguments, SBItem.FolderIcon);
                         SBitem.IsFolder = item.IsFolder;
                         SBitem.ShowMiniatures = item.ShowMiniatures;
                     }
                     else
                     {
                         //use Loading image first
                         BitmapSource bmps = SBItem.LoadingImage;
-                        SBitem = new SBItem(item.Name, item.Application, item.IconPath, item.Arguments, bmps);
+                        SBitem = new SBItem(item.Name, item.Keywords, item.Application, item.IconPath, item.Arguments, bmps);
                         SBitem.RunAsAdmin = item.RunAsAdmin;
                     }
 
@@ -332,6 +332,7 @@ public class ICItem
         public int Page = 0;
 
         public string Name = "";
+        public string Keywords = "";
         public string Application = "";
         public string Arguments = "";
         public bool RunAsAdmin = false;
@@ -343,14 +344,15 @@ public ICItem()
             Items = new List<ICItem>();
         }
 
-        public ICItem(int GridIndex, int Page, string App, string IconPath, string Name, string Arguments, bool RunAsAdmin, bool IsFolder, bool showMiniatures)
+        public ICItem(int GridIndex, int Page, string App, string IconPath, string Name, string Keywords, string Arguments, bool RunAsAdmin, bool IsFolder, bool showMiniatures)
         {
             Items = new List<ICItem>();
             this.GridIndex = GridIndex;
             this.Page = Page;
             this.Application = App;
             this.IconPath = IconPath;
             this.Name = Name;
+            this.Keywords = Keywords;
             this.Arguments = Arguments;
             this.RunAsAdmin = RunAsAdmin;
             this.IsFolder = IsFolder;
diff --git a/WinLaunch/Springboard/SBItem.cs b/WinLaunch/Springboard/SBItem.cs
@@ -35,6 +35,8 @@ public sealed class SBItem : DependencyObject
 
         public string Name { get; set; }
 
+        public string Keywords { get; set; }
+
         public string ApplicationPath { get; set; }
 
         public string IconPath { get; set; }
@@ -61,10 +63,11 @@ public void StopWiggle()
             ShowClose = false;
         }
 
-        public SBItem(string Name, string ApplicationPath, string IconPath, string Arguments, BitmapSource Icon, double XPos = 0.0, double YPos = 0.0)
+        public SBItem(string Name, string Keywords, string ApplicationPath, string IconPath, string Arguments, BitmapSource Icon, double XPos = 0.0, double YPos = 0.0)
         {
             this.IC = new ItemCollection();
             this.Name = Name;
+            this.Keywords = Keywords;
             this.ApplicationPath = ApplicationPath;
             this.IconPath = IconPath;
             this.Arguments = Arguments;
diff --git a/WinLaunch/Springboard/SpringboardManager.cs b/WinLaunch/Springboard/SpringboardManager.cs
@@ -10,6 +10,7 @@
 using System.Windows.Media;
 using System.Windows.Threading;
 using Xceed.Wpf.Toolkit.Primitives;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement.Tab;
 using Point = System.Windows.Point;
 
 namespace WinLaunch
@@ -1155,7 +1156,7 @@ private void ItemDraggedOnItem(SBItem DraggedItem, SBItem TargetItem)
 
         #endregion Item event handling
 
-    #region Input handling
+        #region Input handling
 
         //mouse stuff
         private MouseDevice MouseDev = null;
@@ -1865,6 +1866,7 @@ public List<SBItem> GetItemsByName(string name)
             return results;
         }
 
+        //search by name and keywords
         public List<SBItem> FindItemsByName(string name)
         {
             List<SBItem> results = new List<SBItem>();
@@ -1875,15 +1877,17 @@ public List<SBItem> FindItemsByName(string name)
                 {
                     foreach (var subItem in item.IC.Items)
                     {
-                        if (subItem.Name.ToLower().Contains(name.ToLower()))
+                        if (subItem.Name.ToLower().Contains(name.ToLower()) || 
+                            subItem.Keywords.ToLower().Contains(name.ToLower()))
                         {
                             results.Add(subItem);
                         }
                     }
                 }
                 else
                 {
-                    if (item.Name.ToLower().Contains(name.ToLower()))
+                    if (item.Name.ToLower().Contains(name.ToLower()) ||
+                        item.Keywords.ToLower().Contains(name.ToLower()))
                     {
                         results.Add(item);
                     }
diff --git a/WinLaunch/Windows/EditItem.xaml b/WinLaunch/Windows/EditItem.xaml
diff --git a/WinLaunch/Windows/EditItem.xaml.cs b/WinLaunch/Windows/EditItem.xaml.cs
diff --git a/WinLaunch/Windows/Welcome.xaml.cs b/WinLaunch/Windows/Welcome.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -481,8 +481,8 @@ private void Grid_ContextMenuOpening(object sender, ContextMenuEventArgs e)`
`481`	`481`	`if (SBM.LockItems)`
`482`	`482`	`e.Handled = true;`
`483`	`483`
`484`		`- if (Settings.CurrentSettings.TabletMode)`
`485`		`- e.Handled = true;`
	`484`	`+ //if (Settings.CurrentSettings.TabletMode)`
	`485`	`+ // e.Handled = true;`
`486`	`486`	`}`
`487`	`487`	`}`
`488`	`488`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ private void AddDefaultApps()`
`98`	`98`	`var directoryFiles = Directory.GetFiles(directory);`
`99`	`99`
`100`	`100`	`//create a folder and add all items`
`101`		`- SBItem Folder = new SBItem(Path.GetFileName(directory), "Folder", null, "", SBItem.FolderIcon);`
	`101`	`+ SBItem Folder = new SBItem(Path.GetFileName(directory), "", "Folder", null, "", SBItem.FolderIcon);`
`102`	`102`	`Folder.IsFolder = true;`
`103`	`103`
`104`	`104`	`int GridIndex = 0;`
`@@ -333,7 +333,7 @@ private SBItem PrepareFile(string File)`
`333`	`333`	`bmps = MiscUtils.GetFileThumbnail(File);`
`334`	`334`	`}`
`335`	`335`
`336`		`- return new SBItem(Name, Path, null, "", bmps);`
	`336`	`+ return new SBItem(Name, "", Path, null, "", bmps);`
`337`	`337`	`}`
`338`	`338`	`catch (Exception ex)`
`339`	`339`	`{`