Author: lluis
Date: 2007-07-18 12:20:56 -0400 (Wed, 18 Jul 2007)
New Revision: 82223

Modified:
   trunk/monodevelop/Extras/MonoDevelop.SourceEditor/ChangeLog
   
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Actions/DefaultEditActions.cs
   
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorDisplayBinding.cs
   
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorView.cs
   
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.addin.xml
Log:
* MonoDevelop.SourceEditor.Gui/SourceEditorView.cs,
  MonoDevelop.SourceEditor.Actions/DefaultEditActions.cs,
  MonoDevelop.SourceEditor.addin.xml: Replaced old actions by command
  handlers.
* MonoDevelop.SourceEditor.Gui/SourceEditorDisplayBinding.cs: When
  setting the cursor position, also set the selection bound, and make
  sure the new cursor position is visible.

Modified: trunk/monodevelop/Extras/MonoDevelop.SourceEditor/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.SourceEditor/ChangeLog 2007-07-18 
16:18:57 UTC (rev 82222)
+++ trunk/monodevelop/Extras/MonoDevelop.SourceEditor/ChangeLog 2007-07-18 
16:20:56 UTC (rev 82223)
@@ -1,5 +1,15 @@
 2007-07-18  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
 
+       * MonoDevelop.SourceEditor.Gui/SourceEditorView.cs,
+         MonoDevelop.SourceEditor.Actions/DefaultEditActions.cs,
+         MonoDevelop.SourceEditor.addin.xml: Replaced old actions by command
+         handlers.
+       * MonoDevelop.SourceEditor.Gui/SourceEditorDisplayBinding.cs: When
+         setting the cursor position, also set the selection bound, and make
+         sure the new cursor position is visible.
+
+2007-07-18  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
+
        * MonoDevelop.SourceEditor.Gui/SourceEditorView.cs: Track api changes.
 
 2007-07-18  Lluis Sanchez Gual <[EMAIL PROTECTED]> 

Modified: 
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Actions/DefaultEditActions.cs
===================================================================
--- 
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Actions/DefaultEditActions.cs
    2007-07-18 16:18:57 UTC (rev 82222)
+++ 
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Actions/DefaultEditActions.cs
    2007-07-18 16:20:56 UTC (rev 82223)
@@ -3,41 +3,6 @@
 
 namespace MonoDevelop.SourceEditor.Actions
 {
-       public class DeleteLine : AbstractEditAction
-       {
-               public override void Execute (SourceEditorView sourceView)
-               {
-                       sourceView.DeleteLine ();
-               }
-       }
-
-       public class End : AbstractEditAction
-       {
-               public override void Execute (SourceEditorView sourceView)
-               {
-                       if (!sourceView.GotoSelectionEnd ())
-                               PassToBase = true;
-               }
-       }
-
-       public class F1 : AbstractEditAction
-       {
-               public override void Execute (SourceEditorView sourceView)
-               {
-                       if (!sourceView.MonodocResolver ())
-                               PassToBase = true;
-               }
-       }               
-
-       public class Home : AbstractEditAction
-       {
-               public override void Execute (SourceEditorView sourceView)
-               {
-                       if (!sourceView.GotoSelectionStart ())
-                               PassToBase = true;
-               }
-       }
-
        // indents the next line using the FormattingStrategy
        public class Return : AbstractEditAction
        {
@@ -53,22 +18,6 @@
                }
        }               
 
-       public class ScrollUp : AbstractEditAction
-       {
-               public override void Execute (SourceEditorView sourceView)
-               {
-                       sourceView.ScrollUp ();
-               }
-       }
-
-       public class ScrollDown : AbstractEditAction
-       {
-               public override void Execute (SourceEditorView sourceView)
-               {
-                       sourceView.ScrollDown ();
-               }
-       }
-
        public class ShiftTab : AbstractEditAction
        {
                public override void Execute (SourceEditorView sourceView)

Modified: 
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorDisplayBinding.cs
===================================================================
--- 
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorDisplayBinding.cs
        2007-07-18 16:18:57 UTC (rev 82222)
+++ 
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorDisplayBinding.cs
        2007-07-18 16:20:56 UTC (rev 82223)
@@ -1089,7 +1089,11 @@
 
                public int CursorPosition {
                        get { return se.Buffer.GetIterAtMark 
(se.Buffer.InsertMark).Offset; }
-                       set { se.Buffer.MoveMark (se.Buffer.InsertMark, 
se.Buffer.GetIterAtOffset (value)); }
+                       set {
+                               se.Buffer.MoveMark (se.Buffer.InsertMark, 
se.Buffer.GetIterAtOffset (value)); 
+                               se.Buffer.MoveMark (se.Buffer.SelectionBound, 
se.Buffer.GetIterAtOffset (value));
+                               se.View.ScrollMarkOnscreen 
(se.Buffer.InsertMark);
+                       }
                }
 
                public void Select (int startPosition, int endPosition)

Modified: 
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorView.cs
===================================================================
--- 
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorView.cs
  2007-07-18 16:18:57 UTC (rev 82222)
+++ 
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorView.cs
  2007-07-18 16:20:56 UTC (rev 82223)
@@ -331,6 +331,7 @@
                        Global.PropagateEvent (this, evnt);
                }
 
