update3 20260610

This commit is contained in:
Stefan Hutter
2026-06-10 18:14:56 +02:00
parent 42376fc823
commit 58cd45116c
122 changed files with 5760 additions and 293 deletions
+4 -1
View File
@@ -53,7 +53,7 @@
<value>E:\Software-Projekte\OnDoc\TKB-Vorlagen\</value>
</setting>
<setting name="OfficeWatchTimerIntervall" serializeAs="String">
<value>60000</value>
<value>5000</value>
</setting>
<setting name="PrinterSettings" serializeAs="String">
<value>E:\Software-Projekte\TKBDiverse\TKBOfficeLib\PluginStart\bin\Debug\pluginstart.exe</value>
@@ -61,6 +61,9 @@
<setting name="GASSize" serializeAs="String">
<value>True</value>
</setting>
<setting name="Lokaldrive" serializeAs="String">
<value>E:</value>
</setting>
</OnDoc.Properties.Settings>
</userSettings>
<runtime>
+1 -1
View File
@@ -65,7 +65,7 @@
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(472, 26);
this.label2.TabIndex = 2;
this.label2.Text = "8. Mai 2026";
this.label2.Text = "10. Juni 2026";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.label2.Click += new System.EventHandler(this.label2_Click);
//
+32 -3
View File
@@ -39,6 +39,8 @@ namespace OnDoc.DocMgmt
private DataTable dokumentpaket = new DataTable();
private DataTable dokumentpaketvorlagen = new DataTable();
private DataTable dokumentpaketvorlagen_Original = new DataTable();
private bool VerantwortungKube = false;
private bool FaksimileUnterschrift = false;
private int profilnr { get; set; }
public int dokumentpaketnr { get; set; } = 0;
public int partnernr { get; set; } = 0;
@@ -118,7 +120,7 @@ namespace OnDoc.DocMgmt
DokTypSelect dt = new DokTypSelect();
dt.vorlagentype = 2;
dt.ShowDialog();
if (dt.DialogResult == DialogResult.OK) { dokumentpaketnr = Convert.ToInt32(dt.dokumenttypnr); return true; } else { return false; }
if (dt.DialogResult == DialogResult.OK) { dokumentpaketnr = Convert.ToInt32(dt.dokumenttypnr); VerantwortungKube = false;FaksimileUnterschrift=false ; return true; } else { return false; }
}
private void Dokumentpaket_Load(object sender, EventArgs e)
{
@@ -139,6 +141,16 @@ namespace OnDoc.DocMgmt
Cursor = Cursors.WaitCursor;
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select * from edex_dokumentpaket where dokumentpaketnr=" + dokumentpaketnr.ToString(), false, true);
try
{
if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["VerantwortungKube"]) == true) { VerantwortungKube = true; }
} catch { }
try
{
if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["FaksimileUnterschrift"]) == true) { FaksimileUnterschrift = true; }
}
catch { }
dokumentpaket = db.dsdaten.Tables[0].Copy();
db.clear_parameter();
@@ -265,6 +277,7 @@ namespace OnDoc.DocMgmt
{
if (txtbpnummer.Text != "") { extdoc.partnernr = Convert.ToInt32(txtbpnummer.Text); }
}
extdoc.Refresh_Details(db.dsdaten.Tables[0].Rows[0][0].ToString(), db.dsdaten.Tables[0].Rows[0][1].ToString());
TabPageAdv tabPage1 = new TabPageAdv(r[3].ToString());
tabPage1.Controls.Add(extdoc);
@@ -286,9 +299,25 @@ namespace OnDoc.DocMgmt
{
if (txtbpnummer.Text != "") { newdoc.partnernr = Convert.ToInt32(txtbpnummer.Text); }
}
try
{
if (VerantwortungKube)
{
newdoc.set_kubezustaendigkeit();
}
}
catch { }
newdoc.Refresh_Details();
try
{
if (FaksimileUnterschrift)
{
newdoc.set_faksimielUnterschrift();
}
}
catch { }
TabPageAdv tabPage = new TabPageAdv(r[3].ToString());
tabPage.Controls.Add(newdoc);
+11 -1
View File
@@ -93,14 +93,20 @@ namespace OnDoc.Klassen
public static void init()
{
string localdrive = Properties.Settings.Default.Lokaldrive;
string startuppath = AppDomain.CurrentDomain.BaseDirectory;
connectionstring = System.IO.File.ReadAllText(startuppath + @"\ondocconn.cfg");
connectionstring = StringCipher.Decrypt(connectionstring, "i%!k!7pab%bNLdA5hE4pkR4XaB%E^jB3d9tHuQ4pbF&BZjF7SB#WBWit5#HrbJiLrLVm");
logconnectionstring = System.IO.File.ReadAllText(startuppath + @"\logconn.cfg");
logconnectionstring = StringCipher.Decrypt(logconnectionstring, "i%!k!7pab%bNLdA5hE4pkR4XaB%E^jB3d9tHuQ4pbF&BZjF7SB#WBWit5#HrbJiLrLVm");
//string startuppath = Application.StartupPath;
DB db = new DB(connectionstring);
db.Get_Tabledata("Select * from ondoc_appParams where usedbparams=1", false, true);
if (startuppath.Substring(0, 2) == localdrive)
{
db.Get_Tabledata("Select * from ondoc_appParams_Lokal where version = 'lokal'", false, true);
}
//MachinName = System.Environment.MachineName;
//O365=false;
//try
@@ -150,6 +156,10 @@ namespace OnDoc.Klassen
else
{
db.Get_Tabledata("Select * from applikation where applikationsnr = 1", false, true);
if (startuppath.Substring(0, 2) == localdrive)
{
db.Get_Tabledata("Select * from applikation where applikatioinsnr=2", false, true);
}
tempdir = db.dsdaten.Tables[0].Rows[0]["pfad_temporaer_dokumente"].ToString();
StaticValues.UserID = "Stefan Hutter";
+3 -3
View File
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Thurgauer Kantonalbank")]
[assembly: AssemblyProduct("OnDoc")]
[assembly: AssemblyCopyright("Thurgauer Kantonalbank 2025")]
[assembly: AssemblyCopyright("Thurgauer Kantonalbank 2026")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
// indem Sie "*" wie unten gezeigt eingeben:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.8.0.01")]
[assembly: AssemblyFileVersion("1.8.0.01")]
[assembly: AssemblyVersion("1.8.1.0")]
[assembly: AssemblyFileVersion("1.8.1.0")]
+13 -1
View File
@@ -194,7 +194,7 @@ namespace OnDoc.Properties {
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("60000")]
[global::System.Configuration.DefaultSettingValueAttribute("5000")]
public string OfficeWatchTimerIntervall {
get {
return ((string)(this["OfficeWatchTimerIntervall"]));
@@ -228,5 +228,17 @@ namespace OnDoc.Properties {
this["GASSize"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("E:")]
public string Lokaldrive {
get {
return ((string)(this["Lokaldrive"]));
}
set {
this["Lokaldrive"] = value;
}
}
}
}
+4 -1
View File
@@ -45,7 +45,7 @@
<Value Profile="(Default)">E:\Software-Projekte\OnDoc\TKB-Vorlagen\</Value>
</Setting>
<Setting Name="OfficeWatchTimerIntervall" Type="System.String" Scope="User">
<Value Profile="(Default)">60000</Value>
<Value Profile="(Default)">5000</Value>
</Setting>
<Setting Name="PrinterSettings" Type="System.String" Scope="User">
<Value Profile="(Default)">E:\Software-Projekte\TKBDiverse\TKBOfficeLib\PluginStart\bin\Debug\pluginstart.exe</Value>
@@ -53,5 +53,8 @@
<Setting Name="GASSize" Type="System.String" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
<Setting Name="Lokaldrive" Type="System.String" Scope="User">
<Value Profile="(Default)">E:</Value>
</Setting>
</Settings>
</SettingsFile>
@@ -1287,5 +1287,15 @@ namespace OnDoc.UIControls
lblautomaarchivierung1.Visible = ChkTagesEndArchivierung.Visible;
lblautomarchivierung2.Visible = ChkTagesEndArchivierung.Visible;
}
public void set_kubezustaendigkeit()
{
this.rbzustaendigkube.Checked = true;
}
public void set_faksimielUnterschrift()
{
if (cbfaksimile.Visible) { this.cbfaksimile.Checked = true; };
}
}
}
+66 -66
View File
@@ -30,15 +30,15 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Versandstrasse));
Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings7 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings();
Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings7 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings();
Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings7 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings();
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo2 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings5 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings();
Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings5 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings();
Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings5 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings();
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo3 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings8 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings();
Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings8 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings();
Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings8 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings();
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo4 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings6 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings();
Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings6 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings();
Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings6 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings();
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo1 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.löschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.externesPDFHinzufügenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -242,17 +242,17 @@
this.pdfViewerControl1.IsTextSearchEnabled = false;
this.pdfViewerControl1.IsTextSelectionEnabled = false;
this.pdfViewerControl1.Location = new System.Drawing.Point(908, 54);
messageBoxSettings7.EnableNotification = true;
this.pdfViewerControl1.MessageBoxSettings = messageBoxSettings7;
messageBoxSettings5.EnableNotification = true;
this.pdfViewerControl1.MessageBoxSettings = messageBoxSettings5;
this.pdfViewerControl1.MinimumZoomPercentage = 50;
this.pdfViewerControl1.Name = "pdfViewerControl1";
this.pdfViewerControl1.PageBorderThickness = 1;
pdfViewerPrinterSettings7.Copies = 1;
pdfViewerPrinterSettings7.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto;
pdfViewerPrinterSettings7.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize;
pdfViewerPrinterSettings7.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings7.PrintLocation")));
pdfViewerPrinterSettings7.ShowPrintStatusDialog = true;
this.pdfViewerControl1.PrinterSettings = pdfViewerPrinterSettings7;
pdfViewerPrinterSettings5.Copies = 1;
pdfViewerPrinterSettings5.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto;
pdfViewerPrinterSettings5.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize;
pdfViewerPrinterSettings5.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings5.PrintLocation")));
pdfViewerPrinterSettings5.ShowPrintStatusDialog = true;
this.pdfViewerControl1.PrinterSettings = pdfViewerPrinterSettings5;
this.pdfViewerControl1.ReferencePath = null;
this.pdfViewerControl1.ScrollDisplacementValue = 0;
this.pdfViewerControl1.ShowHorizontalScrollBar = true;
@@ -262,10 +262,10 @@
this.pdfViewerControl1.SpaceBetweenPages = 8;
this.pdfViewerControl1.TabIndex = 10;
this.pdfViewerControl1.Text = "pdfViewerControl1";
textSearchSettings7.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64)))));
textSearchSettings7.HighlightAllInstance = true;
textSearchSettings7.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0)))));
this.pdfViewerControl1.TextSearchSettings = textSearchSettings7;
textSearchSettings5.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64)))));
textSearchSettings5.HighlightAllInstance = true;
textSearchSettings5.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0)))));
this.pdfViewerControl1.TextSearchSettings = textSearchSettings5;
this.pdfViewerControl1.ThemeName = "Default";
this.pdfViewerControl1.VerticalScrollOffset = 0;
this.pdfViewerControl1.VisualStyle = Syncfusion.Windows.Forms.PdfViewer.VisualStyle.Default;
@@ -309,7 +309,7 @@
this.groupBox3.Controls.Add(this.treeViewAdvAdresse);
this.groupBox3.Controls.Add(this.chkGAS);
this.groupBox3.Dock = System.Windows.Forms.DockStyle.Top;
this.groupBox3.Location = new System.Drawing.Point(3, 77);
this.groupBox3.Location = new System.Drawing.Point(3, 86);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(440, 254);
this.groupBox3.TabIndex = 2;
@@ -379,15 +379,15 @@
// treeViewAdvAdresse
//
this.treeViewAdvAdresse.BackgroundColor = new Syncfusion.Drawing.BrushInfo(System.Drawing.SystemColors.Window);
treeNodeAdvStyleInfo2.CheckBoxTickThickness = 1;
treeNodeAdvStyleInfo2.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo2.EnsureDefaultOptionedChild = true;
treeNodeAdvStyleInfo2.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo2.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo2.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdvStyleInfo2.TextColor = System.Drawing.Color.Black;
treeNodeAdvStyleInfo3.CheckBoxTickThickness = 1;
treeNodeAdvStyleInfo3.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo3.EnsureDefaultOptionedChild = true;
treeNodeAdvStyleInfo3.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo3.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo3.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdvStyleInfo3.TextColor = System.Drawing.Color.Black;
this.treeViewAdvAdresse.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] {
new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo2)});
new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo3)});
//
//
//
@@ -716,7 +716,7 @@
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top;
this.groupBox1.Location = new System.Drawing.Point(3, 16);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(440, 61);
this.groupBox1.Size = new System.Drawing.Size(440, 70);
this.groupBox1.TabIndex = 0;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Versandart";
@@ -724,7 +724,7 @@
// rbeinschreiben
//
this.rbeinschreiben.AutoSize = true;
this.rbeinschreiben.Location = new System.Drawing.Point(198, 21);
this.rbeinschreiben.Location = new System.Drawing.Point(170, 44);
this.rbeinschreiben.Name = "rbeinschreiben";
this.rbeinschreiben.Size = new System.Drawing.Size(148, 17);
this.rbeinschreiben.TabIndex = 6;
@@ -736,12 +736,12 @@
//
this.rbb1post.AutoSize = true;
this.rbb1post.Checked = true;
this.rbb1post.Location = new System.Drawing.Point(74, 21);
this.rbb1post.Location = new System.Drawing.Point(5, 44);
this.rbb1post.Name = "rbb1post";
this.rbb1post.Size = new System.Drawing.Size(62, 17);
this.rbb1post.Size = new System.Drawing.Size(143, 17);
this.rbb1post.TabIndex = 5;
this.rbb1post.TabStop = true;
this.rbb1post.Text = "B1-Post";
this.rbb1post.Text = "B1-Post (bis 3 Werktage)";
this.rbb1post.UseVisualStyleBackColor = true;
this.rbb1post.CheckedChanged += new System.EventHandler(this.rbapost_CheckedChanged);
//
@@ -750,9 +750,9 @@
this.rbb2post.AutoSize = true;
this.rbb2post.Location = new System.Drawing.Point(6, 21);
this.rbb2post.Name = "rbb2post";
this.rbb2post.Size = new System.Drawing.Size(62, 17);
this.rbb2post.Size = new System.Drawing.Size(146, 17);
this.rbb2post.TabIndex = 4;
this.rbb2post.Text = "B2-Post";
this.rbb2post.Text = "B2-Post (bis 6 Werktage) ";
this.rbb2post.UseVisualStyleBackColor = true;
this.rbb2post.CheckedChanged += new System.EventHandler(this.rbapost_CheckedChanged);
//
@@ -770,7 +770,7 @@
// rbapost
//
this.rbapost.AutoSize = true;
this.rbapost.Location = new System.Drawing.Point(142, 21);
this.rbapost.Location = new System.Drawing.Point(170, 21);
this.rbapost.Name = "rbapost";
this.rbapost.Size = new System.Drawing.Size(56, 17);
this.rbapost.TabIndex = 3;
@@ -816,16 +816,16 @@
this.treeViewAdv1.AllowDrop = true;
this.treeViewAdv1.BackColor = System.Drawing.Color.White;
this.treeViewAdv1.BackgroundColor = new Syncfusion.Drawing.BrushInfo(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))));
treeNodeAdvStyleInfo3.CheckBoxTickThickness = 1;
treeNodeAdvStyleInfo3.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo3.EnsureDefaultOptionedChild = true;
treeNodeAdvStyleInfo3.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
treeNodeAdvStyleInfo3.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo3.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo3.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdvStyleInfo3.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43)))));
treeNodeAdvStyleInfo4.CheckBoxTickThickness = 1;
treeNodeAdvStyleInfo4.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo4.EnsureDefaultOptionedChild = true;
treeNodeAdvStyleInfo4.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
treeNodeAdvStyleInfo4.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo4.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo4.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdvStyleInfo4.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43)))));
this.treeViewAdv1.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] {
new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo3)});
new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo4)});
this.treeViewAdv1.Border3DStyle = System.Windows.Forms.Border3DStyle.Flat;
this.treeViewAdv1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.treeViewAdv1.ContextMenuStrip = this.contextMenuStrip1;
@@ -899,17 +899,17 @@
this.pdfViewerControl2.IsTextSearchEnabled = true;
this.pdfViewerControl2.IsTextSelectionEnabled = true;
this.pdfViewerControl2.Location = new System.Drawing.Point(482, 0);
messageBoxSettings8.EnableNotification = true;
this.pdfViewerControl2.MessageBoxSettings = messageBoxSettings8;
messageBoxSettings6.EnableNotification = true;
this.pdfViewerControl2.MessageBoxSettings = messageBoxSettings6;
this.pdfViewerControl2.MinimumZoomPercentage = 50;
this.pdfViewerControl2.Name = "pdfViewerControl2";
this.pdfViewerControl2.PageBorderThickness = 1;
pdfViewerPrinterSettings8.Copies = 1;
pdfViewerPrinterSettings8.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto;
pdfViewerPrinterSettings8.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize;
pdfViewerPrinterSettings8.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings8.PrintLocation")));
pdfViewerPrinterSettings8.ShowPrintStatusDialog = true;
this.pdfViewerControl2.PrinterSettings = pdfViewerPrinterSettings8;
pdfViewerPrinterSettings6.Copies = 1;
pdfViewerPrinterSettings6.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto;
pdfViewerPrinterSettings6.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize;
pdfViewerPrinterSettings6.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings6.PrintLocation")));
pdfViewerPrinterSettings6.ShowPrintStatusDialog = true;
this.pdfViewerControl2.PrinterSettings = pdfViewerPrinterSettings6;
this.pdfViewerControl2.ReferencePath = null;
this.pdfViewerControl2.ScrollDisplacementValue = 0;
this.pdfViewerControl2.ShowHorizontalScrollBar = true;
@@ -919,10 +919,10 @@
this.pdfViewerControl2.SpaceBetweenPages = 8;
this.pdfViewerControl2.TabIndex = 11;
this.pdfViewerControl2.Text = "pdfViewerControl2";
textSearchSettings8.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64)))));
textSearchSettings8.HighlightAllInstance = true;
textSearchSettings8.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0)))));
this.pdfViewerControl2.TextSearchSettings = textSearchSettings8;
textSearchSettings6.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64)))));
textSearchSettings6.HighlightAllInstance = true;
textSearchSettings6.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0)))));
this.pdfViewerControl2.TextSearchSettings = textSearchSettings6;
this.pdfViewerControl2.ThemeName = "Default";
this.pdfViewerControl2.VerticalScrollOffset = 0;
this.pdfViewerControl2.VisualStyle = Syncfusion.Windows.Forms.PdfViewer.VisualStyle.Default;
@@ -1046,16 +1046,16 @@
this.treeViewAdvCouverts.AllowMouseBasedSelection = true;
this.treeViewAdvCouverts.BackColor = System.Drawing.Color.White;
this.treeViewAdvCouverts.BackgroundColor = new Syncfusion.Drawing.BrushInfo(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))));
treeNodeAdvStyleInfo4.CheckBoxTickThickness = 1;
treeNodeAdvStyleInfo4.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo4.EnsureDefaultOptionedChild = true;
treeNodeAdvStyleInfo4.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
treeNodeAdvStyleInfo4.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo4.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo4.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdvStyleInfo4.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43)))));
treeNodeAdvStyleInfo1.CheckBoxTickThickness = 1;
treeNodeAdvStyleInfo1.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo1.EnsureDefaultOptionedChild = true;
treeNodeAdvStyleInfo1.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
treeNodeAdvStyleInfo1.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo1.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
treeNodeAdvStyleInfo1.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
treeNodeAdvStyleInfo1.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(43)))), ((int)(((byte)(43)))), ((int)(((byte)(43)))));
this.treeViewAdvCouverts.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] {
new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo4)});
new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)});
this.treeViewAdvCouverts.Border3DStyle = System.Windows.Forms.Border3DStyle.Flat;
this.treeViewAdvCouverts.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.treeViewAdvCouverts.ContextMenuStrip = this.contextMenuStrip2;
+28
View File
@@ -640,9 +640,11 @@ namespace OnDoc.Versandstrasse
switch (dropPosition)
{
case TreeViewDropPositions.AboveNode:
if (sourceNode.Parent != destinationNode.Parent) { movenode(sourceNode, destinationNode.Parent); }
sourceNode.Move(destinationNode, NodePositions.Previous);
break;
case TreeViewDropPositions.BelowNode:
if (sourceNode.Parent != destinationNode.Parent) { movenode(sourceNode, destinationNode.Parent); }
sourceNode.Move(destinationNode, NodePositions.Next);
break;
case TreeViewDropPositions.OnNode:
@@ -678,6 +680,32 @@ namespace OnDoc.Versandstrasse
}
private void movenode(TreeNodeAdv sourceNode, TreeNodeAdv destinationNode)
{
Versandpaket sourcepaket = sourceNode.Parent.TagObject as Versandpaket;
TreeNodeAdv savenode = sourceNode.Parent;
sourceNode.Move(destinationNode.Nodes);
//Versanddokument dem neuen Versandpaket zuordnen
Versandpaket paket = destinationNode.TagObject as Versandpaket;
Versanddokument vd = sourceNode.TagObject as Versanddokument;
paket.Dokument.Add(vd);
destinationNode.TagObject = paket;
foreach (Versanddokument vd1 in sourcepaket.Dokument)
{
if (vd1.DokumentID == vd.DokumentID)
{
sourcepaket.Dokument.Remove(vd1);
break;
}
}
savenode.TagObject = sourcepaket;
destinationNode.Expand();
}
private void treeViewAdv1_DragLeave(object sender, EventArgs e)
{
this.treeViewDragHighlightTracker.ClearHighlightNode();
+5 -5
View File
@@ -128,7 +128,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD0
DAAAAk1TRnQBSQFMAgEBBgEAAYgBAQGIAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
DAAAAk1TRnQBSQFMAgEBBgEAAZABAQGQAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -194,7 +194,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAU
DAAAAk1TRnQBSQFMAgEBBQEAAZABAQGQAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
DAAAAk1TRnQBSQFMAgEBBQEAAZgBAQGYAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -248,7 +248,7 @@
AYABAQIAAeABBwHAAQMBwAEDAgAB8AEPAfABDwHwAQ8BgAEBCw==
</value>
</data>
<data name="pdfViewerPrinterSettings7.PrintLocation" mimetype="application/x-microsoft.net.object.binary.base64">
<data name="pdfViewerPrinterSettings5.PrintLocation" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0
dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABVTeXN0ZW0uRHJh
@@ -337,7 +337,7 @@
/wM19F1wo1uqCAAAAABJRU5ErkJggg==
</value>
</data>
<data name="pdfViewerPrinterSettings8.PrintLocation" mimetype="application/x-microsoft.net.object.binary.base64">
<data name="pdfViewerPrinterSettings6.PrintLocation" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0
dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABVTeXN0ZW0uRHJh
@@ -355,7 +355,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAq
CQAAAk1TRnQBSQFMAgEBAwEAAVABAQFQAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CQAAAk1TRnQBSQFMAgEBAwEAAVgBAQFYAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+4 -1
View File
@@ -53,7 +53,7 @@
<value>E:\Software-Projekte\OnDoc\TKB-Vorlagen\</value>
</setting>
<setting name="OfficeWatchTimerIntervall" serializeAs="String">
<value>60000</value>
<value>5000</value>
</setting>
<setting name="PrinterSettings" serializeAs="String">
<value>E:\Software-Projekte\TKBDiverse\TKBOfficeLib\PluginStart\bin\Debug\pluginstart.exe</value>
@@ -61,6 +61,9 @@
<setting name="GASSize" serializeAs="String">
<value>True</value>
</setting>
<setting name="Lokaldrive" serializeAs="String">
<value>E:</value>
</setting>
</OnDoc.Properties.Settings>
</userSettings>
<runtime>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+34 -8
View File
@@ -41,6 +41,7 @@
},
"frameworks": {
"net48": {
"framework": "net48",
"projectReferences": {
"E:\\Software-Projekte\\OnDoc\\OnDoc\\Database\\Database.csproj": {
"projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\Database\\Database.csproj"
@@ -74,6 +75,7 @@
},
"frameworks": {
"net48": {
"framework": "net48",
"dependencies": {
"Microsoft.Office.Interop.Excel": {
"target": "Package",
@@ -129,6 +131,7 @@
"UsingMicrosoftNETSdk": false,
"frameworks": {
"net48": {
"framework": "net48",
"projectReferences": {
"E:\\Software-Projekte\\OnDoc\\OnDoc\\Helper\\Helper.csproj": {
"projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\Helper\\Helper.csproj"
@@ -141,7 +144,9 @@
}
},
"frameworks": {
"net48": {}
"net48": {
"framework": "net48"
}
}
},
"E:\\Software-Projekte\\OnDoc\\OnDoc\\DOCGEN\\DocGen.csproj": {
@@ -152,6 +157,7 @@
"UsingMicrosoftNETSdk": false,
"frameworks": {
"net48": {
"framework": "net48",
"projectReferences": {
"E:\\Software-Projekte\\OnDoc\\OnDoc\\Database\\Database.csproj": {
"projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\Database\\Database.csproj"
@@ -170,7 +176,9 @@
}
},
"frameworks": {
"net48": {}
"net48": {
"framework": "net48"
}
}
},
"E:\\Software-Projekte\\OnDoc\\OnDoc\\Helper\\Helper.csproj": {
@@ -181,12 +189,15 @@
"UsingMicrosoftNETSdk": false,
"frameworks": {
"net48": {
"framework": "net48",
"projectReferences": {}
}
}
},
"frameworks": {
"net48": {}
"net48": {
"framework": "net48"
}
}
},
"E:\\Software-Projekte\\OnDoc\\OnDoc\\Logging\\Logging.csproj": {
@@ -197,12 +208,15 @@
"UsingMicrosoftNETSdk": false,
"frameworks": {
"net48": {
"framework": "net48",
"projectReferences": {}
}
}
},
"frameworks": {
"net48": {}
"net48": {
"framework": "net48"
}
}
},
"E:\\Software-Projekte\\OnDoc\\OnDoc\\Model\\Model.csproj": {
@@ -213,12 +227,15 @@
"UsingMicrosoftNETSdk": false,
"frameworks": {
"net48": {
"framework": "net48",
"projectReferences": {}
}
}
},
"frameworks": {
"net48": {}
"net48": {
"framework": "net48"
}
}
},
"E:\\Software-Projekte\\OnDoc\\OnDoc\\OfficePrinter\\OfficePrinter.csproj": {
@@ -229,12 +246,15 @@
"UsingMicrosoftNETSdk": false,
"frameworks": {
"net48": {
"framework": "net48",
"projectReferences": {}
}
}
},
"frameworks": {
"net48": {}
"net48": {
"framework": "net48"
}
}
},
"E:\\Software-Projekte\\OnDoc\\OnDoc\\OnDocOffice\\OnDocOffice.csproj": {
@@ -245,6 +265,7 @@
"UsingMicrosoftNETSdk": false,
"frameworks": {
"net48": {
"framework": "net48",
"projectReferences": {
"E:\\Software-Projekte\\OnDoc\\OnDoc\\Helper\\Helper.csproj": {
"projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\Helper\\Helper.csproj"
@@ -260,7 +281,9 @@
}
},
"frameworks": {
"net48": {}
"net48": {
"framework": "net48"
}
}
},
"E:\\Software-Projekte\\OnDoc\\OnDoc\\VBFileManagement\\VBFileManagement.vbproj": {
@@ -271,12 +294,15 @@
"UsingMicrosoftNETSdk": false,
"frameworks": {
"net48": {
"framework": "net48",
"projectReferences": {}
}
}
},
"frameworks": {
"net48": {}
"net48": {
"framework": "net48"
}
}
}
}
Binary file not shown.
+4 -1
View File
@@ -53,7 +53,7 @@
<value>E:\Software-Projekte\OnDoc\TKB-Vorlagen\</value>
</setting>
<setting name="OfficeWatchTimerIntervall" serializeAs="String">
<value>60000</value>
<value>5000</value>
</setting>
<setting name="PrinterSettings" serializeAs="String">
<value>E:\Software-Projekte\TKBDiverse\TKBOfficeLib\PluginStart\bin\Debug\pluginstart.exe</value>
@@ -61,6 +61,9 @@
<setting name="GASSize" serializeAs="String">
<value>True</value>
</setting>
<setting name="Lokaldrive" serializeAs="String">
<value>E:</value>
</setting>
</OnDoc.Properties.Settings>
</userSettings>
<runtime>
Binary file not shown.
Binary file not shown.
+1 -1
View File
@@ -1,6 +1,6 @@
{
"version": 2,
"dgSpecHash": "DeB7oF4pu5M=",
"dgSpecHash": "vAxdVDk6QzI=",
"success": true,
"projectFilePath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\Client\\Client.csproj",
"expectedPackageFiles": [