Browse Source

Update English and German StringResources (combine -> solution).

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@378 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 20 years ago
parent
commit
c1d54b7df2
  1. 2
      AddIns/ICSharpCode.SharpDevelop.addin
  2. 9
      data/options/SharpDevelop-tools.xml
  3. BIN
      data/resources/StringResources.de.resources
  4. 3
      data/resources/image/BitmapResources/BitmapResources.res
  5. BIN
      data/resources/image/BitmapResources/PadIcons/MbUnit.png
  6. 0
      data/resources/image/BitmapResources/PadIcons/NUnit.png
  7. 1
      src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Options.cs
  8. 2
      src/AddIns/Misc/MbUnitPad/Project/Configuration/AssemblyInfo.cs
  9. 4
      src/AddIns/Misc/MbUnitPad/Project/MbUnitPad.addin
  10. 2
      src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
  11. 102
      src/Main/Base/Project/Resources/ProjectAndCombineOptions.xfrm
  12. 36
      src/Main/Base/Project/Src/Commands/CustomStringTagProvider.cs
  13. 3
      src/Main/Base/Project/Src/Commands/MenuItemBuilders.cs
  14. 86
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndCombinePanel.cs
  15. 2
      src/Main/Base/Project/Src/Services/ClassBrowserIcons/ClassBrowserIconService.cs
  16. 16
      src/Main/Core/Project/Src/Services/FileUtility/FileUtility.cs
  17. BIN
      src/Main/StartUp/Project/Resources/BitmapResources.resources
  18. BIN
      src/Main/StartUp/Project/Resources/StringResources.resources
  19. 2
      src/SharpDevelop.sln

2
AddIns/ICSharpCode.SharpDevelop.addin

@ -97,7 +97,7 @@
<Pad id = "DefinitionView" <Pad id = "DefinitionView"
category = "Tools" category = "Tools"
title = "Definition View" title = "${res:MainWindow.Windows.DefinitionViewLabel}"
icon = "PadIcons.Bookmarks" icon = "PadIcons.Bookmarks"
class = "ICSharpCode.SharpDevelop.Gui.DefinitionViewPad"/> class = "ICSharpCode.SharpDevelop.Gui.DefinitionViewPad"/>
</Path> </Path>

9
data/options/SharpDevelop-tools.xml

@ -6,17 +6,10 @@
<MENUCOMMAND>Notepad</MENUCOMMAND> <MENUCOMMAND>Notepad</MENUCOMMAND>
<PROMPTFORARGUMENTS>False</PROMPTFORARGUMENTS> <PROMPTFORARGUMENTS>False</PROMPTFORARGUMENTS>
</TOOL> </TOOL>
<TOOL>
<INITIALDIRECTORY>${TargetDir}</INITIALDIRECTORY>
<ARGUMENTS>"/R:${TargetPath}" "/W:${TargetDir}"</ARGUMENTS>
<COMMAND>${StartupPath}\nprof\NProf.Application.exe</COMMAND>
<MENUCOMMAND>NProf</MENUCOMMAND>
<PROMPTFORARGUMENTS>True</PROMPTFORARGUMENTS>
</TOOL>
<TOOL> <TOOL>
<INITIALDIRECTORY>${TargetDir}</INITIALDIRECTORY> <INITIALDIRECTORY>${TargetDir}</INITIALDIRECTORY>
<ARGUMENTS>"${TargetPath}"</ARGUMENTS> <ARGUMENTS>"${TargetPath}"</ARGUMENTS>
<COMMAND>ILDasm.exe</COMMAND> <COMMAND>${NetSdkDir}bin\ILDasm.exe</COMMAND>
<MENUCOMMAND>IL Dasm</MENUCOMMAND> <MENUCOMMAND>IL Dasm</MENUCOMMAND>
<PROMPTFORARGUMENTS>False</PROMPTFORARGUMENTS> <PROMPTFORARGUMENTS>False</PROMPTFORARGUMENTS>
</TOOL> </TOOL>

BIN
data/resources/StringResources.de.resources

Binary file not shown.

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

