Compare commits

...

4 Commits

Author SHA1 Message Date
e4e23d6d23 Manually merged MainView 2024-04-03 09:01:57 -04:00
fe3a06890d New area for learning 2024-04-03 08:58:35 -04:00
6577b5ef43 Load some data before the show 2024-04-03 08:58:10 -04:00
0d50c5db83 Coded cleanup 2024-04-03 08:57:42 -04:00
12 changed files with 357 additions and 40 deletions

View File

@@ -37,6 +37,7 @@
testAreaToolStripMenuItem = new ToolStripMenuItem();
bindToModelToolStripMenuItem = new ToolStripMenuItem();
bindToViewToolStripMenuItem = new ToolStripMenuItem();
bindToViewWithEqualityToolStripMenuItem = new ToolStripMenuItem();
validateModelToolStripMenuItem = new ToolStripMenuItem();
menuStrip1.SuspendLayout();
SuspendLayout();
@@ -87,6 +88,7 @@
//
// testAreaToolStripMenuItem
//
testAreaToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { bindToModelToolStripMenuItem, bindToViewToolStripMenuItem, bindToViewWithEqualityToolStripMenuItem });
testAreaToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { bindToModelToolStripMenuItem, bindToViewToolStripMenuItem, validateModelToolStripMenuItem });
testAreaToolStripMenuItem.Name = "testAreaToolStripMenuItem";
testAreaToolStripMenuItem.Size = new Size(66, 20);
@@ -95,17 +97,24 @@
// bindToModelToolStripMenuItem
//
bindToModelToolStripMenuItem.Name = "bindToModelToolStripMenuItem";
bindToModelToolStripMenuItem.Size = new Size(180, 22);
bindToModelToolStripMenuItem.Size = new Size(212, 22);
bindToModelToolStripMenuItem.Text = "Bind To Model";
bindToModelToolStripMenuItem.Click += BindToModelToolStripMenuItem_Click;
//
// bindToViewToolStripMenuItem
//
bindToViewToolStripMenuItem.Name = "bindToViewToolStripMenuItem";
bindToViewToolStripMenuItem.Size = new Size(180, 22);
bindToViewToolStripMenuItem.Size = new Size(212, 22);
bindToViewToolStripMenuItem.Text = "Bind To View";
bindToViewToolStripMenuItem.Click += BindToViewToolStripMenuItem_Click;
//
// bindToViewWithEqualityToolStripMenuItem
//
bindToViewWithEqualityToolStripMenuItem.Name = "bindToViewWithEqualityToolStripMenuItem";
bindToViewWithEqualityToolStripMenuItem.Size = new Size(212, 22);
bindToViewWithEqualityToolStripMenuItem.Text = "Bind To View with Equality";
bindToViewWithEqualityToolStripMenuItem.Click += BindToViewWithEqualityToolStripMenuItem_Click;
//
// validateModelToolStripMenuItem
//
validateModelToolStripMenuItem.Name = "validateModelToolStripMenuItem";
@@ -140,6 +149,7 @@
private ToolStripMenuItem testAreaToolStripMenuItem;
private ToolStripMenuItem bindToModelToolStripMenuItem;
private ToolStripMenuItem bindToViewToolStripMenuItem;
private ToolStripMenuItem bindToViewWithEqualityToolStripMenuItem;
private ToolStripMenuItem validateModelToolStripMenuItem;
}
}

View File

@@ -1,5 +1,6 @@
using MVPLearning.RecordKeeping.SermonFiler;
using MVPLearning.TestingArea.ModelProperties;
using MVPLearning.TestingArea.ViewModelEquality;
using MVPLearning.TestingArea.Validation;
using MVPLearning.TestingArea.ViewProperties;
@@ -32,6 +33,11 @@ namespace MVPLearning
_ = new ViewPropertiesPresenter(new ViewPropertiesView() { MdiParent = this });
}
private void BindToViewWithEqualityToolStripMenuItem_Click(object sender, EventArgs e)
{
_ = new ViewModelEqualityPresenter(new ViewModelEqualityView() { MdiParent = this });
}
private void ValidateModelToolStripMenuItem_Click(object sender, EventArgs e)
{
_ = new ValidateController(new ValidateForm() { MdiParent = this });

View File

@@ -12,7 +12,7 @@
event EventHandler? BrowseButtonClicked;
event EventHandler<string>? LaunchButtonClicked;
event EventHandler<MaintainSermonFilerModel>? SaveButtonClicked;
event EventHandler? CancelButtonClicked;
event EventHandler<int>? CancelButtonClicked;
}
}

