pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Corrected output path of the filetype registerer (his job should be done by the installer) and resource editor. 

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@6 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Mike Krüger 21 years ago
parent
ca943fafba
commit
bff7f0c17a
22 changed files with 135 additions and 75 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 42
      AddIns/ICSharpCode.SharpDevelop.addin
  2. BIN
      src/AddIns/AddIns/DisplayBindings/ResourceEditor.dll
  3. BIN
      src/AddIns/AddIns/DisplayBindings/ResourceEditor.pdb
  4. BIN
      src/AddIns/AddIns/Misc/FiletypeRegisterer/ICSharpCode.FiletypeRegisterer.dll
  5. BIN
      src/AddIns/AddIns/Misc/FiletypeRegisterer/ICSharpCode.FiletypeRegisterer.pdb
  6. 6
      src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
  7. 2
      src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj.user
  8. 15
      src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj
  9. 2
      src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj.user
  10. 6
      src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj
  11. 2
      src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj.user
  12. 18
      src/Libraries/DockPanel_Src/WinFormsUI/WinFormsUI.csproj
  13. 2
      src/Libraries/DockPanel_Src/WinFormsUI/WinFormsUI.csproj.user
  14. 9
      src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
  15. 2
      src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj.user
  16. 1
      src/Main/Base/Project/Resources/CommonAboutDialog.xfrm
  17. 2
      src/Main/Base/Project/Src/Gui/Dialogs/CommonAboutDialog.cs
  18. 2
      src/Main/Base/Project/Src/Project/MSBuildProject.cs
  19. 15
      src/Main/Core/Project/Src/AddInTree/AddIn/StandardErbauer/MenuItem/Gui/Menu.cs
  20. 28
      src/Main/Core/Project/Src/AddInTree/AddIn/StandardErbauer/MenuItem/Gui/MenuCommand.cs
  21. 4
      src/Main/Core/Project/Src/AddInTree/AddIn/StandardErbauer/MenuItem/MenuItemErbauer.cs
  22. 52
      src/SharpDevelop.sln

42
AddIns/ICSharpCode.SharpDevelop.addin
Unescape View File

