[ChangeLogAddin] Use ImageView in stetic widgets

3 files changed, 45 insertions, 50 deletions

diff --git a/main/src/addins/ChangeLogAddIn/gtk-gui/MonoDevelop.ChangeLogAddIn.AddLogEntryDialog.cs b/main/src/addins/ChangeLogAddIn/gtk-gui/MonoDevelop.ChangeLogAddIn.AddLogEntryDialog.cs
index e88f8540d9..f71b2fb618 100644
--- a/main/src/addins/ChangeLogAddIn/gtk-gui/MonoDevelop.ChangeLogAddIn.AddLogEntryDialog.cs
+++ b/main/src/addins/ChangeLogAddIn/gtk-gui/MonoDevelop.ChangeLogAddIn.AddLogEntryDialog.cs
@@ -5,28 +5,49 @@ namespace MonoDevelop.ChangeLogAddIn
 	internal partial class AddLogEntryDialog
 	{
 		private global::Gtk.VBox vbox1;
+		
 		private global::Gtk.VPaned vpaned1;
+		
 		private global::Gtk.VBox vbox2;
+		
 		private global::Gtk.Label label1;
+		
 		private global::Gtk.ScrolledWindow scrolledwindow2;
+		
 		private global::Gtk.TreeView fileList;
+		
 		private global::Gtk.VBox vbox3;
+		
 		private global::Gtk.Label label3;
+		
 		private global::Gtk.ScrolledWindow scrolledwindow1;
+		
 		private global::Gtk.TextView textview;
+		
 		private global::Gtk.HBox boxNewFile;
-		private global::Gtk.Image image36;
+		
+		private global::MonoDevelop.Components.ImageView image36;
+		
 		private global::Gtk.Label label7;
+		
 		private global::Gtk.HBox boxNoFile;
-		private global::Gtk.Image image37;
+		
+		private global::MonoDevelop.Components.ImageView image37;
+		
 		private global::Gtk.Label label8;
+		
 		private global::Gtk.HBox hbox3;
+		
 		private global::Gtk.VBox vbox4;
-		private global::Gtk.Image image38;
+		
+		private global::MonoDevelop.Components.ImageView image38;
+		
 		private global::Gtk.Label label9;
+		
 		private global::Gtk.Button button7;
-		private global::Gtk.Button button119;
 		
+		private global::Gtk.Button button119;
+
 		protected virtual void Build ()
 		{
 			global::Stetic.Gui.Initialize (this);
@@ -119,9 +140,10 @@ namespace MonoDevelop.ChangeLogAddIn
 			this.boxNewFile.Name = "boxNewFile";
 			this.boxNewFile.Spacing = 6;
 			// Container child boxNewFile.Gtk.Box+BoxChild
-			this.image36 = new global::Gtk.Image ();
+			this.image36 = new global::MonoDevelop.Components.ImageView ();
 			this.image36.Name = "image36";
-			this.image36.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-new", global::Gtk.IconSize.SmallToolbar);
+			this.image36.IconId = "gtk-new";
+			this.image36.IconSize = ((global::Gtk.IconSize)(2));
 			this.boxNewFile.Add (this.image36);
 			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.boxNewFile [this.image36]));
 			w11.Position = 0;
@@ -149,9 +171,10 @@ namespace MonoDevelop.ChangeLogAddIn
 			this.boxNoFile.Name = "boxNoFile";
 			this.boxNoFile.Spacing = 6;
 			// Container child boxNoFile.Gtk.Box+BoxChild
-			this.image37 = new global::Gtk.Image ();
+			this.image37 = new global::MonoDevelop.Components.ImageView ();
 			this.image37.Name = "image37";
-			this.image37.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-dialog-warning", global::Gtk.IconSize.SmallToolbar);
+			this.image37.IconId = "gtk-dialog-warning";
+			this.image37.IconSize = ((global::Gtk.IconSize)(2));
 			this.boxNoFile.Add (this.image37);
 			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.boxNoFile [this.image37]));
 			w14.Position = 0;
@@ -184,9 +207,10 @@ namespace MonoDevelop.ChangeLogAddIn
 			this.vbox4.Name = "vbox4";
 			this.vbox4.Spacing = 6;
 			// Container child vbox4.Gtk.Box+BoxChild
-			this.image38 = new global::Gtk.Image ();
+			this.image38 = new global::MonoDevelop.Components.ImageView ();
 			this.image38.Name = "image38";
-			this.image38.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-dialog-info", global::Gtk.IconSize.SmallToolbar);
+			this.image38.IconId = "gtk-dialog-info";
+			this.image38.IconSize = ((global::Gtk.IconSize)(2));
 			this.vbox4.Add (this.image38);
 			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.image38]));
 			w17.Position = 0;
