Author: mkrueger
Date: 2008-01-21 12:41:37 -0500 (Mon, 21 Jan 2008)
New Revision: 93424

Modified:
   trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog
   
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ExtendibleTextEditor.cs
   
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml
   
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.mdp
   
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/SourceEditorView.cs
Log:
* ExtendibleTextEditor.cs, SourceEditorView.cs,
  MonoDevelop.SourceEditor.addin.xml, MonoDevelop.SourceEditor.mdp:
  Worked on context menu.

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog       
2008-01-21 17:33:32 UTC (rev 93423)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog       
2008-01-21 17:41:37 UTC (rev 93424)
@@ -1,3 +1,9 @@
+2008-01-21  Mike Krüger <[EMAIL PROTECTED]> 
+
+       * ExtendibleTextEditor.cs, SourceEditorView.cs,
+         MonoDevelop.SourceEditor.addin.xml, MonoDevelop.SourceEditor.mdp: 
Worked
+         on context menu.
+
 2008-01-21  Geoff Norton  <[EMAIL PROTECTED]>
 
        * MonoDevelop.SourceEditor.mdp: Remove hard dependency on Gnome#

Modified: 
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ExtendibleTextEditor.cs
===================================================================
--- 
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ExtendibleTextEditor.cs
 2008-01-21 17:33:32 UTC (rev 93423)
+++ 
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ExtendibleTextEditor.cs
 2008-01-21 17:41:37 UTC (rev 93424)
@@ -28,14 +28,18 @@
 using System.IO;
 using System.Text;
 
+using Gtk;
+
 using Mono.TextEditor;
+using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Projects.Parser;
 using MonoDevelop.Projects.Gui.Completion;
+using MonoDevelop.Components.Commands;
 
 namespace MonoDevelop.SourceEditor
 {
-       public class ExtendibleTextEditor : TextEditor
+       public class ExtendibleTextEditor : Mono.TextEditor.TextEditor
        {
                ITextEditorExtension extension = null;
                LanguageItemWindow languageItemWindow;
@@ -69,7 +73,18 @@
                                        extension.TextChanged (args.Offset, 
args.Offset + Math.Max (args.Count, args.Value != null ? args.Value.Length : 
0));
                        };
 //                     keyBindings.Remove (GetKeyCode (Gdk.Key.Tab));
+                       this.PopupMenu += delegate {
+                               this.ShowPopup ();
+                       };
+                       
                }
+               protected override bool OnButtonPressEvent (Gdk.EventButton e)
+               {
+                       if (e.Button == 3) {
+                               this.ShowPopup ();
+                       }
+                       return base.OnButtonPressEvent (e);
+               }
                
                protected override bool OnKeyPressEvent (Gdk.EventKey evnt)
                {
@@ -228,5 +243,25 @@
                                languageItemWindow = null;
                        }
                }
+
+               void ShowPopup ()
+               {
+                       HideLanguageItemWindow ();
+                       CommandEntrySet cset = 
IdeApp.CommandService.CreateCommandEntrySet 
("/MonoDevelop/SourceEditor2/ContextMenu/Editor");
+                       IdeApp.CommandService.ShowContextMenu (cset);
+               }
+               
+               
+//             protected override void OnPopulatePopup (Menu menu)
+//             {
+//                     
+//                     CommandEntrySet cset = 
IdeApp.CommandService.CreateCommandEntrySet ("");
+//                     if (cset.Count > 0) {
+//                             cset.AddItem (Command.Separator);
+//                             IdeApp.CommandService.InsertOptions (menu, 
cset, 0);
+//                     }
+//                     base.OnPopulatePopup (menu);
+//             }
+//             
        }
 }

Modified: 
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml
===================================================================
--- 
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml
      2008-01-21 17:33:32 UTC (rev 93423)
+++ 
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml
      2008-01-21 17:41:37 UTC (rev 93424)
@@ -41,4 +41,21 @@
                        supportedformats = "Text Files,Source Files"
                        class = 
"MonoDevelop.SourceEditor.SourceEditorDisplayBinding" />
        </Extension>
+       
+       <Extension path = "/MonoDevelop/SourceEditor2/ContextMenu/Editor">
+               <CommandItem id = 
"MonoDevelop.Ide.Commands.RefactoryCommands.CurrentRefactoryOperations" />
+               <CommandItem id = "MonoDevelop.Ide.Commands.HelpCommands.Help" 
/>
+               <CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.Save" 
/>
+               <CommandItem id = 
"MonoDevelop.Ide.Commands.FileCommands.SaveAs" />
+               <CommandItem id = 
"MonoDevelop.Ide.Commands.FileCommands.CloseFile" />
+               <SeparatorItem id = "Separator1" />
+<!--           <CommandItem id = 
"MonoDevelop.Ide.Commands.EditCommands.CommentCode" />
+               <CommandItem id = 
"MonoDevelop.Ide.Commands.EditCommands.UncommentCode" />
+               <CommandItem id = 
"MonoDevelop.Ide.Commands.EditCommands.IndentSelection" />
+               <CommandItem id = 
"MonoDevelop.Ide.Commands.EditCommands.UnIndentSelection" />
+               <ItemSet id = "Advanced" _label = "_Advanced">
+                       <CommandItem id = 
"MonoDevelop.Ide.Commands.EditCommands.UppercaseSelection" />
+                       <CommandItem id = 
"MonoDevelop.Ide.Commands.EditCommands.LowercaseSelection" />
+               </ItemSet> -->
+       </Extension>
 </Addin>
\ No newline at end of file

Modified: 
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.mdp
===================================================================
--- 
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.mdp
    2008-01-21 17:33:32 UTC (rev 93423)
+++ 
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.mdp
    2008-01-21 17:41:37 UTC (rev 93424)
@@ -28,6 +28,7 @@
     <File name="gtk-gui/MonoDevelop.SourceEditor.SourceEditorWidget.cs" 
subtype="Code" buildaction="Compile" />
     <File name="ExtendibleTextEditor.cs" subtype="Code" buildaction="Compile" 
/>
     <File name="LanguageItemWindow.cs" subtype="Code" buildaction="Compile" />
+    <File name="ChangeLog" subtype="Code" buildaction="Nothing" />
   </Contents>
   <References>
     <ProjectReference type="Project" localcopy="False" refto="Mono.TextEditor" 
/>
@@ -49,4 +50,4 @@
       <Widget>MonoDevelop.SourceEditor.SourceEditorWidget</Widget>
     </ExportedWidgets>
   </GtkDesignInfo>
-</Project>
+</Project>
\ No newline at end of file

Modified: 
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/SourceEditorView.cs
===================================================================
--- 
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/SourceEditorView.cs 
    2008-01-21 17:33:32 UTC (rev 93423)
+++ 
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/SourceEditorView.cs 
    2008-01-21 17:41:37 UTC (rev 93424)
@@ -255,7 +255,7 @@
                        
                public string SelectedText { 
                        get {
-                               return 
this.widget.TextEditor.TextEditorData.IsSomethingSelected ? 
this.widget.TextEditor.Document.Buffer.GetTextAt 
(this.widget.TextEditor.TextEditorData.SelectionRange) : null;
+                               return 
this.widget.TextEditor.TextEditorData.IsSomethingSelected ? 
this.widget.TextEditor.Document.Buffer.GetTextAt 
(this.widget.TextEditor.TextEditorData.SelectionRange) : "";
                        }
                        set {
                                
this.widget.TextEditor.TextEditorData.DeleteSelectedText ();

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

Reply via email to