@ -233,7 +233,8 @@ PadIcons.ErrorList = PadIcons\ErrorList.png
PadIcons.TaskList = PadIcons\TaskList.png PadIcons.TaskList = PadIcons\TaskList.png
PadIcons.Output = PadIcons\Output.png PadIcons.Output = PadIcons\Output.png
PadIcons.Toolbar = PadIcons\Toolbar.png PadIcons.Toolbar = PadIcons\Toolbar.png
PadIcons.UnitTest = PadIcons\UnitTest.png PadIcons.NUnitTest = PadIcons\NUnit.png
PadIcons.MbUnitTest = PadIcons\MbUnit.png
PadIcons.FindResults = PadIcons\FindResults.png PadIcons.FindResults = PadIcons\FindResults.png
PadIcons.FileBrowser = PadIcons\FileBrowser.png PadIcons.FileBrowser = PadIcons\FileBrowser.png
PadIcons.ClassBrowser = PadIcons\ClassBrowser.png PadIcons.ClassBrowser = PadIcons\ClassBrowser.png

BIN
data/resources/image/BitmapResources/PadIcons/MbUnit.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 365 B

0
data/resources/image/BitmapResources/PadIcons/UnitTest.png → data/resources/image/BitmapResources/PadIcons/NUnit.png

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

1
src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Options.cs

@ -30,6 +30,7 @@ namespace HtmlHelp2Service
{ {
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("HtmlHelp2.Resources.HtmlHelp2Options.xfrm")); SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("HtmlHelp2.Resources.HtmlHelp2Options.xfrm"));
ControlDictionary["reregisterButton"].Click += ReregisterButtonClick; ControlDictionary["reregisterButton"].Click += ReregisterButtonClick;
ControlDictionary["reregisterButton"].Visible = false;
this.InitializeComponents(); this.InitializeComponents();
} }

2
src/AddIns/Misc/MbUnitPad/Project/Configuration/AssemblyInfo.cs

@ -1,4 +1,4 @@
// <file> // <file>
// <copyright see="prj:///doc/copyright.txt">2002-2005 AlphaSierraPapa</copyright> // <copyright see="prj:///doc/copyright.txt">2002-2005 AlphaSierraPapa</copyright>
// <license see="prj:///doc/license.txt">GNU General Public License</license> // <license see="prj:///doc/license.txt">GNU General Public License</license>
// <owner name="Daniel Grunwald" email="daniel@danielgrunwald.de"/> // <owner name="Daniel Grunwald" email="daniel@danielgrunwald.de"/>

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

@ -15,7 +15,7 @@
<Pad id = "MbUnitPad" <Pad id = "MbUnitPad"
category = "Tools" category = "Tools"
title = "MbUnit Tests" title = "MbUnit Tests"
icon = "PadIcons.UnitTest" icon = "PadIcons.MbUnitTest"
shortcut = "Control|Alt|T" shortcut = "Control|Alt|T"
class = "ICSharpCode.MbUnitPad.MbUnitPadContent"/> class = "ICSharpCode.MbUnitPad.MbUnitPadContent"/>
</Path> </Path>
@ -36,7 +36,7 @@
tooltip = "${res:MbUnitPad.ReferenceItem}" tooltip = "${res:MbUnitPad.ReferenceItem}"
class = "ICSharpCode.MbUnitPad.AddMbUnitReferenceCommand"/> class = "ICSharpCode.MbUnitPad.AddMbUnitReferenceCommand"/>
<ToolbarItem id = "AddNUnitReference" <ToolbarItem id = "AddNUnitReference"
icon = "PadIcons.UnitTest" icon = "PadIcons.NUnitTest"
tooltip = "${res:NUnitPad.NUnitPadContent.ReferenceItem}" tooltip = "${res:NUnitPad.NUnitPadContent.ReferenceItem}"
class = "ICSharpCode.MbUnitPad.AddNUnitReferenceCommand"/> class = "ICSharpCode.MbUnitPad.AddNUnitReferenceCommand"/>
<ToolbarItem id = "Separator2" type = "Separator"/> <ToolbarItem id = "Separator2" type = "Separator"/>

2
src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj

