Author: mkrueger
Date: 2008-02-17 13:04:31 -0500 (Sun, 17 Feb 2008)
New Revision: 95991
Modified:
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SearchWidget.cs
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/gui.stetic
Log:
* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs,
MonoDevelop.SourceEditor/SourceEditorWidget.cs,
MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs,
MonoDevelop.SourceEditor/SearchWidget.cs: Worked on search options.
Modified: trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog
2008-02-17 18:03:43 UTC (rev 95990)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog
2008-02-17 18:04:31 UTC (rev 95991)
@@ -1,6 +1,13 @@
2008-02-17 Mike Krüger <[EMAIL PROTECTED]>
* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs,
+ MonoDevelop.SourceEditor/SourceEditorWidget.cs,
+ MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs,
+ MonoDevelop.SourceEditor/SearchWidget.cs: Worked on search options.
+
+2008-02-17 Mike Krüger <[EMAIL PROTECTED]>
+
+ * gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs,
gtk-gui/MonoDevelop.SourceEditor.SearchWidget.cs,
gtk-gui/MonoDevelop.SourceEditor.GotoLineNumberWidget.cs,
MonoDevelop.SourceEditor/SourceEditorWidget.cs,
Modified:
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs
===================================================================
---
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs
2008-02-17 18:03:43 UTC (rev 95990)
+++
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs
2008-02-17 18:04:31 UTC (rev 95991)
@@ -31,6 +31,7 @@
using Gtk;
using MonoDevelop.Core;
+using MonoDevelop.Ide.Gui;
namespace MonoDevelop.SourceEditor
{
@@ -102,6 +103,33 @@
UpdateSearchHistory (SearchPattern);
widget.FindPrevious ();
};
+ this.buttonOptions.Clicked += delegate {
+ Menu menu = new Menu ();
+
+ Gtk.CheckMenuItem caseSensitive = new
Gtk.CheckMenuItem (GettextCatalog.GetString ("Case sensitive"));
+ caseSensitive.Active =
SearchWidget.IsCaseSensitive;
+ caseSensitive.ShowToggle = true;
+ caseSensitive.Toggled += delegate {
+ SetIsCaseSensitive
(caseSensitive.Active);
+ };
+ caseSensitive.ButtonPressEvent += delegate {
+ caseSensitive.Toggle ();
+ };
+ menu.Append (caseSensitive);
+
+ Gtk.CheckMenuItem wholeWordsOnly = new
Gtk.CheckMenuItem (GettextCatalog.GetString ("Whole words only"));
+ wholeWordsOnly.Active =
SearchWidget.IsWholeWordOnly;
+ wholeWordsOnly.ShowToggle = true;
+ wholeWordsOnly.Toggled += delegate {
+ SetIsWholeWordOnly
(wholeWordsOnly.Active);
+ };
+ wholeWordsOnly.ButtonPressEvent += delegate {
+ wholeWordsOnly.Toggle ();
+ };
+ menu.Append (wholeWordsOnly);
+ IdeApp.CommandService.ShowContextMenu (menu);
+ menu.ShowAll ();
+ };
#endregion
this.entryReplace.Changed += delegate {
@@ -153,6 +181,18 @@
this.searchHistory.AppendValues (item);
}
}
+
+ void SetIsCaseSensitive (bool value)
+ {
+ PropertyService.Set ("IsCaseSensitive", value);
+ widget.SetSearchOptions ();
+ }
+
+ void SetIsWholeWordOnly (bool value)
+ {
+ PropertyService.Set ("IsWholeWordOnly", value);
+ widget.SetSearchOptions ();
+ }
#endregion
void UpdateReplaceHistory (string item)
Modified:
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SearchWidget.cs
===================================================================
---
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SearchWidget.cs
2008-02-17 18:03:43 UTC (rev 95990)
+++
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SearchWidget.cs
2008-02-17 18:04:31 UTC (rev 95991)
@@ -49,24 +49,22 @@
}
}
+ public static bool IsWholeWordOnly {
+ get {
+ return PropertyService.Get ("IsWholeWordOnly",
false);
+ }
+ }
+
void SetIsCaseSensitive (bool value)
{
PropertyService.Set ("IsCaseSensitive", value);
widget.SetSearchOptions ();
- widget.TextEditor.QueueDraw ();
}
- public static bool IsWholeWordOnly {
- get {
- return PropertyService.Get ("IsWholeWordOnly",
false);
- }
- }
-
void SetIsWholeWordOnly (bool value)
{
PropertyService.Set ("IsWholeWordOnly", value);
widget.SetSearchOptions ();
- widget.TextEditor.QueueDraw ();
}
public string SearchPattern {
@@ -93,6 +91,7 @@
};
}
+ // if you change something here don"t forget the
SearchAndReplaceWidget
this.closeButton.Clicked += delegate {
widget.RemoveSearchWidget ();
};
@@ -120,21 +119,26 @@
Menu menu = new Menu ();
Gtk.CheckMenuItem caseSensitive = new
Gtk.CheckMenuItem (GettextCatalog.GetString ("Case sensitive"));
- caseSensitive.Active = IsCaseSensitive;
+ caseSensitive.Active =
SearchWidget.IsCaseSensitive;
caseSensitive.ShowToggle = true;
caseSensitive.Toggled += delegate {
SetIsCaseSensitive
(caseSensitive.Active);
};
+ caseSensitive.ButtonPressEvent += delegate {
+ caseSensitive.Toggle ();
+ };
menu.Append (caseSensitive);
Gtk.CheckMenuItem wholeWordsOnly = new
Gtk.CheckMenuItem (GettextCatalog.GetString ("Whole words only"));
- wholeWordsOnly.Active = IsWholeWordOnly;
+ wholeWordsOnly.Active =
SearchWidget.IsWholeWordOnly;
wholeWordsOnly.ShowToggle = true;
wholeWordsOnly.Toggled += delegate {
SetIsWholeWordOnly
(wholeWordsOnly.Active);
};
+ wholeWordsOnly.ButtonPressEvent += delegate {
+ wholeWordsOnly.Toggle ();
+ };
menu.Append (wholeWordsOnly);
-
IdeApp.CommandService.ShowContextMenu (menu);
menu.ShowAll ();
};
Modified:
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
===================================================================
---
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
2008-02-17 18:03:43 UTC (rev 95990)
+++
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
2008-02-17 18:04:31 UTC (rev 95991)
@@ -895,6 +895,8 @@
{
TextEditor.SearchOptions.IsCaseSensitive =
SearchWidget.IsCaseSensitive;
TextEditor.SearchOptions.IsWholeWordOnly =
SearchWidget.IsWholeWordOnly;
+ TextEditor.CompilePattern ();
+ TextEditor.QueueDraw ();
}
[CommandHandler (SearchCommands.FindNext)]
Modified:
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs
===================================================================
---
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs
2008-02-17 18:03:43 UTC (rev 95990)
+++
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs
2008-02-17 18:04:31 UTC (rev 95991)
@@ -31,7 +31,7 @@
private Gtk.Button buttonSearchBackward;
- private Gtk.Button button4;
+ private Gtk.Button buttonOptions;
private Gtk.HBox hbox2;
@@ -164,11 +164,11 @@
w22.Expand = false;
w22.Fill = false;
// Container child hbox1.Gtk.Box+BoxChild
- this.button4 = new Gtk.Button();
- this.button4.CanFocus = true;
- this.button4.Name = "button4";
- this.button4.UseUnderline = true;
- // Container child button4.Gtk.Container+ContainerChild
+ this.buttonOptions = new Gtk.Button();
+ this.buttonOptions.CanFocus = true;
+ this.buttonOptions.Name = "buttonOptions";
+ this.buttonOptions.UseUnderline = true;
+ // Container child buttonOptions.Gtk.Container+ContainerChild
Gtk.Alignment w23 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
// Container child GtkAlignment.Gtk.Container+ContainerChild
Gtk.HBox w24 = new Gtk.HBox();
@@ -183,9 +183,9 @@
w27.UseUnderline = true;
w24.Add(w27);
w23.Add(w24);
- this.button4.Add(w23);
- this.hbox1.Add(this.button4);
- Gtk.Box.BoxChild w31 =
((Gtk.Box.BoxChild)(this.hbox1[this.button4]));
+ this.buttonOptions.Add(w23);
+ this.hbox1.Add(this.buttonOptions);
+ Gtk.Box.BoxChild w31 =
((Gtk.Box.BoxChild)(this.hbox1[this.buttonOptions]));
w31.Position = 2;
w31.Expand = false;
w31.Fill = false;
Modified:
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/gui.stetic
===================================================================
---
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/gui.stetic
2008-02-17 18:03:43 UTC (rev 95990)
+++
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/gui.stetic
2008-02-17 18:04:31 UTC (rev 95991)
@@ -1065,7 +1065,7 @@
</packing>
</child>
<child>
- <widget class="Gtk.Button" id="button4">
+ <widget class="Gtk.Button" id="buttonOptions">
<property name="MemberName" />
<property name="CanFocus">True</property>
<property name="Type">TextAndIcon</property>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
