Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/main/src
diff options
context:
space:
mode:
authorMike Krüger <mkrueger@novell.com>2009-04-17 14:45:49 +0400
committerMike Krüger <mkrueger@novell.com>2009-04-17 14:45:49 +0400
commitf96bb1065c15d1af1072842b84d798d5debdef72 (patch)
tree307d3a65abd83dfdbf2e663c3ebc484865e2b7ab /main/src
parent86ba24281792e681bbd75fb84b2bd392e64f2bbe (diff)
* gtk-gui/gui.stetic:
* MonoDevelop.Ide.Gui/Ide.cs: * MonoDevelop.Ide/Services.cs: * MonoDevelop.Ide.Gui/IdeStartup.cs: * MonoDevelop.Ide.Gui/DocumentSwitcher.cs: * MonoDevelop.Ide.Gui.Pads/SearchResultPad.cs: * MonoDevelop.Ide.Gui/MonoDevelopStatusBar.cs: * MonoDevelop.Ide.Gui.Components/TreeBuilder.cs: * MonoDevelop.Ide.Gui.Dialogs/ProjectReferencePanel.cs: * MonoDevelop.Ide.Gui.Dialogs/SelectReferenceDialog.cs: * MonoDevelop.Ide.Gui.Pads.ClassPad/ProjectNodeBuilder.cs: * gtk-gui/MonoDevelop.Ide.Gui.Dialogs.TipOfTheDayWindow.cs: * MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectNodeBuilder.cs: * MonoDevelop.Ide.Gui.Pads.ProjectPad/SystemFileNodeBuilder.cs: * MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs: * gtk-gui/MonoDevelop.Ide.Gui.Dialogs.EncapsulateFieldDialog.cs: * MonoDevelop.Ide.Gui.Pads.ProjectPad/UnknownEntryNodeBuilder.cs: * MonoDevelop.Ide.Gui.Pads.ProjectPad/ShowAllFilesBuilderExtension.cs: Removed icon service. svn path=/trunk/monodevelop/; revision=131996
Diffstat (limited to 'main/src')
-rw-r--r--main/src/core/MonoDevelop.Ide/ChangeLog22
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/TreeBuilder.cs4
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/ProjectReferencePanel.cs5
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SelectReferenceDialog.cs2
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ProjectNodeBuilder.cs3
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs8
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectNodeBuilder.cs2
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ShowAllFilesBuilderExtension.cs4
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SystemFileNodeBuilder.cs8
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/UnknownEntryNodeBuilder.cs2
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/SearchResultPad.cs3
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DocumentSwitcher.cs4
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Ide.cs8
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IdeStartup.cs2
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/MonoDevelopStatusBar.cs2
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Services.cs7
-rw-r--r--main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.EncapsulateFieldDialog.cs1
-rw-r--r--main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.TipOfTheDayWindow.cs1
-rw-r--r--main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic1
19 files changed, 41 insertions, 48 deletions
diff --git a/main/src/core/MonoDevelop.Ide/ChangeLog b/main/src/core/MonoDevelop.Ide/ChangeLog
index d644e2a2b6..b1acb9e76f 100644
--- a/main/src/core/MonoDevelop.Ide/ChangeLog
+++ b/main/src/core/MonoDevelop.Ide/ChangeLog
@@ -1,5 +1,27 @@
2009-04-17 Mike Krüger <mkrueger@novell.com>
+ * gtk-gui/gui.stetic:
+ * MonoDevelop.Ide.Gui/Ide.cs:
+ * MonoDevelop.Ide/Services.cs:
+ * MonoDevelop.Ide.Gui/IdeStartup.cs:
+ * MonoDevelop.Ide.Gui/DocumentSwitcher.cs:
+ * MonoDevelop.Ide.Gui.Pads/SearchResultPad.cs:
+ * MonoDevelop.Ide.Gui/MonoDevelopStatusBar.cs:
+ * MonoDevelop.Ide.Gui.Components/TreeBuilder.cs:
+ * MonoDevelop.Ide.Gui.Dialogs/ProjectReferencePanel.cs:
+ * MonoDevelop.Ide.Gui.Dialogs/SelectReferenceDialog.cs:
+ * MonoDevelop.Ide.Gui.Pads.ClassPad/ProjectNodeBuilder.cs:
+ * gtk-gui/MonoDevelop.Ide.Gui.Dialogs.TipOfTheDayWindow.cs:
+ * MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectNodeBuilder.cs:
+ * MonoDevelop.Ide.Gui.Pads.ProjectPad/SystemFileNodeBuilder.cs:
+ * MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:
+ * gtk-gui/MonoDevelop.Ide.Gui.Dialogs.EncapsulateFieldDialog.cs:
+ * MonoDevelop.Ide.Gui.Pads.ProjectPad/UnknownEntryNodeBuilder.cs:
+ * MonoDevelop.Ide.Gui.Pads.ProjectPad/ShowAllFilesBuilderExtension.cs:
+ Removed icon service.
+
+2009-04-17 Mike Krüger <mkrueger@novell.com>
+
* Makefile.am:
* MonoDevelop.Ide.csproj:
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/TreeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/TreeBuilder.cs
index cbc880098b..d78717268a 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/TreeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/TreeBuilder.cs
@@ -267,13 +267,13 @@ namespace MonoDevelop.Ide.Gui.Components
if (tree.CopyObjects != null && ((IList)tree.CopyObjects).Contains (dataObject) && tree.CurrentTransferOperation == DragOperation.Move) {
Gdk.Pixbuf gicon = tree.BuilderContext.GetComposedIcon (icon, "fade");
if (gicon == null) {
- gicon = Services.Icons.MakeTransparent (icon, 0.5);
+ gicon = Services.Resources.MakeTransparent (icon, 0.5);
tree.BuilderContext.CacheComposedIcon (icon, "fade", gicon);
}
icon = gicon;
gicon = tree.BuilderContext.GetComposedIcon (closedIcon, "fade");
if (gicon == null) {
- gicon = Services.Icons.MakeTransparent (closedIcon, 0.5);
+ gicon = Services.Resources.MakeTransparent (closedIcon, 0.5);
tree.BuilderContext.CacheComposedIcon (closedIcon, "fade", gicon);
}
closedIcon = gicon;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/ProjectReferencePanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/ProjectReferencePanel.cs
index b924f50401..200ad44391 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/ProjectReferencePanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/ProjectReferencePanel.cs
@@ -151,9 +151,8 @@ namespace MonoDevelop.Ide.Gui.Dialogs {
if (!configureProject.TargetFramework.IsCompatibleWithFramework (netProject.TargetFramework.Id))
continue;
}
-
- string iconName = Services.Icons.GetImageForProjectType (projectEntry.ProjectType);
- Gdk.Pixbuf icon = treeView.RenderIcon (iconName, Gtk.IconSize.Menu, "");
+
+ Gdk.Pixbuf icon = Services.Resources.GetBitmap (projectEntry.StockIcon, IconSize.Menu);
store.AppendValues (projectEntry.Name, projectEntry.BaseDirectory, projectEntry, false, icon, true);
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SelectReferenceDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SelectReferenceDialog.cs
index f30fe13c19..a84f271518 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SelectReferenceDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SelectReferenceDialog.cs
@@ -124,7 +124,7 @@ namespace MonoDevelop.Ide.Gui.Dialogs
Project p = c.FindProjectByName (refInfo.Reference);
if (p == null) return TreeIter.Zero;
- string iconName = Services.Icons.GetImageForProjectType (p.ProjectType);
+ string iconName = p.StockIcon;
projectRefPanel.SignalRefChange (refInfo.Reference, true);
return refTreeStore.AppendValues (System.IO.Path.GetFileName (refInfo.Reference), GetTypeText (refInfo), p.BaseDirectory, refInfo, iconName);
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ProjectNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ProjectNodeBuilder.cs
index 07284adc41..0ad3ba6045 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ProjectNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ProjectNodeBuilder.cs
@@ -90,8 +90,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ClassPad
{
Project p = dataObject as Project;
label = p.Name;
- string iconName = Services.Icons.GetImageForProjectType (p.ProjectType);
- icon = Context.GetIcon (iconName);
+ icon = Context.GetIcon (p.StockIcon);
}
public override void BuildChildNodes (ITreeBuilder builder, object dataObject)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs
index 6342848fb0..171cde9022 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs
@@ -79,12 +79,8 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad
if (!File.Exists (file.FilePath)) {
label = "<span foreground='red'>" + label + "</span>";
}
-
- string ic = Services.Icons.GetImageForFile (file.FilePath);
- if (ic != Stock.MiscFiles || !File.Exists (file.FilePath))
- icon = Context.GetIcon (ic);
- else
- icon = IdeApp.Services.PlatformService.GetPixbufForFile (file.FilePath, Gtk.IconSize.Menu);
+
+ icon = IdeApp.Services.PlatformService.GetPixbufForFile (file.FilePath, Gtk.IconSize.Menu);
}
public override object GetParentObject (object dataObject)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectNodeBuilder.cs
index a65b0f6bb2..cd62ae4f85 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectNodeBuilder.cs
@@ -113,7 +113,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad
iconName = Gtk.Stock.DialogError;
label = GettextCatalog.GetString ("{0} <span foreground='red' size='small'>(Unknown language '{1}')</span>", p.Name, ((DotNetProject)p).LanguageName);
} else {
- iconName = Services.Icons.GetImageForProjectType (p.ProjectType);
+ iconName = p.StockIcon;
if (p.ParentSolution != null && p.ParentSolution.SingleStartup && p.ParentSolution.StartupItem == p)
label = "<b>" + p.Name + "</b>";
else
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ShowAllFilesBuilderExtension.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ShowAllFilesBuilderExtension.cs
index 51ad4ebcf8..7e61ebab4c 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ShowAllFilesBuilderExtension.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ShowAllFilesBuilderExtension.cs
@@ -116,13 +116,13 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad
if (pf.Project == null || !ProjectFolderCommandHandler.PathExistsInProject (pf.Project, thisPath)) {
Gdk.Pixbuf gicon = Context.GetComposedIcon (icon, "fade");
if (gicon == null) {
- gicon = Services.Icons.MakeTransparent (icon, 0.5);
+ gicon = Services.Resources.MakeTransparent (icon, 0.5);
Context.CacheComposedIcon (icon, "fade", gicon);
}
icon = gicon;
gicon = Context.GetComposedIcon (closedIcon, "fade");
if (gicon == null) {
- gicon = Services.Icons.MakeTransparent (closedIcon, 0.5);
+ gicon = Services.Resources.MakeTransparent (closedIcon, 0.5);
Context.CacheComposedIcon (closedIcon, "fade", gicon);
}
closedIcon = gicon;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SystemFileNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SystemFileNodeBuilder.cs
index bd456a36a5..00e84f11f9 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SystemFileNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/SystemFileNodeBuilder.cs
@@ -66,16 +66,12 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad
SystemFile file = (SystemFile) dataObject;
label = file.Name;
- string ic = Services.Icons.GetImageForFile (file.Path);
- if (ic != Stock.MiscFiles || !File.Exists (file.Path))
- icon = Context.GetIcon (ic);
- else
- icon = IdeApp.Services.PlatformService.GetPixbufForFile (file.Path, Gtk.IconSize.Menu);
+ icon = IdeApp.Services.PlatformService.GetPixbufForFile (file.Path, Gtk.IconSize.Menu);
if (file.ShowTransparent) {
Gdk.Pixbuf gicon = Context.GetComposedIcon (icon, "fade");
if (gicon == null) {
- gicon = Services.Icons.MakeTransparent (icon, 0.5);
+ gicon = Services.Resources.MakeTransparent (icon, 0.5);
Context.CacheComposedIcon (icon, "fade", gicon);
}
icon = gicon;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/UnknownEntryNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/UnknownEntryNodeBuilder.cs
index 1b333d1774..71c78f0f84 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/UnknownEntryNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/UnknownEntryNodeBuilder.cs
@@ -59,7 +59,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad
icon = Context.GetIcon (MonoDevelop.Core.Gui.Stock.Project);
Gdk.Pixbuf gicon = Context.GetComposedIcon (icon, "fade");
if (gicon == null) {
- gicon = Services.Icons.MakeTransparent (icon, 0.5);
+ gicon = Services.Resources.MakeTransparent (icon, 0.5);
Context.CacheComposedIcon (icon, "fade", gicon);
}
icon = gicon;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/SearchResultPad.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/SearchResultPad.cs
index 58ec273e9c..9c7bfa92c6 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/SearchResultPad.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/SearchResultPad.cs
@@ -437,8 +437,7 @@ namespace MonoDevelop.Ide.Gui.Pads
return;
}
- Gdk.Pixbuf stock;
- stock = sw.RenderIcon (Services.Icons.GetImageForFile (file), Gtk.IconSize.Menu, "");
+ Gdk.Pixbuf stock = IdeApp.Services.PlatformService.GetPixbufForFile (file, Gtk.IconSize.Menu);
string tmpPath = file;
if (basePath != null)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DocumentSwitcher.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DocumentSwitcher.cs
index e2e60f8ed6..07e5e1c56d 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DocumentSwitcher.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DocumentSwitcher.cs
@@ -72,9 +72,7 @@ namespace MonoDevelop.Ide
return IdeApp.Services.Resources.GetBitmap (document.Window.ViewContent.StockIconId, iconSize);
if (string.IsNullOrEmpty (document.FileName))
return IdeApp.Services.Resources.GetBitmap (MonoDevelop.Core.Gui.Stock.MiscFiles, iconSize);
- string icName = MonoDevelop.Projects.Gui.Services.Icons.GetImageForFile (document.FileName);
- if (icName != MonoDevelop.Core.Gui.Stock.MiscFiles || !System.IO.File.Exists (document.FileName))
- return IdeApp.Services.Resources.GetIcon (icName, Gtk.IconSize.Menu);
+
return IdeApp.Services.PlatformService.GetPixbufForFile (document.FileName, iconSize);
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Ide.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Ide.cs
index b240c8a3c5..33cfbc00c4 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Ide.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Ide.cs
@@ -369,18 +369,10 @@ namespace MonoDevelop.Ide.Gui
public class IdeServices
{
-// IconService icons;
-
public ResourceService Resources {
get { return MonoDevelop.Core.Gui.Services.Resources; }
}
- public IconService Icons {
- get {
- return MonoDevelop.Projects.Gui.Services.Icons;
- }
- }
-
public TaskService TaskService {
get { return MonoDevelop.Ide.Services.TaskService; }
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IdeStartup.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IdeStartup.cs
index 1513adf079..c0bdb9af03 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IdeStartup.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IdeStartup.cs
@@ -173,8 +173,6 @@ namespace MonoDevelop.Ide.Gui
try {
//force initialisation
- IconService s = MonoDevelop.Projects.Gui.Services.Icons;
-
if (errorsList.Count > 0) {
if (monitor is SplashScreenForm)
SplashScreenForm.SplashScreen.Hide ();
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/MonoDevelopStatusBar.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/MonoDevelopStatusBar.cs
index 9b5a904530..a46fddfdcc 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/MonoDevelopStatusBar.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/MonoDevelopStatusBar.cs
@@ -271,7 +271,7 @@ namespace MonoDevelop.Ide
images = new Gtk.Image [10];
for (int n=0; n<10; n++) {
- images [n] = new Image (Services.Icons.MakeTransparent (icon, ((double)(9-n))/10.0));
+ images [n] = new Image (Services.Resources.MakeTransparent (icon, ((double)(9-n))/10.0));
images [n].Show ();
}
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Services.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Services.cs
index 3efa1cbda8..0f50192d63 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Services.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Services.cs
@@ -39,17 +39,12 @@ namespace MonoDevelop.Ide
{
internal class Services
{
-// static IconService icons;
static TaskService taskService;
public static ResourceService Resources {
get { return MonoDevelop.Core.Gui.Services.Resources; }
}
-
- public static IconService Icons {
- get { return MonoDevelop.Projects.Gui.Services.Icons; }
- }
-
+
public static TaskService TaskService {
get {
if (taskService == null)
diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.EncapsulateFieldDialog.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.EncapsulateFieldDialog.cs
index f105deefb7..43817e79f4 100644
--- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.EncapsulateFieldDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.EncapsulateFieldDialog.cs
@@ -151,7 +151,6 @@ namespace MonoDevelop.Ide.Gui.Dialogs {
this.radioUpdateExternal = new Gtk.RadioButton(Mono.Unix.Catalog.GetString("_External"));
this.radioUpdateExternal.CanFocus = true;
this.radioUpdateExternal.Name = "radioUpdateExternal";
- this.radioUpdateExternal.Active = true;
this.radioUpdateExternal.DrawIndicator = true;
this.radioUpdateExternal.UseUnderline = true;
this.radioUpdateExternal.Group = new GLib.SList(System.IntPtr.Zero);
diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.TipOfTheDayWindow.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.TipOfTheDayWindow.cs
index 1b42bc3dee..94d3ad29c7 100644
--- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.TipOfTheDayWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.TipOfTheDayWindow.cs
@@ -119,6 +119,7 @@ namespace MonoDevelop.Ide.Gui.Dialogs {
w7.Fill = false;
// Container child hbox5.Gtk.Box+BoxChild
this.hbuttonbox1 = new Gtk.HButtonBox();
+ this.hbuttonbox1.Name = "hbuttonbox1";
this.hbuttonbox1.Spacing = 10;
this.hbuttonbox1.LayoutStyle = ((Gtk.ButtonBoxStyle)(4));
// Container child hbuttonbox1.Gtk.ButtonBox+ButtonBoxChild
diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic b/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic
index 12bad32b2a..b2ef0f74cb 100644
--- a/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic
+++ b/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic
@@ -1301,7 +1301,6 @@
<property name="MemberName" />
<property name="CanFocus">True</property>
<property name="Label" translatable="yes">_External</property>
- <property name="Active">True</property>
<property name="DrawIndicator">True</property>
<property name="HasLabel">True</property>
<property name="UseUnderline">True</property>