Browse Source

When an external AddIn is missing, allow removing the AddIn with the AddIn Manager.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3671 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 17 years ago
parent
commit
25612ba844
  1. 2
      src/AddIns/Misc/AddInManager/Project/AddInManager.addin
  2. 2
      src/AddIns/Misc/AddInManager/Project/Src/AboutForm.cs
  3. 3
      src/AddIns/Misc/AddInManager/Project/Src/Commands.cs
  4. 2
      src/AddIns/Misc/AddInManager/Project/Src/ManagerForm.cs
  5. 4
      src/Main/Core/Project/Src/AddInTree/AddIn/AddIn.cs
  6. 1
      src/Main/Core/Project/Src/AddInTree/AddInTree.cs

2
src/AddIns/Misc/AddInManager/Project/AddInManager.addin

@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
label="${res:AddInManager.ActionEnable}"
class="ICSharpCode.AddInManager.EnableCommand"/>
</Condition>
<Condition name="AddInManagerAddInState" states="Enable,Disable,InstalledTwice,DependencyError">
<Condition name="AddInManagerAddInState" states="Enable,Disable,InstalledTwice,DependencyError,CustomError">
<MenuItem id="Uninstall"
label="${res:AddInManager.ActionUninstall}"
class="ICSharpCode.AddInManager.UninstallCommand"/>

2
src/AddIns/Misc/AddInManager/Project/Src/AboutForm.cs

@ -69,7 +69,7 @@ namespace ICSharpCode.AddInManager @@ -69,7 +69,7 @@ namespace ICSharpCode.AddInManager
}
titles.Add("AddIn file");
values.Add(System.IO.Path.GetFullPath(addIn.FileName));
values.Add(FileUtility.NormalizePath(addIn.FileName));
titles.Add("Internal name");
values.Add(addIn.Manifest.PrimaryIdentity);

3
src/AddIns/Misc/AddInManager/Project/Src/Commands.cs

@ -8,10 +8,9 @@ @@ -8,10 +8,9 @@
using System;
using System.Collections.Generic;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop;
#if !STANDALONE
using ICSharpCode.SharpDevelop;
#endif
namespace ICSharpCode.AddInManager

2
src/AddIns/Misc/AddInManager/Project/Src/ManagerForm.cs

@ -257,7 +257,7 @@ namespace ICSharpCode.AddInManager @@ -257,7 +257,7 @@ namespace ICSharpCode.AddInManager
runActionButton.Enabled = ShowDependencies(selected, ShowDependencyMode.Disable);
else
runActionButton.Enabled = false;
uninstallButton.Enabled = allUninstallable && runActionButton.Enabled;
uninstallButton.Enabled = allUninstallable;
} else if (allDisabled) {
selectedAction = AddInAction.Enable;
actionGroupBox.Text = runActionButton.Text = ResourceService.GetString("AddInManager.ActionEnable");

4
src/Main/Core/Project/Src/AddInTree/AddIn/AddIn.cs

@ -19,8 +19,8 @@ namespace ICSharpCode.Core @@ -19,8 +19,8 @@ namespace ICSharpCode.Core
List<string> bitmapResources = new List<string>();
List<string> stringResources = new List<string>();
string addInFileName = null;
AddInManifest manifest = new AddInManifest();
internal string addInFileName = null;
AddInManifest manifest = new AddInManifest();
Dictionary<string, ExtensionPath> paths = new Dictionary<string, ExtensionPath>();
AddInAction action = AddInAction.Disable;
bool enabled;

1
src/Main/Core/Project/Src/AddInTree/AddInTree.cs

@ -356,6 +356,7 @@ namespace ICSharpCode.Core @@ -356,6 +356,7 @@ namespace ICSharpCode.Core
+ ex.Message);
}
addIn = new AddIn();
addIn.addInFileName = fileName;
addIn.CustomErrorMessage = ex.Message;
}
if (addIn.Action == AddInAction.CustomError) {

Loading…
Cancel
Save