View File

@@ -62,8 +62,6 @@ namespace MVPLearning.RecordKeeping.SermonFiler
ButtonSave = new Button();
ButtonCancel = new Button();
LabelTitleWarning = new Label();
button1 = new Button();
button2 = new Button();
ActionPanel.SuspendLayout();
SuspendLayout();
//
@@ -365,33 +363,11 @@ namespace MVPLearning.RecordKeeping.SermonFiler
LabelTitleWarning.Text = "Title cannont be blank";
LabelTitleWarning.Visible = false;
//
// button1
//
button1.Location = new Point(517, 142);
button1.Name = "button1";
button1.Size = new Size(75, 23);
button1.TabIndex = 26;
button1.Text = "Rebind";
button1.UseVisualStyleBackColor = true;
button1.Click += button1_Click;
//
// button2
//
button2.Location = new Point(517, 177);
button2.Name = "button2";
button2.Size = new Size(75, 23);
button2.TabIndex = 27;
button2.Text = "button2";
button2.UseVisualStyleBackColor = true;
button2.Click += button2_Click;
//
// MaintainSermonFilerView
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(800, 450);
Controls.Add(button2);
Controls.Add(button1);
Controls.Add(LabelTitleWarning);
Controls.Add(ButtonCancel);
Controls.Add(ButtonSave);
@@ -459,7 +435,5 @@ namespace MVPLearning.RecordKeeping.SermonFiler
private Button ButtonSave;
private Button ButtonCancel;
private Label LabelTitleWarning;
private Button button1;
private Button button2;
}
}

View File

@@ -126,7 +126,7 @@ namespace MVPLearning.RecordKeeping.SermonFiler
public event EventHandler? BrowseButtonClicked;
public event EventHandler<string>? LaunchButtonClicked;
public event EventHandler<MaintainSermonFilerModel>? SaveButtonClicked;
public event EventHandler? CancelButtonClicked;
public event EventHandler<int>? CancelButtonClicked;
private void AddButton_Click(object sender, EventArgs _) { if (CheckForChangedData()) { AddButtonClicked?.Invoke(sender, EventArgs.Empty); } }
private void DeleteButton_Click(object sender, EventArgs _) { DeleteButtonClicked?.Invoke(sender, _model.Seid); }
@@ -137,7 +137,7 @@ namespace MVPLearning.RecordKeeping.SermonFiler
private void BrowseButton_Click(object sender, EventArgs _) { if (CheckForChangedData()) { BrowseButtonClicked?.Invoke(sender, EventArgs.Empty); } }
private void LaunchButton_Click(object sender, EventArgs _) { LaunchButtonClicked?.Invoke(sender, _model.Filename); }
private void SaveButton_Click(object sender, EventArgs _) { SaveButtonClicked?.Invoke(sender, _model); }
private void CancelButton_Click(object sender, EventArgs _) { if (_loadedModel != null) { LoadData(_loadedModel); } }
private void CancelButton_Click(object sender, EventArgs _) { CancelButtonClicked?.Invoke(sender, _model.Seid); }
@@ -154,14 +154,6 @@ namespace MVPLearning.RecordKeeping.SermonFiler
return true;
}
private void button1_Click(object sender, EventArgs e)
{
BindControls();
}
private void button2_Click(object sender, EventArgs e)
{
this.Refresh();
}
}
}

View File

@@ -14,6 +14,7 @@ namespace MVPLearning.TestingArea.ModelProperties
{
_view = view;
_view.ButtonClick += ButtonClick;
_view.LoadData(new() { FirstName = "Mary" });
if (_view is Form form) { form.Show(); }
}

View File

@@ -0,0 +1,11 @@
using MVPLearning.TestingArea.ViewProperties;
namespace MVPLearning.TestingArea.ViewModelEquality
{
public interface IViewModelEqualityView
{
event EventHandler<string>? ButtonClick;
void LoadData(ViewModelEqualityModel model);
}
}

View File

