Changeset 2293 for branches/eraser6/pluginsRewrite/Eraser/SettingsPanel.cs

Timestamp:

1/4/2011 6:29:53 AM (2 years ago)

Author:

lowjoel

Message:

Rename the PluginInstance? class to be the PluginInfo? class.

File:

• branches/eraser6/pluginsRewrite/Eraser/SettingsPanel.cs (modified) (7 diffs)

branches/eraser6/pluginsRewrite/Eraser/SettingsPanel.cs

@@ -34 +34 @@
 
 using Eraser.Manager;
-using Eraser.Manager.Plugin;
+using Eraser.Plugins;
 using Eraser.Util;
 using Eraser.Util.ExtensionMethods;
@@ -59 +59 @@
         {
             ListViewItem item = new ListViewItem();
-            if (e.Instance.Plugin == null)
-            {
-                item.Text = System.IO.Path.GetFileNameWithoutExtension(e.Instance.Assembly.Location);
-                item.SubItems.Add(e.Instance.AssemblyInfo.Author);
+            if (e.Plugin.Loaded)
+            {
+                item.Text = e.Plugin.Plugin.Name;
+                item.SubItems.Add(e.Plugin.Plugin.Author);
             }
             else
             {
-                item.Text = e.Instance.Plugin.Name;
-                item.SubItems.Add(e.Instance.Plugin.Author);
-            }
-
+                item.Text = System.IO.Path.GetFileNameWithoutExtension(e.Plugin.Assembly.Location);
+                item.SubItems.Add(e.Plugin.AssemblyInfo.Author);
+            }
+            
             //The item is checked if the plugin was given the green light to load
-            item.Checked = e.Instance.Plugin != null ||
+            item.Checked = e.Plugin.Plugin != null ||
                 (Manager.ManagerLibrary.Settings.PluginApprovals.ContainsKey(
-                    e.Instance.AssemblyInfo.Guid) && Manager.ManagerLibrary.
-                    Settings.PluginApprovals[e.Instance.AssemblyInfo.Guid]
+                    e.Plugin.AssemblyInfo.Guid) && Manager.ManagerLibrary.
+                    Settings.PluginApprovals[e.Plugin.AssemblyInfo.Guid]
                 );
 
             //Visually display the other metadata associated with the assembly
-            item.ImageIndex = e.Instance.AssemblyAuthenticode == null ? -1 : 0;
-            item.Group = e.Instance.LoadingPolicy == LoadingPolicy.Core ?
+            item.ImageIndex = e.Plugin.AssemblyAuthenticode == null ? -1 : 0;
+            item.Group = e.Plugin.LoadingPolicy == LoadingPolicy.Core ?
                 pluginsManager.Groups[0] : pluginsManager.Groups[1];
-            item.SubItems.Add(e.Instance.Assembly.GetFileVersion().ToString());
-            item.SubItems.Add(e.Instance.Assembly.Location);
-            item.Tag = e.Instance;
+            item.SubItems.Add(e.Plugin.Assembly.GetFileVersion().ToString());
+            item.SubItems.Add(e.Plugin.Assembly.Location);
+            item.Tag = e.Plugin;
             pluginsManager.Items.Add(item);
         }
@@ -122 +122 @@
             //Load the list of plugins
             Host instance = Host.Instance;
-            IEnumerator<PluginInstance> i = instance.Plugins.GetEnumerator();
+            IEnumerator<PluginInfo> i = instance.Plugins.GetEnumerator();
             while (i.MoveNext())
                 OnNewPluginLoaded(this, new PluginLoadedEventArgs(i.Current));
@@ -309 +309 @@
         {
             ListViewItem item = pluginsManager.Items[e.Index];
-            PluginInstance instance = (PluginInstance)item.Tag;
-            if (instance.LoadingPolicy == LoadingPolicy.Core)
+            PluginInfo plugin = (PluginInfo)item.Tag;
+            if (plugin.LoadingPolicy == LoadingPolicy.Core)
                 e.NewValue = CheckState.Checked;
         }
@@ -318 +318 @@
             if (pluginsManager.SelectedItems.Count == 1)
             {
-                PluginInstance instance = (PluginInstance)pluginsManager.SelectedItems[0].Tag;
-                e.Cancel = instance.Plugin == null || !instance.Plugin.Configurable;
+                PluginInfo plugin = (PluginInfo)pluginsManager.SelectedItems[0].Tag;
+                e.Cancel = !(plugin.Loaded && plugin.Plugin.Configurable);
             }
             else
@@ -330 +330 @@
                 return;
 
-            PluginInstance instance = (PluginInstance)pluginsManager.SelectedItems[0].Tag;
-            instance.Plugin.DisplaySettings(this);
+            PluginInfo plugin = (PluginInfo)pluginsManager.SelectedItems[0].Tag;
+            plugin.Plugin.DisplaySettings(this);
         }
 
@@ -348 +348 @@
             foreach (ListViewItem item in pluginsManager.Items)
             {
-                PluginInstance plugin = (PluginInstance)item.Tag;
+                PluginInfo plugin = (PluginInfo)item.Tag;
                 Guid guid = plugin.AssemblyInfo.Guid;
                 if (!pluginApprovals.ContainsKey(guid))