Changeset 13369

Timestamp:

11/24/15 17:08:43 (8 years ago)

Author:

gkronber

Message:

#2522: improvements to AboutDialog and PluginInformationDialog

Location:

branches/RefactorPluginInfrastructure-2522

Files:

• HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/MenuItems/AboutMenuItem.cs (modified) (2 diffs)
• HeuristicLab.Optimizer/3.3/MenuItems/AboutPluginsMenuItem.cs (added)
• HeuristicLab.PluginInfrastructure.UI/AboutDialog.cs (modified) (2 diffs)
• HeuristicLab.PluginInfrastructure.UI/PluginInformationDialog.cs (modified) (3 diffs)
• HeuristicLab.PluginInfrastructure.UI/StarterForm.cs (modified) (2 diffs)
• HeuristicLab.PluginInfrastructure/3.3/AssemblyExtensions.cs (modified) (1 diff)

branches/RefactorPluginInfrastructure-2522/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj

@@ -150 +150 @@
     <EmbeddedResource Include="Documents\ALPSGA_TSP.hl" />
     <None Include="Plugin.cs.frame" />
+    <Compile Include="MenuItems\AboutPluginsMenuItem.cs" />
     <Compile Include="OptimizerSingleDocumentMainForm.cs">
       <SubType>Form</SubType>

branches/RefactorPluginInfrastructure-2522/HeuristicLab.Optimizer/3.3/MenuItems/AboutMenuItem.cs

@@ -23 +23 @@
 using System.Windows.Forms;
 using HeuristicLab.MainForm;
+using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.PluginInfrastructure.UI;
 
@@ -41 +42 @@
     public override void Execute() {
       if (aboutDialog == null)
-        aboutDialog = new AboutDialog();
+        aboutDialog = new AboutDialog(ApplicationManager.Manager.Plugins, GetType().Assembly); // show information about optimizer
       aboutDialog.ShowDialog((IWin32Window)MainFormManager.MainForm);
     }

branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure.UI/AboutDialog.cs

@@ -37 +37 @@
     /// </summary>
     /// <param name="plugins">Enumerable of plugins that should be listed.</param>
-    public AboutDialog(IEnumerable<IPluginDescription> plugins) {
+    public AboutDialog(IEnumerable<IPluginDescription> plugins, Assembly mainAssembly) {
       InitializeComponent();
-      var entryAssembly = Assembly.GetEntryAssembly();
-      productTextBox.Text = GetProduct(entryAssembly);
-      versionTextBox.Text = entryAssembly.GetFileVersion();
-      copyrightTextBox.Text = GetCopyright(entryAssembly);
+
+      productTextBox.Text = mainAssembly.GetProduct();
+      versionTextBox.Text = mainAssembly.GetFileVersion();
+      copyrightTextBox.Text = mainAssembly.GetCopyright();
       imageList.Images.Add(Resources.Plugin);
       pictureBox.Image = Resources.HeuristicLabLogo;
@@ -54 +54 @@
     /// </summary>
     public AboutDialog()
-      : this(ApplicationManager.Manager.Plugins) {
-    }
-
-    private ListViewItem CreateListViewItem(IPluginDescription plugin) {
-      ListViewItem item = new ListViewItem(new string[] { plugin.Name, plugin.Version.ToString(), plugin.Description });
-      item.Tag = plugin;
-      item.ImageIndex = 0;
-      return item;
-    }
-
-    private string GetCopyright(Assembly asm) {
-      AssemblyCopyrightAttribute attribute = GetAttribute<AssemblyCopyrightAttribute>(asm);
-      return attribute.Copyright;
-    }
-
-    private string GetProduct(Assembly asm) {
-      AssemblyProductAttribute attribute = GetAttribute<AssemblyProductAttribute>(asm);
-      return attribute.Product;
-    }
-
-    private T GetAttribute<T>(Assembly asm) {
-      return (T)asm.GetCustomAttributes(typeof(T), false).Single();
+      : this(ApplicationManager.Manager.Plugins, typeof(IPluginDescription).Assembly) {
     }
 
     private void okButton_Click(object sender, EventArgs e) {
       Close();
-    }
-
-    private void pluginListView_ItemActivate(object sender, EventArgs e) {
     }
 

branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure.UI/PluginInformationDialog.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Drawing;
-using System.IO;
 using System.Linq;
-using System.Reflection;
-using System.Text.RegularExpressions;
 using System.Windows.Forms;
 
@@ -36 +33 @@
     public PluginInformationDialog(IEnumerable<IPluginDescription> plugins) {
       InitializeComponent();
-      var entryAssembly = Assembly.GetEntryAssembly();
-      productTextBox.Text = GetProduct(entryAssembly);
-      versionTextBox.Text = entryAssembly.GetFileVersion();
-      contactTextBox.Text = GetCopyright(entryAssembly);
       imageList.Images.Add(Resources.Plugin);
       textBox.Text = Resources.LicenseText;
       PopulatePluginList(plugins);
+
+      // select first plugin to update plugin details
+      pluginListView.Items[0].Selected = true;
+      pluginListView.EnsureVisible(0);
+
       ActiveControl = okButton;
     }
@@ -66 +64 @@
       item.SubItems[2].Name = "Description";
       return item;
-    }
-
-    private string GetCopyright(Assembly asm) {
-      AssemblyCopyrightAttribute attribute = GetAttribute<AssemblyCopyrightAttribute>(asm);
-      return attribute.Copyright;
-    }
-
-    private string GetProduct(Assembly asm) {
-      AssemblyProductAttribute attribute = GetAttribute<AssemblyProductAttribute>(asm);
-      return attribute.Product;
-    }
-
-    private T GetAttribute<T>(Assembly asm) {
-      return (T)asm.GetCustomAttributes(typeof(T), false).Single();
     }
 

branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure.UI/StarterForm.cs

@@ -24 +24 @@
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
@@ -130 +131 @@
     private void aboutButton_Click(object sender, EventArgs e) {
       List<IPluginDescription> plugins = new List<IPluginDescription>(pluginManager.Plugins.OfType<IPluginDescription>());
-      using (var dialog = new AboutDialog(plugins)) {
+      using (var dialog = new AboutDialog(plugins, Assembly.GetEntryAssembly())) {
         dialog.ShowDialog();
       }

branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/AssemblyExtensions.cs

@@ -52 +52 @@
       return GetCustomAttributeValue<AssemblyFileVersionAttribute>(assembly, "Version");
     }
+    public static string GetCopyright(this Assembly assembly) {
+      return GetCustomAttributeValue<AssemblyCopyrightAttribute>(assembly, "Copyright");
+    }
+
+    public static string GetProduct(this Assembly assembly) {
+      return GetCustomAttributeValue<AssemblyProductAttribute>(assembly, "Product");
+    }
+
   }
 }