@ -208,15 +208,18 @@ @@ -208,15 +208,18 @@
</MenuItem>
<MenuItem id = "AddSeparator" type = "Separator"/>
<MenuItem id = "Cut"
<MenuItem id = "Cut"
label = "Cut"
icon = "Icons.16x16.CutIcon"
type = "Item"
icon = "Icons.16x16.CutIcon"
class = "ICSharpCode.SharpDevelop.Project.Commands.CutProjectBrowserNode"/>
<MenuItem id = "Paste"
<MenuItem id = "Paste"
label = "Paste"
icon = "Icons.16x16.PasteIcon"
type = "Item"
icon = "Icons.16x16.PasteIcon"
class = "ICSharpCode.SharpDevelop.Project.Commands.PasteProjectBrowserNode"/>
<MenuItem id = "Remove"
<MenuItem id = "Remove"
type = "Item"
label = "Remove"
icon = "Icons.16x16.DeleteIcon"
class = "ICSharpCode.SharpDevelop.Project.Commands.DeleteProjectBrowserNode"/>
@ -234,14 +237,17 @@ @@ -234,14 +237,17 @@
<MenuItem id = "OpenSeparator" type = "Separator" />
<MenuItem id = "Cut"
label = "Cut"
type = "Item"
icon = "Icons.16x16.CutIcon"
class = "ICSharpCode.SharpDevelop.Project.Commands.CutProjectBrowserNode"/>
<MenuItem id = "Copy"
label = "Copy"
icon = "Icons.16x16.CopyIcon"
type = "Item"
icon = "Icons.16x16.CopyIcon"
class = "ICSharpCode.SharpDevelop.Project.Commands.CopyProjectBrowserNode"/>
<MenuItem id = "Remove"
label = "Remove"
type = "Item"
icon = "Icons.16x16.DeleteIcon"
class = "ICSharpCode.SharpDevelop.Project.Commands.DeleteProjectBrowserNode"/>
<MenuItem id = "Rename"
@ -303,14 +309,17 @@ @@ -303,14 +309,17 @@
<MenuItem id = "Separator2" type = "Separator"/>
<MenuItem id = "Cut"
label = "Cut"
type = "Item"
icon = "Icons.16x16.CutIcon"
class = "ICSharpCode.SharpDevelop.Project.Commands.CutProjectBrowserNode"/>
<MenuItem id = "Paste"
label = "Paste"
type = "Item"
icon = "Icons.16x16.PasteIcon"
class = "ICSharpCode.SharpDevelop.Project.Commands.PasteProjectBrowserNode"/>
<MenuItem id = "Remove"
label = "Remove"
type = "Item"
icon = "Icons.16x16.DeleteIcon"
class = "ICSharpCode.SharpDevelop.Project.Commands.DeleteProjectBrowserNode"/>
<MenuItem id = "Rename"
@ -379,18 +388,22 @@ @@ -379,18 +388,22 @@
</ComplexCondition>
<MenuItem id = "Cut"
label = "Cut"
type = "Item"
icon = "Icons.16x16.CutIcon"
class = "ICSharpCode.SharpDevelop.Project.Commands.CutProjectBrowserNode"/>
<MenuItem id = "Copy"
label = "Copy"
icon = "Icons.16x16.CopyIcon"
type = "Item"
icon = "Icons.16x16.CopyIcon"
class = "ICSharpCode.SharpDevelop.Project.Commands.CopyProjectBrowserNode"/>
<MenuItem id = "Paste"
label = "Paste"
type = "Item"
icon = "Icons.16x16.PasteIcon"
class = "ICSharpCode.SharpDevelop.Project.Commands.PasteProjectBrowserNode"/>
<MenuItem id = "Delete"
label = "Delete"
type = "Item"
icon = "Icons.16x16.DeleteIcon"
class = "ICSharpCode.SharpDevelop.Project.Commands.DeleteProjectBrowserNode"/>
<MenuItem id = "Rename"
@ -442,18 +455,22 @@ @@ -442,18 +455,22 @@
<MenuItem id = "Cut"
label = "Cut"
type = "Item"
icon = "Icons.16x16.CutIcon"
class = "ICSharpCode.SharpDevelop.Project.Commands.CutProjectBrowserNode"/>
<MenuItem id = "Copy"
label = "Copy"
type = "Item"
icon = "Icons.16x16.CopyIcon"
class = "ICSharpCode.SharpDevelop.Project.Commands.CopyProjectBrowserNode"/>
<MenuItem id = "Paste"
label = "Paste"
icon = "Icons.16x16.PasteIcon"
type = "Item"
class = "ICSharpCode.SharpDevelop.Project.Commands.PasteProjectBrowserNode"/>
<MenuItem id = "Delete"
label = "Delete"
type = "Item"
icon = "Icons.16x16.DeleteIcon"
class = "ICSharpCode.SharpDevelop.Project.Commands.DeleteProjectBrowserNode"/>
<MenuItem id = "Rename"
@ -1029,12 +1046,14 @@ @@ -1029,12 +1046,14 @@
<MenuItem id = "Undo"
label = "${res:XML.MainMenu.EditMenu.Undo}"
icon = "Icons.16x16.UndoIcon"
type = "Item"
description = "${res:XML.MainMenu.EditMenu.Undo.Description}"
shortcut = "Control|Z"
class = "ICSharpCode.SharpDevelop.Commands.Undo"/>
<MenuItem id = "Redo"
label = "${res:XML.MainMenu.EditMenu.Redo}"
icon = "Icons.16x16.RedoIcon"
type = "Item"
description = "${res:XML.MainMenu.EditMenu.Redo.Description}"
shortcut = "Control|Y"
class = "ICSharpCode.SharpDevelop.Commands.Redo"/>
@ -1043,29 +1062,34 @@ @@ -1043,29 +1062,34 @@
<MenuItem id = "Cut"
label = "${res:XML.MainMenu.EditMenu.Cut}"
icon = "Icons.16x16.CutIcon"
type = "Item"
description = "${res:XML.MainMenu.EditMenu.Cut.Description}"
shortcut = "Control|X"
class = "ICSharpCode.SharpDevelop.Commands.Cut"/>
<MenuItem id = "Copy"
label = "${res:XML.MainMenu.EditMenu.Copy}"
icon = "Icons.16x16.CopyIcon"
type = "Item"
description = "${res:XML.MainMenu.EditMenu.Copy.Description}"
shortcut = "Control|C"
class = "ICSharpCode.SharpDevelop.Commands.Copy"/>
<MenuItem id = "Paste"
label = "${res:XML.MainMenu.EditMenu.Paste}"
icon = "Icons.16x16.PasteIcon"
type = "Item"
description = "${res:XML.MainMenu.EditMenu.Paste.Description}"
shortcut = "Control|V"
class = "ICSharpCode.SharpDevelop.Commands.Paste"/>
<MenuItem id = "Delete"
label = "${res:XML.MainMenu.EditMenu.Delete}"
icon = "Icons.16x16.DeleteIcon"
type = "Item"
description = "${res:XML.MainMenu.EditMenu.Delete.Description}"
class = "ICSharpCode.SharpDevelop.Commands.Delete"/>
<MenuItem id = "SelectAll"
label = "${res:XML.MainMenu.EditMenu.SelectAll}"
description = "${res:XML.MainMenu.EditMenu.SelectAll.Description}"
type = "Item"
shortcut = "Control|A"
class = "ICSharpCode.SharpDevelop.Commands.SelectAll"/>
<MenuItem id = "Separator4" type = "Separator" />
@ -1464,21 +1488,25 @@ @@ -1464,21 +1488,25 @@
<Path name = "/SharpDevelop/ViewContent/DefaultTextEditor/ContextMenu">
<MenuItem id = "Cut"
label = "${res:XML.TextAreaContextMenu.Cut}"
type = "Item"
icon = "Icons.16x16.CutIcon"
shortcut = "Control|X"
class = "ICSharpCode.SharpDevelop.Commands.Cut"/>
<MenuItem id = "Copy"
label = "${res:XML.TextAreaContextMenu.Copy}"
type = "Item"
icon = "Icons.16x16.CopyIcon"
shortcut = "Control|C"
class = "ICSharpCode.SharpDevelop.Commands.Copy"/>
<MenuItem id = "Paste"
label = "${res:XML.TextAreaContextMenu.Paste}"
type = "Item"
icon = "Icons.16x16.PasteIcon"
shortcut = "Control|V"
class = "ICSharpCode.SharpDevelop.Commands.Paste"/>
<MenuItem id = "Delete"
label = "${res:XML.MainMenu.EditMenu.Delete}"
type = "Item"
icon = "Icons.16x16.DeleteIcon"
class = "ICSharpCode.SharpDevelop.Commands.Delete"/>
<MenuItem id = "Separator1" type = "Separator" />

