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

Rename Files

newNRvisualizers
Peter Forstmeier 13 years ago
parent
cf080f1140
commit
a8e2c54257
5 changed files with 13 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
  2. 6
      src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
  3. 2
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/OutputWindowOptionsPanel.xaml
  4. 6
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/OutputWindowOptionsPanel.xaml.cs
  5. 8
      src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs

7
src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
Unescape View File

@ -1255,13 +1255,10 @@
label = "${res:Dialog.Options.IDEOptions.TaskListOptions.PanelName}" label = "${res:Dialog.Options.IDEOptions.TaskListOptions.PanelName}"
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.TaskListXaml"/> class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.TaskListXaml"/>
<OptionPanel id = "OutputWindowOptions"
label = "${res:Dialog.Options.IDEOptions.OutputPanel.Title}"
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.old_OutputWindowOptionsPanel"/>
<OptionPanel id = "OutputWindowOptions1" <OptionPanel id = "OutputWindowOptions"
label = "${res:Dialog.Options.IDEOptions.OutputPanel.Title}" label = "${res:Dialog.Options.IDEOptions.OutputPanel.Title}"
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.OutputWindowOptionsPanelXaml"/> class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.OutputWindowOptionsPanel"/>
<OptionPanel id = "ProjectAndSolutionOptions" <OptionPanel id = "ProjectAndSolutionOptions"
label = "${res:Dialog.Options.IDEOptions.ProjectAndSolutionOptions.PanelName}" label = "${res:Dialog.Options.IDEOptions.ProjectAndSolutionOptions.PanelName}"

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

@ -225,8 +225,8 @@
<DependentUpon>AbstractAttachToProcessForm.cs</DependentUpon> <DependentUpon>AbstractAttachToProcessForm.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="Src\Gui\Dialogs\ExtractInterfaceDialog.cs" /> <Compile Include="Src\Gui\Dialogs\ExtractInterfaceDialog.cs" />
<Compile Include="Src\Gui\Dialogs\OptionPanels\OutputWindowOptionsPanelXaml.xaml.cs"> <Compile Include="Src\Gui\Dialogs\OptionPanels\OutputWindowOptionsPanel.xaml.cs">
<DependentUpon>OutputWindowOptionsPanelXaml.xaml</DependentUpon> <DependentUpon>OutputWindowOptionsPanel.xaml</DependentUpon>
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Src\Services\FileChangeWatcher.cs" /> <Compile Include="Src\Services\FileChangeWatcher.cs" />
@ -839,7 +839,7 @@
<Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\EditStandardHeaderPanel.xaml" /> <Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\EditStandardHeaderPanel.xaml" />
<Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\SelectStylePanel.xaml" /> <Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\SelectStylePanel.xaml" />
<Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\TaskListOptionsl.xaml" /> <Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\TaskListOptionsl.xaml" />
<Page Include="Src\Gui\Dialogs\OptionPanels\OutputWindowOptionsPanelXaml.xaml" /> <Page Include="Src\Gui\Dialogs\OptionPanels\OutputWindowOptionsPanel.xaml" />
<Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\ApplicationSettings.xaml" /> <Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\ApplicationSettings.xaml" />
<Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\BuildAdvanced.xaml" /> <Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\BuildAdvanced.xaml" />
<Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\BuildEvents.xaml" /> <Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\BuildEvents.xaml" />

2
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/OutputWindowOptionsPanelXaml.xaml → src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/OutputWindowOptionsPanel.xaml
Unescape View File

@ -1,4 +1,4 @@
<gui:OptionPanel x:Class="ICSharpCode.SharpDevelop.Gui.OptionPanels.OutputWindowOptionsPanelXaml" <gui:OptionPanel x:Class="ICSharpCode.SharpDevelop.Gui.OptionPanels.OutputWindowOptionsPanel"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:core="http://icsharpcode.net/sharpdevelop/core" xmlns:core="http://icsharpcode.net/sharpdevelop/core"

6
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/OutputWindowOptionsPanelXaml.xaml.cs → src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/OutputWindowOptionsPanel.xaml.cs
Unescape View File

