|
| From: | Rhys Weatherley <address@hidden> |
| Subject: | [Dotgnu-pnet-commits] pnetlib/System.Windows.Forms MessageBox.cs, 1.1, 1.2 S.cs, 1.1, 1.2 |
| Date: | Fri, 03 Oct 2003 07:52:05 +0000 |
Update of /cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms
In directory subversions:/tmp/cvs-serv29545/System.Windows.Forms
Modified Files:
MessageBox.cs S.cs
Log Message:
Add some infrastructure for message boxes (not finished yet).
Index: MessageBox.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms/MessageBox.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MessageBox.cs 4 Jul 2003 18:40:02 -0000 1.1
--- MessageBox.cs 3 Oct 2003 07:52:03 -0000 1.2
***************
*** 3,8 ****
*
* Copyright (C) 2003 Southern Storm Software, Pty Ltd.
- *
- * Contributed by Gopal.V
*
* This program is free software; you can redistribute it and/or modify
--- 3,6 ----
***************
*** 21,133 ****
*/
using System;
using System.Drawing;
! namespace System.Windows.Forms
{
! public class MessageBox : Control
{
! [TODO]
! public MessageBox()
! {
! throw new NotImplementedException("ctor");
! }
! [TODO]
! public static DialogResult Show(String text)
! {
! throw new NotImplementedException("Show");
! }
! [TODO]
! public static DialogResult Show(IWin32Window owner, String text)
! {
! throw new NotImplementedException("Show");
! }
! [TODO]
! public static DialogResult Show(String text, String caption)
! {
! throw new NotImplementedException("Show");
! }
! [TODO]
! public static DialogResult Show(IWin32Window owner, String
text,
!
String caption)
! {
! throw new NotImplementedException("Show");
! }
! [TODO]
! public static DialogResult Show(String text, String caption,
!
MessageBoxButtons buttons)
! {
! throw new NotImplementedException("Show");
! }
! [TODO]
! public static DialogResult Show(IWin32Window owner, String
text,
!
String caption,
!
MessageBoxButtons buttons)
! {
! throw new NotImplementedException("Show");
! }
! [TODO]
! public static DialogResult Show(String text, String caption,
!
MessageBoxButtons buttons,
!
MessageBoxIcon icon)
! {
! throw new NotImplementedException("Show");
! }
! [TODO]
! public static DialogResult Show(IWin32Window owner, String
text,
!
String caption,
!
MessageBoxButtons buttons,
!
MessageBoxIcon icon)
! {
! throw new NotImplementedException("Show");
! }
! [TODO]
! public static DialogResult Show(String text, String caption,
!
MessageBoxButtons buttons,
!
MessageBoxIcon icon,
!
MessageBoxDefaultButton defaultButton)
! {
! throw new NotImplementedException("Show");
! }
! [TODO]
! public static DialogResult Show(IWin32Window owner, String
text,
!
String caption,
!
MessageBoxButtons buttons,
!
MessageBoxIcon icon,
!
MessageBoxDefaultButton defaultButton)
! {
! throw new NotImplementedException("Show");
! }
! [TODO]
! public static DialogResult Show(String text, String caption,
!
MessageBoxButtons buttons,
!
MessageBoxIcon icon,
!
MessageBoxDefaultButton defaultButton,
!
MessageBoxOptions options)
! {
! throw new NotImplementedException("Show");
! }
! [TODO]
! public static DialogResult Show(IWin32Window owner, String
text,
!
String caption,
!
MessageBoxButtons buttons,
!
MessageBoxIcon icon,
!
MessageBoxDefaultButton defaultButton,
!
MessageBoxOptions options)
! {
! throw new NotImplementedException("Show");
! }
! }
! }//namespace
--- 19,505 ----
*/
+ namespace System.Windows.Forms
+ {
+
using System;
using System.Drawing;
+ using System.ComponentModel;
! public class MessageBox
{
! // Internal state.
! private static Icon handIcon;
! private static Icon questionIcon;
! private static Icon exclamationIcon;
! private static Icon asteriskIcon;
!
! // Cannot instantiate this class.
! private MessageBox() {}
!
! // Show a message box and get the result code.
! public static DialogResult Show(String text)
! {
! return Show(null, text, String.Empty,
! MessageBoxButtons.OK,
! MessageBoxIcon.None,
!
MessageBoxDefaultButton.Button1,
! (MessageBoxOptions)0);
! }
! public static DialogResult Show(IWin32Window owner, String text)
! {
! return Show(owner, text, String.Empty,
! MessageBoxButtons.OK,
! MessageBoxIcon.None,
!
MessageBoxDefaultButton.Button1,
! (MessageBoxOptions)0);
! }
! public static DialogResult Show(String text, String caption)
! {
! return Show(null, text, caption,
! MessageBoxButtons.OK,
! MessageBoxIcon.None,
!
MessageBoxDefaultButton.Button1,
! (MessageBoxOptions)0);
! }
! public static DialogResult Show(IWin32Window owner, String text,
! String
caption)
! {
! return Show(owner, text, caption,
! MessageBoxButtons.OK,
! MessageBoxIcon.None,
!
MessageBoxDefaultButton.Button1,
! (MessageBoxOptions)0);
! }
! public static DialogResult Show(String text, String caption,
!
MessageBoxButtons buttons)
! {
! return Show(null, text, caption, buttons,
! MessageBoxIcon.None,
!
MessageBoxDefaultButton.Button1,
! (MessageBoxOptions)0);
! }
! public static DialogResult Show(IWin32Window owner, String text,
! String
caption,
!
MessageBoxButtons buttons)
! {
! return Show(owner, text, caption, buttons,
! MessageBoxIcon.None,
!
MessageBoxDefaultButton.Button1,
! (MessageBoxOptions)0);
! }
! public static DialogResult Show(String text, String caption,
!
MessageBoxButtons buttons,
!
MessageBoxIcon icon)
! {
! return Show(null, text, caption, buttons, icon,
!
MessageBoxDefaultButton.Button1,
! (MessageBoxOptions)0);
! }
! public static DialogResult Show(IWin32Window owner, String text,
! String
caption,
!
MessageBoxButtons buttons,
!
MessageBoxIcon icon)
! {
! return Show(owner, text, caption, buttons, icon,
!
MessageBoxDefaultButton.Button1,
! (MessageBoxOptions)0);
! }
! public static DialogResult Show(String text, String caption,
!
MessageBoxButtons buttons,
!
MessageBoxIcon icon,
!
MessageBoxDefaultButton defaultButton)
! {
! return Show(null, text, caption, buttons, icon,
! defaultButton,
(MessageBoxOptions)0);
! }
! public static DialogResult Show(IWin32Window owner, String text,
! String
caption,
!
MessageBoxButtons buttons,
!
MessageBoxIcon icon,
!
MessageBoxDefaultButton defaultButton)
! {
! return Show(owner, text, caption, buttons, icon,
! defaultButton,
(MessageBoxOptions)0);
! }
! public static DialogResult Show(String text, String caption,
!
MessageBoxButtons buttons,
!
MessageBoxIcon icon,
!
MessageBoxDefaultButton defaultButton,
!
MessageBoxOptions options)
! {
! return Show(null, text, caption, buttons, icon,
! defaultButton, options);
! }
! public static DialogResult Show(IWin32Window owner, String text,
! String
caption,
!
MessageBoxButtons buttons,
!
MessageBoxIcon icon,
!
MessageBoxDefaultButton defaultButton,
!
MessageBoxOptions options)
! {
! MessageBoxForm form = new MessageBoxForm
! (text, caption, buttons, icon,
! defaultButton, options);
! DialogResult result = form.ShowDialog(owner as
Form);
! form.Dispose();
! return result;
! }
!
! // Load a particular message box icon from this assembly's resources.
! private static Icon LoadIcon(MessageBoxIcon icon)
! {
! lock(typeof(MessageBox))
! {
! Icon iconObject = null;
! try
! {
! switch(icon)
! {
! case
MessageBoxIcon.Hand:
! {
! if(handIcon ==
null)
! {
!
handIcon = new Icon
!
(typeof(MessageBox), "hand.ico");
! }
! iconObject =
handIcon;
! }
! break;
!
! case
MessageBoxIcon.Question:
! {
! if(questionIcon
== null)
! {
!
questionIcon = new Icon
!
(typeof(MessageBox), "question.ico");
! }
! iconObject =
questionIcon;
! }
! break;
!
! case
MessageBoxIcon.Exclamation:
! {
!
if(exclamationIcon == null)
! {
!
exclamationIcon = new Icon
!
(typeof(MessageBox), "exclamation.ico");
! }
! iconObject =
exclamationIcon;
! }
! break;
!
! case
MessageBoxIcon.Asterisk:
! {
! if(asteriskIcon
== null)
! {
!
asteriskIcon = new Icon
!
(typeof(MessageBox), "asterisk.ico");
! }
! iconObject =
asteriskIcon;
! }
! break;
! }
! }
! catch(Exception e)
! {
! // Could not load the icon -
ignore this condition.
! }
! return iconObject;
! }
! }
!
! // Form class for message box dialogs.
! private sealed class MessageBoxForm : Form
{
! // Internal state.
! private MessageBoxButtons buttons;
! private Control iconControl;
! private Icon icon;
! private Label textLabel;
! private Button button1;
! private Button button2;
! private Button button3;
! private bool hasCancel;
! // Constructor.
! public MessageBoxForm(String text, String caption,
! MessageBoxButtons
buttons,
! MessageBoxIcon icon,
!
MessageBoxDefaultButton defaultButton,
! MessageBoxOptions
options)
! {
! // Set the message box's caption.
! if(caption != null)
! {
! Text = caption;
! }
! else
! {
! Text = String.Empty;
! }
! // Create a control to display the message box
icon.
! this.icon = LoadIcon(icon);
! if(this.icon != null)
! {
! iconControl = new Control();
! iconControl.ClientSize = this.icon.Size;
! Controls.Add(iconControl);
! }
! // Create the label containing the message text.
! textLabel = new Label();
! if(text != null)
! {
! textLabel.Text = text;
! }
! else
! {
! textLabel.Text = String.Empty;
! }
! Controls.Add(textLabel);
! // Determine the number and names of the
message box buttons.
! this.buttons = buttons;
! switch(buttons)
! {
! case MessageBoxButtons.OK: default:
! {
! button1 = new Button();
! button1.Text =
S._("MessageBox_OK", "OK");
! button2 = null;
! button3 = null;
! hasCancel = true; // Can
always cancel an OK dialog.
! }
! break;
! case MessageBoxButtons.OKCancel:
! {
! button1 = new Button();
! button2 = new Button();
! button1.Text =
S._("MessageBox_OK", "OK");
! button2.Text =
S._("MessageBox_Cancel", "Cancel");
! button3 = null;
! hasCancel = true;
! }
! break;
! case MessageBoxButtons.AbortRetryIgnore:
! {
! button1 = new Button();
! button2 = new Button();
! button3 = new Button();
! button1.Text =
S._("MessageBox_Abort", "Abort");
! button2.Text =
S._("MessageBox_Retry", "Retry");
! button3.Text =
S._("MessageBox_Ignore", "Ignore");
! hasCancel = false;
! }
! break;
! case MessageBoxButtons.YesNoCancel:
! {
! button1 = new Button();
! button2 = new Button();
! button3 = new Button();
! button1.Text =
S._("MessageBox_Yes", "Yes");
! button2.Text =
S._("MessageBox_No", "No");
! button3.Text =
S._("MessageBox_Cancel", "Cancel");
! hasCancel = true;
! }
! break;
! case MessageBoxButtons.YesNo:
! {
! button1 = new Button();
! button2 = new Button();
! button1.Text =
S._("MessageBox_Yes", "Yes");
! button2.Text =
S._("MessageBox_No", "No");
! button3.Text = null;
! hasCancel = false;
! }
! break;
! case MessageBoxButtons.RetryCancel:
! {
! button1 = new Button();
! button2 = new Button();
! button1.Text =
S._("MessageBox_Retry", "Retry");
! button2.Text =
S._("MessageBox_Cancel", "Cancel");
! button3.Text = null;
! hasCancel = true;
! }
! break;
! }
! // Add the buttons to the control.
! Controls.Add(button1);
! if(button2 != null)
! {
! Controls.Add(button2);
! }
! if(button3 != null)
! {
! Controls.Add(button3);
! }
! // Set the "Accept" and "Cancel" buttons.
! Button acceptButton = null;
! if(hasCancel)
! {
! if(button3 != null)
! {
! CancelButton = button3;
! }
! else if(button2 != null)
! {
! CancelButton = button2;
! }
! }
! switch(defaultButton)
! {
! case MessageBoxDefaultButton.Button1:
default:
! {
! acceptButton = button1;
! }
! break;
! case MessageBoxDefaultButton.Button2:
! {
! if(button2 != null)
! {
! acceptButton = button2;
! }
! else
! {
! acceptButton = button1;
! }
! }
! break;
!
! case MessageBoxDefaultButton.Button3:
! {
! if(button3 != null)
! {
! acceptButton = button3;
! }
! else if(button2 != null)
! {
! acceptButton = button2;
! }
! else
! {
! acceptButton = button1;
! }
! }
! break;
! }
! AcceptButton = acceptButton;
!
! // Hook up the events for the form.
! button1.Click += new
EventHandler(Button1Clicked);
! if(button2 != null)
! {
! button2.Click += new
EventHandler(Button2Clicked);
! }
! if(button3 != null)
! {
! button3.Click += new
EventHandler(Button3Clicked);
! }
! Closing += new
CancelEventHandler(CloseRequested);
! if(iconControl != null)
! {
! iconControl.Paint += new
PaintEventHandler(PaintIcon);
! }
!
! // TODO: perform dialog box layout and sizing
! }
!
! // Detect when button 1 is clicked.
! private void Button1Clicked(Object sender, EventArgs args)
! {
! switch(buttons)
! {
! case MessageBoxButtons.OK: default:
! case MessageBoxButtons.OKCancel:
! DialogResult = DialogResult.OK;
break;
!
! case MessageBoxButtons.AbortRetryIgnore:
! DialogResult =
DialogResult.Abort; break;
!
! case MessageBoxButtons.YesNoCancel:
! case MessageBoxButtons.YesNo:
! DialogResult =
DialogResult.Yes; break;
!
! case MessageBoxButtons.RetryCancel:
! DialogResult =
DialogResult.Retry; break;
! }
! }
!
! // Detect when button 2 is clicked.
! private void Button2Clicked(Object sender, EventArgs args)
! {
! switch(buttons)
! {
! case MessageBoxButtons.OKCancel:
! DialogResult =
DialogResult.Cancel; break;
!
! case MessageBoxButtons.AbortRetryIgnore:
! DialogResult =
DialogResult.Retry; break;
!
! case MessageBoxButtons.YesNoCancel:
! case MessageBoxButtons.YesNo:
! DialogResult = DialogResult.No;
break;
!
! case MessageBoxButtons.RetryCancel:
! DialogResult =
DialogResult.Cancel; break;
! }
! }
!
! // Detect when button 3 is clicked.
! private void Button3Clicked(Object sender, EventArgs args)
! {
! switch(buttons)
! {
! case MessageBoxButtons.AbortRetryIgnore:
! DialogResult =
DialogResult.Ignore; break;
!
! case MessageBoxButtons.YesNoCancel:
! DialogResult =
DialogResult.Cancel; break;
! }
! }
!
! // Handle the "Closing" event on the form.
! private void CloseRequested(Object sender, CancelEventArgs args)
! {
! if(hasCancel)
! {
! if(buttons == MessageBoxButtons.OK)
! {
! DialogResult = DialogResult.OK;
! }
! else
! {
! DialogResult =
DialogResult.Cancel;
! }
! }
! else
! {
! // There is no "Cancel" button, so
prevent the
! // dialog box from being closed until
the user
! // selects one of the displayed buttons.
! args.Cancel = true;
! }
! }
!
! // Paint the icon control.
! private void PaintIcon(Object sender, PaintEventArgs args)
! {
! Graphics g = args.Graphics;
! g.DrawIcon(icon, 0, 0);
! }
!
! }; // class MessageBoxForm
!
! }; // class MessageBox
!
! }; // namespace System.Windows.Forms
Index: S.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms/S.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** S.cs 11 Jun 2003 07:07:19 -0000 1.1
--- S.cs 3 Oct 2003 07:52:03 -0000 1.2
***************
*** 81,84 ****
--- 81,96 ----
}
}
+ public static String _(String tag, String defaultValue)
+ {
+ String value = _(tag);
+ if(value == null || value == tag)
+ {
+ return defaultValue;
+ }
+ else
+ {
+ return value;
+ }
+ }
#else // !CONFIG_RUNTIME_INFRA
***************
*** 88,91 ****
--- 100,107 ----
{
return tag;
+ }
+ public static String _(String tag, String defaultValue)
+ {
+ return defaultValue;
}
| [Prev in Thread] | Current Thread | [Next in Thread] |