Browse Source

Added context menu to AddInManager, put strings into translation database. Chloë (GeneralWizardBackground.png) now uses alpha transparency and looks great in different color profiles.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@814 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 20 years ago
parent
commit
2cff0d9e07
  1. 4
      AddIns/ICSharpCode.SharpDevelop.addin
  2. BIN
      data/resources/StringResources.de.resources
  3. BIN
      data/resources/image/BitmapResources/BitmapResources-data/GeneralWizardBackground.png
  4. 3
      data/resources/image/BitmapResources/BitmapResources.res
  5. BIN
      data/resources/image/BitmapResources/backendicons/Empty16x16File.xcf
  6. BIN
      data/resources/image/BitmapResources/backendicons/Empty32x32File.xcf
  7. BIN
      data/resources/image/BitmapResources/backendicons/miscFiles/AddIn16.png
  8. BIN
      data/resources/image/BitmapResources/backendicons/miscFiles/AddIn32.png
  9. 2
      src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin
  10. 1
      src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin
  11. 1
      src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmBinding.addin
  12. 1
      src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin
  13. 1
      src/AddIns/DisplayBindings/FormDesigner/Project/FormDesigner.addin
  14. 4
      src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.addin
  15. 1
      src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin
  16. 58
      src/AddIns/Misc/AddInManager/Project/AddInManager.addin
  17. 5
      src/AddIns/Misc/AddInManager/Project/AddInManager.csproj
  18. 210
      src/AddIns/Misc/AddInManager/Project/Src/AboutForm.cs
  19. 123
      src/AddIns/Misc/AddInManager/Project/Src/AboutForm.resx
  20. 17
      src/AddIns/Misc/AddInManager/Project/Src/AddInControl.cs
  21. 37
      src/AddIns/Misc/AddInManager/Project/Src/AddInInstallBinding.cs
  22. 112
      src/AddIns/Misc/AddInManager/Project/Src/Commands.cs
  23. 81
      src/AddIns/Misc/AddInManager/Project/Src/ManagerForm.cs
  24. 1
      src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.addin
  25. 3
      src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj
  26. 1
      src/AddIns/Misc/FiletypeRegisterer/Project/filetypes/Filetypes.xml
  27. BIN
      src/AddIns/Misc/FiletypeRegisterer/Project/filetypes/addin.ico
  28. 1
      src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.addin
  29. 1
      src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.addin
  30. 1
      src/AddIns/Misc/MbUnitPad/Project/MbUnitPad.addin
  31. 1
      src/AddIns/Misc/NAntAddIn/Project/NAnt.addin
  32. 4
      src/AddIns/Misc/RegExpTk/Project/RegExpTk.addin
  33. 1
      src/AddIns/Misc/StartPage/Project/StartPage.addin
  34. 1
      src/AddIns/Misc/SubversionAddIn/Project/ICSharpCode.Svn.addin
  35. 12
      src/Main/Base/Project/Src/Commands/ToolsCommands.cs
  36. 2
      src/Main/Base/Project/Src/Gui/Dialogs/Wizard/CurrentPanelPanel.cs
  37. 21
      src/Main/Base/Project/Src/Gui/Dialogs/Wizard/StatusPanel.cs
  38. 15
      src/Main/Base/Project/Src/TextEditor/Commands/TextAreaContextmenuCommands.cs
  39. BIN
      src/Main/StartUp/Project/Resources/BitmapResources.resources
  40. BIN
      src/Main/StartUp/Project/Resources/StringResources.resources

4
AddIns/ICSharpCode.SharpDevelop.addin

@ -1906,6 +1906,10 @@ @@ -1906,6 +1906,10 @@
extensions = ".asp,.aspx"
resource = "Icons.16x16.ASPFileIcon"/>
<Icon id = "AddInFileIcon"
extensions = ".addin"
resource = "Icons.16x16.AddInIcon" />
<!-- TextFiles -->
<Icon id = "TextFileIcon"
extensions = ".txt,.doc"

BIN
data/resources/StringResources.de.resources

Binary file not shown.

BIN
data/resources/image/BitmapResources/BitmapResources-data/GeneralWizardBackground.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 16 KiB

3
data/resources/image/BitmapResources/BitmapResources.res

@ -430,6 +430,9 @@ Icons.32x32.CombineIcon = backendicons\miscFiles\Icons @@ -430,6 +430,9 @@ Icons.32x32.CombineIcon = backendicons\miscFiles\Icons
Icons.32x32.ResourceFileIcon = backendicons\miscFiles\Icons.32x32.ResourceFileIcon.png
Icons.32x32.NAntBuildFileIcon = backendicons\miscFiles\Icons.32x32.NAntBuildFileIcon.png
Icons.16x16.AddInIcon = backendicons\miscFiles\AddIn16.png
Icons.32x32.AddInIcon = backendicons\miscFiles\AddIn32.png
Icons.16x16.CSSIcon = backendicons\miscFiles\CSS_16.png
Icons.32x32.CSSIcon = backendicons\miscFiles\CSS_32.png
Icons.16x16.DTDIcon = backendicons\miscFiles\DTD_16.png

BIN
data/resources/image/BitmapResources/backendicons/Empty16x16File.xcf

Binary file not shown.

BIN
data/resources/image/BitmapResources/backendicons/Empty32x32File.xcf

Binary file not shown.

BIN
data/resources/image/BitmapResources/backendicons/miscFiles/AddIn16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 657 B

BIN
data/resources/image/BitmapResources/backendicons/miscFiles/AddIn32.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

2
src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
<AddIn name = "Boo Binding"
author = "Daniel Grunwald"
copyright = "GPL"
url = "http://www.icsharpcode.net"
url = "http://boo.codehaus.org/Boo+AddIn+For+SharpDevelop"
description = "Backing binding for Boo">
<Manifest>