@ -229,7 +229,6 @@
<Compile Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\LoadSavePanel.cs"> <Compile Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\LoadSavePanel.cs">
<SubType>UserControl</SubType> <SubType>UserControl</SubType>
</Compile> </Compile>
<Compile Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\ProjectAndCombinePanel.cs" />
<Compile Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\SelectCulturePanel.cs"> <Compile Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\SelectCulturePanel.cs">
<SubType>UserControl</SubType> <SubType>UserControl</SubType>
</Compile> </Compile>
@ -482,7 +481,6 @@
<EmbeddedResource Include="Resources\NewFileDialog.xfrm" /> <EmbeddedResource Include="Resources\NewFileDialog.xfrm" />
<EmbeddedResource Include="Resources\NewProjectDialog.xfrm" /> <EmbeddedResource Include="Resources\NewProjectDialog.xfrm" />
<EmbeddedResource Include="Resources\OutputWindowOptionsPanel.xfrm" /> <EmbeddedResource Include="Resources\OutputWindowOptionsPanel.xfrm" />
<EmbeddedResource Include="Resources\ProjectAndCombineOptions.xfrm" />
<EmbeddedResource Include="Resources\SelectStylePanel.xfrm" /> <EmbeddedResource Include="Resources\SelectStylePanel.xfrm" />
<EmbeddedResource Include="Resources\TabbedOptionsDialog.xfrm" /> <EmbeddedResource Include="Resources\TabbedOptionsDialog.xfrm" />
<EmbeddedResource Include="Resources\TaskListOptions.xfrm" /> <EmbeddedResource Include="Resources\TaskListOptions.xfrm" />

102
src/Main/Base/Project/Resources/ProjectAndCombineOptions.xfrm

@ -1,102 +0,0 @@
<Components version="1.0">
<System.Windows.Forms.UserControl>
<Name value="ProjectAndCombineOptionsPanel" />
<DockPadding value="" />
<ClientSize value="{Width=352, Height=324}" />
<Controls>
<System.Windows.Forms.GroupBox>
<Name value="CreatedObject2" />
<TabIndex value="0" />
<Location value="{X=8,Y=8}" />
<Anchor value="Top, Left, Right" />
<ClientSize value="{Width=336, Height=104}" />
<Text value="${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.SettingsGroupBox}" />
<Controls>
<System.Windows.Forms.Button>
<Name value="selectProjectLocationButton" />
<Location value="{X=294,Y=32}" />
<ClientSize value="{Width=32, Height=21}" />
<Text value="..." />
<Anchor value="Top, Right" />
<TabIndex value="6" />
</System.Windows.Forms.Button>
<System.Windows.Forms.TextBox>
<Name value="projectLocationTextBox" />
<Anchor value="Top, Left, Right" />
<TabIndex value="1" />
<Location value="{X=8,Y=32}" />
<ClientSize value="{Width=276, Height=17}" />
<Text value="" />
</System.Windows.Forms.TextBox>
<System.Windows.Forms.Label>
<Name value="label" />
<Text value="${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.ProjectLocationLabel}" />
<TextAlign value="BottomLeft" />
<Anchor value="Top, Left, Right" />
<TabIndex value="0" />
<ClientSize value="{Width=320, Height=16}" />
<Location value="{X=8,Y=16}" />
</System.Windows.Forms.Label>
<System.Windows.Forms.CheckBox>
<Name value="loadPrevProjectCheckBox" />
<Location value="{X=8,Y=56}" />
<ClientSize value="{Width=320, Height=32}" />
<Text value="${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.LoadPrevProjectCheckBox}" />
<Anchor value="Top, Left, Right" />
<TabIndex value="8" />
</System.Windows.Forms.CheckBox>
</Controls>
</System.Windows.Forms.GroupBox>
<System.Windows.Forms.GroupBox>
<Name value="CreatedObject27" />
<TabIndex value="1" />
<Location value="{X=8,Y=128}" />
<Anchor value="Top, Bottom, Left, Right" />
<ClientSize value="{Width=336, Height=184}" />
<Text value="${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.BuildAndRunGroupBox}" />
<Controls>
<System.Windows.Forms.CheckBox>
<Name value="showTaskListCheckBox" />
<Location value="{X=8,Y=144}" />
<ClientSize value="{Width=320, Height=32}" />
<Text value="${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.ShowTaskListPadCheckBox}" />
<Anchor value="Top, Left, Right" />
<TabIndex value="10" />
</System.Windows.Forms.CheckBox>
<System.Windows.Forms.CheckBox>
<Name value="showOutputCheckBox" />
<Location value="{X=8,Y=112}" />
<ClientSize value="{Width=320, Height=32}" />
<Text value="${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.ShowOutputPadCheckBox}" />
<Anchor value="Top, Left, Right" />
<TabIndex value="9" />
</System.Windows.Forms.CheckBox>
<System.Windows.Forms.RadioButton>
<Name value="noSaveRadioButton" />
<Location value="{X=8,Y=72}" />
<ClientSize value="{Width=320, Height=32}" />
<Text value="${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.DontSaveRadioButton}" />
<Anchor value="Top, Left, Right" />
<TabIndex value="2" />
</System.Windows.Forms.RadioButton>
<System.Windows.Forms.RadioButton>
<Name value="promptChangesRadioButton" />
<Location value="{X=8,Y=44}" />
<ClientSize value="{Width=320, Height=32}" />
<Text value="${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.PromptToSaveRadioButton}" />
<Anchor value="Top, Left, Right" />
<TabIndex value="1" />
</System.Windows.Forms.RadioButton>
<System.Windows.Forms.RadioButton>
<Name value="saveChangesRadioButton" />
<Location value="{X=8,Y=16}" />
<ClientSize value="{Width=320, Height=32}" />
<Text value="${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.SaveChangesRadioButton}" />
<Anchor value="Top, Left, Right" />
<TabIndex value="0" />
</System.Windows.Forms.RadioButton>
</Controls>
</System.Windows.Forms.GroupBox>
</Controls>
</System.Windows.Forms.UserControl>
</Components>

