[Monodevelop-patches-list] r2573 - in trunk/MonoDevelop/Core/src: MonoDevelop.Base MonoDevelop.Base/Gui/Pads/FileScout MonoDevelop.Base/Gui/Workbench/Layouts MonoDevelop.Gui.Utils MonoDevelop.Gui.Utils/FileIcons MonoDevelop.Gui.Widgets MonoDevelop.Gui.Widgets/FileBrowser
John Luke <jluke@cfl.rr.com>
jluke at mono-cvs.ximian.com
Wed Jun 1 11:21:47 EDT 2005
Author: jluke
Date: 2005-06-01 11:21:47 -0400 (Wed, 01 Jun 2005)
New Revision: 2573
Modified:
trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/FileScout/FileListItem.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog
trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog
trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/FileBrowser/FileBrowser.cs
Log:
change FileIconLoader to just use size instead
of height, width
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-06-01 13:41:24 UTC (rev 2572)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-06-01 15:21:47 UTC (rev 2573)
@@ -1,3 +1,10 @@
+2005-06-01 John Luke <john.luke at gmail.com>
+
+ * Gui/Workbench/Layouts/SdiWorkspaceLayout.cs:
+ * Gui/Workbench/Layouts/SdiWorkspaceWindow.cs:
+ * Gui/Pads/FileScout/FileListItem.cs: adjust to
+ FileIconLoader.GetPixbufForFile change
+
2005-06-01 Jacob Ilsø Christensen <jacobilsoe at gmail.com>
* Services/MessageService.cs: Added methods to ask a question
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/FileScout/FileListItem.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/FileScout/FileListItem.cs 2005-06-01 13:41:24 UTC (rev 2572)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/FileScout/FileListItem.cs 2005-06-01 15:21:47 UTC (rev 2573)
@@ -65,7 +65,7 @@
this.lastModified = lastModified;
//FIXME: This is because //home/blah is not the same as /home/blah according to Icon.LookupSync, if we get weird behaviours, lets look at this again, see if we still need it.
FullName = fullname.Substring (1);
- icon = FileIconLoader.GetPixbufForFile (FullName, 24, 24);
+ icon = FileIconLoader.GetPixbufForFile (FullName, 24);
}
public FileListItem (string name)
@@ -74,7 +74,7 @@
this.size = Math.Round ((double) fi.Length / 1024).ToString () + " KB";
this.lastModified = fi.LastWriteTime.ToString ();
FullName = System.IO.Path.GetFullPath (name);
- icon = FileIconLoader.GetPixbufForFile (FullName, 24, 24);
+ icon = FileIconLoader.GetPixbufForFile (FullName, 24);
}
}
}
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs 2005-06-01 13:41:24 UTC (rev 2572)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs 2005-06-01 15:21:47 UTC (rev 2573)
@@ -464,7 +464,7 @@
if (content.IsUntitled) {
mimeimage = new Gtk.Image (FileIconLoader.GetPixbufForType ("gnome-fs-regular").ScaleSimple (16, 16, Gdk.InterpType.Bilinear));
} else {
- mimeimage = new Gtk.Image (FileIconLoader.GetPixbufForFile (content.ContentName, 16, 16));
+ mimeimage = new Gtk.Image (FileIconLoader.GetPixbufForFile (content.ContentName, 16));
}
TabLabel tabLabel = new TabLabel (new Label (), mimeimage != null ? mimeimage : new Gtk.Image (""));
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs 2005-06-01 13:41:24 UTC (rev 2572)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs 2005-06-01 15:21:47 UTC (rev 2573)
@@ -313,7 +313,7 @@
try {
if (content.ContentName.IndexOfAny (new char[] { '*', '+'}) == -1) {
- tabLabel.Icon.Pixbuf = FileIconLoader.GetPixbufForFile (content.ContentName, 16, 16);
+ tabLabel.Icon.Pixbuf = FileIconLoader.GetPixbufForFile (content.ContentName, 16);
}
} catch {
tabLabel.Icon.Pixbuf = FileIconLoader.GetPixbufForType ("gnome-fs-regular").ScaleSimple (16, 16, Gdk.InterpType.Bilinear);
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog 2005-06-01 13:41:24 UTC (rev 2572)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog 2005-06-01 15:21:47 UTC (rev 2573)
@@ -1,3 +1,8 @@
+2005-06-01 John Luke <john.luke at gmail.com>
+
+ * FileIcons/FileIconLoader.cs (GetPixbufForFile):
+ just use size instead of height, width
+
2005-04-17 John Luke <john.luke at gmail.com>
* Makefile.am: fix distcheck
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs 2005-06-01 13:41:24 UTC (rev 2572)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs 2005-06-01 15:21:47 UTC (rev 2573)
@@ -24,7 +24,7 @@
{
}
- public static Gdk.Pixbuf GetPixbufForFile (string filename, int width, int height)
+ public static Gdk.Pixbuf GetPixbufForFile (string filename, int size)
{
Gnome.IconLookupResultFlags result;
string icon;
@@ -37,7 +37,7 @@
icon = "gnome-fs-regular";
}
Gdk.Pixbuf pix = GetPixbufForType (icon);
- return pix.ScaleSimple (height, width, Gdk.InterpType.Bilinear);
+ return pix.ScaleSimple (size, size, Gdk.InterpType.Bilinear);
}
public static Gdk.Pixbuf GetPixbufForType (string type)
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog 2005-06-01 13:41:24 UTC (rev 2572)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog 2005-06-01 15:21:47 UTC (rev 2573)
@@ -1,3 +1,8 @@
+2005-06-01 John Luke <john.luke at gmail.com>
+
+ * FileBrowser/FileBrowser.cs: adjust to FileIconLoader
+ change
+
2005-05-30 Lluis Sanchez Gual <lluis at novell.com>
* Commands/CommandToolButton.cs: Only update button properties if
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/FileBrowser/FileBrowser.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/FileBrowser/FileBrowser.cs 2005-06-01 13:41:24 UTC (rev 2572)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/FileBrowser/FileBrowser.cs 2005-06-01 15:21:47 UTC (rev 2573)
@@ -176,11 +176,11 @@
if (ignoreHidden)
{
if (!d.Name.StartsWith (".") && NotHidden (d.Name))
- store.AppendValues (FileIconLoader.GetPixbufForFile (System.IO.Path.Combine (CurrentDir, d.Name), 24, 24), d.Name);
+ store.AppendValues (FileIconLoader.GetPixbufForFile (System.IO.Path.Combine (CurrentDir, d.Name), 24), d.Name);
}
else
{
- store.AppendValues (FileIconLoader.GetPixbufForFile (System.IO.Path.Combine (CurrentDir, d.Name), 24, 24), d.Name);
+ store.AppendValues (FileIconLoader.GetPixbufForFile (System.IO.Path.Combine (CurrentDir, d.Name), 24), d.Name);
}
}
@@ -415,7 +415,7 @@
text_render.Editable = true;
tv.Reorderable = false;
- iter = store.AppendValues (FileIconLoader.GetPixbufForFile (CurrentDir, 24, 24), "folder name");
+ iter = store.AppendValues (FileIconLoader.GetPixbufForFile (CurrentDir, 24), "folder name");
treepath = tv.Model.GetPath(iter);
column = tv.GetColumn (0);
More information about the Monodevelop-patches-list
mailing list