[Monodevelop-patches-list] r2748 - in trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor: . Gui

[Lluis Sanchez <lluis@ximian.com>]

Author: lluis
Date: 2005-08-18 13:35:34 -0400 (Thu, 18 Aug 2005)
New Revision: 2748

Modified:
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/MonoDevelopEditor.addin.xml
Log:
2005-08-12  Lluis Sanchez Gual  <lluis at novell.com> 

	* MonoDevelopEditor.addin.xml:
	* Gui/SourceEditorDisplayBinding.cs: Use stock icon id instead of
	file name.



Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2005-08-18 17:34:41 UTC (rev 2747)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2005-08-18 17:35:34 UTC (rev 2748)
@@ -1,3 +1,9 @@
+2005-08-12  Lluis Sanchez Gual  <lluis at novell.com> 
+
+	* MonoDevelopEditor.addin.xml:
+	* Gui/SourceEditorDisplayBinding.cs: Use stock icon id instead of
+	file name.
+
 2005-08-10  Ben Motmans  <ben.motmans at gmail.com>
 
 	* SourceEditor.mdp: references update

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs	2005-08-18 17:34:41 UTC (rev 2747)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs	2005-08-18 17:35:34 UTC (rev 2748)
@@ -346,7 +346,7 @@
 			if (reloadBar == null) {
 				reloadBar = new HBox ();
 				reloadBar.BorderWidth = 3;
-				Gtk.Image img = Runtime.Gui.Resources.GetImage ("Icons.32x32.Warning", IconSize.Menu);
+				Gtk.Image img = Runtime.Gui.Resources.GetImage ("gtk-dialog-warning", IconSize.Menu);
 				reloadBar.PackStart (img, false, false, 2);
 				reloadBar.PackStart (new Gtk.Label (GettextCatalog.GetString ("This file has been changed outside of MonoDevelop")), false, false, 5);
 				HBox box = new HBox ();
@@ -423,10 +423,11 @@
 				if (bouncingDelegate == null)
 					bouncingDelegate = new GLib.IdleHandler (BounceAndGrab);
 				if (needsUpdate) {
-					GLib.Idle.Add (bouncingDelegate);
+					cachedText = se.Buffer.Text;
+/*					GLib.Idle.Add (bouncingDelegate);
 					if (cachedText == null)
 						return se.Buffer.Text;
-				}
+*/				}
 				return cachedText;
 			}
 			set { se.Buffer.Text = value; }

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs	2005-08-18 17:34:41 UTC (rev 2747)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs	2005-08-18 17:35:34 UTC (rev 2748)
@@ -11,6 +11,7 @@
 using MonoDevelop.DefaultEditor;
 using MonoDevelop.Services;
 using MonoDevelop.Gui.Search;
+using Stock = MonoDevelop.Gui.Stock;
 
 namespace MonoDevelop.SourceEditor.Gui
 {
@@ -27,8 +28,8 @@
 		static SourceEditor ()
 		{
 			dragIconPixbuf = new Gdk.Pixbuf (drag_icon_xpm);
-			executionMarkerPixbuf = new Gdk.Pixbuf ("../data/resources/icons/ExecutionMarker.png");
-			breakPointPixbuf = new Gdk.Pixbuf ("../data/resources/icons/BreakPoint.png");
+			executionMarkerPixbuf = Runtime.Gui.Resources.GetIcon (Stock.ExecutionMarker);
+			breakPointPixbuf = Runtime.Gui.Resources.GetIcon (Stock.BreakPoint);
 		}
 		
 		protected SourceEditor (IntPtr ptr): base (ptr)

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/MonoDevelopEditor.addin.xml
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/MonoDevelopEditor.addin.xml	2005-08-18 17:34:41 UTC (rev 2747)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/MonoDevelopEditor.addin.xml	2005-08-18 17:35:34 UTC (rev 2748)
@@ -59,24 +59,24 @@
 				_label = "bogus_label" />
 		<Command id = "MonoDevelop.DefaultEditor.EditorCommands.ShowBufferOptions"
 				_label = "Buffer Options"
-				icon = "Icons.16x16.PropertiesIcon" />
+				icon = "md-properties-icon" />
 		<Command id = "MonoDevelop.DefaultEditor.EditorCommands.ToggleBookmark"
-				icon = "Icons.16x16.ToggleBookmark"
+				icon = "md-toggle-bookmark"
 				shortcut = "Control|F2"
 				description = "Toggle Bookmark"
 				_label = "Toggle Bookmark" />
 		<Command id = "MonoDevelop.DefaultEditor.EditorCommands.PrevBookmark"
-				icon = "Icons.16x16.GotoPrevbookmark"
+				icon = "md-goto-prevbookmark"
 				shortcut = "Shift|F2"
 				description = "Previous Bookmark"
 				_label = "Previous Bookmark" />
 		<Command id = "MonoDevelop.DefaultEditor.EditorCommands.NextBookmark"
-				icon = "Icons.16x16.GotoNextbookmark"
+				icon = "md-goto-nextbookmark"
 				shortcut = "F2"
 				description = "Next Bookmark"
 				_label = "Next Bookmark" />
 		<Command id = "MonoDevelop.DefaultEditor.EditorCommands.ClearBookmarks"
-				icon = "Icons.16x16.ClearAllBookmarks"
+				icon = "md-clear-all-bookmarks"
 				description = "Clear Bookmarks"
 				_label = "Clear Bookmarks" />
 		<Command id = "MonoDevelop.DefaultEditor.EditorCommands.GotoLineNumber"