diff --git a/SanSystem/SanSystem.csproj b/SanSystem/SanSystem.csproj index 448121b..c1dec1e 100644 --- a/SanSystem/SanSystem.csproj +++ b/SanSystem/SanSystem.csproj @@ -82,6 +82,12 @@ frmAuftraggeberEdit.cs + + Form + + + frmExceptionWindow.cs + Form @@ -174,6 +180,9 @@ frmAuftraggeberEdit.cs + + frmExceptionWindow.cs + frmKalibrierungFestlegung.cs diff --git a/SanSystem/frmExceptionWindow.Designer.cs b/SanSystem/frmExceptionWindow.Designer.cs new file mode 100644 index 0000000..e3a0522 --- /dev/null +++ b/SanSystem/frmExceptionWindow.Designer.cs @@ -0,0 +1,46 @@ +namespace SanSystem +{ + partial class frmExceptionWindow + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.SuspendLayout(); + // + // frmExceptionWindow + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Name = "frmExceptionWindow"; + this.Text = "ExceptionWindow"; + this.ResumeLayout(false); + + } + + #endregion + } +} \ No newline at end of file diff --git a/SanSystem/frmExceptionWindow.cs b/SanSystem/frmExceptionWindow.cs new file mode 100644 index 0000000..1a622f1 --- /dev/null +++ b/SanSystem/frmExceptionWindow.cs @@ -0,0 +1,20 @@ +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 +{ + public partial class frmExceptionWindow : Form + { + public frmExceptionWindow() + { + InitializeComponent(); + } + } +} diff --git a/SanSystem/frmExceptionWindow.resx b/SanSystem/frmExceptionWindow.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/SanSystem/frmExceptionWindow.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SanSystem/frmMain.cs b/SanSystem/frmMain.cs index 992c045..94f0c5b 100644 --- a/SanSystem/frmMain.cs +++ b/SanSystem/frmMain.cs @@ -37,9 +37,9 @@ 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"); + MessageBox.Show("Software und Datenbank passen nicht zusammen\nProgramm wird beendet\n"+ex.Message); Environment.Exit(0); } @@ -56,12 +56,15 @@ 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!"; + + }