Author: aolk
Date: 2006-07-07 16:13:46 -0400 (Fri, 07 Jul 2006)
New Revision: 62358
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/FileDialog.cs
Log:
* FileDialog.cs: Don't use brackets for new folders if they exist
under *nix. Instead use -(number of existing folders +1).
2006-07-07 Alexander Olk <[EMAIL PROTECTED]>
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-07-07 19:56:08 UTC (rev 62357)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-07-07 20:13:46 UTC (rev 62358)
@@ -1,5 +1,10 @@
2006-07-07 Alexander Olk <[EMAIL PROTECTED]>
+ * FileDialog.cs: Don't use brackets for new folders if they exist
+ under *nix. Instead use -(number of existing folders +1).
+
+2006-07-07 Alexander Olk <[EMAIL PROTECTED]>
+
* FileDialog.cs:
- Fixed really nasty bug #78771
- Don't block the whole GUI when reading directories with a lot of
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/FileDialog.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/FileDialog.cs
2006-07-07 19:56:08 UTC (rev 62357)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/FileDialog.cs
2006-07-07 20:13:46 UTC (rev 62358)
@@ -1905,6 +1905,8 @@
private int old_menuitem_index;
private bool do_update_view = false;
+ private int platform = (int) Environment.OSVersion.Platform;
+
public MWFFileView (MWFVFS vfs)
{
this.vfs = vfs;
@@ -1976,8 +1978,6 @@
ResumeLayout (false);
-// currentFolder = Environment.CurrentDirectory;
-
KeyDown += new KeyEventHandler (MWF_KeyDown);
}
@@ -2116,11 +2116,19 @@
if (Directory.Exists (Path.Combine (folder,
tmp_filename))) {
int i = 1;
- tmp_filename = tmp_filename + " (" + i + ")";
+ if ((platform == 4) || (platform == 128)) {
+ tmp_filename = tmp_filename + "-" + i;
+ } else {
+ tmp_filename = tmp_filename + " (" + i
+ ")";
+ }
while (Directory.Exists (Path.Combine (folder,
tmp_filename))) {
i++;
- tmp_filename = "New Folder" + " (" + i
+ ")";
+ if ((platform == 4) || (platform ==
128)) {
+ tmp_filename = "New Folder" +
"-" + i;
+ } else {
+ tmp_filename = "New Folder" + "
(" + i + ")";
+ }
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