diff --git a/main/src/addins/ChangeLogAddIn/gtk-gui/generated.cs b/main/src/addins/ChangeLogAddIn/gtk-gui/generated.cs
index 36abc51341..75935e2e55 100644
--- a/main/src/addins/ChangeLogAddIn/gtk-gui/generated.cs
+++ b/main/src/addins/ChangeLogAddIn/gtk-gui/generated.cs
@@ -14,40 +14,6 @@ namespace Stetic
 		}
 	}
 
-	internal class IconLoader
-	{
-		public static Gdk.Pixbuf LoadIcon (Gtk.Widget widget, string name, Gtk.IconSize size)
-		{
-			Gdk.Pixbuf res = widget.RenderIcon (name, size, null);
-			if ((res != null)) {
-				return res;
-			} else {
-				int sz;
-				int sy;
-				global::Gtk.Icon.SizeLookup (size, out  sz, out  sy);
-				try {
-					return Gtk.IconTheme.Default.LoadIcon (name, sz, 0);
-				} catch (System.Exception) {
-					if ((name != "gtk-missing-image")) {
-						return Stetic.IconLoader.LoadIcon (widget, "gtk-missing-image", size);
-					} else {
-						Gdk.Pixmap pmap = new Gdk.Pixmap (Gdk.Screen.Default.RootWindow, sz, sz);
-						Gdk.GC gc = new Gdk.GC (pmap);
-						gc.RgbFgColor = new Gdk.Color (255, 255, 255);
-						pmap.DrawRectangle (gc, true, 0, 0, sz, sz);
-						gc.RgbFgColor = new Gdk.Color (0, 0, 0);
-						pmap.DrawRectangle (gc, false, 0, 0, (sz - 1), (sz - 1));
-						gc.SetLineAttributes (3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round);
-						gc.RgbFgColor = new Gdk.Color (255, 0, 0);
-						pmap.DrawLine (gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4)));
-						pmap.DrawLine (gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)));
-						return Gdk.Pixbuf.FromDrawable (pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz);
-					}
-				}
-			}
-		}
-	}
-
 	internal class BinContainer
 	{
 		private Gtk.Widget child;
diff --git a/main/src/addins/ChangeLogAddIn/gtk-gui/gui.stetic b/main/src/addins/ChangeLogAddIn/gtk-gui/gui.stetic
index cc2a22e669..16bc54996d 100644
--- a/main/src/addins/ChangeLogAddIn/gtk-gui/gui.stetic
+++ b/main/src/addins/ChangeLogAddIn/gtk-gui/gui.stetic
@@ -8,6 +8,8 @@
     <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" />
     <widget-library name="../../../../build/AddIns/VersionControl/MonoDevelop.VersionControl.dll" />
     <widget-library name="../../../../build/bin/Mono.TextEditor.dll" />
+    <widget-library name="../../../../build/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor2.dll" />
+    <widget-library name="../../../../build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll" />
     <widget-library name="../../../../build/AddIns/ChangeLogAddIn/ChangeLogAddIn.dll" internal="true" />
   </import>
   <widget class="Gtk.Dialog" id="MonoDevelop.ChangeLogAddIn.AddLogEntryDialog" design-size="573 510">
@@ -125,9 +127,10 @@
                 <property name="Visible">False</property>
                 <property name="Spacing">6</property>
                 <child>
-                  <widget class="Gtk.Image" id="image36">
+                  <widget class="MonoDevelop.Components.ImageView" id="image36">
                     <property name="MemberName" />
-                    <property name="Pixbuf">stock:gtk-new SmallToolbar</property>
+                    <property name="IconId">gtk-new</property>
+                    <property name="IconSize">SmallToolbar</property>
                   </widget>
                   <packing>
                     <property name="Position">0</property>
@@ -165,9 +168,10 @@
                 <property name="Visible">False</property>
                 <property name="Spacing">6</property>
                 <child>
-                  <widget class="Gtk.Image" id="image37">
+                  <widget class="MonoDevelop.Components.ImageView" id="image37">
                     <property name="MemberName" />
-                    <property name="Pixbuf">stock:gtk-dialog-warning SmallToolbar</property>
+                    <property name="IconId">gtk-dialog-warning</property>
+                    <property name="IconSize">SmallToolbar</property>
                   </widget>
                   <packing>
                     <property name="Position">0</property>
@@ -209,9 +213,10 @@
                     <property name="MemberName" />
                     <property name="Spacing">6</property>
                     <child>
-                      <widget class="Gtk.Image" id="image38">
+                      <widget class="MonoDevelop.Components.ImageView" id="image38">
                         <property name="MemberName" />
-                        <property name="Pixbuf">stock:gtk-dialog-info SmallToolbar</property>
+                        <property name="IconId">gtk-dialog-info</property>
+                        <property name="IconSize">SmallToolbar</property>
                       </widget>
                       <packing>
                         <property name="Position">0</property>