BIN
src/AddIns/AddIns/DisplayBindings/ResourceEditor.dll
View File

Binary file not shown.

BIN
src/AddIns/AddIns/DisplayBindings/ResourceEditor.pdb
View File

Binary file not shown.

BIN
src/AddIns/AddIns/Misc/FiletypeRegisterer/ICSharpCode.FiletypeRegisterer.dll
View File

Binary file not shown.

BIN
src/AddIns/AddIns/Misc/FiletypeRegisterer/ICSharpCode.FiletypeRegisterer.pdb
View File

Binary file not shown.

6
src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -58,7 +58,7 @@ @@ -58,7 +58,7 @@
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\OptionPanels\BuildOptions.cs">
<SubType>Form</SubType>
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\OptionPanels\DebugOptions.cs">
<SubType>UserControl</SubType>
@ -100,6 +100,8 @@ @@ -100,6 +100,8 @@
<Name>ICSharpCode.Core</Name>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Src\PrettyPrinter\Gui\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

2
src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj.user
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<StartProgram>..\..\..\..\..\bin\SharpDevelop.exe</StartProgram>
</PropertyGroup>

15
src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -7,19 +7,24 @@ @@ -7,19 +7,24 @@
<ProjectGuid>{CBC6C247-747B-4908-B09A-4D2E0F640B6B}</ProjectGuid>
<AssemblyName>ResourceEditor</AssemblyName>
<OutputTarget>Library</OutputTarget>
<WarningLevel>4</WarningLevel>
<NoStdLib>False</NoStdLib>
<NoConfig>False</NoConfig>
<RunPostBuildEvent>OnSuccessfulBuild</RunPostBuildEvent>
<OutputType>Library</OutputType>
<StartupObject />
<ApplicationIcon />
<Win32Resource />
<AssemblyOriginatorKeyFile />
<AssemblyKeyProviderName />
<AssemblyOriginatorKeyMode>File</AssemblyOriginatorKeyMode>
<PreBuildEvent />
<PostBuildEvent />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
<Optimize>True</Optimize>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
<OutputPath>..\..\..\AddIns\DisplayBindings\</OutputPath>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<OutputPath>..\..\..\..\..\AddIns\AddIns\DisplayBindings\ResourceEditor\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>

2
src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj.user
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
<PropertyGroup>

6
src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
<Optimize>False</Optimize>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
<OutputPath>..\..\..\AddIns\Misc\FiletypeRegisterer\</OutputPath>
<OutputPath>..\..\..\..\..\AddIns\AddIns\Misc\FiletypeRegisterer\</OutputPath>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@ -63,6 +63,8 @@ @@ -63,6 +63,8 @@
<Content Include="Src\filetypes\vb.ico" />
<Content Include="Src\filetypes\xfrm.ico" />
<Content Include="Src\filetypes\xml.ico" />
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

