diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb index 257aa6c..4867d7f 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.vb @@ -6248,7 +6248,7 @@ Public Class frmConstructor_Main Private Sub AuswertungAnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AuswertungAnzeigenToolStripMenuItem.Click Dim frm As New frmDiagrams() - frm.MdiParent = MAIN_FORM + 'frm.MdiParent = MAIN_FORM frm.Show() End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmRecOrgConfig_Basic.Designer.vb b/app/DD-Record-Organiser/frmRecOrgConfig_Basic.Designer.vb index 6d4f593..980623a 100644 --- a/app/DD-Record-Organiser/frmRecOrgConfig_Basic.Designer.vb +++ b/app/DD-Record-Organiser/frmRecOrgConfig_Basic.Designer.vb @@ -33,7 +33,6 @@ Partial Class frmRecOrgConfig_Basic 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() Me.btnResetBackground = New System.Windows.Forms.Button() @@ -105,9 +104,6 @@ Partial Class frmRecOrgConfig_Basic ' '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") @@ -124,12 +120,6 @@ Partial Class frmRecOrgConfig_Basic resources.ApplyResources(Me.Label9, "Label9") Me.Label9.Name = "Label9" ' - 'chkUnicode - ' - resources.ApplyResources(Me.chkUnicode, "chkUnicode") - Me.chkUnicode.Name = "chkUnicode" - Me.chkUnicode.UseVisualStyleBackColor = True - ' 'lblSaveresult ' resources.ApplyResources(Me.lblSaveresult, "lblSaveresult") @@ -269,6 +259,8 @@ Partial Class frmRecOrgConfig_Basic ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.txtWiki) + Me.Controls.Add(Me.Label9) Me.Controls.Add(Me.GroupBox5) Me.Controls.Add(Me.GroupBox4) Me.Controls.Add(Me.GroupBox3) @@ -302,7 +294,6 @@ Partial Class frmRecOrgConfig_Basic Friend WithEvents txtwddriveletter As System.Windows.Forms.TextBox Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox - Friend WithEvents chkUnicode As System.Windows.Forms.CheckBox Friend WithEvents btnsave As System.Windows.Forms.Button Friend WithEvents lblSaveresult As System.Windows.Forms.Label Friend WithEvents pbBackground As System.Windows.Forms.PictureBox diff --git a/app/DD-Record-Organiser/frmRecOrgConfig_Basic.resx b/app/DD-Record-Organiser/frmRecOrgConfig_Basic.resx index a8841a7..5d18bed 100644 --- a/app/DD-Record-Organiser/frmRecOrgConfig_Basic.resx +++ b/app/DD-Record-Organiser/frmRecOrgConfig_Basic.resx @@ -171,7 +171,7 @@ GroupBox2 - 3 + 0 True @@ -261,7 +261,7 @@ GroupBox2 - 4 + 1 266, 74 @@ -285,92 +285,13 @@ $this - 7 - - - 9, 98 - - - 185, 22 - - - 10 - - - txtWiki - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 0 - - - True - - - - NoControl - - - 6, 82 - - - 80, 13 - - 9 - - WIKI Network: - - - Label9 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 1 - - - True - - - 9, 62 - - - 117, 17 - - - 8 - - - Unicode-Version? - - - chkUnicode - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 2 - 12, 12 - 200, 131 + 245, 65 9 @@ -388,7 +309,59 @@ $this - 6 + 8 + + + 12, 96 + + + 245, 22 + + + 10 + + + txtWiki + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + + NoControl + + + 9, 80 + + + 80, 13 + + + 9 + + + WIKI Network: + + + Label9 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 Top, Right @@ -424,6 +397,66 @@ $this + 6 + + + btnResetBackground + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox3 + + + 0 + + + btnSelectBackground + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox3 + + + 1 + + + pbBackground + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox3 + + + 2 + + + 564, 12 + + + 368, 315 + + + 81 + + + Anwendungshintergrund + + + GroupBox3 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + 4 @@ -498,42 +531,9 @@ 2 - - 564, 12 - - - 368, 315 - - - 81 - - - Anwendungshintergrund - - - GroupBox3 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - 17, 17 - - 6, 21 - - - 238, 22 - - - 0 - txtProductName @@ -568,7 +568,28 @@ $this - 1 + 3 + + + 6, 21 + + + 238, 22 + + + 0 + + + txtProductName + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox4 + + + 0 False @@ -601,7 +622,7 @@ $this - 5 + 7 True @@ -632,8 +653,152 @@ $this + 5 + + + btnTest_Anmeldung + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox5 + + + 0 + + + txtServername + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox5 + + + 1 + + + Label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox5 + + + 2 + + + txtPW + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox5 + + 3 + + Label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox5 + + + 4 + + + txtUser + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox5 + + + 5 + + + Label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox5 + + + 6 + + + txtDomäne + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox5 + + + 7 + + + Label7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox5 + + + 8 + + + Label8 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox5 + + + 9 + + + 12, 185 + + + 541, 142 + + + 83 + + + Userautentifizierung windream Rechte: + + + GroupBox5 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + MiddleLeft @@ -886,30 +1051,6 @@ 9 - - 12, 185 - - - 541, 142 - - - 83 - - - Userautentifizierung windream Rechte: - - - GroupBox5 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - True @@ -922,6 +1063,48 @@ Segoe UI, 8.25pt + + + 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 + AP/8AQD//gMD///Dj/////// + + Grundeinstellungen Record Organizer diff --git a/app/DD-Record-Organiser/frmRecOrgConfig_Basic.vb b/app/DD-Record-Organiser/frmRecOrgConfig_Basic.vb index 9878250..843348c 100644 --- a/app/DD-Record-Organiser/frmRecOrgConfig_Basic.vb +++ b/app/DD-Record-Organiser/frmRecOrgConfig_Basic.vb @@ -46,7 +46,7 @@ Public Class frmRecOrgConfig_Basic dt = ClassDatabase.Return_Datatable(sql) If Not dt Is Nothing Then If dt.Rows.Count = 1 Then - Me.chkUnicode.Checked = dt.Rows(0).Item("WD_UNICODE") + ' Me.chkUnicode.Checked = dt.Rows(0).Item("WD_UNICODE") Me.txtWiki.Text = dt.Rows(0).Item("WIKI_STRING") End If End If @@ -63,7 +63,7 @@ Public Class frmRecOrgConfig_Basic End If End Sub - Private Sub chkUnicode_CheckedChanged(sender As Object, e As EventArgs) Handles chkUnicode.CheckedChanged + Private Sub chkUnicode_CheckedChanged(sender As Object, e As EventArgs) If loaded = True Then changes_PMOKonfig = True btnsave.Enabled = True @@ -107,9 +107,9 @@ Public Class frmRecOrgConfig_Basic If changes_PMOKonfig = True Then Try Dim wduni As Integer = 0 - If chkUnicode.Checked Then - wduni = 1 - End If + 'If chkUnicode.Checked Then + ' wduni = 1 + 'End If 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