1
src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin

@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
<AddIn name = "C# Binding"
author = "Mike Krueger"
copyright = "GPL"
url = "http://www.icsharpcode.net"
description = "Backing binding for C#">
<Manifest>

1
src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmBinding.addin

@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
<AddIn name = "ILAsm binding"
author = "Mike Krueger"
copyright = "GPL"
url = "http://www.icsharpcode.net"
description = "Backing binding for IL Assembler">
<Manifest>

1
src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin

@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
<AddIn name = "VB Binding"
author = "Mike Krueger, Markus Palme"
copyright = "GPL"
url = "http://www.icsharpcode.net"
description = "Backing binding for VB.NET">
<Manifest>

1
src/AddIns/DisplayBindings/FormDesigner/Project/FormDesigner.addin

@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
<AddIn name = "Form Designer"
author = "Mike Krueger"
copyright = "GPL"
url = "http://www.icsharpcode.net"
description = "SharpDevelop Form Designer">
<Manifest>

4
src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.addin

@ -1,9 +1,7 @@ @@ -1,9 +1,7 @@
<AddIn name = "Resource Editor"
author = "Mike Krueger"
copyright = "GPL"
url = "http://www.icsharpcode.net"
description = "A Display binding for *.resources and *.resx files."
version = "1.0.0">
description = "A Display binding for *.resources and *.resx files.">
<Runtime>
<Import assembly="ResourceEditor.dll"/>

1
src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin

@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
<AddIn name = "Xml Editor"
author = "Matt Ward"
copyright = "GPL"
url = "http://www.icsharpcode.net"
description = "Xml Editor">
<Manifest>

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

@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
<AddIn name = "AddInManager"
author = "Daniel Grunwald"
copyright = "GNU General Public License"
url = ""
description = "Can install, enable, disable and uninstall AddIns">
<Manifest>
@ -9,7 +8,9 @@ @@ -9,7 +8,9 @@
</Manifest>
<Runtime>
<Import assembly = "ICSharpCode.AddInManager.dll"/>
<Import assembly = "ICSharpCode.AddInManager.dll">
<ConditionEvaluator name="AddInManagerAddInState" class="ICSharpCode.AddInManager.AddInManagerAddInStateConditionEvaluator"/>
</Import>
</Runtime>
<Path name = "/SharpDevelop/Workbench/MainMenu/Tools">
@ -18,4 +19,57 @@ @@ -18,4 +19,57 @@
label = "AddIn Manager"
class = "ICSharpCode.AddInManager.ShowCommand"/>
</Path>
<Path name = "/SharpDevelop/Workbench/DisplayBindings">
<DisplayBinding id = "AddInManager"
class = "ICSharpCode.AddInManager.AddInInstallBinding"
insertbefore = "Text"
fileNamePattern = "\.sdaddin$"
languagePattern = "^SDAddInPackageFiles$"/>
</Path>
<Path name = "/AddIns/AddInManager/ContextMenu">
<Condition name="AddInManagerAddInState" states="Enable">
<MenuItem id="Disable"
label="${res:AddInManager.ActionDisable}"
class="ICSharpCode.AddInManager.DisableCommand"/>
</Condition>
<Condition name="AddInManagerAddInState" states="Disable">
<MenuItem id="Enable"
label="${res:AddInManager.ActionEnable}"
class="ICSharpCode.AddInManager.EnableCommand"/>
</Condition>
<Condition name="AddInManagerAddInState" states="Enable,Disable,InstalledTwice,DependencyError">
<MenuItem id="Uninstall"
label="${res:AddInManager.ActionUninstall}"
class="ICSharpCode.AddInManager.UninstallCommand"/>
</Condition>
<Condition name="AddInManagerAddInState" states="Install">
<MenuItem id="AbortInstall"
label="${res:AddInManager.ActionCancelInstallation}"
class="ICSharpCode.AddInManager.AbortInstallCommand"/>
</Condition>
<Condition name="AddInManagerAddInState" states="Uninstall">
<MenuItem id="AbortUninstall"
label="${res:AddInManager.ActionCancelDeinstallation}"
class="ICSharpCode.AddInManager.EnableCommand"/>
</Condition>
<Condition name="AddInManagerAddInState" states="Update">
<MenuItem id="AbortUpdate"
label="${res:AddInManager.ActionCancelUpdate}"
class="ICSharpCode.AddInManager.AbortUpdateCommand"/>
</Condition>
<MenuItem id="Separator1" type="Separator"/>
<MenuItem id="GoToHomepage"
label="${res:AddInManager.OpenWebsite}"
class="ICSharpCode.AddInManager.OpenHomepageCommand"
loadclasslazy="false"/>
<MenuItem id="Options"
label="${res:AddInManager.Options}"
class="ICSharpCode.AddInManager.OptionsCommand"
loadclasslazy="false"/>
<MenuItem id="About"
label="${res:AddInManager.About}"
class="ICSharpCode.AddInManager.AboutCommand"/>
</Path>
</AddIn>

5
src/AddIns/Misc/AddInManager/Project/AddInManager.csproj

@ -55,6 +55,11 @@ @@ -55,6 +55,11 @@
</EmbeddedResource>
<Compile Include="Src\AddInControl.cs" />
<Compile Include="Src\InstallableAddIn.cs" />
<Compile Include="Src\AboutForm.cs" />
<EmbeddedResource Include="Src\AboutForm.resx">
<DependentUpon>AboutForm.cs</DependentUpon>
</EmbeddedResource>
<Compile Include="Src\AddInInstallBinding.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\Main\Core\Project\ICSharpCode.Core.csproj">

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

