[Monodevelop-patches-list] r940 - in trunk/MonoDevelop/src: AddIns/DisplayBindings/SourceEditor/Gui/Pads Libraries/MonoDevelop.Gui.Widgets/Dock Main/Base/Gui/Pads Main/Base/Gui/Pads/ClassScout Main/Base/Gui/Pads/ProjectBrowser Main/Base/Gui/Workbench/Layouts Main/Base/Services
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Wed Feb 18 17:44:20 EST 2004
Author: tberman
Date: 2004-02-18 17:44:20 -0500 (Wed, 18 Feb 2004)
New Revision: 940
Modified:
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Pads/CompilerMessageView.cs
trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Dock/DockingManager.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/FileScout.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/OpenTaskView.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs
trunk/MonoDevelop/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs
trunk/MonoDevelop/src/Main/Base/Services/ResourceService.cs
Log:
work with our icons, instead of gtk-execute
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Pads/CompilerMessageView.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Pads/CompilerMessageView.cs 2004-02-18 20:55:06 UTC (rev 939)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Pads/CompilerMessageView.cs 2004-02-18 22:44:20 UTC (rev 940)
@@ -48,7 +48,7 @@
public string Icon {
get {
- return "Icons.16x16.OutputIcon";
+ return MonoDevelop.Gui.Stock.OutputIcon;
}
}
Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Dock/DockingManager.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Dock/DockingManager.cs 2004-02-18 20:55:06 UTC (rev 939)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Dock/DockingManager.cs 2004-02-18 22:44:20 UTC (rev 940)
@@ -133,7 +133,7 @@
return Add(widget, title, null);
}
- public Content Add(Gtk.Widget widget, string title, Gdk.Pixbuf image) {
+ public Content Add(Gtk.Widget widget, string title, string image) {
Content ret = new Content(widget, title, image);
contents.Add(ret);
return ret;
@@ -148,14 +148,14 @@
public class Content: WindowContent {
private Gtk.Widget widget;
private string title;
- private Gdk.Pixbuf image;
+ private string image;
private string fulltitle;
public Content(Gtk.Widget widget, string title): this(widget, title, null) {
// Nothing
}
- public Content(Gtk.Widget widget, string title, Gdk.Pixbuf image) {
+ public Content(Gtk.Widget widget, string title, string image) {
this.widget = widget;
this.title = title;
this.image = image;
@@ -186,7 +186,7 @@
}
}
- public Gdk.Pixbuf Image {
+ public string Image {
get {
return image;
}
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs 2004-02-18 20:55:06 UTC (rev 939)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs 2004-02-18 22:44:20 UTC (rev 940)
@@ -85,7 +85,7 @@
public string Icon {
get {
- return "Icons.16x16.Class";
+ return MonoDevelop.Gui.Stock.Class;
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/FileScout.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/FileScout.cs 2004-02-18 20:55:06 UTC (rev 939)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/FileScout.cs 2004-02-18 22:44:20 UTC (rev 940)
@@ -298,7 +298,7 @@
public string Icon {
get {
- return "Icons.16x16.OpenFolderBitmap";
+ return MonoDevelop.Gui.Stock.OpenFolderBitmap;
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/OpenTaskView.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/OpenTaskView.cs 2004-02-18 20:55:06 UTC (rev 939)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/OpenTaskView.cs 2004-02-18 22:44:20 UTC (rev 940)
@@ -41,7 +41,7 @@
public string Icon {
get {
- return "Icons.16x16.TaskListIcon";
+ return MonoDevelop.Gui.Stock.TaskListIcon;
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs 2004-02-18 20:55:06 UTC (rev 939)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs 2004-02-18 22:44:20 UTC (rev 940)
@@ -65,7 +65,7 @@
public string Icon {
get {
- return "Icons.16x16.CombineIcon";
+ return MonoDevelop.Gui.Stock.CombineIcon;
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs 2004-02-18 20:55:06 UTC (rev 939)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs 2004-02-18 22:44:20 UTC (rev 940)
@@ -146,7 +146,7 @@
foreach (string typeName in leftContents) {
Content c = GetContent (typeName);
if (c != null) {
- DockItem item = new DockItem (typeName, c.Title, "gtk-execute",
+ DockItem item = new DockItem (typeName, c.Title, c.Image,
DockItemBehavior.Normal);
item.Add (c.Widget);
item.ShowAll ();
@@ -157,7 +157,7 @@
foreach (string typeName in bottomContents) {
Content c = GetContent (typeName);
if (c != null) {
- DockItem item = new DockItem (typeName, c.Title, "gtk-execute",
+ DockItem item = new DockItem (typeName, c.Title, c.Image,
DockItemBehavior.Normal);
item.Add (c.Widget);
item.ShowAll ();
@@ -168,7 +168,7 @@
foreach (string typeName in rightContents) {
Content c = GetContent (typeName);
if (c != null) {
- DockItem item = new DockItem (typeName, c.Title, "gtk-execute",
+ DockItem item = new DockItem (typeName, c.Title, c.Image,
DockItemBehavior.Normal);
item.Add (c.Widget);
item.ShowAll ();
@@ -223,7 +223,7 @@
} else {
//newContent = dockManager.Contents.Add(content.Control, content.Title);
}*/
- contentHash[content] = new Content (content.Control, content.Title, null);
+ contentHash[content] = new Content (content.Control, content.Title, content.Icon);
} else {
Content c = (Content)contentHash[content];
if (c != null) {
Modified: trunk/MonoDevelop/src/Main/Base/Services/ResourceService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/ResourceService.cs 2004-02-18 20:55:06 UTC (rev 939)
+++ trunk/MonoDevelop/src/Main/Base/Services/ResourceService.cs 2004-02-18 22:44:20 UTC (rev 940)
@@ -34,6 +34,7 @@
this.Add(hbox1);
}
}
+
public class ResourceService : AbstractService, IResourceService
{
readonly static string uiLanguageProperty = "CoreProperties.UILanguage";
@@ -72,6 +73,7 @@
LoadLanguageResources();
}
}
+
void LoadLanguageResources()
{
PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
More information about the Monodevelop-patches-list
mailing list