@@ -24,14 +24,15 @@ namespace Community.PowerToys.Run.Plugin.Everything
2424{
2525 public class Main : IPlugin , IDisposable , IDelayedExecutionPlugin , IContextMenu , ISettingProvider , IPluginI18n
2626 {
27- private const string Wait = nameof ( Wait ) ;
27+ private const string Legacy = nameof ( Legacy ) ;
2828 private const string Top = nameof ( Top ) ;
2929 private const string NoPreview = nameof ( NoPreview ) ;
3030 private readonly string reservedStringPattern = @"^[\/\\\$\%]+$|^.*[<>].*$" ;
3131 private bool top ;
3232 private bool preview ;
33+ private bool legacy ;
3334
34- public string Name => Resources . plugin_name + "-WIP" ;
35+ public string Name => Resources . plugin_name ;
3536
3637 public string Description => Resources . plugin_description ;
3738
@@ -49,27 +50,22 @@ public class Main : IPlugin, IDisposable, IDelayedExecutionPlugin, IContextMenu,
4950 DisplayLabel = Resources . Preview ,
5051 Value = false ,
5152 } ,
53+ new PluginAdditionalOption ( )
54+ {
55+ Key = Legacy ,
56+ DisplayLabel = "Legacy Icon Logic" ,
57+ Value = false ,
58+ } ,
5259 } ;
5360
5461 private IContextMenu contextMenuLoader ;
5562 private PluginInitContext context ;
5663 private bool disposed ;
57- private static string warningIconPath ;
58-
59- internal static string WarningIcon
60- {
61- get
62- {
63- return warningIconPath ;
64- }
65- }
6664
6765 public void Init ( PluginInitContext context )
6866 {
6967 this . context = context ;
7068 this . contextMenuLoader = new ContextMenuLoader ( context ) ;
71- this . context . API . ThemeChanged += this . OnThemeChanged ;
72- UpdateIconPath ( this . context . API . GetCurrentTheme ( ) ) ;
7369 EverythingSetup ( ) ;
7470 }
7571
@@ -79,8 +75,6 @@ public List<Result> Query(Query query)
7975 return results ;
8076 }
8177
82- [ System . Diagnostics . CodeAnalysis . SuppressMessage ( "Design" , "CA1031:Do not catch general exception types" , Justification = "We want to keep the process alive but will log the exception" ) ]
83- [ System . Diagnostics . CodeAnalysis . SuppressMessage ( "Design" , "CA1062:Validate arguments of public methods" , Justification = "Already validated" ) ]
8478 public List < Result > Query ( Query query , bool delayedExecution )
8579 {
8680 List < Result > results = new List < Result > ( ) ;
@@ -94,25 +88,15 @@ public List<Result> Query(Query query, bool delayedExecution)
9488 {
9589 try
9690 {
97- results . AddRange ( EverythingSearch ( searchQuery , this . top , this . preview ) ) ;
98- }
99- catch ( OperationCanceledException )
100- {
101- results . Add ( new Result ( )
102- {
103- Title = Resources . timeout ,
104- SubTitle = Resources . enable_wait ,
105- IcoPath = warningIconPath ,
106- Score = int . MaxValue ,
107- } ) ;
91+ results . AddRange ( EverythingSearch ( searchQuery , this . top , this . preview , this . legacy ) ) ;
10892 }
10993 catch ( System . ComponentModel . Win32Exception )
11094 {
11195 results . Add ( new Result ( )
11296 {
11397 Title = Resources . Everything_not_running ,
11498 SubTitle = Resources . Everything_ini ,
115- IcoPath = warningIconPath ,
99+ IcoPath = "Images/warning.png" ,
116100 QueryTextDisplay = '.' + Resources . plugin_name ,
117101 Score = int . MaxValue ,
118102 } ) ;
@@ -127,23 +111,6 @@ public List<Result> Query(Query query, bool delayedExecution)
127111 return results ;
128112 }
129113
130- private void OnThemeChanged ( Theme oldtheme , Theme newTheme )
131- {
132- UpdateIconPath ( newTheme ) ;
133- }
134-
135- private static void UpdateIconPath ( Theme theme )
136- {
137- if ( theme == Theme . Light || theme == Theme . HighContrastWhite )
138- {
139- warningIconPath = "Images/Warning.light.png" ;
140- }
141- else
142- {
143- warningIconPath = "Images/Warning.dark.png" ;
144- }
145- }
146-
147114 public List < ContextMenuResult > LoadContextMenus ( Result selectedResult )
148115 {
149116 return this . contextMenuLoader . LoadContextMenus ( selectedResult ) ;
@@ -158,14 +125,17 @@ public void UpdateSettings(PowerLauncherPluginSettings settings)
158125 {
159126 var top = false ;
160127 var nopreview = false ;
128+ var leg = false ;
161129 if ( settings != null && settings . AdditionalOptions != null )
162130 {
163131 top = settings . AdditionalOptions . FirstOrDefault ( x => x . Key == Top ) ? . Value ?? false ;
164132 nopreview = settings . AdditionalOptions . FirstOrDefault ( x => x . Key == NoPreview ) ? . Value ?? false ;
133+ leg = settings . AdditionalOptions . FirstOrDefault ( x => x . Key == Legacy ) ? . Value ?? false ;
165134 }
166135
167136 this . top = top ;
168137 this . preview = nopreview ;
138+ this . legacy = leg ;
169139 }
170140
171141 protected virtual void Dispose ( bool disposing )
@@ -189,12 +159,12 @@ public void Dispose()
189159
190160 public string GetTranslatedPluginTitle ( )
191161 {
192- throw new NotImplementedException ( ) ;
162+ return Resources . plugin_name ;
193163 }
194164
195165 public string GetTranslatedPluginDescription ( )
196166 {
197- throw new NotImplementedException ( ) ;
167+ return Resources . plugin_description ;
198168 }
199169 }
200170}
0 commit comments