@ -0,0 +1,210 @@ @@ -0,0 +1,210 @@
// <file>
// <copyright see="prj:///doc/copyright.txt">2002-2005 AlphaSierraPapa</copyright>
// <license see="prj:///doc/license.txt">GNU General Public License</license>
// <owner name="Daniel Grunwald" email="daniel@danielgrunwald.de"/>
// <version>$Revision$</version>
// </file>
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms;
using ICSharpCode.Core;
namespace ICSharpCode.AddInManager
{
public class AboutForm : System.Windows.Forms.Form
{
Font boldFont;
public AboutForm(AddIn addIn)
{
//
// The InitializeComponent() call is required for Windows Forms designer support.
//
InitializeComponent();
boldFont = new Font(Font, FontStyle.Bold);
List<string> titles = new List<string>();
List<string> values = new List<string>();
this.Text = addIn.Name;
closeButton.Text = ResourceService.GetString("Global.CloseButtonText");
titles.Add("AddIn name");
values.Add(addIn.Name);
if (addIn.Manifest.PrimaryVersion != null && addIn.Manifest.PrimaryVersion.ToString() != "0.0.0.0") {
titles.Add("Version");
values.Add(addIn.Manifest.PrimaryVersion.ToString());
}
if (addIn.Properties["author"].Length > 0) {
titles.Add("Author");
values.Add(addIn.Properties["author"]);
}
if (addIn.Properties["copyright"].Length > 0) {
titles.Add("Copyright");
values.Add(addIn.Properties["copyright"]);
}
if (addIn.Properties["url"].Length > 0) {
titles.Add("Website");
values.Add(addIn.Properties["url"]);
}
if (addIn.Properties["description"].Length > 0) {
titles.Add("Description");
values.Add(addIn.Properties["description"]);
}
titles.Add("AddIn file");
values.Add(System.IO.Path.GetFullPath(addIn.FileName));
titles.Add("Internal name");
values.Add(addIn.Manifest.PrimaryIdentity);
table.RowCount = titles.Count + 1;
table.RowStyles.Clear();
for (int i = 0; i < titles.Count; i++) {
table.RowStyles.Add(new RowStyle(SizeType.AutoSize));
AddRow(titles[i], values[i], i);
}
}
protected override void Dispose(bool disposing)
{
base.Dispose(disposing);
if (disposing) {
if (boldFont != null)
boldFont.Dispose();
}
}
void AddRow(string desc, string val, int rowIndex)
{
Label descLabel = new Label();
descLabel.AutoSize = true;
descLabel.Anchor = AnchorStyles.Top | AnchorStyles.Right;
descLabel.Font = boldFont;
descLabel.Text = StringParser.Parse(desc) + ":";
table.Controls.Add(descLabel, 0, rowIndex);
Label valLabel;
string link = GetLink(val);
if (link != null) {
LinkLabel linkLabel = new LinkLabel();
linkLabel.LinkClicked += delegate {
try {
System.Diagnostics.Process.Start(link);
} catch (Exception ex) {
MessageService.ShowMessage(ex.ToString());
}
};
valLabel = linkLabel;
} else {
valLabel = new Label();
}
valLabel.AutoSize = true;
valLabel.Text = val;
table.Controls.Add(valLabel, 1, rowIndex);
}
string GetLink(string text)
{
switch (text) {
case "GNU General Public License":
case "GPL":
return "http://www.gnu.org/licenses/gpl.html";
case "LGPL":
case "GNU Lesser General Public License":
return "http://www.gnu.org/licenses/lgpl.html";
default:
if (text.StartsWith("http://"))
return text;
if (text.StartsWith("www."))
return "http://" + text;
return null;
}
}
#region Windows Forms Designer generated code
/// <summary>
/// This method is required for Windows Forms designer support.
/// Do not change the method contents inside the source code editor. The Forms designer might
/// not be able to load this method if it was changed manually.
/// </summary>
private void InitializeComponent()
{
System.Windows.Forms.Panel bottomPanel;
this.closeButton = new System.Windows.Forms.Button();
this.table = new System.Windows.Forms.TableLayoutPanel();
bottomPanel = new System.Windows.Forms.Panel();
bottomPanel.SuspendLayout();
this.SuspendLayout();
//
// bottomPanel
//
bottomPanel.Controls.Add(this.closeButton);
bottomPanel.Dock = System.Windows.Forms.DockStyle.Bottom;
bottomPanel.Location = new System.Drawing.Point(0, 233);
bottomPanel.Name = "bottomPanel";
bottomPanel.Size = new System.Drawing.Size(351, 35);
bottomPanel.TabIndex = 0;
//
// closeButton
//
this.closeButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.closeButton.Location = new System.Drawing.Point(264, 6);
this.closeButton.Name = "closeButton";
this.closeButton.Size = new System.Drawing.Size(75, 23);
this.closeButton.TabIndex = 0;
this.closeButton.Text = "Close";
this.closeButton.UseCompatibleTextRendering = true;
this.closeButton.UseVisualStyleBackColor = true;
this.closeButton.Click += new System.EventHandler(this.CloseButtonClick);
//
// table
//
this.table.ColumnCount = 2;
this.table.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.table.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.table.Dock = System.Windows.Forms.DockStyle.Fill;
this.table.Location = new System.Drawing.Point(0, 8);
this.table.Name = "table";
this.table.RowCount = 2;
this.table.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.table.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.table.Size = new System.Drawing.Size(351, 225);
this.table.TabIndex = 1;
//
// AboutForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Info;
this.ClientSize = new System.Drawing.Size(351, 268);
this.Controls.Add(this.table);
this.Controls.Add(bottomPanel);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "AboutForm";
this.Padding = new System.Windows.Forms.Padding(0, 8, 0, 0);
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "AboutForm";
bottomPanel.ResumeLayout(false);
this.ResumeLayout(false);
}
private System.Windows.Forms.Button closeButton;
private System.Windows.Forms.TableLayoutPanel table;
#endregion
void CloseButtonClick(object sender, EventArgs e)
{
Close();
}
}
}