36
src/Main/Base/Project/Src/Commands/CustomStringTagProvider.cs

@ -21,9 +21,9 @@ using ICSharpCode.SharpDevelop.Project;
namespace ICSharpCode.SharpDevelop.Commands namespace ICSharpCode.SharpDevelop.Commands
{ {
public class SharpDevelopStringTagProvider : IStringTagProvider public class SharpDevelopStringTagProvider : IStringTagProvider
{ {
readonly static string[] tags = new string[] { readonly static string[] tags = new string[] {
"ItemPath", "ItemDir", "ItemFilename", "ItemExt", "ItemPath", "ItemDir", "ItemFilename", "ItemExt",
"CurLine", "CurCol", "CurText", "CurLine", "CurCol", "CurText",
"TargetPath", "TargetDir", "TargetName", "TargetExt", "TargetPath", "TargetDir", "TargetName", "TargetExt",
@ -31,9 +31,9 @@ namespace ICSharpCode.SharpDevelop.Commands
"ProjectDir", "ProjectFilename", "ProjectDir", "ProjectFilename",
"CombineDir", "CombineFilename", "CombineDir", "CombineFilename",
"Startuppath", "Startuppath",
"TaskService.Warnings", "TaskService.Errors", "TaskService.Messages" "TaskService.Warnings", "TaskService.Errors", "TaskService.Messages",
"NetSdkDir"
}; };
public string[] Tags { public string[] Tags {
get { get {
@ -51,14 +51,13 @@ namespace ICSharpCode.SharpDevelop.Commands
string GetCurrentTargetPath() string GetCurrentTargetPath()
{ {
// TODO: if (ProjectService.CurrentProject != null) {
// if (ProjectService.CurrentProject != null) { return ProjectService.CurrentProject.OutputAssemblyFullPath;
// return ProjectService.GetOutputAssemblyName(ProjectService.CurrentProject); }
// } /*if (WorkbenchSingleton.Workbench.ActiveWorkbenchWindow != null) {
// if (WorkbenchSingleton.Workbench.ActiveWorkbenchWindow != null) { string fileName = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.FileName;
// string fileName = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.FileName; return ProjectService.GetOutputAssemblyName(fileName);
// return ProjectService.GetOutputAssemblyName(fileName); }*/
// }
return String.Empty; return String.Empty;
} }
@ -77,7 +76,8 @@ namespace ICSharpCode.SharpDevelop.Commands
} }
switch (tag.ToUpper()) { switch (tag.ToUpper()) {
case "NETSDKDIR":
return FileUtility.NetSdkInstallRoot;
case "ITEMPATH": case "ITEMPATH":
try { try {
return GetCurrentItemPath(); return GetCurrentItemPath();
@ -98,15 +98,15 @@ namespace ICSharpCode.SharpDevelop.Commands
return Path.GetExtension(GetCurrentItemPath()); return Path.GetExtension(GetCurrentItemPath());
} catch (Exception) {} } catch (Exception) {}
break; break;
// TODO: // TODO:
case "CURLINE": case "CURLINE":
return String.Empty; return String.Empty;
case "CURCOL": case "CURCOL":
return String.Empty; return String.Empty;
case "CURTEXT": case "CURTEXT":
return String.Empty; return String.Empty;
case "TARGETPATH": case "TARGETPATH":
try { try {
return GetCurrentTargetPath(); return GetCurrentTargetPath();
@ -127,7 +127,7 @@ namespace ICSharpCode.SharpDevelop.Commands
return Path.GetExtension(GetCurrentTargetPath()); return Path.GetExtension(GetCurrentTargetPath());
} catch (Exception) {} } catch (Exception) {}
break; break;
case "PROJECTDIR": case "PROJECTDIR":
if (ProjectService.CurrentProject != null) { if (ProjectService.CurrentProject != null) {
return ProjectService.CurrentProject.FileName; return ProjectService.CurrentProject.FileName;
@ -140,7 +140,7 @@ namespace ICSharpCode.SharpDevelop.Commands
} catch (Exception) {} } catch (Exception) {}
} }
break; break;
case "COMBINEDIR": case "COMBINEDIR":
return Path.GetDirectoryName(ProjectService.OpenSolution.FileName); return Path.GetDirectoryName(ProjectService.OpenSolution.FileName);
case "COMBINEFILENAME": case "COMBINEFILENAME":

3
src/Main/Base/Project/Src/Commands/MenuItemBuilders.cs

@ -170,8 +170,7 @@ namespace ICSharpCode.SharpDevelop.Commands
} }
process.Start(); process.Start();
} catch (Exception ex) { } catch (Exception ex) {
MessageService.ShowError("External program execution failed.\nError while starting:\n '" + command + " " + args + "'\n" + ex.Message);
MessageService.ShowError(ex, "External program execution failed.\nError while starting:\n '" + command + " " + args + "'");
} }
break; break;
} }