2
src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj.user
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
<PropertyGroup>

18
src/Libraries/DockPanel_Src/WinFormsUI/WinFormsUI.csproj
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>8.0.41115</ProductVersion>
@ -66,7 +66,9 @@ @@ -66,7 +66,9 @@
<Compile Include="DockAreasEditor.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="DockContent.cs" />
<Compile Include="DockContent.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="DockContentCollection.cs">
<SubType>Code</SubType>
</Compile>
@ -76,7 +78,9 @@ @@ -76,7 +78,9 @@
<Compile Include="DockList.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="DockPane.cs" />
<Compile Include="DockPane.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="DockPaneCollection.cs">
<SubType>Code</SubType>
</Compile>
@ -106,11 +110,15 @@ @@ -106,11 +110,15 @@
<Compile Include="EventArgs.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="FloatWindow.cs" />
<Compile Include="FloatWindow.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FloatWindowCollection.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="HiddenMdiChild.cs" />
<Compile Include="HiddenMdiChild.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="InertButton.cs" />
<Compile Include="Interfaces.cs">
<SubType>Code</SubType>

2
src/Libraries/DockPanel_Src/WinFormsUI/WinFormsUI.csproj.user
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastOpenVersion>8.0.41115</LastOpenVersion>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

9
src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -200,10 +200,9 @@ @@ -200,10 +200,9 @@
<SubType>Form</SubType>
</Compile>
<Compile Include="Src\Gui\Dialogs\TipOfTheDay.cs">
<SubType>Form</SubType>
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\Gui\Dialogs\TreeViewOptions.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Src\Gui\Dialogs\ViewGPLDialog.cs">
<SubType>Form</SubType>
@ -274,7 +273,9 @@ @@ -274,7 +273,9 @@
<SubType>Form</SubType>
</Compile>
<Compile Include="Src\Gui\Workbench\Layouts\SdiWorkspaceLayout.cs" />
<Compile Include="Src\Gui\Workbench\Layouts\SdiWorkspaceWindow.cs" />
<Compile Include="Src\Gui\Workbench\Layouts\SdiWorkspaceWindow.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Src\Gui\XmlForms\SharpDevelopObjectCreator.cs" />
<Compile Include="Src\Gui\XmlForms\SharpDevelopPropertyValueCreator.cs" />
<Compile Include="Src\Gui\XmlForms\SharpDevelopStringValueFilter.cs" />

2
src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj.user
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
<PropertyGroup>

1
src/Main/Base/Project/Resources/CommonAboutDialog.xfrm
Unescape View File

@ -21,7 +21,6 @@ @@ -21,7 +21,6 @@
<Width value = "400"/>
<Height value = "224"/>
<Location value = "{X=8, Y=8}"/>
<Image value = "Icons.AboutImage"/>
<TabStop value = "False"/>
</ICSharpCode.SharpDevelop.Gui.ScrollBox>

2
src/Main/Base/Project/Src/Gui/Dialogs/CommonAboutDialog.cs
Unescape View File