@ -15,7 +15,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
/// <summary> /// <summary>
/// Interaction logic for OutputWindowOptionsPanelXaml.xaml /// Interaction logic for OutputWindowOptionsPanelXaml.xaml
/// </summary> /// </summary>
public partial class OutputWindowOptionsPanelXaml : OptionPanel public partial class OutputWindowOptionsPanel : OptionPanel
{ {
public static readonly string OutputWindowsProperty = "SharpDevelop.UI.OutputWindowOptions"; public static readonly string OutputWindowsProperty = "SharpDevelop.UI.OutputWindowOptions";
@ -24,7 +24,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
public static readonly string WordWrapName = "WordWrap"; public static readonly string WordWrapName = "WordWrap";
public OutputWindowOptionsPanelXaml() public OutputWindowOptionsPanel()
{ {
InitializeComponent(); InitializeComponent();
this.DataContext = this; this.DataContext = this;
@ -37,7 +37,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
var properties = PropertyService.NestedProperties(OutputWindowsProperty); var properties = PropertyService.NestedProperties(OutputWindowsProperty);
WordWrap = properties.Get(WordWrapName, true); WordWrap = properties.Get(WordWrapName, true);
var fontDescription = OutputWindowOptionsPanelXaml.DefaultFontDescription(); var fontDescription = OutputWindowOptionsPanel.DefaultFontDescription();
fontSelectionPanel.SelectedFontFamily = new FontFamily(fontDescription.Item1); fontSelectionPanel.SelectedFontFamily = new FontFamily(fontDescription.Item1);
fontSelectionPanel.SelectedFontSize = fontDescription.Item2; fontSelectionPanel.SelectedFontSize = fontDescription.Item2;
} }

8
src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs
Unescape View File

@ -206,7 +206,7 @@ namespace ICSharpCode.SharpDevelop.Gui
textEditor.ContextMenu = MenuService.CreateContextMenu(this, "/SharpDevelop/Pads/CompilerMessageView/ContextMenu"); textEditor.ContextMenu = MenuService.CreateContextMenu(this, "/SharpDevelop/Pads/CompilerMessageView/ContextMenu");
properties = PropertyService.NestedProperties(OutputWindowOptionsPanelXaml.OutputWindowsProperty); properties = PropertyService.NestedProperties(OutputWindowOptionsPanel.OutputWindowsProperty);
SetTextEditorFont(); SetTextEditorFont();
@ -238,7 +238,7 @@ namespace ICSharpCode.SharpDevelop.Gui
private bool IsFontChanged (string propName) private bool IsFontChanged (string propName)
{ {
if ((propName == OutputWindowOptionsPanelXaml.FontSizeName) || (propName == OutputWindowOptionsPanelXaml.FontFamilyName)) { if ((propName == OutputWindowOptionsPanel.FontSizeName) || (propName == OutputWindowOptionsPanel.FontFamilyName)) {
return true; return true;
} }
return false; return false;
@ -253,7 +253,7 @@ namespace ICSharpCode.SharpDevelop.Gui
private void SetTextEditorFont() private void SetTextEditorFont()
{ {
var fontDescription = OutputWindowOptionsPanelXaml.DefaultFontDescription(); var fontDescription = OutputWindowOptionsPanel.DefaultFontDescription();
textEditor.FontFamily = new FontFamily(fontDescription.Item1); textEditor.FontFamily = new FontFamily(fontDescription.Item1);
textEditor.FontSize = fontDescription.Item2; textEditor.FontSize = fontDescription.Item2;
} }
@ -413,7 +413,7 @@ namespace ICSharpCode.SharpDevelop.Gui
/// </summary> /// </summary>
void PropertyChanged(object sender, PropertyChangedEventArgs e) void PropertyChanged(object sender, PropertyChangedEventArgs e)
{ {
if (e.PropertyName == OutputWindowOptionsPanelXaml.WordWrapName) { if (e.PropertyName == OutputWindowOptionsPanel.WordWrapName) {
SetWordWrap(); SetWordWrap();
ToolBarService.UpdateStatus(toolStrip.Items); ToolBarService.UpdateStatus(toolStrip.Items);
} }

Write Preview
Loading…
Cancel
Save