+               [CommandHandler (TextEditorCommands.DeleteToLineEnd)]
                internal void DeleteLine ()
                {
                        TextIter start = buf.GetIterAtMark (buf.InsertMark);
@@ -371,17 +372,14 @@
                        }
                }
 
-               internal bool MonodocResolver ()
+               [CommandHandler (HelpCommands.Help)]
+               internal void MonodocResolver ()
                {
                        TextIter insertIter = buf.GetIterAtMark 
(buf.InsertMark);
                        ILanguageItem languageItem = GetLanguageItem 
(insertIter);
                        
-                       if (languageItem == null)
-                               return false;
-
-                       IdeApp.HelpOperations.ShowHelp 
(MonoDevelop.Projects.Services.DocumentationService.GetHelpUrl(languageItem));
-                       
-                       return true;
+                       if (languageItem != null)
+                               IdeApp.HelpOperations.ShowHelp 
(MonoDevelop.Projects.Services.DocumentationService.GetHelpUrl(languageItem));
                }
                
                ILanguageItem GetLanguageItem (TextIter ti)
@@ -406,6 +404,7 @@
                        return ctx.ResolveIdentifier (expression, ti.Line + 1, 
ti.LineOffset + 1, fileName, txt);
                }
 
+               [CommandHandler (TextEditorCommands.ScrollLineUp)]
                internal void ScrollUp ()
                {
                        ParentEditor.Vadjustment.Value -= 
(ParentEditor.Vadjustment.StepIncrement / 5);
@@ -415,6 +414,7 @@
                        ParentEditor.Vadjustment.ChangeValue();
                }
 
+               [CommandHandler (TextEditorCommands.ScrollLineDown)]
                internal void ScrollDown ()
                {
                        double maxvalue = ParentEditor.Vadjustment.Upper - 
ParentEditor.Vadjustment.PageSize;
@@ -483,15 +483,16 @@
                        return null;
                }
                
-               internal bool GotoSelectionEnd ()
+               [CommandHandler (TextEditorCommands.CharRight)]
+               internal void CursorRight ()
                {
-                       return buf.GotoSelectionEnd ();
+                       buf.BeginUserAction ();
+                       TextIter it = buf.GetIterAtMark (buf.InsertMark);
+                       it.ForwardChar ();
+                       buf.MoveMark (buf.InsertMark, it); 
+                       buf.MoveMark (buf.SelectionBound, it); 
+                       buf.EndUserAction ();
                }
-
-               internal bool GotoSelectionStart ()
-               {
-                       return buf.GotoSelectionStart ();
-               }
                
                public int FindPrevWordStart (string doc, int offset)
                {

Modified: 
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.addin.xml
===================================================================
--- 
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.addin.xml
        2007-07-18 16:18:57 UTC (rev 82222)
+++ 
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.addin.xml
        2007-07-18 16:20:56 UTC (rev 82223)
@@ -183,13 +183,6 @@
        
        <Extension path = "/AddIns/DefaultTextEditor/EditActions" 
extension-nodes="EditAction" description="Custom edit actions.">
                <!-- these are the default editor actions -->
-               <EditAction id = "DeleteLine" class = 
"MonoDevelop.SourceEditor.Actions.DeleteLine" keys = "Control|k" />
-               <EditAction id = "DeleteLine2" class = 
"MonoDevelop.SourceEditor.Actions.DeleteLine" keys = "Control|l" />
-               <EditAction id = "End" class = 
"MonoDevelop.SourceEditor.Actions.End" keys = "End"/>
-               <EditAction id = "F1" class = 
"MonoDevelop.SourceEditor.Actions.F1" keys = "F1"/>
-               <EditAction id = "Home" class = 
"MonoDevelop.SourceEditor.Actions.Home" keys = "Home"/>
-               <EditAction id = "ScrollUp" class = 
"MonoDevelop.SourceEditor.Actions.ScrollUp" keys = "Control|Up"/>
-               <EditAction id = "ScrollDown" class = 
"MonoDevelop.SourceEditor.Actions.ScrollDown" keys = "Control|Down"/>
                <EditAction id = "ShiftTab" class = 
"MonoDevelop.SourceEditor.Actions.ShiftTab" keys = "Shift|ISO_Left_Tab"/>
                <EditAction id = "Tab" class = 
"MonoDevelop.SourceEditor.Actions.Tab" keys = "Tab"/>
                <EditAction id = "Return" class = 
"MonoDevelop.SourceEditor.Actions.Return" keys = "Return"/>

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to