Rijn/Advanced-Software-Engineering-Drawing-Project
Private
Public Access
1
0 Fork 0
Code Activity

Refactored Settings

Browse Source
This commit is contained in:
Lukasz Baldyga committed 2020-10-06 11:37:26 +01:00
1 parent dbdde96a0d
commit 5d2513d6af
7 files changed
+222 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj
+9
View File
@@ -46,6 +46,12 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Console.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Console.Designer.cs">
<DependentUpon>Console.cs</DependentUpon>
</Compile>
<Compile Include="Settings.cs" />
<Compile Include="Menu.cs">
<SubType>Form</SubType>
@@ -55,6 +61,9 @@
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="Console.resx">
<DependentUpon>Console.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Menu.resx">
<DependentUpon>Menu.cs</DependentUpon>
</EmbeddedResource>
Advanced Software Engineering/Advanced Software Engineering/Console.Designer.cs
Generated
+47
View File
@@ -0,0 +1,47 @@
namespace Advanced_Software_Engineering
{
partial class Console
{
/// <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()
{
this.SuspendLayout();
//
// Console
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(800, 450);
this.Name = "Console";
this.Text = "Console";
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.Console_FormClosed);
this.ResumeLayout(false);
}
#endregion
}
}
Advanced Software Engineering/Advanced Software Engineering/Console.cs
+26
View File
@@ -0,0 +1,26 @@
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 Advanced_Software_Engineering
{
public partial class Console : Form
{
public Console()
{
InitializeComponent();
}
private void Console_FormClosed(object sender, FormClosedEventArgs e)
{
SettingsAndHelperFunctions.NumberOfWindows--;
}
}
}
Advanced Software Engineering/Advanced Software Engineering/Console.resx
+120
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>
Advanced Software Engineering/Advanced Software Engineering/Menu.Designer.cs
Generated
+1
View File
@@ -111,6 +111,7 @@
this.Name = "Menu";
this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
this.Text = "Menu";
this.Load += new System.EventHandler(this.Menu_Load);
this.ResumeLayout(false);
this.PerformLayout();
Advanced Software Engineering/Advanced Software Engineering/Menu.cs
+17 -3
View File
@@ -19,22 +19,36 @@ namespace Advanced_Software_Engineering
private void button1_Click(object sender, EventArgs e)
{
Settings.NumberOfWindows++;
SettingsAndHelperFunctions.NumberOfWindows++;
new Console().Show();
this.Hide();
}
private void button2_Click(object sender, EventArgs e)
{
Settings.NumberOfWindows++;
SettingsAndHelperFunctions.NumberOfWindows++;
this.Hide();
}
private void button3_Click(object sender, EventArgs e)
{
Settings.NumberOfWindows++;
SettingsAndHelperFunctions.NumberOfWindows++;
this.Hide();
}
private void button4_Click(object sender, EventArgs e)
{
this.Close();
}
public static void CheckWindows()
{
if (SettingsAndHelperFunctions.NumberOfWindows == 0) Menu.Show();
}
private void Menu_Load(object sender, EventArgs e)
{
//Do things on load
}
}
}
Advanced Software Engineering/Advanced Software Engineering/Settings.cs → Advanced Software Engineering/Advanced Software Engineering/SettingsAndHelperFunctions.cs
+2 -1
View File
@@ -3,10 +3,11 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace Advanced_Software_Engineering
{
class Settings
class SettingsAndHelperFunctions
{
public static int NumberOfWindows = 0;
}