Retinaification

4 files changed, 17 insertions, 35 deletions

diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Components/MonoDevelop.Database.Components.csproj b/extras/MonoDevelop.Database/MonoDevelop.Database.Components/MonoDevelop.Database.Components.csproj
index 77772ab408..81dc6b48cb 100644
--- a/extras/MonoDevelop.Database/MonoDevelop.Database.Components/MonoDevelop.Database.Components.csproj
+++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Components/MonoDevelop.Database.Components.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{70E5F8DB-FB9B-41BE-A4D5-4075056C6D04}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -68,92 +68,74 @@
     </Reference>
     <Reference Include="MonoDevelop.VersionControl, Version=2.2.0.0, Culture=neutral">
       <Package>monodevelop-core-addins</Package>
-      <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="MonoDevelop.NUnit, Version=2.2.0.0, Culture=neutral">
       <Package>monodevelop-core-addins</Package>
-      <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="MonoDevelop.XmlEditor, Version=2.2.0.0, Culture=neutral">
       <Package>monodevelop-core-addins</Package>
-      <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="MonoDevelop.AspNet, Version=2.2.0.0, Culture=neutral">
       <Package>monodevelop-core-addins</Package>
-      <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="MonoDevelop.Gettext, Version=2.2.0.0, Culture=neutral">
       <Package>monodevelop-core-addins</Package>
-      <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="MonoDevelop.Deployment.Linux, Version=2.2.0.0, Culture=neutral">
       <Package>monodevelop-core-addins</Package>
-      <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="MonoDevelop.GtkCore, Version=2.2.0.0, Culture=neutral">
       <Package>monodevelop-core-addins</Package>
-      <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="MonoDevelop.DesignerSupport, Version=2.2.0.0, Culture=neutral">
       <Package>monodevelop-core-addins</Package>
-      <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="MonoDevelop.VBNetBinding, Version=2.2.0.0, Culture=neutral">
       <Package>monodevelop-core-addins</Package>
-      <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="MonoDevelop.CBinding, Version=2.2.0.0, Culture=neutral">
       <Package>monodevelop-core-addins</Package>
-      <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="MonoDevelop.CSharpBinding, Version=2.2.0.0, Culture=neutral">
       <Package>monodevelop-core-addins</Package>
-      <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="MonoDevelop.Autotools, Version=2.2.0.0, Culture=neutral">
       <Package>monodevelop-core-addins</Package>
-      <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="MonoDevelop.SourceEditor2, Version=2.2.0.0, Culture=neutral">
       <Package>monodevelop-core-addins</Package>
-      <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="MonoDevelop.Debugger, Version=2.2.0.0, Culture=neutral">
       <Package>monodevelop-core-addins</Package>
-      <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="MonoDevelop.Refactoring, Version=2.2.0.0, Culture=neutral">
       <Package>monodevelop-core-addins</Package>
       <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
     </Reference>
     <Reference Include="MonoDevelop.Debugger.Soft, Version=2.2.0.0, Culture=neutral">
       <Package>monodevelop-core-addins</Package>
-      <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="MonoDevelop.Ide, Version=2.2.0.0, Culture=neutral">
       <Package>monodevelop</Package>
-      <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Mono.Cecil, Version=0.6.8.8607, Culture=neutral">
       <Package>monodevelop</Package>
-      <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Mono.TextEditor, Version=1.0.0.0, Culture=neutral">
@@ -169,7 +151,9 @@
       <Package>monodevelop</Package>
     </Reference>
     <Reference Include="ICSharpCode.NRefactory, Version=5.0.0.0, Culture=neutral, PublicKeyToken=d4bfe873e7598c49">
-      <Private>False</Private>
+      <Package>monodevelop</Package>
+    </Reference>
+    <Reference Include="Xwt, Version=0.1.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
       <Package>monodevelop</Package>
     </Reference>
   </ItemGroup>
diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Components/Widgets/DataGrid/Views/ImageVisualizerView.cs b/extras/MonoDevelop.Database/MonoDevelop.Database.Components/Widgets/DataGrid/Views/ImageVisualizerView.cs
index d8cc6418fb..afdd01edde 100644
--- a/extras/MonoDevelop.Database/MonoDevelop.Database.Components/Widgets/DataGrid/Views/ImageVisualizerView.cs
+++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Components/Widgets/DataGrid/Views/ImageVisualizerView.cs
@@ -85,7 +85,7 @@ namespace MonoDevelop.Database.Components
 				} catch {}
 			}
 			
-			image.Pixbuf = ImageService.GetPixbuf ("gtk-missing-image", IconSize.Dialog);
+			image.Pixbuf = ImageService.GetIcon ("gtk-missing-image", IconSize.Dialog).ToPixbuf ();
 		}
 	}
 }
diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Components/Widgets/ProjectDirectoryComboBox.cs b/extras/MonoDevelop.Database/MonoDevelop.Database.Components/Widgets/ProjectDirectoryComboBox.cs
index df36b30a2d..0a557f872a 100644
--- a/extras/MonoDevelop.Database/MonoDevelop.Database.Components/Widgets/ProjectDirectoryComboBox.cs
+++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Components/Widgets/ProjectDirectoryComboBox.cs
@@ -24,13 +24,10 @@
 //
 
 using Gtk;
-using System;
 using System.IO;
-using System.Collections.Generic;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide;
 using MonoDevelop.Projects;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.Database.Components
 {
@@ -42,14 +39,14 @@ namespace MonoDevelop.Database.Components
 		
 		public ProjectDirectoryComboBox ()
 		{
-			store = new TreeStore (typeof (Gdk.Pixbuf), typeof (string), typeof (Project), typeof (string));
+			store = new TreeStore (typeof (Xwt.Drawing.Image), typeof (string), typeof (Project), typeof (string));
 			
-			var pixbuf = new CellRendererPixbuf ();
+			var pixbuf = new CellRendererImage ();
 			CellRendererText text = new CellRendererText ();
 
 			this.PackStart (pixbuf, false);
 			this.PackStart (text, false);
-			this.AddAttribute (pixbuf, "pixbuf", 0);
+			this.AddAttribute (pixbuf, "image", 0);
 			this.AddAttribute (text, "markup", 1);
 			
 			this.Model = store;
@@ -88,12 +85,12 @@ namespace MonoDevelop.Database.Components
 						continue;
 				
 					DotNetProject proj = (DotNetProject)entry;
-					Gdk.Pixbuf pixbuf = null;
+					Xwt.Drawing.Image pixbuf = null;
 					
 					if (proj is DotNetProject && (proj as DotNetProject).LanguageBinding == null) {
-						pixbuf = ImageService.GetPixbuf (Gtk.Stock.DialogError);
+						pixbuf = ImageService.GetIcon (Gtk.Stock.DialogError, IconSize.Menu);
 					} else {
-						pixbuf = ImageService.GetPixbuf (proj.StockIcon, IconSize.Menu);
+						pixbuf = ImageService.GetIcon (proj.StockIcon, IconSize.Menu);
 					}
 					
 					TreeIter iter = store.AppendValues (pixbuf, "<b>" + proj.Name + "</b>", proj, proj.BaseDirectory);
@@ -123,7 +120,7 @@ namespace MonoDevelop.Database.Components
 				if (name == "gtk-gui" || name == "bin" || info.Attributes.ToString ().Contains ("Hidden"))
 					continue;
 				
-				Gdk.Pixbuf pixbuf = ImageService.GetPixbuf (Gtk.Stock.Directory);
+				var pixbuf = ImageService.GetIcon (Gtk.Stock.Directory, IconSize.Menu);
 				TreeIter iter = store.AppendValues (parent, pixbuf, name, project, dir);
 						
 				PopulateCombo (iter, dir, project);
diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Components/Widgets/SelectSchemaWidget.cs b/extras/MonoDevelop.Database/MonoDevelop.Database.Components/Widgets/SelectSchemaWidget.cs
index 7ec6fdb20d..649e41b374 100644
--- a/extras/MonoDevelop.Database/MonoDevelop.Database.Components/Widgets/SelectSchemaWidget.cs
+++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Components/Widgets/SelectSchemaWidget.cs
@@ -28,6 +28,7 @@ using System;
 using System.Collections.Generic;
 using MonoDevelop.Database.Sql;
 using MonoDevelop.Ide;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.Database.Components
 {
@@ -53,7 +54,7 @@ namespace MonoDevelop.Database.Components
 			toggleRenderer.Toggled += new ToggledHandler (ItemToggled);
 			col.PackStart (toggleRenderer, false);
 			
-			var pixbufRenderer = new CellRendererPixbuf ();
+			var pixbufRenderer = new CellRendererImage ();
 			col.PackStart (pixbufRenderer, false);
 
 			CellRendererText textRenderer = new CellRendererText ();
@@ -149,7 +150,7 @@ namespace MonoDevelop.Database.Components
 		
 		private void PixbufDataFunc (CellLayout layout, CellRenderer cell, TreeModel model, TreeIter iter)
 		{
-			var pixbufRenderer = (CellRendererPixbuf) cell;
+			var pixbufRenderer = (CellRendererImage) cell;
 			var schema = (ISchemaContainer) model.GetValue (iter, columnObj);
 			
 			string iconString = null;
@@ -169,7 +170,7 @@ namespace MonoDevelop.Database.Components
 			}
 
 			if (iconString != null)
-				pixbufRenderer.Pixbuf = ImageService.GetPixbuf (iconString);
+				pixbufRenderer.Image = ImageService.GetIcon (iconString, IconSize.Menu);
 		}
 		
 		private void ItemToggled (object sender, ToggledArgs args)