123
src/AddIns/Misc/AddInManager/Project/Src/AboutForm.resx

@ -0,0 +1,123 @@ @@ -0,0 +1,123 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="bottomPanel.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
</root>

17
src/AddIns/Misc/AddInManager/Project/Src/AddInControl.cs

@ -29,6 +29,7 @@ namespace ICSharpCode.AddInManager @@ -29,6 +29,7 @@ namespace ICSharpCode.AddInManager
{
this.addIn = addIn;
this.BackColor = SystemColors.Window;
this.ContextMenuStrip = MenuService.CreateContextMenu(this, "/AddIns/AddInManager/ContextMenu");
isExternal = !FileUtility.IsBaseDirectory(FileUtility.ApplicationRootPath, addIn.FileName)
&& !FileUtility.IsBaseDirectory(PropertyService.ConfigDirectory, addIn.FileName);
@ -158,29 +159,29 @@ namespace ICSharpCode.AddInManager @@ -158,29 +159,29 @@ namespace ICSharpCode.AddInManager
return addIn.Properties["description"];
} else {
textBrush = SystemBrushes.ActiveCaption;
return "AddIn will be enabled after restarting SharpDevelop";
return ResourceService.GetString("AddInManager.AddInEnabled");
}
case AddInAction.Disable:
textBrush = SystemBrushes.GrayText;
if (addIn.Enabled)
return "AddIn will be disabled after restarting SharpDevelop";
return ResourceService.GetString("AddInManager.AddInWillBeDisabled");
else
return "Disabled"; // TODO: Test if it was disabled because of conflict
return ResourceService.GetString("AddInManager.AddInDisabled");
case AddInAction.Install:
textBrush = SystemBrushes.ActiveCaption;
return "AddIn will be installed after restarting SharpDevelop";
return ResourceService.GetString("AddInManager.AddInInstalled");
case AddInAction.Uninstall:
textBrush = SystemBrushes.GrayText;
return "AddIn will be removed after restarting SharpDevelop";
return ResourceService.GetString("AddInManager.AddInRemoved");
case AddInAction.Update:
textBrush = SystemBrushes.ActiveCaption;
return "AddIn will be updated after restarting SharpDevelop";
return ResourceService.GetString("AddInManager.AddInUpdated");
case AddInAction.InstalledTwice:
textBrush = Brushes.Red;
return "Duplicate installation";
return ResourceService.GetString("AddInManager.AddInInstalledTwice");
case AddInAction.DependencyError:
textBrush = Brushes.Red;
return "Dependency failed";
return ResourceService.GetString("AddInManager.AddInDependencyFailed");
default:
textBrush = Brushes.Yellow;
return addIn.Action.ToString();

37
src/AddIns/Misc/AddInManager/Project/Src/AddInInstallBinding.cs

@ -0,0 +1,37 @@ @@ -0,0 +1,37 @@
// <file>
// <copyright see="prj:///doc/copyright.txt">2002-2005 AlphaSierraPapa</copyright>
// <license see="prj:///doc/license.txt">GNU General Public License</license>
// <owner name="Daniel Grunwald" email="daniel@danielgrunwald.de"/>
// <version>$Revision$</version>
// </file>
using System;
using ICSharpCode.Core;
namespace ICSharpCode.AddInManager
{
public class AddInInstallBinding : IDisplayBinding
{
public bool CanCreateContentForFile(string fileName)
{
return true;
}
public ICSharpCode.SharpDevelop.Gui.IViewContent CreateContentForFile(string fileName)
{
ManagerForm.ShowForm();
ManagerForm.Instance.ShowInstallableAddIns(new string[] { fileName });
return null;
}
public bool CanCreateContentForLanguage(string languageName)
{
return false;
}
public ICSharpCode.SharpDevelop.Gui.IViewContent CreateContentForLanguage(string languageName, string content)
{
throw new NotImplementedException();
}
}
}

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

