Husky/Kanalsanierungsverwaltung
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into arbeitsnachweis

Browse Source
This commit is contained in:
Husky
2019-08-13 21:32:33 +02:00
parent e39dd3f4a1 009faaccde
commit 7f4db67209
5 changed files with 252 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
SanSystem/SanSystem.csproj
View File

@@ -82,6 +82,12 @@
<Compile Include="frmAuftraggeberEdit.Designer.cs">
<DependentUpon>frmAuftraggeberEdit.cs</DependentUpon>
</Compile>
<Compile Include="frmExceptionWindow.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmExceptionWindow.Designer.cs">
<DependentUpon>frmExceptionWindow.cs</DependentUpon>
</Compile>
<Compile Include="frmKalibrierungFestlegung.cs">
<SubType>Form</SubType>
</Compile>
@@ -174,6 +180,9 @@
<EmbeddedResource Include="frmAuftraggeberEdit.resx">
<DependentUpon>frmAuftraggeberEdit.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmExceptionWindow.resx">
<DependentUpon>frmExceptionWindow.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmKalibrierungFestlegung.resx">
<DependentUpon>frmKalibrierungFestlegung.cs</DependentUpon>
</EmbeddedResource>

78
SanSystem/frmExceptionWindow.Designer.cs generated Normal file
View File

@@ -0,0 +1,78 @@
namespace SanSystem
{
partial class frmExceptionWindow
{
/// <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.button1 = new System.Windows.Forms.Button();
this.txt_error = new System.Windows.Forms.TextBox();
this.SuspendLayout();
//
// button1
//
this.button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 16.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.button1.Location = new System.Drawing.Point(12, 389);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(911, 75);
this.button1.TabIndex = 0;
this.button1.Text = "OK";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.Button1_Click);
//
// txt_error
//
this.txt_error.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.txt_error.Font = new System.Drawing.Font("Microsoft Sans Serif", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txt_error.Location = new System.Drawing.Point(12, 12);
this.txt_error.Multiline = true;
this.txt_error.Name = "txt_error";
this.txt_error.Size = new System.Drawing.Size(911, 371);
this.txt_error.TabIndex = 1;
//
// frmExceptionWindow
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(935, 476);
this.ControlBox = false;
this.Controls.Add(this.txt_error);
this.Controls.Add(this.button1);
this.Name = "frmExceptionWindow";
this.Text = "ExceptionWindow";
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.Button button1;
private System.Windows.Forms.TextBox txt_error;
}
}

34
SanSystem/frmExceptionWindow.cs Normal file
View File

@@ -0,0 +1,34 @@
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 SanSystem
{
/// <summary>
///
/// </summary>
public partial class frmExceptionWindow : Form
{
/// <summary>
///
/// </summary>
/// <param name="message"></param>
public frmExceptionWindow(string message)
{
InitializeComponent();
txt_error.Text = message;
txt_error.ReadOnly = true;
}
private void Button1_Click(object sender, EventArgs e)
{
Environment.Exit(0);
}
}
}

120
SanSystem/frmExceptionWindow.resx Normal file
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>

16
SanSystem/frmMain.cs
View File

@@ -37,10 +37,11 @@ namespace SanSystem
{
Datenbank.Instance.LoadProjekt(Global.Instance.ProjektNummer, Global.Instance.Projektpfad);// Path.Combine(Global.Instance.Projektpfad,"18-850.xaml"));
}
catch(DataBaseVersionMismatchException)
catch(DataBaseVersionMismatchException ex)
{
MessageBox.Show("Database version mistmatch\nProgramm wird beendet");
Environment.Exit(0);
frmExceptionWindow frmException = new frmExceptionWindow(ex.Message);
frmException.FormClosed += FrmException_FormClosed;
frmException.ShowDialog();
}
//Datenbank.Instance.CreateProjekt("");
@@ -56,17 +57,22 @@ namespace SanSystem
toolStripStatus_projekt_Label.Text = Datenbank.Instance.projekt;
this.Text += " " + Global.Instance.PROGRAMMVERSION;
#if (DEBUG || LAPTOP)
this.Text += " INTERNE DEBUG VERSION";
#endif
if (Wupi.QueryInfo(0, QueryInfoOption.FirmCode) == 0)
this.Text += " nicht geschützter Version nur für TESTZWECKE!";
}
private void FrmException_FormClosed(object sender, FormClosedEventArgs e)
{
Environment.Exit(0);
}
private void frm_main_Load(object sender, EventArgs e)
{