Author: mkrueger
Date: 2008-02-09 07:15:54 -0500 (Sat, 09 Feb 2008)
New Revision: 95325
Removed:
trunk/monodevelop/main/src/addins/CSharpBinding/FormattingStrategy/CSharpFormattingStrategy.cs
Modified:
trunk/monodevelop/main/src/addins/CSharpBinding/CSharpBinding.addin.xml
trunk/monodevelop/main/src/addins/CSharpBinding/CSharpBinding.mdp
trunk/monodevelop/main/src/addins/CSharpBinding/ChangeLog
trunk/monodevelop/main/src/addins/CSharpBinding/Gui/CSharpTextEditorExtension.cs
trunk/monodevelop/main/src/addins/CSharpBinding/Gui/FormattingPanel.cs
trunk/monodevelop/main/src/addins/CSharpBinding/Makefile.am
trunk/monodevelop/main/src/addins/CSharpBinding/gtk-gui/CSharpBinding.CodeGenerationPanelWidget.cs
trunk/monodevelop/main/src/addins/CSharpBinding/gtk-gui/CSharpBinding.CompilerOptionsPanelWidget.cs
Log:
* Gui/CSharpTextEditorExtension.cs, Gui/FormattingPanel.cs,
CSharpBinding.addin.xml, CSharpBinding.mdp,
FormattingStrategy/CSharpFormattingStrategy.cs,
gtk-gui/CSharpBinding.CodeGenerationPanelWidget.cs,
gtk-gui/CSharpBinding.CompilerOptionsPanelWidget.cs, Makefile.am:
Removed SourceEditor dependency.
Modified:
trunk/monodevelop/main/src/addins/CSharpBinding/CSharpBinding.addin.xml
===================================================================
--- trunk/monodevelop/main/src/addins/CSharpBinding/CSharpBinding.addin.xml
2008-02-09 11:52:03 UTC (rev 95324)
+++ trunk/monodevelop/main/src/addins/CSharpBinding/CSharpBinding.addin.xml
2008-02-09 12:15:54 UTC (rev 95325)
@@ -14,7 +14,6 @@
<Addin id="Projects" version="0.19.0"/>
<Addin id="Projects.Gui" version="0.19.0"/>
<Addin id="Ide" version="0.19.0"/>
- <Addin id="SourceEditor" version="0.19.0"/>
</Dependencies>
<Extension path = "/MonoDevelop/ProjectModel/Ambiences">
@@ -83,10 +82,6 @@
class =
"CSharpBinding.CompilerOptionsPanel"/>
</Condition>
</Extension>
-
- <Extension path = "/MonoDevelop/SourceEditor/Formatters">
- <Class id ="cs" class =
"CSharpBinding.FormattingStrategy.CSharpFormattingStrategy" />
- </Extension>
<Extension path =
"/MonoDevelop/Ide/OptionsDialogPanels/TextEditorOptions">
<Condition id="activelanguage" value="C#">
Modified: trunk/monodevelop/main/src/addins/CSharpBinding/CSharpBinding.mdp
===================================================================
--- trunk/monodevelop/main/src/addins/CSharpBinding/CSharpBinding.mdp
2008-02-09 11:52:03 UTC (rev 95324)
+++ trunk/monodevelop/main/src/addins/CSharpBinding/CSharpBinding.mdp
2008-02-09 12:15:54 UTC (rev 95325)
@@ -39,7 +39,6 @@
<File name="Parser/ExpressionFinder.cs" subtype="Code"
buildaction="Compile" />
<File name="Project/CSharpCompilerParameters.cs" subtype="Code"
buildaction="Compile" />
<File name="CSharpLanguageBinding.cs" subtype="Code" buildaction="Compile"
/>
- <File name="FormattingStrategy/CSharpFormattingStrategy.cs" subtype="Code"
buildaction="Compile" />
<File name="CSharpBindingCompilerManager.cs" subtype="Code"
buildaction="Compile" />
<File name="CSharpEnhancedCodeProvider.cs" subtype="Code"
buildaction="Compile" />
<File name="Parser/SharpDevelopTree/GenericParameter.cs" subtype="Code"
buildaction="Compile" />
@@ -66,7 +65,6 @@
<References>
<ProjectReference type="Project" localcopy="False"
refto="MonoDevelop.Core" />
<ProjectReference type="Project" localcopy="False"
refto="MonoDevelop.Core.Gui" />
- <ProjectReference type="Project" localcopy="False"
refto="MonoDevelop.SourceEditor" />
<ProjectReference type="Project" localcopy="False"
refto="MonoDevelop.Projects" />
<ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Ide"
/>
<ProjectReference type="Project" localcopy="False"
refto="MonoDevelop.Components" />
Modified: trunk/monodevelop/main/src/addins/CSharpBinding/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/CSharpBinding/ChangeLog 2008-02-09
11:52:03 UTC (rev 95324)
+++ trunk/monodevelop/main/src/addins/CSharpBinding/ChangeLog 2008-02-09
12:15:54 UTC (rev 95325)
@@ -1,3 +1,12 @@
+2008-02-09 Mike Krüger <[EMAIL PROTECTED]>
+
+ * Gui/CSharpTextEditorExtension.cs, Gui/FormattingPanel.cs,
+ CSharpBinding.addin.xml, CSharpBinding.mdp,
+ FormattingStrategy/CSharpFormattingStrategy.cs,
+ gtk-gui/CSharpBinding.CodeGenerationPanelWidget.cs,
+ gtk-gui/CSharpBinding.CompilerOptionsPanelWidget.cs, Makefile.am:
+ Removed SourceEditor dependency.
+
2008-02-05 Mike Krüger <[EMAIL PROTECTED]>
* Parser/Parser.cs: Fixed #region ... #endregion end region position.
Deleted:
trunk/monodevelop/main/src/addins/CSharpBinding/FormattingStrategy/CSharpFormattingStrategy.cs
===================================================================
---
trunk/monodevelop/main/src/addins/CSharpBinding/FormattingStrategy/CSharpFormattingStrategy.cs
2008-02-09 11:52:03 UTC (rev 95324)
+++
trunk/monodevelop/main/src/addins/CSharpBinding/FormattingStrategy/CSharpFormattingStrategy.cs
2008-02-09 12:15:54 UTC (rev 95325)
@@ -1,54 +0,0 @@
-// CSharpFormattingStrategy.cs
-//
-// This file was derived from a file from #Develop.
-//
-// Copyright (C) 2001-2007 Mike Krüger <[EMAIL PROTECTED]>
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-using System;
-using System.Collections;
-using System.Diagnostics;
-using System.Drawing;
-using System.Text;
-
-using MonoDevelop.SourceEditor;
-using MonoDevelop.SourceEditor.FormattingStrategy;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-
-namespace CSharpBinding.FormattingStrategy {
- /// <summary>
- /// This class handles the auto and smart indenting in the textbuffer
while
- /// you type.
- /// </summary>
- public class CSharpFormattingStrategy : DefaultFormattingStrategy {
- /// <summary>
- /// Define CSharp specific smart indenting for a line
- /// </summary>
- protected override int SmartIndentLine (TextEditor d, int
lineNr, string indentString)
- {
- // Smart indenting is handled elsewhere in this CSharp
Binding
- return 0;
- }
-
- public override int FormatLine (TextEditor d, int line, int
cursorOffset, char ch,
- string indentString, bool
autoInsertCurlyBracket)
- {
- // no-op, only ever called on Enter key press which we
handle elsewhere.
- return 0;
- }
- }
-}
Modified:
trunk/monodevelop/main/src/addins/CSharpBinding/Gui/CSharpTextEditorExtension.cs
===================================================================
---
trunk/monodevelop/main/src/addins/CSharpBinding/Gui/CSharpTextEditorExtension.cs
2008-02-09 11:52:03 UTC (rev 95324)
+++
trunk/monodevelop/main/src/addins/CSharpBinding/Gui/CSharpTextEditorExtension.cs
2008-02-09 12:15:54 UTC (rev 95325)
@@ -11,9 +11,6 @@
using MonoDevelop.Projects.Parser;
using MonoDevelop.Projects.Gui.Completion;
-using MonoDevelop.SourceEditor;
-using MonoDevelop.SourceEditor.FormattingStrategy;
-
using CSharpBinding.Parser;
using CSharpBinding.FormattingStrategy;
Modified: trunk/monodevelop/main/src/addins/CSharpBinding/Gui/FormattingPanel.cs
===================================================================
--- trunk/monodevelop/main/src/addins/CSharpBinding/Gui/FormattingPanel.cs
2008-02-09 11:52:03 UTC (rev 95324)
+++ trunk/monodevelop/main/src/addins/CSharpBinding/Gui/FormattingPanel.cs
2008-02-09 12:15:54 UTC (rev 95325)
@@ -7,8 +7,6 @@
using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.SourceEditor;
-
using CSharpBinding.FormattingStrategy.Properties;
namespace CSharpBinding {
Modified: trunk/monodevelop/main/src/addins/CSharpBinding/Makefile.am
===================================================================
--- trunk/monodevelop/main/src/addins/CSharpBinding/Makefile.am 2008-02-09
11:52:03 UTC (rev 95324)
+++ trunk/monodevelop/main/src/addins/CSharpBinding/Makefile.am 2008-02-09
12:15:54 UTC (rev 95325)
@@ -10,7 +10,6 @@
$(GLIB_SHARP_LIBS) \
$(GTK_SHARP_LIBS) \
$(MONO_ADDINS_LIBS) \
- -r:$(top_builddir)/build/AddIns/MonoDevelop.SourceEditor.dll \
-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
@@ -29,7 +28,6 @@
CSharpEnhancedCodeProvider.cs \
CSharpLanguageBinding.cs \
FormattingStrategy/CSharpFormattingProperties.cs \
- FormattingStrategy/CSharpFormattingStrategy.cs \
FormattingStrategy/CSharpIndentEngine.cs \
FormattingStrategy/CSharpIndentEngineStack.cs \
gtk-gui/CSharpBinding.CodeGenerationPanelWidget.cs \
Modified:
trunk/monodevelop/main/src/addins/CSharpBinding/gtk-gui/CSharpBinding.CodeGenerationPanelWidget.cs
===================================================================
---
trunk/monodevelop/main/src/addins/CSharpBinding/gtk-gui/CSharpBinding.CodeGenerationPanelWidget.cs
2008-02-09 11:52:03 UTC (rev 95324)
+++
trunk/monodevelop/main/src/addins/CSharpBinding/gtk-gui/CSharpBinding.CodeGenerationPanelWidget.cs
2008-02-09 12:15:54 UTC (rev 95325)
@@ -366,6 +366,10 @@
if ((this.Child != null)) {
this.Child.ShowAll();
}
+ this.label87.MnemonicWidget = this.symbolsEntry;
+ this.label85.MnemonicWidget = this.warningLevelSpinButton;
+ this.label86.MnemonicWidget = this.warningLevelSpinButton;
+ this.label88.MnemonicWidget = this.warningLevelSpinButton;
this.Show();
}
}
Modified:
trunk/monodevelop/main/src/addins/CSharpBinding/gtk-gui/CSharpBinding.CompilerOptionsPanelWidget.cs
===================================================================
---
trunk/monodevelop/main/src/addins/CSharpBinding/gtk-gui/CSharpBinding.CompilerOptionsPanelWidget.cs
2008-02-09 11:52:03 UTC (rev 95324)
+++
trunk/monodevelop/main/src/addins/CSharpBinding/gtk-gui/CSharpBinding.CompilerOptionsPanelWidget.cs
2008-02-09 12:15:54 UTC (rev 95325)
@@ -307,6 +307,7 @@
if ((this.Child != null)) {
this.Child.ShowAll();
}
+ this.label88.MnemonicWidget = this.mainClassEntry;
this.Show();
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