@ -6,6 +6,9 @@ @@ -6,6 +6,9 @@
// </file>
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms;
using ICSharpCode.Core;
namespace ICSharpCode.AddInManager
@ -17,4 +20,113 @@ namespace ICSharpCode.AddInManager @@ -17,4 +20,113 @@ namespace ICSharpCode.AddInManager
ManagerForm.ShowForm();
}
}
public class AddInManagerAddInStateConditionEvaluator : IConditionEvaluator
{
public bool IsValid(object caller, Condition condition)
{
string states = condition.Properties["states"];
string action = ((AddInControl)caller).AddIn.Action.ToString();
foreach (string state in states.Split(',')) {
if (state == action)
return true;
}
return false;
}
}
public class DisableCommand : AbstractMenuCommand
{
public override void Run()
{
ManagerForm.Instance.TryRunAction(((AddInControl)Owner).AddIn, AddInAction.Disable);
}
}
public class EnableCommand : AbstractMenuCommand
{
public override void Run()
{
ManagerForm.Instance.TryRunAction(((AddInControl)Owner).AddIn, AddInAction.Enable);
}
}
public class AbortInstallCommand : AbstractMenuCommand
{
public override void Run()
{
ManagerForm.Instance.TryRunAction(((AddInControl)Owner).AddIn, AddInAction.Uninstall);
}
}
public class AbortUpdateCommand : AbstractMenuCommand
{
public override void Run()
{
ManagerForm.Instance.TryRunAction(((AddInControl)Owner).AddIn, AddInAction.InstalledTwice);
}
}
public class UninstallCommand : AbstractMenuCommand
{
public override void Run()
{
ManagerForm.Instance.TryUninstall(((AddInControl)Owner).AddIn);
}
}
public class OpenHomepageCommand : AbstractMenuCommand
{
public override bool IsEnabled {
get {
return ((AddInControl)Owner).AddIn.Properties["url"].Length > 0;
}
}
public override void Run()
{
FileService.OpenFile(((AddInControl)Owner).AddIn.Properties["url"]);
ManagerForm.Instance.Close();
}
}
public class AboutCommand : AbstractMenuCommand
{
public override void Run()
{
using (AboutForm form = new AboutForm(((AddInControl)Owner).AddIn)) {
form.ShowDialog(ManagerForm.Instance);
}
}
}
public class OptionsCommand : AbstractMenuCommand
{
public override bool IsEnabled {
get {
AddIn addIn = ((AddInControl)Owner).AddIn;
if (addIn.Enabled) {
foreach (KeyValuePair<string, ExtensionPath> pair in addIn.Paths) {
if (pair.Key.StartsWith("/SharpDevelop/Dialogs/OptionsDialog")) {
return true;
}
}
}
return false;
}
}
public override void Run()
{
AddIn addIn = ((AddInControl)Owner).AddIn;
AddInTreeNode dummyNode = new AddInTreeNode();
foreach (KeyValuePair<string, ExtensionPath> pair in addIn.Paths) {
if (pair.Key.StartsWith("/SharpDevelop/Dialogs/OptionsDialog")) {
dummyNode.Codons.AddRange(pair.Value.Codons);
}
}
ICSharpCode.SharpDevelop.Commands.OptionsCommand.ShowTabbedOptions(addIn.Name + " " + ResourceService.GetString("AddInManager.Options"),
dummyNode);
}
}
}

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