86
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndCombinePanel.cs

@ -1,86 +0,0 @@
//// <file>
//// <copyright see="prj:///doc/copyright.txt"/>
//// <license see="prj:///doc/license.txt"/>
//// <owner name="Mike Krüger" email="mike@icsharpcode.net"/>
//// <version value="$version"/>
//// </file>
//
//using System;
//using System.IO;
//using System.Drawing;
//using System.Collections;
//using System.Windows.Forms;
//
//using ICSharpCode.SharpDevelop.Internal.ExternalTool;
//using ICSharpCode.Core;
//using ICSharpCode.Core;
//using ICSharpCode.SharpDevelop.Gui;
//using ICSharpCode.Core;
//using ICSharpCode.Core;
//using ICSharpCode.Core;
//
//namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
//{
// public class ProjectAndCombinePanel : AbstractOptionPanel
// {
// public override void LoadPanelContents()
// {
// SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.ProjectAndCombineOptions.xfrm"));
//
// // read properties
// ControlDictionary["projectLocationTextBox"].Text = PropertyService.Get("ICSharpCode.SharpDevelop.Gui.NewProjectDialog.DefaultPath", Path.Combine(System.Environment.GetFolderPath(System.Environment.SpecialFolder.Personal),
// "SharpDevelop Projects")).ToString();
//
// BeforeCompileAction action = (BeforeCompileAction)PropertyService.Get("SharpDevelop.Services.ParserService.BeforeCompileAction", BeforeCompileAction.SaveAllFiles);
//
// ((RadioButton)ControlDictionary["saveChangesRadioButton"]).Checked = action == BeforeCompileAction.SaveAllFiles;
// ((RadioButton)ControlDictionary["promptChangesRadioButton"]).Checked = action == BeforeCompileAction.PromptForSave;
// ((RadioButton)ControlDictionary["noSaveRadioButton"]).Checked = action == BeforeCompileAction.Nothing;
//
// ((CheckBox)ControlDictionary["loadPrevProjectCheckBox"]).Checked = (bool)PropertyService.Get("SharpDevelop.LoadPrevProjectOnStartup", false);
//
// ((CheckBox)ControlDictionary["showTaskListCheckBox"]).Checked = (bool)PropertyService.Get("SharpDevelop.ShowTaskListAfterBuild", true);
// ((CheckBox)ControlDictionary["showOutputCheckBox"]).Checked = (bool)PropertyService.Get("SharpDevelop.ShowOutputWindowAtBuild", true);
//
// ((Button)ControlDictionary["selectProjectLocationButton"]).Click += new EventHandler(SelectProjectLocationButtonClicked);
// }
//
// public override bool StorePanelContents()
// {
// // check for correct settings
// string projectPath = ControlDictionary["projectLocationTextBox"].Text;
// if (projectPath.Length > 0) {
// if (!FileUtility.IsValidFileName(projectPath)) {
// MessageService.ShowError("Invalid project path specified");
// return false;
// }
// }
//
// // set properties
// PropertyService.Set("ICSharpCode.SharpDevelop.Gui.NewProjectDialog.DefaultPath", projectPath);
//
// if (((RadioButton)ControlDictionary["saveChangesRadioButton"]).Checked) {
// PropertyService.Set("SharpDevelop.Services.ParserService.BeforeCompileAction", BeforeCompileAction.SaveAllFiles);
// } else if (((RadioButton)ControlDictionary["promptChangesRadioButton"]).Checked) {
// PropertyService.Set("SharpDevelop.Services.ParserService.BeforeCompileAction", BeforeCompileAction.PromptForSave);
// } else if (((RadioButton)ControlDictionary["noSaveRadioButton"]).Checked) {
// PropertyService.Set("SharpDevelop.Services.ParserService.BeforeCompileAction", BeforeCompileAction.Nothing);
// }
//
// PropertyService.Set("SharpDevelop.LoadPrevProjectOnStartup", ((CheckBox)ControlDictionary["loadPrevProjectCheckBox"]).Checked);
//
// PropertyService.Set("SharpDevelop.ShowTaskListAfterBuild", ((CheckBox)ControlDictionary["showTaskListCheckBox"]).Checked);
// PropertyService.Set("SharpDevelop.ShowOutputWindowAtBuild", ((CheckBox)ControlDictionary["showOutputCheckBox"]).Checked);
//
// return true;
// }
//
// void SelectProjectLocationButtonClicked(object sender, EventArgs e)
// {
// FolderDialog fdiag = new FolderDialog();
// if (fdiag.DisplayDialog("Select default combile location") == DialogResult.OK) {
// ControlDictionary["projectLocationTextBox"].Text = fdiag.Path;
// }
// }
// }
//}

