Author: miguel
Date: 2006-05-25 12:08:05 -0400 (Thu, 25 May 2006)
New Revision: 61120
Added:
trunk/mcs/class/Managed.Windows.Forms/resources/dialog-error.png
trunk/mcs/class/Managed.Windows.Forms/resources/dialog-information.png
trunk/mcs/class/Managed.Windows.Forms/resources/dialog-question3.png
trunk/mcs/class/Managed.Windows.Forms/resources/dialog-warning.png
Modified:
trunk/mcs/class/Managed.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.dll.resources
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Theme.cs
Log:
2006-05-25 Miguel de Icaza <[EMAIL PROTECTED]>
* Theme.cs: Use Tangoified messagebox icons.
(GetSizedResourceImage): Also cope with width = 0 and do not
trigger a warning in that case (0 means "give me your icon from
the resouce, no special size needed).
2006-05-25 Miguel de Icaza <[EMAIL PROTECTED]>
* Add new dialog-*.png Tango icons (dialog-question is from a
different theme as Tango is still missing it).
Modified: trunk/mcs/class/Managed.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/ChangeLog 2006-05-25 16:06:45 UTC
(rev 61119)
+++ trunk/mcs/class/Managed.Windows.Forms/ChangeLog 2006-05-25 16:08:05 UTC
(rev 61120)
@@ -1,3 +1,8 @@
+2006-05-25 Miguel de Icaza <[EMAIL PROTECTED]>
+
+ * Add new dialog-*.png Tango icons (dialog-question is from a
+ different theme as Tango is still missing it).
+
2006-05-24 Miguel de Icaza <[EMAIL PROTECTED]>
* Changes so that we can use the filename as the resource name,
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-05-25 16:06:45 UTC (rev 61119)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-05-25 16:08:05 UTC (rev 61120)
@@ -1,3 +1,11 @@
+2006-05-25 Miguel de Icaza <[EMAIL PROTECTED]>
+
+ * Theme.cs: Use Tangoified messagebox icons.
+
+ (GetSizedResourceImage): Also cope with width = 0 and do not
+ trigger a warning in that case (0 means "give me your icon from
+ the resouce, no special size needed).
+
2006-05-25 Peter Dennis Bartok <[EMAIL PROTECTED]>
* Application.cs: Leave runloop if the the main modal form is
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Theme.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Theme.cs
2006-05-25 16:06:45 UTC (rev 61119)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Theme.cs
2006-05-25 16:08:05 UTC (rev 61120)
@@ -577,8 +577,8 @@
return null;
ResPool.AddUIImage (image, name, 0);
- if (image.Width != width){
- Console.Error.WriteLine ("warning: requesting
icon that not been tuned {0}_{1}", name, width);
+ if (image.Width != width && width != 0){
+ Console.Error.WriteLine ("warning: requesting
icon that not been tuned {0}_{1} {2}", width, name, image.Width);
int height = (image.Height * width)/image.Width;
Bitmap b = new Bitmap (width, height);
Graphics g = Graphics.FromImage (b);
@@ -609,13 +609,13 @@
// Icons for message boxes
case UIIcon.MessageBoxError:
- return GetSizedResourceImage
("mbox_error.png", size);
+ return GetSizedResourceImage
("dialog-error.png", size);
case UIIcon.MessageBoxInfo:
- return GetSizedResourceImage
("mbox_info.png", size);
+ return GetSizedResourceImage
("dialog-information.png", size);
case UIIcon.MessageBoxQuestion:
- return GetSizedResourceImage
("mbox_question.png", size);
+ return GetSizedResourceImage
("dialog-question.png", size);
case UIIcon.MessageBoxWarning:
- return GetSizedResourceImage
("mbox_warn.png", size);
+ return GetSizedResourceImage
("dialog-warning.png", size);
// misc Icons
case UIIcon.NormalFolder:
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.dll.resources
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.dll.resources
2006-05-25 16:06:45 UTC (rev 61119)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.dll.resources
2006-05-25 16:08:05 UTC (rev 61120)
@@ -29,3 +29,7 @@
-resource:resources/16_user-desktop.png
-resource:resources/32_user-desktop.png
-resource:resources/user-desktop.png
+-resource:resources/dialog-error.png
+-resource:resources/dialog-information.png
+-resource:resources/dialog-question3.png
+-resource:resources/dialog-warning.png
Added: trunk/mcs/class/Managed.Windows.Forms/resources/dialog-error.png
===================================================================
(Binary files differ)
Property changes on:
trunk/mcs/class/Managed.Windows.Forms/resources/dialog-error.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/mcs/class/Managed.Windows.Forms/resources/dialog-information.png
===================================================================
(Binary files differ)
Property changes on:
trunk/mcs/class/Managed.Windows.Forms/resources/dialog-information.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/mcs/class/Managed.Windows.Forms/resources/dialog-question3.png
===================================================================
(Binary files differ)
Property changes on:
trunk/mcs/class/Managed.Windows.Forms/resources/dialog-question3.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/mcs/class/Managed.Windows.Forms/resources/dialog-warning.png
===================================================================
(Binary files differ)
Property changes on:
trunk/mcs/class/Managed.Windows.Forms/resources/dialog-warning.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
