From da72cc1e5a9206e37506f4b0ba1419df9fd84415 Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Tue, 27 Sep 2016 14:19:08 +0200 Subject: [PATCH] MS3 --- app/DD-Record-Organiser/ClassInit.vb | 10 + app/DD-Record-Organiser/ModuleMySettings.vb | 2 + .../frmConstructor_Main.vb | 4 +- .../frmRecOrgConfig_Basic.Designer.vb | 33 +- .../frmRecOrgConfig_Basic.en-US.resx | 12 +- .../frmRecOrgConfig_Basic.resx | 1038 +++++++++-------- .../frmRecOrgConfig_Basic.vb | 35 +- 7 files changed, 614 insertions(+), 520 deletions(-) diff --git a/app/DD-Record-Organiser/ClassInit.vb b/app/DD-Record-Organiser/ClassInit.vb index ffc503a..531d4e9 100644 --- a/app/DD-Record-Organiser/ClassInit.vb +++ b/app/DD-Record-Organiser/ClassInit.vb @@ -85,6 +85,16 @@ Public Class ClassInit If configResult = False Then Throw New Exception("Find more information in the logfile.") End If + Dim sql = String.Format("SELECT * FROM TBPMO_KONFIGURATION WHERE GUID = 1") + Dim KONFIG_DT As DataTable = ClassDatabase.Return_Datatable(sql) + If KONFIG_DT.Rows.Count = 1 Then + Try + MY_WIKISTRING = KONFIG_DT.Rows(0).Item("WIKI_STRING") + Catch ex As Exception + MY_WIKISTRING = "" + End Try + WD_UNICODE = KONFIG_DT.Rows(0).Item("WD_UNICODE") + End If Catch ex As Exception MsgBox("Unexpected Error in InitBasics2:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try diff --git a/app/DD-Record-Organiser/ModuleMySettings.vb b/app/DD-Record-Organiser/ModuleMySettings.vb index 62c1913..e7b8435 100644 --- a/app/DD-Record-Organiser/ModuleMySettings.vb +++ b/app/DD-Record-Organiser/ModuleMySettings.vb @@ -14,6 +14,8 @@ Module ModuleMySettings Public Sett_ShowQuickMenue As Boolean = True Public Sett_ConstructorStart As Integer Public MY_ADDON_PATH As String + Public MY_WIKISTRING As String + Public WD_UNICODE As Boolean = False Public WD_ShowEnitityDocs As Boolean = True Public WD_ShowDocs As Boolean = False diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb index cf26fbd..9309d07 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.vb @@ -3643,8 +3643,8 @@ Public Class frmConstructor_Main Dim temppath = Path.GetTempPath Dim EncodingFormat As Encoding - Dim WDUnicode = ClassDatabase.Execute_Scalar("SELECT WD_UNICODE FROM TBPMO_KONFIGURATION WHERE GUID = 1") - If WDUnicode = True Then + + If WD_UNICODE = True Then EncodingFormat = Encoding.GetEncoding(1252) '1252 If LogErrorsOnly = False Then ClassLogger.Add(" >> Unicode is used (Encoding.GetEncoding(1252))", False) Else diff --git a/app/DD-Record-Organiser/frmRecOrgConfig_Basic.Designer.vb b/app/DD-Record-Organiser/frmRecOrgConfig_Basic.Designer.vb index 556359e..6d4f593 100644 --- a/app/DD-Record-Organiser/frmRecOrgConfig_Basic.Designer.vb +++ b/app/DD-Record-Organiser/frmRecOrgConfig_Basic.Designer.vb @@ -31,6 +31,8 @@ Partial Class frmRecOrgConfig_Basic Me.txtwddriveletter = New System.Windows.Forms.TextBox() Me.GroupBox1 = New System.Windows.Forms.GroupBox() Me.GroupBox2 = New System.Windows.Forms.GroupBox() + Me.txtWiki = New System.Windows.Forms.TextBox() + Me.Label9 = New System.Windows.Forms.Label() Me.chkUnicode = New System.Windows.Forms.CheckBox() Me.lblSaveresult = New System.Windows.Forms.Label() Me.GroupBox3 = New System.Windows.Forms.GroupBox() @@ -93,23 +95,35 @@ Partial Class frmRecOrgConfig_Basic ' 'GroupBox1 ' - resources.ApplyResources(Me.GroupBox1, "GroupBox1") Me.GroupBox1.Controls.Add(Me.Label1) Me.GroupBox1.Controls.Add(Me.Label3) Me.GroupBox1.Controls.Add(Me.txtDelimiterFile) Me.GroupBox1.Controls.Add(Me.txtDelimiterVersion) + resources.ApplyResources(Me.GroupBox1, "GroupBox1") Me.GroupBox1.Name = "GroupBox1" Me.GroupBox1.TabStop = False ' 'GroupBox2 ' - resources.ApplyResources(Me.GroupBox2, "GroupBox2") + Me.GroupBox2.Controls.Add(Me.txtWiki) + Me.GroupBox2.Controls.Add(Me.Label9) Me.GroupBox2.Controls.Add(Me.chkUnicode) Me.GroupBox2.Controls.Add(Me.Label2) Me.GroupBox2.Controls.Add(Me.txtwddriveletter) + resources.ApplyResources(Me.GroupBox2, "GroupBox2") Me.GroupBox2.Name = "GroupBox2" Me.GroupBox2.TabStop = False ' + 'txtWiki + ' + resources.ApplyResources(Me.txtWiki, "txtWiki") + Me.txtWiki.Name = "txtWiki" + ' + 'Label9 + ' + resources.ApplyResources(Me.Label9, "Label9") + Me.Label9.Name = "Label9" + ' 'chkUnicode ' resources.ApplyResources(Me.chkUnicode, "chkUnicode") @@ -124,10 +138,10 @@ Partial Class frmRecOrgConfig_Basic ' 'GroupBox3 ' - resources.ApplyResources(Me.GroupBox3, "GroupBox3") Me.GroupBox3.Controls.Add(Me.btnResetBackground) Me.GroupBox3.Controls.Add(Me.btnSelectBackground) Me.GroupBox3.Controls.Add(Me.pbBackground) + resources.ApplyResources(Me.GroupBox3, "GroupBox3") Me.GroupBox3.Name = "GroupBox3" Me.GroupBox3.TabStop = False ' @@ -152,12 +166,11 @@ Partial Class frmRecOrgConfig_Basic 'OpenFileDialog1 ' Me.OpenFileDialog1.FileName = "OpenFileDialog1" - resources.ApplyResources(Me.OpenFileDialog1, "OpenFileDialog1") ' 'GroupBox4 ' - resources.ApplyResources(Me.GroupBox4, "GroupBox4") Me.GroupBox4.Controls.Add(Me.txtProductName) + resources.ApplyResources(Me.GroupBox4, "GroupBox4") Me.GroupBox4.Name = "GroupBox4" Me.GroupBox4.TabStop = False ' @@ -184,7 +197,6 @@ Partial Class frmRecOrgConfig_Basic ' 'GroupBox5 ' - resources.ApplyResources(Me.GroupBox5, "GroupBox5") Me.GroupBox5.Controls.Add(Me.btnTest_Anmeldung) Me.GroupBox5.Controls.Add(Me.txtServername) Me.GroupBox5.Controls.Add(Me.Label5) @@ -195,14 +207,15 @@ Partial Class frmRecOrgConfig_Basic Me.GroupBox5.Controls.Add(Me.txtDomäne) Me.GroupBox5.Controls.Add(Me.Label7) Me.GroupBox5.Controls.Add(Me.Label8) + resources.ApplyResources(Me.GroupBox5, "GroupBox5") Me.GroupBox5.Name = "GroupBox5" Me.GroupBox5.TabStop = False ' 'btnTest_Anmeldung ' - resources.ApplyResources(Me.btnTest_Anmeldung, "btnTest_Anmeldung") Me.btnTest_Anmeldung.BackColor = System.Drawing.SystemColors.Control Me.btnTest_Anmeldung.Image = Global.DD_Record_Organiser.My.Resources.Resources.database_connect + resources.ApplyResources(Me.btnTest_Anmeldung, "btnTest_Anmeldung") Me.btnTest_Anmeldung.Name = "btnTest_Anmeldung" Me.btnTest_Anmeldung.UseVisualStyleBackColor = False ' @@ -252,7 +265,7 @@ Partial Class frmRecOrgConfig_Basic resources.ApplyResources(Me.Label8, "Label8") Me.Label8.Name = "Label8" ' - 'frmConfiguration_Basic + 'frmRecOrgConfig_Basic ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font @@ -266,7 +279,7 @@ Partial Class frmRecOrgConfig_Basic Me.Controls.Add(Me.GroupBox1) Me.MaximizeBox = False Me.MinimizeBox = False - Me.Name = "frmConfiguration_Basic" + Me.Name = "frmRecOrgConfig_Basic" Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.PerformLayout() Me.GroupBox2.ResumeLayout(False) @@ -311,4 +324,6 @@ Partial Class frmRecOrgConfig_Basic Friend WithEvents txtDomäne As System.Windows.Forms.TextBox Friend WithEvents Label7 As System.Windows.Forms.Label Friend WithEvents Label8 As System.Windows.Forms.Label + Friend WithEvents txtWiki As System.Windows.Forms.TextBox + Friend WithEvents Label9 As System.Windows.Forms.Label End Class diff --git a/app/DD-Record-Organiser/frmRecOrgConfig_Basic.en-US.resx b/app/DD-Record-Organiser/frmRecOrgConfig_Basic.en-US.resx index f649f36..7c089f1 100644 --- a/app/DD-Record-Organiser/frmRecOrgConfig_Basic.en-US.resx +++ b/app/DD-Record-Organiser/frmRecOrgConfig_Basic.en-US.resx @@ -149,12 +149,12 @@ General Settings: - - Global windream-Settings - NoControl + + Global windream-Settings + NoControl @@ -164,9 +164,6 @@ Changes saved successfully! - - Application background - NoControl @@ -182,6 +179,9 @@ NoControl + + Application background + Application name diff --git a/app/DD-Record-Organiser/frmRecOrgConfig_Basic.resx b/app/DD-Record-Organiser/frmRecOrgConfig_Basic.resx index ed837d3..a8841a7 100644 --- a/app/DD-Record-Organiser/frmRecOrgConfig_Basic.resx +++ b/app/DD-Record-Organiser/frmRecOrgConfig_Basic.resx @@ -117,776 +117,824 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 5 + + + True - - 19, 56 - - - 151, 23 + + 15, 18 - - txtwddriveletter + + 235, 13 - + 0 - - - 2 - - - txtDelimiterVersion - - - 82 - - - txtProductName - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Trennzeichen für Versionierung der Dateien: - - 7 + + Label1 - - $this + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 81 + + GroupBox1 - + 0 - - Speichern + + True - - 2 + + 6, 18 - - txtServername + + 167, 13 - - btnsave + + 1 - - 218, 74 + + Laufwerkbuchstabe Windream: - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Label2 - - 224, 12 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + GroupBox2 - - 49, 22 + + 3 - + True - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 15, 59 - - 7 + + 261, 13 - - True + + 2 - - 329, 56 + + Trennzeichen zur Nutzung in Namenskonvention: - - GroupBox5 + + Label3 - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - txtPW + + GroupBox1 - - 2 + + 1 - - 984, 384 + + 18, 34 - - chkUnicode + + 49, 22 - - Trennzeichen zur Nutzung in Namenskonvention: + + 4 - - 40 + + txtDelimiterVersion - - 117, 17 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Server-Name:* + + GroupBox1 - - 15, 18 + + 3 - - Grundeinstellungen Record Organizer + + 18, 75 - - 330, 22 + + 49, 22 - - 0 + + 5 - - True + + txtDelimiterFile - - 1 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1 + + GroupBox1 - - 4 + + 2 - - True + + 9, 34 - + + 49, 22 + + + 7 + + + txtwddriveletter + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Top, Right + + GroupBox2 - - $this + + 4 - - Label1 + + 266, 74 + + + 287, 105 8 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Anwendungsname + + Allgemeine Funktionen: - - GroupBox3 + + GroupBox1 - - 5 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 9 + + $this - - 6, 13 + + 7 - - 6, 274 + + 9, 98 - - Allgemeine Funktionen: + + 185, 22 - - Definieren sie hier die Anmeldedaten des windream-Hauptbenutzers. + + 10 - - System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + txtWiki - - True + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + GroupBox2 - - 12, 135 + + 0 - + True - + + NoControl - - 692, 358 + + 6, 82 - - Label4 + + 80, 13 - - Label7 + + 9 - - 16, 85 + + WIKI Network: - - Userautentifizierung windream Rechte: + + Label9 - - 44 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 194, 30 + + GroupBox2 - - GroupBox3 + + 1 - - 6 + + True - - $this + + 9, 62 - - 200, 105 + + 117, 17 - - GroupBox2 + + 8 - - 83 + + Unicode-Version? - - True + + chkUnicode - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 19, 101 + + GroupBox2 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 2 - - GroupBox1 + + 12, 12 - - Design-Panels als Child aufrufen -(Eingebettet in Hauptformular) + + 200, 131 - - txtDelimiterFile + + 9 - - Label5 + + Globale windream-Einstellungen - - 8 + + GroupBox2 - - 564, 12 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 167, 13 + + $this - - CenterImage + + 6 - - 0 + + Top, Right - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True - - Label3 + + Segoe UI, 9.75pt, style=Bold - - 0 + + 692, 358 - - 839, 333 + + 234, 17 - - GroupBox3 + + 78 - - GroupBox2 + + Änderungen erfolgreich gespeichert! - - 238, 22 + + False - - 1 + + lblSaveresult - - 0 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - - 78 + + 4 - - 80 + + 211, 274 - - 2 + + 151, 23 - - GroupBox5 + + 82 - - 6, 21 + + Hintergrund zurücksetzen - - btnTest_Anmeldung + + btnResetBackground - + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox3 + + 0 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 6, 274 - - Globale windream-Einstellungen + + 151, 23 - - 162, 22 + + 81 - - 368, 315 + + Hintergrund auswählen.. - - Änderungen erfolgreich gespeichert! + + btnSelectBackground - - OpenFileDialog1 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 355, 56 + + GroupBox3 - - 184, 40 + + 1 - - 46 + + 6, 21 - - GroupBox4 + + 356, 247 - - $this + + CenterImage - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 80 - - 162, 22 + + pbBackground - - 3 + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - $this + + GroupBox3 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 2 - - 3 + + 564, 12 - - Label2 + + 368, 315 - - 87, 22 + + 81 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Anwendungshintergrund - + + GroupBox3 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this + + 2 + + + 17, 17 + 6, 21 - - GroupBox5 + + 238, 22 - + + 0 + + + txtProductName + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 49, 22 + + GroupBox4 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0 - - GroupBox1 + + 266, 12 - - GroupBox5 + + 287, 56 - - Anwendungshintergrund + + 82 - - Segoe UI, 8.25pt + + Anwendungsname - - Segoe UI, 9.75pt, style=Bold + + GroupBox4 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 9 + + $this - - GroupBox4 + + 1 - - 49, 22 + + False - - Unicode-Version? + + MiddleLeft - - 3 + + 839, 333 - - MiddleRight + + 87, 22 - - GroupBox5 + + 10 - - 18, 75 + + Speichern - - 541, 142 + + MiddleRight - - $this + + btnsave - - GroupBox1 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 9, 62 + + $this - - GroupBox1 + + 5 - - Laufwerkbuchstabe Windream: + + True - - 7 + + NoControl - - 4 + + 12, 149 - - 79, 13 + + 194, 30 - - 6, 18 + + 79 - - MiddleRight + + Design-Panels als Child aufrufen +(Eingebettet in Hauptformular) chkChildWindow - - 43 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 82 + + $this - - 2 + + 3 - - 211, 274 + + MiddleLeft + + + 355, 97 + + + 162, 26 49 - - 162, 22 - - - 235, 13 + + Anmeldung testen - - frmConfiguration_Basic + + MiddleRight - - Hintergrund auswählen.. + + btnTest_Anmeldung - + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Label8 + + GroupBox5 - - Label6 + + 0 - - GroupBox5 + + 19, 101 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 330, 22 - - Trennzeichen für Versionierung der Dateien: + + 48 - + + txtServername + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox5 + + + 1 + + True + + 16, 85 + + + 79, 13 + + + 47 + + + Server-Name:* + + + Label5 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 352, 40 + + GroupBox5 - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 2 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 355, 56 - - 61, 13 + + 162, 22 - + + 46 + + + txtPW + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 15, 59 + + GroupBox5 - - 12, 12 + + 3 - - 10 + + True - - txtUser + + 352, 40 - - 1 + + 56, 13 - - 4 + + 45 - - MiddleLeft + + Passwort: - - 6 + + Label4 - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + GroupBox5 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4 - - False + + 187, 56 - - 1 + + 162, 22 - - lblSaveresult + + 44 - - MiddleLeft + + txtUser - + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Hintergrund zurücksetzen + + GroupBox5 - - 18, 34 + + 5 - - Segoe UI, 9pt, style=Italic + + True - - GroupBox2 + + 184, 40 - - 187, 56 + + 61, 13 - - 45 + + 43 - - 16, 18 + + Username: - - 355, 97 + + Label6 - - txtDomäne + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Anmeldung testen + + GroupBox5 - - 79 + + 6 - - 5 + + 19, 56 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 162, 22 - - 56, 13 + + 42 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + txtDomäne - - GroupBox5 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + GroupBox5 - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 7 - - pbBackground + + True 16, 40 - - Passwort: - 58, 13 - - 335, 105 + + 41 - - $this + + Domäne:* - - GroupBox2 + + Label7 - - 261, 13 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 12, 185 + + GroupBox5 - - 375, 15 + + 8 - - 2 + + True - - 356, 247 + + Segoe UI, 9pt, style=Italic - - 162, 26 + + 16, 18 - - 1 + + 375, 15 - - btnSelectBackground + + 40 - - 8 + + Definieren sie hier die Anmeldedaten des windream-Hauptbenutzers. - - 9, 34 + + Label8 - + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + GroupBox5 - - True + + 9 - - False + + 12, 185 - - 81 + + 541, 142 - - 151, 23 + + 83 - - GroupBox1 + + Userautentifizierung windream Rechte: - - Domäne:* + + GroupBox5 - - GroupBox3 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + $this - - btnResetBackground + + 0 - - Username: + + True + + + 6, 13 - - 234, 17 + + 984, 384 - - 48 + + Segoe UI, 8.25pt - - GroupBox5 + + Grundeinstellungen Record Organizer - - 42 + + OpenFileDialog1 - - 47 + + System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 41 + + frmRecOrgConfig_Basic - - GroupBox5 + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - - - en-US - - - 17, 17 - \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmRecOrgConfig_Basic.vb b/app/DD-Record-Organiser/frmRecOrgConfig_Basic.vb index fd4ff33..9878250 100644 --- a/app/DD-Record-Organiser/frmRecOrgConfig_Basic.vb +++ b/app/DD-Record-Organiser/frmRecOrgConfig_Basic.vb @@ -2,7 +2,8 @@ Public Class frmRecOrgConfig_Basic Dim loaded As Boolean = False Dim changes_ModuleKonfig As Boolean = False - Dim changes_Konfig As Boolean = False + Dim changes_RightService As Boolean = False + Dim changes_PMOKonfig As Boolean = False Private Sub frmConfiguration_Basic_Load(sender As Object, e As EventArgs) Handles Me.Load Try Dim sql As String = "select * from TBDD_MODULES where UPPER(NAME) = UPPER('Record-Organizer')" @@ -46,6 +47,7 @@ Public Class frmRecOrgConfig_Basic If Not dt Is Nothing Then If dt.Rows.Count = 1 Then Me.chkUnicode.Checked = dt.Rows(0).Item("WD_UNICODE") + Me.txtWiki.Text = dt.Rows(0).Item("WIKI_STRING") End If End If Catch ex As Exception @@ -63,7 +65,7 @@ Public Class frmRecOrgConfig_Basic Private Sub chkUnicode_CheckedChanged(sender As Object, e As EventArgs) Handles chkUnicode.CheckedChanged If loaded = True Then - changes_Konfig = True + changes_PMOKonfig = True btnsave.Enabled = True End If End Sub @@ -102,13 +104,13 @@ Public Class frmRecOrgConfig_Basic MsgBox("Error in Save ModuleConfig: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try End If - If changes_Konfig = True Then + If changes_PMOKonfig = True Then Try Dim wduni As Integer = 0 If chkUnicode.Checked Then wduni = 1 End If - Dim upd = String.Format("UPDATE TBPMO_KONFIGURATION SET AD_DOMAIN = '{0}', AD_USER = '{1}', AD_USER_PW = '{2}', AD_SERVER = '{3}', CHANGED_WHO = '{4}',WD_UNICODE = {5} WHERE GUID = 1", Me.txtDomäne.Text, Me.txtUser.Text, Me.txtPW.Text, Me.txtServername.Text, Environment.UserName, wduni) + Dim upd = String.Format("UPDATE TBPMO_KONFIGURATION SET WIKI_STRING = '{0}', CHANGED_WHO = '{1}', WD_UNICODE = {2} WHERE GUID = 1", Me.txtWiki.Text, Environment.UserName, wduni) If ClassDatabase.Execute_non_Query(upd, True) = True Then lblSaveresult.Visible = True @@ -119,6 +121,16 @@ Public Class frmRecOrgConfig_Basic MsgBox("Error in Save Config: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try End If + If changes_RightService = True Then + Dim wrapper As New ClassEncryption("!35452didalog=") + Dim cipherText As String = wrapper.EncryptData(Me.txtPW.Text) + Dim pw As String = cipherText + + Dim upd = String.Format("UPDATE TBPMO_SERVICE_RIGHT_CONFIG SET AD_DOMAIN = '{0}', AD_USER = '{1}', AD_USER_PW = '{2}', AD_SERVER = '{3}', CHANGED_WHO = '{4}' WHERE GUID = 1", Me.txtDomäne.Text, Me.txtUser.Text, pw, Me.txtServername.Text, Environment.UserName) + ClassDatabase.Execute_non_Query(upd) + btnsave.Enabled = False + + End If End Sub @@ -171,28 +183,35 @@ Public Class frmRecOrgConfig_Basic Private Sub txtDomäne_TextChanged(sender As Object, e As EventArgs) Handles txtDomäne.TextChanged If loaded = True Then - changes_Konfig = True + changes_RightService = True btnsave.Enabled = True End If End Sub Private Sub txtUser_TextChanged(sender As Object, e As EventArgs) Handles txtUser.TextChanged If loaded = True Then - changes_Konfig = True + changes_RightService = True btnsave.Enabled = True End If End Sub Private Sub txtPW_TextChanged(sender As Object, e As EventArgs) Handles txtPW.TextChanged If loaded = True Then - changes_Konfig = True + changes_RightService = True btnsave.Enabled = True End If End Sub Private Sub txtServername_TextChanged(sender As Object, e As EventArgs) Handles txtServername.TextChanged If loaded = True Then - changes_Konfig = True + changes_RightService = True + btnsave.Enabled = True + End If + End Sub + + Private Sub txtWiki_TextChanged(sender As Object, e As EventArgs) Handles txtWiki.TextChanged + If loaded = True Then + changes_PMOKonfig = True btnsave.Enabled = True End If End Sub