@@ -0,0 +1,24 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MVPLearning.TestingArea.ViewModelEquality
{
public class ViewModelEqualityModel
{
public string FirstName { get; set; } = string.Empty;
public override bool Equals(object? obj)
{
return obj is ViewModelEqualityModel model &&
FirstName == model.FirstName;
}
public override int GetHashCode()
{
return HashCode.Combine(FirstName);
}
}
}

View File

@@ -0,0 +1,26 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MVPLearning.TestingArea.ViewModelEquality
{
public class ViewModelEqualityPresenter
{
private readonly IViewModelEqualityView _view;
public ViewModelEqualityPresenter(IViewModelEqualityView view)
{
_view = view;
_view.LoadData(new() { FirstName = "Mary" });
_view.ButtonClick += ButtonClick;
if (_view is Form form) { form.Show(); }
}
private void ButtonClick(object? sender, string e)
{
_view.LoadData(new() { FirstName = e });
}
}
}

View File

@@ -0,0 +1,111 @@
namespace MVPLearning.TestingArea.ViewModelEquality
{
partial class ViewModelEqualityView
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
baseTextBox1 = new BaseLibrary.BaseTextBox();
button1 = new Button();
button2 = new Button();
button3 = new Button();
label1 = new Label();
SuspendLayout();
//
// baseTextBox1
//
baseTextBox1.BorderStyle = BorderStyle.FixedSingle;
baseTextBox1.Location = new Point(12, 12);
baseTextBox1.Name = "baseTextBox1";
baseTextBox1.Size = new Size(269, 23);
baseTextBox1.TabIndex = 0;
//
// button1
//
button1.Location = new Point(12, 41);
button1.Name = "button1";
button1.Size = new Size(75, 23);
button1.TabIndex = 1;
button1.Text = "Mary";
button1.UseVisualStyleBackColor = true;
button1.Click += Button_Click;
//
// button2
//
button2.Location = new Point(109, 41);
button2.Name = "button2";
button2.Size = new Size(75, 23);
button2.TabIndex = 2;
button2.Text = "Sara";
button2.UseVisualStyleBackColor = true;
button2.Click += Button_Click;
//
// button3
//
button3.Location = new Point(206, 41);
button3.Name = "button3";
button3.Size = new Size(75, 23);
button3.TabIndex = 3;
button3.Text = "John";
button3.UseVisualStyleBackColor = true;
button3.Click += Button_Click;
//
// label1
//
label1.AutoSize = true;
label1.Font = new Font("Segoe UI", 16F);
label1.ForeColor = SystemColors.Highlight;
label1.Location = new Point(15, 107);
label1.Name = "label1";
label1.Size = new Size(262, 30);
label1.TabIndex = 5;
label1.Text = "A change has been made.";
//
// ViewModelEqualityView
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(293, 245);
Controls.Add(label1);
Controls.Add(button3);
Controls.Add(button2);
Controls.Add(button1);
Controls.Add(baseTextBox1);
Name = "ViewModelEqualityView";
Text = "View Properties with Model Equality";
ResumeLayout(false);
PerformLayout();
}
#endregion
private BaseLibrary.BaseTextBox baseTextBox1;
private Button button1;
private Button button2;
private Button button3;
private Label label1;
}
}

View File

@@ -0,0 +1,42 @@
using MVPLearning.BaseLibrary;
using MVPLearning.TestingArea.ViewProperties;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace MVPLearning.TestingArea.ViewModelEquality
{
public partial class ViewModelEqualityView : BaseForm, IViewModelEqualityView
{
public ViewModelEqualityView()
{
InitializeComponent();
baseTextBox1.Bind(this, nameof(FirstName));
PropertyChanged += ModelChanged;
}
private void ModelChanged(object? sender, PropertyChangedEventArgs e)
{
label1.Visible = !_model.Equals(_loadedModel);
}
private readonly ViewModelEqualityModel _model = new();
private ViewModelEqualityModel? _loadedModel;
private string _firstName = string.Empty;
public string FirstName { get => _firstName; set { _model.FirstName = value; SetProperty(ref _firstName, value); } }
public event EventHandler<string>? ButtonClick;
public void LoadData(ViewModelEqualityModel model)
{
_loadedModel = model;
FirstName = model.FirstName;
}
private void Button_Click(object sender, EventArgs e) { ButtonClick?.Invoke(this, ((Button)sender).Text); }
}
}

View File

@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>