@ -50,6 +50,10 @@ namespace ICSharpCode.AddInManager @@ -50,6 +50,10 @@ namespace ICSharpCode.AddInManager
ICSharpCode.SharpDevelop.Gui.FormLocationHelper.Apply(this, "AddInManager.WindowBounds", true);
#endif
actionFlowLayoutPanel.BackgroundImage = ResourceService.GetBitmap("GeneralWizardBackground");
installButton.Text = ResourceService.GetString("AddInManager.InstallButton");
uninstallButton.Text = ResourceService.GetString("AddInManager.ActionUninstall");
closeButton.Text = ResourceService.GetString("Global.CloseButtonText");
CreateAddInList();
}
@ -59,10 +63,8 @@ namespace ICSharpCode.AddInManager @@ -59,10 +63,8 @@ namespace ICSharpCode.AddInManager
Rectangle rect = splitContainer.Panel1.ClientRectangle;
rect.Offset(16, 16);
rect.Inflate(-32, -32);
e.Graphics.DrawString("You don't have any AddIns installed.\n" +
"Download an AddIn from the Internet, then click 'Install AddIn' and " +
"choose the downloaded file to install it.",
Font, SystemBrushes.ControlText, rect);
e.Graphics.DrawString(ResourceService.GetString("AddInManager.NoAddInsInstalled"),
Font, SystemBrushes.WindowText, rect);
}
}
@ -222,39 +224,39 @@ namespace ICSharpCode.AddInManager @@ -222,39 +224,39 @@ namespace ICSharpCode.AddInManager
}
if (allEnabled) {
selectedAction = AddInAction.Disable;
actionGroupBox.Text = runActionButton.Text = "Disable";
actionDescription.Text = "Disables the selected AddIns.";
actionGroupBox.Text = runActionButton.Text = ResourceService.GetString("AddInManager.ActionDisable");
actionDescription.Text = ResourceService.GetString("AddInManager.DescriptionDisable");
runActionButton.Enabled = ShowDependencies(selected, ShowDependencyMode.Disable);
uninstallButton.Enabled = allUninstallable && runActionButton.Enabled;
} else if (allDisabled) {
selectedAction = AddInAction.Enable;
actionGroupBox.Text = runActionButton.Text = "Enable";
actionDescription.Text = "Enables the selected AddIns.";
actionGroupBox.Text = runActionButton.Text = ResourceService.GetString("AddInManager.ActionEnable");
actionDescription.Text = ResourceService.GetString("AddInManager.DescriptionEnable");
runActionButton.Enabled = ShowDependencies(selected, ShowDependencyMode.Enable);
if (hasErrors)
runActionButton.Enabled = false;
uninstallButton.Enabled = allUninstallable;
} else if (allInstalling) {
selectedAction = AddInAction.Uninstall;
actionGroupBox.Text = runActionButton.Text = "Cancel installation";
actionDescription.Text = "Aborts the installation of the selected AddIns.";
actionGroupBox.Text = runActionButton.Text = ResourceService.GetString("AddInManager.ActionCancelInstallation");
actionDescription.Text = ResourceService.GetString("AddInManager.DescriptionCancelInstall");
runActionButton.Enabled = ShowDependencies(selected, ShowDependencyMode.Disable);
uninstallButton.Visible = false;
} else if (allUninstalling) {
selectedAction = AddInAction.Enable;
actionGroupBox.Text = runActionButton.Text = "Cancel deinstallation";
actionDescription.Text = "Aborts the deinstallation of the selected AddIns.";
actionGroupBox.Text = runActionButton.Text = ResourceService.GetString("AddInManager.ActionCancelDeinstallation");
actionDescription.Text = ResourceService.GetString("AddInManager.DescriptionCancelDeinstallation");
runActionButton.Enabled = ShowDependencies(selected, ShowDependencyMode.Enable);
uninstallButton.Visible = false;
} else if (allUpdating) {
selectedAction = AddInAction.InstalledTwice;
actionGroupBox.Text = runActionButton.Text = "Cancel update";
actionDescription.Text = "Aborts the update of the selected AddIns.";
actionGroupBox.Text = runActionButton.Text = ResourceService.GetString("AddInManager.ActionCancelUpdate");
actionDescription.Text = ResourceService.GetString("AddInManager.DescriptionCancelUpdate");
runActionButton.Enabled = ShowDependencies(selected, ShowDependencyMode.CancelUpdate);
uninstallButton.Visible = false;
} else {
actionGroupBox.Text = "";
actionDescription.Text = "AddIns with multiple states are selected";
actionDescription.Text = ResourceService.GetString("AddInManager.DescriptionInconsistentSelection");
runActionButton.Visible = false;
uninstallButton.Visible = false;
}
@ -340,14 +342,14 @@ namespace ICSharpCode.AddInManager @@ -340,14 +342,14 @@ namespace ICSharpCode.AddInManager
}
int rowIndex = 0;
if (dependencies.Count > 0) {
AddLabelRow(rowIndex++, "Required dependencies:");
AddLabelRow(rowIndex++, ResourceService.GetString("AddInManager.RequiredDependencies"));
foreach (AddInReference dep in dependencies) {
if (!AddDependencyRow(addInDict, dep, rowIndex++, null))
allDepenciesOK = false;
}
}
if (dependenciesToSel.Count > 0) {
AddLabelRow(rowIndex++, "AddIns are required by:");
AddLabelRow(rowIndex++, ResourceService.GetString("AddInManager.RequiredBy"));
foreach (KeyValuePair<AddIn, AddInReference> pair in dependenciesToSel) {
if (!AddDependencyRow(addInDict, pair.Value, rowIndex++, pair.Key.Name))
allDepenciesOK = false;
@ -399,7 +401,7 @@ namespace ICSharpCode.AddInManager @@ -399,7 +401,7 @@ namespace ICSharpCode.AddInManager
void InstallButtonClick(object sender, EventArgs e)
{
using (OpenFileDialog dlg = new OpenFileDialog()) {
dlg.Filter = "SharpDevelop AddIns|*.addin;*.sdaddin|All files|*.*";
dlg.Filter = ResourceService.GetString("AddInManager.FileFilter");
dlg.Multiselect = true;
if (dlg.ShowDialog() == DialogResult.OK) {
if (ShowInstallableAddIns(dlg.FileNames)) {
@ -410,7 +412,7 @@ namespace ICSharpCode.AddInManager @@ -410,7 +412,7 @@ namespace ICSharpCode.AddInManager
}
}
bool ShowInstallableAddIns(IEnumerable<string> fileNames)
public bool ShowInstallableAddIns(IEnumerable<string> fileNames)
{
foreach (AddInControl ctl in splitContainer.Panel1.Controls) {
ctl.Selected = false;
@ -478,12 +480,16 @@ namespace ICSharpCode.AddInManager @@ -478,12 +480,16 @@ namespace ICSharpCode.AddInManager
}
}
if (updateAddIns.Count == 0)
actionGroupBox.Text = runActionButton.Text = "Install";
else if (installAddIns.Count == 0)
actionGroupBox.Text = runActionButton.Text = "Update";
else
actionGroupBox.Text = runActionButton.Text = "Install + Update";
if (updateAddIns.Count == 0) {
actionGroupBox.Text = runActionButton.Text = ResourceService.GetString("AddInManager.ActionInstall");
} else if (installAddIns.Count == 0) {
actionGroupBox.Text = runActionButton.Text = ResourceService.GetString("AddInManager.ActionUpdate");
} else {
actionGroupBox.Text = runActionButton.Text =
ResourceService.GetString("AddInManager.ActionInstall")
+ " + " +
ResourceService.GetString("AddInManager.ActionUpdate");
}
List<AddIn> addInList = new List<AddIn>();
StringBuilder b = new StringBuilder();
if (installAddIns.Count == 1) {
@ -591,6 +597,26 @@ namespace ICSharpCode.AddInManager @@ -591,6 +597,26 @@ namespace ICSharpCode.AddInManager
instance = null;
}
public void TryRunAction(AddIn addIn, AddInAction action)
{
foreach (AddInControl ctl in splitContainer.Panel1.Controls) {
ctl.Selected = ctl.AddIn == addIn;
}
UpdateActionBox();
if (selectedAction == action && runActionButton.Visible && runActionButton.Enabled)
runActionButton.PerformClick();
}
public void TryUninstall(AddIn addIn)
{
foreach (AddInControl ctl in splitContainer.Panel1.Controls) {
ctl.Selected = ctl.AddIn == addIn;
}
UpdateActionBox();
if (uninstallButton.Visible && uninstallButton.Enabled)
uninstallButton.PerformClick();
}
void RunActionButtonClick(object sender, EventArgs e)
{
switch (selectedAction) {
@ -708,6 +734,7 @@ namespace ICSharpCode.AddInManager @@ -708,6 +734,7 @@ namespace ICSharpCode.AddInManager
//
// splitContainer
//
this.splitContainer.BackColor = System.Drawing.SystemColors.Window;
this.splitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
this.splitContainer.Location = new System.Drawing.Point(0, 33);
@ -717,7 +744,6 @@ namespace ICSharpCode.AddInManager @@ -717,7 +744,6 @@ namespace ICSharpCode.AddInManager
//
this.splitContainer.Panel1.AllowDrop = true;
this.splitContainer.Panel1.AutoScroll = true;
this.splitContainer.Panel1.BackColor = System.Drawing.SystemColors.Window;
this.splitContainer.Panel1.DragDrop += new System.Windows.Forms.DragEventHandler(this.Panel1DragDrop);
this.splitContainer.Panel1.DragEnter += new System.Windows.Forms.DragEventHandler(this.Panel1DragEnter);
this.splitContainer.Panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.OnSplitContainerPanel1Paint);
@ -752,6 +778,7 @@ namespace ICSharpCode.AddInManager @@ -752,6 +778,7 @@ namespace ICSharpCode.AddInManager
this.actionFlowLayoutPanel.Controls.Add(this.uninstallButton);
this.actionFlowLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill;
this.actionFlowLayoutPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
this.actionFlowLayoutPanel.ForeColor = System.Drawing.SystemColors.WindowText;
this.actionFlowLayoutPanel.Location = new System.Drawing.Point(3, 17);
this.actionFlowLayoutPanel.Name = "actionFlowLayoutPanel";
this.actionFlowLayoutPanel.Size = new System.Drawing.Size(202, 302);
@ -870,7 +897,5 @@ namespace ICSharpCode.AddInManager @@ -870,7 +897,5 @@ namespace ICSharpCode.AddInManager
private System.Windows.Forms.Panel bottomPanel;
private System.Windows.Forms.Panel topPanel;
#endregion
}
}

1
src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.addin

@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
<AddIn name = "Filetype Registerer"
author = "Georg Brandl"
copyright = "GPL"
url = "http://www.icsharpcode.net"
description = "Registers files in the Windows Explorer for #Develop">
<Manifest>

3
src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj

@ -80,6 +80,9 @@ @@ -80,6 +80,9 @@
<Private>False</Private>
</ProjectReference>
<Folder Include="filetypes" />
<Content Include="filetypes\addin.ico">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
</Project>

1
src/AddIns/Misc/FiletypeRegisterer/Project/filetypes/Filetypes.xml

@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
<Filetype ext="csproj" icon="prjx.ico">C# ${res:ICSharpCode.FiletypeRegisterer.Project}</Filetype>
<Filetype ext="vbproj" icon="prjx.ico">VB ${res:ICSharpCode.FiletypeRegisterer.Project}</Filetype>
<Filetype ext="booproj" icon="prjx.ico">Boo ${res:ICSharpCode.FiletypeRegisterer.Project}</Filetype>
<Filetype ext="sdaddin" icon="addin.ico">SharpDevelop ${res:AddInManager.FileAssociation}</Filetype>
<Filetype ext="cs" icon="cs.ico">${res:ICSharpCode.FiletypeRegisterer.CSharpSourceFileAssozisation}</Filetype>
<Filetype ext="vb" icon="vb.ico">${res:ICSharpCode.FiletypeRegisterer.VBNetSourceFileAssozisation}</Filetype>
<!--<Filetype ext="java" icon="java.ico">${res:ICSharpCode.FiletypeRegisterer.JavaSourceFileAssozisation}</Filetype>-->

BIN
src/AddIns/Misc/FiletypeRegisterer/Project/filetypes/addin.ico

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

1
src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.addin

@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
<AddIn name = "Highlighting Editor"
author = "Georg Brandl"
copyright = "GPL"
url = "http://www.icsharpcode.net"
description = "Editor for syntax highlighting styles for the text editor">
<Manifest>

1
src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.addin

@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
<AddIn name = "Help 2.0 Environment for SharpDevelop"
author = "Mathias Simmack"
copyright = "Copyright (c) 2005"
url = "unknown"
description = "integrates Microsoft's Help 2.0 Environment">
<Runtime>

1
src/AddIns/Misc/MbUnitPad/Project/MbUnitPad.addin

@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
<AddIn name = "MbUnit-Addin"
author = "Daniel Grunwald"
copyright = "GNU General Public License"
url = "http://www.icsharpcode.net"
description = "Runs MbUnit and NUnit tests inside #Develop">
<Manifest>

1
src/AddIns/Misc/NAntAddIn/Project/NAnt.addin

@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
<AddIn name = "NAnt Add-in"
author = "Matt Ward"
copyright = "GPL"
url = "http://www.icsharpcode.net/"
description = "NAnt integration for SharpDevelop.">
<Manifest>

4
src/AddIns/Misc/RegExpTk/Project/RegExpTk.addin

@ -1,9 +1,7 @@ @@ -1,9 +1,7 @@
<AddIn name = "Regular expressions toolkit"
author = "Markus Palme"
copyright = "GPL"
url = "unknown"
description = "Testing toolkit for regular expressions"
version = "1.0.0">
description = "Testing toolkit for regular expressions">
<Manifest>
<Identity name = "ICSharpCode.RegExpTk"/>

1
src/AddIns/Misc/StartPage/Project/StartPage.addin

@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
<AddIn name = "Start Page"
author = "Georg Brandl"
copyright = "GPL"
url = "http://www.icsharpcode.net"
description = "VS like Start Page for #develop">
<Manifest>

1
src/AddIns/Misc/SubversionAddIn/Project/ICSharpCode.Svn.addin

@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
<AddIn name = "ICSharpCode.Svn"
author = "Mike Krueger"
copyright = "GPL"
url = "http://www.icsharpcode.net"
description = "Subversion plugin">
<Manifest>

12
src/Main/Base/Project/Src/Commands/ToolsCommands.cs

@ -17,6 +17,18 @@ namespace ICSharpCode.SharpDevelop.Commands @@ -17,6 +17,18 @@ namespace ICSharpCode.SharpDevelop.Commands
{
public class OptionsCommand : AbstractMenuCommand
{
public static void ShowTabbedOptions(string dialogTitle, AddInTreeNode node)
{
TabbedOptions o = new TabbedOptions(dialogTitle,
((Properties)PropertyService.Get("ICSharpCode.TextEditor.Document.Document.DefaultDocumentAggregatorProperties", new Properties())),
node);
o.Width = 450;
o.Height = 425;
o.FormBorderStyle = FormBorderStyle.FixedDialog;
o.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm);
o.Dispose();
}
public override void Run()
{
using (TreeViewOptions optionsDialog = new TreeViewOptions((Properties)PropertyService.Get("ICSharpCode.TextEditor.Document.Document.DefaultDocumentAggregatorProperties", new Properties()),

2
src/Main/Base/Project/Src/Gui/Dialogs/Wizard/CurrentPanelPanel.cs

@ -21,7 +21,6 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -21,7 +21,6 @@ namespace ICSharpCode.SharpDevelop.Gui
public class CurrentPanelPanel : UserControl
{
WizardDialog wizard;
Bitmap backGround = null;
Font normalFont;
@ -31,7 +30,6 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -31,7 +30,6 @@ namespace ICSharpCode.SharpDevelop.Gui
normalFont = ResourceService.LoadFont("SansSerif", 18, GraphicsUnit.World);
this.wizard = wizard;
backGround = ResourceService.GetBitmap("GeneralWizardBackground");
Size = new Size(wizard.Width - 220, 30);
ResizeRedraw = false;

21
src/Main/Base/Project/Src/Gui/Dialogs/Wizard/StatusPanel.cs

@ -21,13 +21,11 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -21,13 +21,11 @@ namespace ICSharpCode.SharpDevelop.Gui
public class StatusPanel : UserControl
{
WizardDialog wizard;
Bitmap backGround = null;
Font smallFont;
Font normalFont;
Font boldFont;
public StatusPanel(WizardDialog wizard)
{
smallFont = ResourceService.LoadFont("Tahoma", 14, GraphicsUnit.World);
@ -35,24 +33,15 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -35,24 +33,15 @@ namespace ICSharpCode.SharpDevelop.Gui
boldFont = ResourceService.LoadFont("Tahoma", 14, FontStyle.Bold, GraphicsUnit.World);
this.wizard = wizard;
backGround = ResourceService.GetBitmap("GeneralWizardBackground");
this.BackgroundImage = ResourceService.GetBitmap("GeneralWizardBackground");
Size = new Size(198, 400);
ResizeRedraw = false;
// SetStyle(ControlStyles.UserPaint, true);
SetStyle(ControlStyles.UserPaint, true);
SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
SetStyle(ControlStyles.AllPaintingInWmPaint, true);
}
protected override void OnPaintBackground(PaintEventArgs pe)
{
// base.OnPaintBackground(pe);
if (backGround != null) {
Graphics g = pe.Graphics;
g.DrawImage(backGround, 0, 0, Width, Height);
}
}
protected override void OnPaint(PaintEventArgs pe)
{
// base.OnPaint(pe);
@ -60,17 +49,17 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -60,17 +49,17 @@ namespace ICSharpCode.SharpDevelop.Gui
g.DrawString(ResourceService.GetString("SharpDevelop.Gui.Dialogs.WizardDialog.StepsLabel"),
smallFont,
Brushes.Black,
SystemBrushes.WindowText,
10,
24 - smallFont.Height);
g.DrawLine(Pens.Black, 10, 24, Width - 10, 24);
g.DrawLine(SystemPens.WindowText, 10, 24, Width - 10, 24);
int curNumber = 0;
for (int i = 0; i < wizard.WizardPanels.Count; i = wizard.GetSuccessorNumber(i)) {
Font curFont = wizard.ActivePanelNumber == i ? boldFont : normalFont;
IDialogPanelDescriptor descriptor = ((IDialogPanelDescriptor)wizard.WizardPanels[i]);
g.DrawString((1 + curNumber) + ". " + descriptor.Label, curFont, Brushes.Black, 10, 40 + curNumber * curFont.Height);
g.DrawString((1 + curNumber) + ". " + descriptor.Label, curFont, SystemBrushes.WindowText, 10, 40 + curNumber * curFont.Height);
++curNumber;
}
}

15
src/Main/Base/Project/Src/TextEditor/Commands/TextAreaContextmenuCommands.cs

@ -21,6 +21,7 @@ using ICSharpCode.TextEditor.Document; @@ -21,6 +21,7 @@ using ICSharpCode.TextEditor.Document;
using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
using ICSharpCode.TextEditor;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Commands;
namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
{
@ -28,16 +29,8 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands @@ -28,16 +29,8 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
{
public override void Run()
{
TabbedOptions o = new TabbedOptions(ResourceService.GetString("Dialog.Options.BufferOptions"),
((Properties)PropertyService.Get("ICSharpCode.TextEditor.Document.Document.DefaultDocumentAggregatorProperties", new Properties())),
AddInTree.GetTreeNode("/SharpDevelop/ViewContent/DefaultTextEditor/OptionsDialog"));
o.Width = 450;
o.Height = 425;
o.FormBorderStyle = FormBorderStyle.FixedDialog;
o.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm);
o.Dispose();
OptionsCommand.ShowTabbedOptions("ShowTabbedOptions",
AddInTree.GetTreeNode("/SharpDevelop/ViewContent/DefaultTextEditor/OptionsDialog"));
}
}
@ -79,5 +72,5 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands @@ -79,5 +72,5 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
control.Refresh();
}
}
}
}
}

BIN
src/Main/StartUp/Project/Resources/BitmapResources.resources

Binary file not shown.

BIN
src/Main/StartUp/Project/Resources/StringResources.resources

Binary file not shown.
Loading…
Cancel
Save