@ -63,7 +63,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -63,7 +63,7 @@ namespace ICSharpCode.SharpDevelop.Gui
{
SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
SetStyle(ControlStyles.AllPaintingInWmPaint, true);
Image = IconService.GetBitmap("Icons.AboutImage");
Font = ResourceService.LoadFont("Tahoma", 10);
text = new string[] {

2
src/Main/Base/Project/Src/Project/MSBuildProject.cs
Unescape View File

@ -299,7 +299,7 @@ namespace ICSharpCode.SharpDevelop.Project @@ -299,7 +299,7 @@ namespace ICSharpCode.SharpDevelop.Project
BeforeBuild();
string runtimeDirectory = System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory();
ProcessStartInfo startInfo = new ProcessStartInfo("\"" + Path.Combine(runtimeDirectory, "msbuild.exe") + "\"");
startInfo.Arguments = "/nologo \"" + FileName + "\" \"/t:" + target + "\"";
startInfo.Arguments = "/nologo /verbosity:m \"" + FileName + "\" \"/t:" + target + "\"";
startInfo.WorkingDirectory = Directory;
startInfo.UseShellExecute = false;

15
src/Main/Core/Project/Src/AddInTree/AddIn/StandardErbauer/MenuItem/Gui/Menu.cs
Unescape View File

@ -28,9 +28,6 @@ namespace ICSharpCode.Core @@ -28,9 +28,6 @@ namespace ICSharpCode.Core
this.subItems = subItems;
this.RightToLeft = RightToLeft.Inherit;
if (subItems != null && subItems.Count > 0) {
DropDownItems.Add(new ToolStripMenuItem());
}
CreateDropDownItems();
}
@ -39,10 +36,6 @@ namespace ICSharpCode.Core @@ -39,10 +36,6 @@ namespace ICSharpCode.Core
DropDownItems.Clear();
foreach (object item in subItems) {
if (item is ToolStripItem) {
if (item is IStatusUpdate) {
((IStatusUpdate)item).UpdateStatus();
}
DropDownItems.Add((ToolStripItem)item);
} else {
ISubmenuBuilder submenuBuilder = (ISubmenuBuilder)item;
@ -53,7 +46,13 @@ namespace ICSharpCode.Core @@ -53,7 +46,13 @@ namespace ICSharpCode.Core
protected override void OnDropDownShow(EventArgs e)
{
base.OnDropDownShow(e);
CreateDropDownItems();
foreach (object item in subItems) {
if (item is ToolStripItem) {
if (item is IStatusUpdate) {
((IStatusUpdate)item).UpdateStatus();
}
}
}
}
protected override void OnDropDownOpened(System.EventArgs e)

28
src/Main/Core/Project/Src/AddInTree/AddIn/StandardErbauer/MenuItem/Gui/MenuCommand.cs
Unescape View File

@ -33,22 +33,36 @@ namespace ICSharpCode.Core @@ -33,22 +33,36 @@ namespace ICSharpCode.Core
public IMenuCommand Command {
get {
if (menuCommand == null) {
CreateCommand();
}
return menuCommand;
}
}
}
public MenuCommand(Codon codon, object caller)
void CreateCommand()
{
this.RightToLeft = RightToLeft.Inherit;
this.caller = caller;
this.codon = codon;
try {
menuCommand = (IMenuCommand)codon.AddIn.CreateObject(codon.Properties["class"]);
} catch (Exception e) {
MessageService.ShowError(e, "Can't create menu command : " + codon.ID);
}
}
public MenuCommand(Codon codon, object caller) : this(codon, caller, false)
{
}
public MenuCommand(Codon codon, object caller, bool createCommand)
{
this.RightToLeft = RightToLeft.Inherit;
this.caller = caller;
this.codon = codon;
if (createCommand) {
CreateCommand();
}
if (codon.Properties.Contains("shortcut")) {
Keys shortCut = Keys.None;

4
src/Main/Core/Project/Src/AddInTree/AddIn/StandardErbauer/MenuItem/MenuItemErbauer.cs
Unescape View File

@ -11,7 +11,7 @@ namespace ICSharpCode.Core @@ -11,7 +11,7 @@ namespace ICSharpCode.Core
{
public object BuildItem(object caller, Codon codon, ArrayList subItems)
{
string type = codon.Properties.Contains("type") ? codon.Properties["type"] : "Item";
string type = codon.Properties.Contains("type") ? codon.Properties["type"] : "Command";
switch (type) {
case "Separator":
@ -20,6 +20,8 @@ namespace ICSharpCode.Core @@ -20,6 +20,8 @@ namespace ICSharpCode.Core
return new MenuCheckBox(codon, caller);
case "Item":
return new MenuCommand(codon, caller);
case "Command":
return new MenuCommand(codon, caller, false);
case "Menu":
return new Menu(codon, caller, subItems);
case "Builder":

52
src/SharpDevelop.sln
Unescape View File

@ -1,5 +1,25 @@ @@ -1,5 +1,25 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# SharpDevelop 2.0.0.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{5A3EBEBA-0560-41C1-966B-23F7D03A5486}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{9421EDF4-9769-4BE9-B5A6-C87DE221D73C}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj", "{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
@ -30,26 +50,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegExpTk", "AddIns\Misc\Reg @@ -30,26 +50,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegExpTk", "AddIns\Misc\Reg
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartPage", "AddIns\Misc\StartPage\Project\StartPage.csproj", "{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{9421EDF4-9769-4BE9-B5A6-C87DE221D73C}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj", "{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{5A3EBEBA-0560-41C1-966B-23F7D03A5486}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -117,6 +117,12 @@ Global @@ -117,6 +117,12 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{1152B71B-3C05-4598-B20D-823B5D40559E} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
{4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
{FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
@ -127,11 +133,5 @@ Global @@ -127,11 +133,5 @@ Global
{64A3E5E6-90BF-47F6-94DF-68C94B62C817} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
{8A462940-E5E9-4E85-982D-D4C006EE31D4} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
{D022A6CE-7438-41E8-AC64-F2DE18EC54C6} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{1152B71B-3C05-4598-B20D-823B5D40559E} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
EndGlobalSection
EndGlobal

Write Preview
Loading…
Cancel
Save