2
src/Main/Base/Project/Src/Services/ClassBrowserIcons/ClassBrowserIconService.cs

@ -218,7 +218,7 @@ namespace ICSharpCode.Core
imglist.Images.Add(ResourceService.GetBitmap("Icons.16x16.ResourceFileIcon")); imglist.Images.Add(ResourceService.GetBitmap("Icons.16x16.ResourceFileIcon"));
imglist.Images.Add(ResourceService.GetBitmap("Icons.16x16.Event")); imglist.Images.Add(ResourceService.GetBitmap("Icons.16x16.Event"));
imglist.Images.Add(ResourceService.GetBitmap("Icons.16x16.Debug.Start")); imglist.Images.Add(ResourceService.GetBitmap("Icons.16x16.SelectionArrow"));
imglist.Images.Add(ResourceService.GetBitmap("Icons.16x16.CombineIcon")); imglist.Images.Add(ResourceService.GetBitmap("Icons.16x16.CombineIcon"));
imglist.Images.Add(ResourceService.GetBitmap("Icons.16x16.Literal")); imglist.Images.Add(ResourceService.GetBitmap("Icons.16x16.Literal"));

16
src/Main/Core/Project/Src/Services/FileUtility/FileUtility.cs

@ -68,9 +68,19 @@ namespace ICSharpCode.Core
public static string NETFrameworkInstallRoot { public static string NETFrameworkInstallRoot {
get { get {
RegistryKey installRootKey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\.NETFramework"); using (RegistryKey installRootKey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\.NETFramework")) {
object o = installRootKey.GetValue("InstallRoot"); object o = installRootKey.GetValue("InstallRoot");
return o == null ? String.Empty : o.ToString(); return o == null ? String.Empty : o.ToString();
}
}
}
public static string NetSdkInstallRoot {
get {
using (RegistryKey installRootKey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\.NETFramework")) {
object o = installRootKey.GetValue("sdkInstallRootv2.0");
return o == null ? String.Empty : o.ToString();
}
} }
} }

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

Binary file not shown.

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

Binary file not shown.

2
src/SharpDevelop.sln

@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 9.00 Microsoft Visual Studio Solution File, Format Version 9.00
# SharpDevelop 2.0.0.348 # SharpDevelop 2.0.0.373
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}"
ProjectSection(SolutionItems) = postProject ProjectSection(SolutionItems) = postProject
EndProjectSection EndProjectSection

Loading…
Cancel
Save