MS_08.03

2016-03-08 16:55:28 +01:00
parent 8456bf837b
commit 5c09ce1034
6 changed files with 60 additions and 55 deletions
--- a/app/DD-Record-Organiser/frmConfig_Basic.Designer.vb
+++ b/app/DD-Record-Organiser/frmConfig_Basic.Designer.vb
@@ -39,6 +39,9 @@ Partial Class frmConfig_Basic
        Me.txtPasswort = New System.Windows.Forms.TextBox()
        Me.BtnConnect = New System.Windows.Forms.Button()
        Me.TabPage2 = New System.Windows.Forms.TabPage()
+        Me.GroupBox4 = New System.Windows.Forms.GroupBox()
+        Me.Button3 = New System.Windows.Forms.Button()
+        Me.cmbLanguage = New System.Windows.Forms.ComboBox()
        Me.GroupBox3 = New System.Windows.Forms.GroupBox()
        Me.Label7 = New System.Windows.Forms.Label()
        Me.cmbConstructor = New System.Windows.Forms.ComboBox()
@@ -62,18 +65,15 @@ Partial Class frmConfig_Basic
        Me.txtScanFolderWatch = New System.Windows.Forms.TextBox()
        Me.Label8 = New System.Windows.Forms.Label()
        Me.btnstartstop2 = New System.Windows.Forms.Button()
-        Me.cmbLanguage = New System.Windows.Forms.ComboBox()
-        Me.Button3 = New System.Windows.Forms.Button()
-        Me.GroupBox4 = New System.Windows.Forms.GroupBox()
        Me.TabControl1.SuspendLayout()
        Me.TabPage1.SuspendLayout()
        Me.TabPage2.SuspendLayout()
+        Me.GroupBox4.SuspendLayout()
        Me.GroupBox3.SuspendLayout()
        Me.GroupBox2.SuspendLayout()
        Me.GroupBox1.SuspendLayout()
        Me.TabPage3.SuspendLayout()
        CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.GroupBox4.SuspendLayout()
        Me.SuspendLayout()
        '
        'TabControl1
@@ -187,6 +187,27 @@ Partial Class frmConfig_Basic
        Me.TabPage2.Name = "TabPage2"
        Me.TabPage2.UseVisualStyleBackColor = True
        '
+        'GroupBox4
+        '
+        Me.GroupBox4.Controls.Add(Me.Button3)
+        Me.GroupBox4.Controls.Add(Me.cmbLanguage)
+        resources.ApplyResources(Me.GroupBox4, "GroupBox4")
+        Me.GroupBox4.Name = "GroupBox4"
+        Me.GroupBox4.TabStop = False
+        '
+        'Button3
+        '
+        resources.ApplyResources(Me.Button3, "Button3")
+        Me.Button3.Name = "Button3"
+        Me.Button3.UseVisualStyleBackColor = True
+        '
+        'cmbLanguage
+        '
+        Me.cmbLanguage.FormattingEnabled = True
+        Me.cmbLanguage.Items.AddRange(New Object() {resources.GetString("cmbLanguage.Items"), resources.GetString("cmbLanguage.Items1")})
+        resources.ApplyResources(Me.cmbLanguage, "cmbLanguage")
+        Me.cmbLanguage.Name = "cmbLanguage"
+        '
        'GroupBox3
        '
        Me.GroupBox3.Controls.Add(Me.Label7)
@@ -343,27 +364,6 @@ Partial Class frmConfig_Basic
        Me.btnstartstop2.Name = "btnstartstop2"
        Me.btnstartstop2.UseVisualStyleBackColor = True
        '
-        'cmbLanguage
-        '
-        Me.cmbLanguage.FormattingEnabled = True
-        Me.cmbLanguage.Items.AddRange(New Object() {resources.GetString("cmbLanguage.Items"), resources.GetString("cmbLanguage.Items1")})
-        resources.ApplyResources(Me.cmbLanguage, "cmbLanguage")
-        Me.cmbLanguage.Name = "cmbLanguage"
-        '
-        'Button3
-        '
-        resources.ApplyResources(Me.Button3, "Button3")
-        Me.Button3.Name = "Button3"
-        Me.Button3.UseVisualStyleBackColor = True
-        '
-        'GroupBox4
-        '
-        Me.GroupBox4.Controls.Add(Me.Button3)
-        Me.GroupBox4.Controls.Add(Me.cmbLanguage)
-        resources.ApplyResources(Me.GroupBox4, "GroupBox4")
-        Me.GroupBox4.Name = "GroupBox4"
-        Me.GroupBox4.TabStop = False
-        '
        'frmConfig_Basic
        '
        resources.ApplyResources(Me, "$this")
@@ -377,6 +377,7 @@ Partial Class frmConfig_Basic
        Me.TabPage1.PerformLayout()
        Me.TabPage2.ResumeLayout(False)
        Me.TabPage2.PerformLayout()
+        Me.GroupBox4.ResumeLayout(False)
        Me.GroupBox3.ResumeLayout(False)
        Me.GroupBox3.PerformLayout()
        Me.GroupBox2.ResumeLayout(False)
@@ -386,7 +387,6 @@ Partial Class frmConfig_Basic
        Me.TabPage3.ResumeLayout(False)
        Me.TabPage3.PerformLayout()
        CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.GroupBox4.ResumeLayout(False)
        Me.ResumeLayout(False)

    End Sub
--- a/app/DD-Record-Organiser/frmConfig_Basic.resx
+++ b/app/DD-Record-Organiser/frmConfig_Basic.resx
@@ -983,7 +983,7 @@
    <value>11, 102</value>
  </data>
  <data name="DataGridView1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>192, 113</value>
+    <value>192, 153</value>
  </data>
  <data name="DataGridView1.TabIndex" type="System.Int32, mscorlib">
    <value>15</value>
--- a/app/DD-Record-Organiser/frmConfig_Basic.vb
+++ b/app/DD-Record-Organiser/frmConfig_Basic.vb
@@ -48,6 +48,9 @@ Public Class frmConfig_Basic
    End Sub

    Private Sub cmbDatenbank_MouseClick(sender As Object, e As MouseEventArgs) Handles cmbDatenbank.MouseClick
+        Load_Databases()
+    End Sub
+    Sub Load_Databases()
        Try
            Me.Cursor = Cursors.WaitCursor
            Dim csb As New SqlClient.SqlConnectionStringBuilder
@@ -80,7 +83,10 @@ Public Class frmConfig_Basic
            End If
            connection.Close()
        Catch ex As Exception
-            MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei Datenbank-Connect:")
+            If ex.Message.ToLower.Contains("he standard-databases") Or ex.Message.ToLower.Contains("ie standard-datenbanken") Then
+                cmbDatenbank.Text = "DD_ECM"
+            End If
+            MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in Load Databases:")
        End Try
        Cursor = Cursors.Default
    End Sub
@@ -379,4 +385,8 @@ Public Class frmConfig_Basic
    Private Sub cmbDatenbank_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cmbDatenbank.SelectedIndexChanged

    End Sub
+
+    Private Sub txtPasswort_Leave(sender As Object, e As EventArgs) Handles txtPasswort.Leave
+
+    End Sub
 End Class
--- a/app/DD-Record-Organiser/frmUserKonfig_AddUsers.Designer.vb
+++ b/app/DD-Record-Organiser/frmUserKonfig_AddUsers.Designer.vb
@@ -28,8 +28,9 @@ Partial Class frmUserKonfig_AddUsers
        Me.lbGroups = New System.Windows.Forms.ListBox()
        Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
        Me.ToolStripLabel1 = New System.Windows.Forms.ToolStripLabel()
-        Me.RBCheck2 = New System.Windows.Forms.RadioButton()
+        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
        Me.RBCheck1 = New System.Windows.Forms.RadioButton()
+        Me.RBCheck2 = New System.Windows.Forms.RadioButton()
        Me.clbUsers = New System.Windows.Forms.CheckedListBox()
        Me.ToolStrip2 = New System.Windows.Forms.ToolStrip()
        Me.ToolStripLabel2 = New System.Windows.Forms.ToolStripLabel()
@@ -38,14 +39,13 @@ Partial Class frmUserKonfig_AddUsers
        Me.btnCancel = New System.Windows.Forms.Button()
        Me.btnAddUsers = New System.Windows.Forms.Button()
        Me.ToolTipController1 = New DevExpress.Utils.ToolTipController(Me.components)
-        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
        CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainer1.Panel1.SuspendLayout()
        Me.SplitContainer1.Panel2.SuspendLayout()
        Me.SplitContainer1.SuspendLayout()
        Me.ToolStrip1.SuspendLayout()
-        Me.ToolStrip2.SuspendLayout()
        Me.GroupBox1.SuspendLayout()
+        Me.ToolStrip2.SuspendLayout()
        Me.SuspendLayout()
        '
        'SplitContainer1
@@ -85,20 +85,28 @@ Partial Class frmUserKonfig_AddUsers
        resources.ApplyResources(Me.ToolStripLabel1, "ToolStripLabel1")
        Me.ToolStripLabel1.Name = "ToolStripLabel1"
        '
-        'RBCheck2
+        'GroupBox1
        '
-        resources.ApplyResources(Me.RBCheck2, "RBCheck2")
-        Me.RBCheck2.Name = "RBCheck2"
-        Me.RBCheck2.UseVisualStyleBackColor = True
+        Me.GroupBox1.Controls.Add(Me.RBCheck1)
+        Me.GroupBox1.Controls.Add(Me.RBCheck2)
+        resources.ApplyResources(Me.GroupBox1, "GroupBox1")
+        Me.GroupBox1.Name = "GroupBox1"
+        Me.GroupBox1.TabStop = False
        '
        'RBCheck1
        '
        resources.ApplyResources(Me.RBCheck1, "RBCheck1")
-        Me.RBCheck1.Checked = True
        Me.RBCheck1.Name = "RBCheck1"
-        Me.RBCheck1.TabStop = True
        Me.RBCheck1.UseVisualStyleBackColor = True
        '
+        'RBCheck2
+        '
+        resources.ApplyResources(Me.RBCheck2, "RBCheck2")
+        Me.RBCheck2.Checked = True
+        Me.RBCheck2.Name = "RBCheck2"
+        Me.RBCheck2.TabStop = True
+        Me.RBCheck2.UseVisualStyleBackColor = True
+        '
        'clbUsers
        '
        Me.clbUsers.BackColor = System.Drawing.SystemColors.GradientActiveCaption
@@ -145,14 +153,6 @@ Partial Class frmUserKonfig_AddUsers
        Me.btnAddUsers.Name = "btnAddUsers"
        Me.btnAddUsers.UseVisualStyleBackColor = True
        '
-        'GroupBox1
-        '
-        Me.GroupBox1.Controls.Add(Me.RBCheck1)
-        Me.GroupBox1.Controls.Add(Me.RBCheck2)
-        resources.ApplyResources(Me.GroupBox1, "GroupBox1")
-        Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.TabStop = False
-        '
        'frmUserKonfig_AddUsers
        '
        resources.ApplyResources(Me, "$this")
@@ -169,10 +169,10 @@ Partial Class frmUserKonfig_AddUsers
        Me.SplitContainer1.ResumeLayout(False)
        Me.ToolStrip1.ResumeLayout(False)
        Me.ToolStrip1.PerformLayout()
-        Me.ToolStrip2.ResumeLayout(False)
-        Me.ToolStrip2.PerformLayout()
        Me.GroupBox1.ResumeLayout(False)
        Me.GroupBox1.PerformLayout()
+        Me.ToolStrip2.ResumeLayout(False)
+        Me.ToolStrip2.PerformLayout()
        Me.ResumeLayout(False)

    End Sub
--- a/app/DD-Record-Organiser/frmUserKonfig_AddUsers.resx
+++ b/app/DD-Record-Organiser/frmUserKonfig_AddUsers.resx
@@ -205,13 +205,13 @@
    <value>18, 21</value>
  </data>
  <data name="RBCheck1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>72, 17</value>
+    <value>95, 17</value>
  </data>
  <data name="RBCheck1.TabIndex" type="System.Int32, mscorlib">
    <value>7</value>
  </data>
  <data name="RBCheck1.Text" xml:space="preserve">
-    <value>Standard</value>
+    <value>Basic Method</value>
  </data>
  <data name="&gt;&gt;RBCheck1.Name" xml:space="preserve">
    <value>RBCheck1</value>
--- a/app/DD-Record-Organiser/frmUserKonfig_AddUsers.vb
+++ b/app/DD-Record-Organiser/frmUserKonfig_AddUsers.vb
@@ -7,12 +7,7 @@ Public Class frmUserKonfig_AddUsers
    Private Sub formUserConfig_AddUsers_Load(sender As Object, e As EventArgs) Handles MyBase.Load
        Try
            Cursor = Cursors.WaitCursor
-            Dim groups = GetActiveDirectoryGroups()
-            If Not IsNothing(groups) Then
-                For Each group In groups
-                    lbGroups.Items.Add(group)
-                Next
-            End If
+            GetGroups(Environment.UserName)
           
        Catch ex As Exception
            MsgBox("Error in Load Groups:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)