diff --git a/app/DD-Record-Organiser/My Project/Resources.Designer.vb b/app/DD-Record-Organiser/My Project/Resources.Designer.vb index f5f98fb..3cb3e63 100644 --- a/app/DD-Record-Organiser/My Project/Resources.Designer.vb +++ b/app/DD-Record-Organiser/My Project/Resources.Designer.vb @@ -630,16 +630,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - ''' - Friend ReadOnly Property delete_12x12() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("delete_12x12", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/app/DD-Record-Organiser/My Project/Resources.resx b/app/DD-Record-Organiser/My Project/Resources.resx index 222f5c6..83da167 100644 --- a/app/DD-Record-Organiser/My Project/Resources.resx +++ b/app/DD-Record-Organiser/My Project/Resources.resx @@ -523,7 +523,4 @@ ..\Resources\action_Cancel_16xLG1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\delete_12x12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmConfig_Basic.Designer.vb b/app/DD-Record-Organiser/frmConfig_Basic.Designer.vb index 8804f5e..54ca4c8 100644 --- a/app/DD-Record-Organiser/frmConfig_Basic.Designer.vb +++ b/app/DD-Record-Organiser/frmConfig_Basic.Designer.vb @@ -39,6 +39,8 @@ Partial Class frmConfig_Basic Me.BtnConnect = New System.Windows.Forms.Button() Me.TabPage2 = New System.Windows.Forms.TabPage() Me.GroupBox3 = New System.Windows.Forms.GroupBox() + Me.Label7 = New System.Windows.Forms.Label() + Me.cmbConstructor = New System.Windows.Forms.ComboBox() Me.CheckBox1 = New System.Windows.Forms.CheckBox() Me.GroupBox2 = New System.Windows.Forms.GroupBox() Me.CheckBoxWD_ShowEnitityDocs = New System.Windows.Forms.CheckBox() @@ -51,8 +53,6 @@ Partial Class frmConfig_Basic Me.Button1 = New System.Windows.Forms.Button() Me.btnApplicationFolder = New System.Windows.Forms.Button() Me.LinkLabel1 = New System.Windows.Forms.LinkLabel() - Me.cmbConstructor = New System.Windows.Forms.ComboBox() - Me.Label7 = New System.Windows.Forms.Label() Me.TabControl1.SuspendLayout() Me.TabPage1.SuspendLayout() Me.TabPage2.SuspendLayout() @@ -89,7 +89,7 @@ Partial Class frmConfig_Basic Me.TabPage1.Location = New System.Drawing.Point(4, 22) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(687, 229) + Me.TabPage1.Size = New System.Drawing.Size(687, 261) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Datenbank-Verbindung" Me.TabPage1.UseVisualStyleBackColor = True @@ -195,7 +195,7 @@ Partial Class frmConfig_Basic ' 'BtnConnect ' - Me.BtnConnect.Image = Global.DD_Record_Organiser.My.Resources.Resources.database_go + Me.BtnConnect.Image = Global.DD_Record_Organiser.My.Resources.Resources.database_go1 Me.BtnConnect.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.BtnConnect.Location = New System.Drawing.Point(302, 82) Me.BtnConnect.Name = "BtnConnect" @@ -234,6 +234,23 @@ Partial Class frmConfig_Basic Me.GroupBox3.TabStop = False Me.GroupBox3.Text = "Formularaufrufe:" ' + 'Label7 + ' + Me.Label7.AutoSize = True + Me.Label7.Location = New System.Drawing.Point(284, 14) + Me.Label7.Name = "Label7" + Me.Label7.Size = New System.Drawing.Size(185, 13) + Me.Label7.TabIndex = 4 + Me.Label7.Text = "Formular bei Programmstart laden:" + ' + 'cmbConstructor + ' + Me.cmbConstructor.FormattingEnabled = True + Me.cmbConstructor.Location = New System.Drawing.Point(287, 30) + Me.cmbConstructor.Name = "cmbConstructor" + Me.cmbConstructor.Size = New System.Drawing.Size(248, 21) + Me.cmbConstructor.TabIndex = 1 + ' 'CheckBox1 ' Me.CheckBox1.AutoSize = True @@ -361,23 +378,6 @@ Partial Class frmConfig_Basic Me.LinkLabel1.TabStop = True Me.LinkLabel1.Text = "Link zu Support-Tool Digital Data" ' - 'cmbConstructor - ' - Me.cmbConstructor.FormattingEnabled = True - Me.cmbConstructor.Location = New System.Drawing.Point(287, 30) - Me.cmbConstructor.Name = "cmbConstructor" - Me.cmbConstructor.Size = New System.Drawing.Size(248, 21) - Me.cmbConstructor.TabIndex = 1 - ' - 'Label7 - ' - Me.Label7.AutoSize = True - Me.Label7.Location = New System.Drawing.Point(284, 14) - Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(185, 13) - Me.Label7.TabIndex = 4 - Me.Label7.Text = "Formular bei Programmstart laden:" - ' 'frmConfig_Basic ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/app/DD-Record-Organiser/frmConnections.Designer.vb b/app/DD-Record-Organiser/frmConnections.Designer.vb index d80aadb..6cf5346 100644 --- a/app/DD-Record-Organiser/frmConnections.Designer.vb +++ b/app/DD-Record-Organiser/frmConnections.Designer.vb @@ -378,7 +378,7 @@ Partial Class frmConnections 'btnCheck_Con ' Me.btnCheck_Con.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.btnCheck_Con.Image = Global.DD_Record_Organiser.My.Resources.Resources.RadioButton_701 + Me.btnCheck_Con.Image = Global.DD_Record_Organiser.My.Resources.Resources.database_go Me.btnCheck_Con.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnCheck_Con.Location = New System.Drawing.Point(530, 81) Me.btnCheck_Con.Name = "btnCheck_Con" diff --git a/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb b/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb index d66e01c..7440659 100644 --- a/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb +++ b/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb @@ -486,7 +486,7 @@ Partial Class frmConstructorDesigner Me.TreeView1.Location = New System.Drawing.Point(0, 0) Me.TreeView1.Name = "TreeView1" Me.TreeView1.SelectedImageIndex = 1 - Me.TreeView1.Size = New System.Drawing.Size(292, 352) + Me.TreeView1.Size = New System.Drawing.Size(292, 355) Me.TreeView1.TabIndex = 1 ' 'ImageList1 @@ -614,7 +614,7 @@ Partial Class frmConstructorDesigner Me.XtraTabPage1.Controls.Add(Me.ToolStrip1) Me.XtraTabPage1.Controls.Add(Me.TreeView1) Me.XtraTabPage1.Name = "XtraTabPage1" - Me.XtraTabPage1.Size = New System.Drawing.Size(1141, 352) + Me.XtraTabPage1.Size = New System.Drawing.Size(1145, 355) Me.XtraTabPage1.Text = "Entitäten-Übersicht" ' 'XtraTabControl2 @@ -623,7 +623,7 @@ Partial Class frmConstructorDesigner Me.XtraTabControl2.Location = New System.Drawing.Point(292, 25) Me.XtraTabControl2.Name = "XtraTabControl2" Me.XtraTabControl2.SelectedTabPage = Me.XtraTabPage3 - Me.XtraTabControl2.Size = New System.Drawing.Size(849, 305) + Me.XtraTabControl2.Size = New System.Drawing.Size(853, 308) Me.XtraTabControl2.TabIndex = 35 Me.XtraTabControl2.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage3, Me.XtraTabPage4, Me.XtraTabPage5}) ' @@ -650,7 +650,7 @@ Partial Class frmConstructorDesigner Me.XtraTabPage3.Controls.Add(Me.GUIDTextBox1) Me.XtraTabPage3.Controls.Add(Me.LEVEL1_SELECTCheckBox) Me.XtraTabPage3.Name = "XtraTabPage3" - Me.XtraTabPage3.Size = New System.Drawing.Size(843, 277) + Me.XtraTabPage3.Size = New System.Drawing.Size(851, 283) Me.XtraTabPage3.Text = "Allgemein" ' 'Label4 @@ -805,9 +805,9 @@ Partial Class frmConstructorDesigner 'StatusStrip1 ' Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblSaveDetail}) - Me.StatusStrip1.Location = New System.Drawing.Point(292, 330) + Me.StatusStrip1.Location = New System.Drawing.Point(292, 333) Me.StatusStrip1.Name = "StatusStrip1" - Me.StatusStrip1.Size = New System.Drawing.Size(849, 22) + Me.StatusStrip1.Size = New System.Drawing.Size(853, 22) Me.StatusStrip1.TabIndex = 35 Me.StatusStrip1.Text = "StatusStrip1" ' @@ -824,7 +824,7 @@ Partial Class frmConstructorDesigner Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbtnSave}) Me.ToolStrip1.Location = New System.Drawing.Point(292, 0) Me.ToolStrip1.Name = "ToolStrip1" - Me.ToolStrip1.Size = New System.Drawing.Size(849, 25) + Me.ToolStrip1.Size = New System.Drawing.Size(853, 25) Me.ToolStrip1.TabIndex = 34 Me.ToolStrip1.Text = "ToolStrip1" ' diff --git a/app/DD-Record-Organiser/frmConstructorDesigner.resx b/app/DD-Record-Organiser/frmConstructorDesigner.resx index 8cf3d2b..e756de6 100644 --- a/app/DD-Record-Organiser/frmConstructorDesigner.resx +++ b/app/DD-Record-Organiser/frmConstructorDesigner.resx @@ -281,7 +281,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABS - CQAAAk1TRnQBSQFMAgEBAgEAAbABCAGwAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAgEAAcABCAHAAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/app/DD-Record-Organiser/frmCustomAppointment.Designer.vb b/app/DD-Record-Organiser/frmCustomAppointment.Designer.vb index 1ba8210..d05c77a 100644 --- a/app/DD-Record-Organiser/frmCustomAppointment.Designer.vb +++ b/app/DD-Record-Organiser/frmCustomAppointment.Designer.vb @@ -54,9 +54,6 @@ Partial Class frmCustomAppointment 'chkAllDay ' ' - 'btnOk - ' - ' 'edtStartDate ' Me.edtStartDate.EditValue = New Date(2005, 3, 31, 0, 0, 0, 0) diff --git a/app/DD-Record-Organiser/frmDD_EMAIL_ACCOUNT.Designer.vb b/app/DD-Record-Organiser/frmDD_EMAIL_ACCOUNT.Designer.vb index 44cf3ba..a6a6810 100644 --- a/app/DD-Record-Organiser/frmDD_EMAIL_ACCOUNT.Designer.vb +++ b/app/DD-Record-Organiser/frmDD_EMAIL_ACCOUNT.Designer.vb @@ -39,11 +39,18 @@ Partial Class frmDD_EMAIL_ACCOUNT Me.TBDD_EMAIL_ACCOUNTTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBDD_EMAIL_ACCOUNTTableAdapter() Me.TableAdapterManager = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager() Me.TBDD_EMAIL_ACCOUNTBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components) + Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel() + Me.BindingNavigatorDeleteItem = New System.Windows.Forms.ToolStripButton() + Me.BindingNavigatorMoveFirstItem = New System.Windows.Forms.ToolStripButton() + Me.BindingNavigatorMovePreviousItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorSeparator = New System.Windows.Forms.ToolStripSeparator() Me.BindingNavigatorPositionItem = New System.Windows.Forms.ToolStripTextBox() Me.BindingNavigatorSeparator1 = New System.Windows.Forms.ToolStripSeparator() + Me.BindingNavigatorMoveNextItem = New System.Windows.Forms.ToolStripButton() + Me.BindingNavigatorMoveLastItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorSeparator2 = New System.Windows.Forms.ToolStripSeparator() + Me.TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem = New System.Windows.Forms.ToolStripButton() Me.GUIDTextBox = New System.Windows.Forms.TextBox() Me.NAMETextBox = New System.Windows.Forms.TextBox() Me.EMAIL_FROMTextBox = New System.Windows.Forms.TextBox() @@ -57,13 +64,6 @@ Partial Class frmDD_EMAIL_ACCOUNT Me.CHANGED_WHOTextBox = New System.Windows.Forms.TextBox() Me.lblSave = New System.Windows.Forms.Label() Me.btnEmailTest = New System.Windows.Forms.Button() - Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton() - Me.BindingNavigatorDeleteItem = New System.Windows.Forms.ToolStripButton() - Me.BindingNavigatorMoveFirstItem = New System.Windows.Forms.ToolStripButton() - Me.BindingNavigatorMovePreviousItem = New System.Windows.Forms.ToolStripButton() - Me.BindingNavigatorMoveNextItem = New System.Windows.Forms.ToolStripButton() - Me.BindingNavigatorMoveLastItem = New System.Windows.Forms.ToolStripButton() - Me.TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem = New System.Windows.Forms.ToolStripButton() Me.lbltest = New System.Windows.Forms.Label() Me.txttestReceipiant = New System.Windows.Forms.TextBox() Me.GroupBox1 = New System.Windows.Forms.GroupBox() @@ -165,6 +165,15 @@ Partial Class frmDD_EMAIL_ACCOUNT CHANGED_WHENLabel.TabIndex = 19 CHANGED_WHENLabel.Text = "Geändert wann:" ' + 'CHANGED_WHOLabel + ' + CHANGED_WHOLabel.AutoSize = True + CHANGED_WHOLabel.Location = New System.Drawing.Point(211, 157) + CHANGED_WHOLabel.Name = "CHANGED_WHOLabel" + CHANGED_WHOLabel.Size = New System.Drawing.Size(80, 15) + CHANGED_WHOLabel.TabIndex = 20 + CHANGED_WHOLabel.Text = "Geändert wer:" + ' 'DD_DMSDataSet ' Me.DD_DMSDataSet.DataSetName = "DD_DMSDataSet" @@ -182,6 +191,7 @@ Partial Class frmDD_EMAIL_ACCOUNT 'TableAdapterManager ' Me.TableAdapterManager.BackupDataSetBeforeUpdate = False + Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing Me.TableAdapterManager.TBDD_DOKUMENTARTTableAdapter = Nothing Me.TableAdapterManager.TBDD_EINGANGSARTENTableAdapter = Nothing Me.TableAdapterManager.TBDD_EMAIL_ACCOUNTTableAdapter = Me.TBDD_EMAIL_ACCOUNTTableAdapter @@ -192,6 +202,7 @@ Partial Class frmDD_EMAIL_ACCOUNT Me.TableAdapterManager.TBPMO_FILES_USERTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FOLLOW_UP_EMAILTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FOLLUPEMAIL_USERTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FORM_CONSTRUCTORTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FORM_TYPETableAdapter = Nothing Me.TableAdapterManager.TBPMO_FORM_VIEWTableAdapter = Nothing @@ -199,6 +210,9 @@ Partial Class frmDD_EMAIL_ACCOUNT Me.TableAdapterManager.TBPMO_KONFIGURATIONTableAdapter = Nothing Me.TableAdapterManager.TBPMO_RECORD_LOG_CONFIGTableAdapter = Nothing Me.TableAdapterManager.TBPMO_RECORDTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_TEMPLATE_ENTITYTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_TEMPLATE_PATTERNTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_TEMPLATETableAdapter = Nothing Me.TableAdapterManager.TBPMO_WD_FVIEW_DT_INDEXTableAdapter = Nothing Me.TableAdapterManager.TBPMO_WD_OBJECTTYPETableAdapter = Nothing Me.TableAdapterManager.TBPMO_WORKFLOW_FORMTableAdapter = Nothing @@ -225,6 +239,15 @@ Partial Class frmDD_EMAIL_ACCOUNT Me.TBDD_EMAIL_ACCOUNTBindingNavigator.TabIndex = 0 Me.TBDD_EMAIL_ACCOUNTBindingNavigator.Text = "BindingNavigator1" ' + 'BindingNavigatorAddNewItem + ' + Me.BindingNavigatorAddNewItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.BindingNavigatorAddNewItem.Image = CType(resources.GetObject("BindingNavigatorAddNewItem.Image"), System.Drawing.Image) + Me.BindingNavigatorAddNewItem.Name = "BindingNavigatorAddNewItem" + Me.BindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = True + Me.BindingNavigatorAddNewItem.Size = New System.Drawing.Size(23, 22) + Me.BindingNavigatorAddNewItem.Text = "Neu hinzufügen" + ' 'BindingNavigatorCountItem ' Me.BindingNavigatorCountItem.Name = "BindingNavigatorCountItem" @@ -232,6 +255,33 @@ Partial Class frmDD_EMAIL_ACCOUNT Me.BindingNavigatorCountItem.Text = "von {0} Email-Profilen" Me.BindingNavigatorCountItem.ToolTipText = "Die Gesamtanzahl der Elemente." ' + 'BindingNavigatorDeleteItem + ' + Me.BindingNavigatorDeleteItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.BindingNavigatorDeleteItem.Image = CType(resources.GetObject("BindingNavigatorDeleteItem.Image"), System.Drawing.Image) + Me.BindingNavigatorDeleteItem.Name = "BindingNavigatorDeleteItem" + Me.BindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = True + Me.BindingNavigatorDeleteItem.Size = New System.Drawing.Size(23, 22) + Me.BindingNavigatorDeleteItem.Text = "Löschen" + ' + 'BindingNavigatorMoveFirstItem + ' + Me.BindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.BindingNavigatorMoveFirstItem.Image = CType(resources.GetObject("BindingNavigatorMoveFirstItem.Image"), System.Drawing.Image) + Me.BindingNavigatorMoveFirstItem.Name = "BindingNavigatorMoveFirstItem" + Me.BindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = True + Me.BindingNavigatorMoveFirstItem.Size = New System.Drawing.Size(23, 22) + Me.BindingNavigatorMoveFirstItem.Text = "Erste verschieben" + ' + 'BindingNavigatorMovePreviousItem + ' + Me.BindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.BindingNavigatorMovePreviousItem.Image = CType(resources.GetObject("BindingNavigatorMovePreviousItem.Image"), System.Drawing.Image) + Me.BindingNavigatorMovePreviousItem.Name = "BindingNavigatorMovePreviousItem" + Me.BindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = True + Me.BindingNavigatorMovePreviousItem.Size = New System.Drawing.Size(23, 22) + Me.BindingNavigatorMovePreviousItem.Text = "Vorherige verschieben" + ' 'BindingNavigatorSeparator ' Me.BindingNavigatorSeparator.Name = "BindingNavigatorSeparator" @@ -251,11 +301,37 @@ Partial Class frmDD_EMAIL_ACCOUNT Me.BindingNavigatorSeparator1.Name = "BindingNavigatorSeparator1" Me.BindingNavigatorSeparator1.Size = New System.Drawing.Size(6, 25) ' + 'BindingNavigatorMoveNextItem + ' + Me.BindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.BindingNavigatorMoveNextItem.Image = CType(resources.GetObject("BindingNavigatorMoveNextItem.Image"), System.Drawing.Image) + Me.BindingNavigatorMoveNextItem.Name = "BindingNavigatorMoveNextItem" + Me.BindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = True + Me.BindingNavigatorMoveNextItem.Size = New System.Drawing.Size(23, 22) + Me.BindingNavigatorMoveNextItem.Text = "Nächste verschieben" + ' + 'BindingNavigatorMoveLastItem + ' + Me.BindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.BindingNavigatorMoveLastItem.Image = CType(resources.GetObject("BindingNavigatorMoveLastItem.Image"), System.Drawing.Image) + Me.BindingNavigatorMoveLastItem.Name = "BindingNavigatorMoveLastItem" + Me.BindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = True + Me.BindingNavigatorMoveLastItem.Size = New System.Drawing.Size(23, 22) + Me.BindingNavigatorMoveLastItem.Text = "Letzte verschieben" + ' 'BindingNavigatorSeparator2 ' Me.BindingNavigatorSeparator2.Name = "BindingNavigatorSeparator2" Me.BindingNavigatorSeparator2.Size = New System.Drawing.Size(6, 25) ' + 'TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem + ' + Me.TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem.Image = CType(resources.GetObject("TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem.Image"), System.Drawing.Image) + Me.TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem.Name = "TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem" + Me.TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem.Size = New System.Drawing.Size(23, 22) + Me.TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem.Text = "Daten speichern" + ' 'GUIDTextBox ' Me.GUIDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_EMAIL_ACCOUNTBindingSource, "GUID", True)) @@ -347,15 +423,6 @@ Partial Class frmDD_EMAIL_ACCOUNT Me.CHANGED_WHENTextBox.TabIndex = 20 Me.CHANGED_WHENTextBox.TabStop = False ' - 'CHANGED_WHOLabel - ' - CHANGED_WHOLabel.AutoSize = True - CHANGED_WHOLabel.Location = New System.Drawing.Point(211, 157) - CHANGED_WHOLabel.Name = "CHANGED_WHOLabel" - CHANGED_WHOLabel.Size = New System.Drawing.Size(80, 15) - CHANGED_WHOLabel.TabIndex = 20 - CHANGED_WHOLabel.Text = "Geändert wer:" - ' 'CHANGED_WHOTextBox ' Me.CHANGED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_EMAIL_ACCOUNTBindingSource, "CHANGED_WHO", True)) @@ -391,68 +458,6 @@ Partial Class frmDD_EMAIL_ACCOUNT Me.btnEmailTest.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnEmailTest.UseVisualStyleBackColor = True ' - 'BindingNavigatorAddNewItem - ' - Me.BindingNavigatorAddNewItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.BindingNavigatorAddNewItem.Image = CType(resources.GetObject("BindingNavigatorAddNewItem.Image"), System.Drawing.Image) - Me.BindingNavigatorAddNewItem.Name = "BindingNavigatorAddNewItem" - Me.BindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = True - Me.BindingNavigatorAddNewItem.Size = New System.Drawing.Size(23, 22) - Me.BindingNavigatorAddNewItem.Text = "Neu hinzufügen" - ' - 'BindingNavigatorDeleteItem - ' - Me.BindingNavigatorDeleteItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.BindingNavigatorDeleteItem.Image = CType(resources.GetObject("BindingNavigatorDeleteItem.Image"), System.Drawing.Image) - Me.BindingNavigatorDeleteItem.Name = "BindingNavigatorDeleteItem" - Me.BindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = True - Me.BindingNavigatorDeleteItem.Size = New System.Drawing.Size(23, 22) - Me.BindingNavigatorDeleteItem.Text = "Löschen" - ' - 'BindingNavigatorMoveFirstItem - ' - Me.BindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.BindingNavigatorMoveFirstItem.Image = CType(resources.GetObject("BindingNavigatorMoveFirstItem.Image"), System.Drawing.Image) - Me.BindingNavigatorMoveFirstItem.Name = "BindingNavigatorMoveFirstItem" - Me.BindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = True - Me.BindingNavigatorMoveFirstItem.Size = New System.Drawing.Size(23, 22) - Me.BindingNavigatorMoveFirstItem.Text = "Erste verschieben" - ' - 'BindingNavigatorMovePreviousItem - ' - Me.BindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.BindingNavigatorMovePreviousItem.Image = CType(resources.GetObject("BindingNavigatorMovePreviousItem.Image"), System.Drawing.Image) - Me.BindingNavigatorMovePreviousItem.Name = "BindingNavigatorMovePreviousItem" - Me.BindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = True - Me.BindingNavigatorMovePreviousItem.Size = New System.Drawing.Size(23, 22) - Me.BindingNavigatorMovePreviousItem.Text = "Vorherige verschieben" - ' - 'BindingNavigatorMoveNextItem - ' - Me.BindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.BindingNavigatorMoveNextItem.Image = CType(resources.GetObject("BindingNavigatorMoveNextItem.Image"), System.Drawing.Image) - Me.BindingNavigatorMoveNextItem.Name = "BindingNavigatorMoveNextItem" - Me.BindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = True - Me.BindingNavigatorMoveNextItem.Size = New System.Drawing.Size(23, 22) - Me.BindingNavigatorMoveNextItem.Text = "Nächste verschieben" - ' - 'BindingNavigatorMoveLastItem - ' - Me.BindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.BindingNavigatorMoveLastItem.Image = CType(resources.GetObject("BindingNavigatorMoveLastItem.Image"), System.Drawing.Image) - Me.BindingNavigatorMoveLastItem.Name = "BindingNavigatorMoveLastItem" - Me.BindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = True - Me.BindingNavigatorMoveLastItem.Size = New System.Drawing.Size(23, 22) - Me.BindingNavigatorMoveLastItem.Text = "Letzte verschieben" - ' - 'TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem - ' - Me.TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem.Image = CType(resources.GetObject("TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem.Image"), System.Drawing.Image) - Me.TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem.Name = "TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem" - Me.TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem.Size = New System.Drawing.Size(23, 22) - Me.TBDD_EMAIL_ACCOUNTBindingNavigatorSaveItem.Text = "Daten speichern" - ' 'lbltest ' Me.lbltest.AutoSize = True diff --git a/app/DD-Record-Organiser/frmDD_EMAIL_ACCOUNT.resx b/app/DD-Record-Organiser/frmDD_EMAIL_ACCOUNT.resx index 21e2f74..455d5db 100644 --- a/app/DD-Record-Organiser/frmDD_EMAIL_ACCOUNT.resx +++ b/app/DD-Record-Organiser/frmDD_EMAIL_ACCOUNT.resx @@ -144,6 +144,9 @@ False + + False + 17, 17 @@ -231,9 +234,6 @@ dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= - - False - AAABAAgAEBAAAAEACABoBQAAhgAAABAQAAABACAAaAQAAO4FAAAYGAAAAQAIAMgGAABWCgAAGBgAAAEA diff --git a/app/DD-Record-Organiser/frmDokumentart_Konfig.Designer.vb b/app/DD-Record-Organiser/frmDokumentart_Konfig.Designer.vb index 666c26a..4a8e08e 100644 --- a/app/DD-Record-Organiser/frmDokumentart_Konfig.Designer.vb +++ b/app/DD-Record-Organiser/frmDokumentart_Konfig.Designer.vb @@ -42,7 +42,8 @@ Partial Class frmDokumentart_Konfig Dim CHANGED_WHENLabel As System.Windows.Forms.Label Dim OBJEKTTYPLabel As System.Windows.Forms.Label Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmDokumentart_Konfig)) - Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.TBDD_DOKUMENTARTBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components) Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton() Me.TBDD_DOKUMENTARTBindingSource = New System.Windows.Forms.BindingSource(Me.components) @@ -543,7 +544,6 @@ Partial Class frmDokumentart_Konfig 'Button1 ' Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Button1.Image = Global.DD_Record_Organiser.My.Resources.Resources.add Me.Button1.Location = New System.Drawing.Point(1275, 77) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(29, 23) @@ -855,7 +855,7 @@ Partial Class frmDokumentart_Konfig Me.XtraTabPage1.Controls.Add(Me.ListBox2) Me.XtraTabPage1.Controls.Add(Me.TBDD_INDEX_AUTOMBindingNavigator) Me.XtraTabPage1.Name = "XtraTabPage1" - Me.XtraTabPage1.Size = New System.Drawing.Size(1261, 249) + Me.XtraTabPage1.Size = New System.Drawing.Size(1265, 252) Me.XtraTabPage1.Text = "Automatische Indexe" ' 'Label2 @@ -980,7 +980,7 @@ Partial Class frmDokumentart_Konfig Me.ListBox2.ItemHeight = 15 Me.ListBox2.Location = New System.Drawing.Point(0, 25) Me.ListBox2.Name = "ListBox2" - Me.ListBox2.Size = New System.Drawing.Size(305, 224) + Me.ListBox2.Size = New System.Drawing.Size(305, 227) Me.ListBox2.TabIndex = 2 Me.ListBox2.TabStop = False Me.ListBox2.ValueMember = "GUID" @@ -1000,7 +1000,7 @@ Partial Class frmDokumentart_Konfig Me.TBDD_INDEX_AUTOMBindingNavigator.MovePreviousItem = Me.ToolStripButton4 Me.TBDD_INDEX_AUTOMBindingNavigator.Name = "TBDD_INDEX_AUTOMBindingNavigator" Me.TBDD_INDEX_AUTOMBindingNavigator.PositionItem = Me.ToolStripTextBox1 - Me.TBDD_INDEX_AUTOMBindingNavigator.Size = New System.Drawing.Size(1261, 25) + Me.TBDD_INDEX_AUTOMBindingNavigator.Size = New System.Drawing.Size(1265, 25) Me.TBDD_INDEX_AUTOMBindingNavigator.TabIndex = 1 Me.TBDD_INDEX_AUTOMBindingNavigator.Text = "BindingNavigator1" ' @@ -1125,8 +1125,8 @@ Partial Class frmDokumentart_Konfig ' Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.AllowUserToAddRows = False Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.AllowUserToDeleteRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.Aqua - Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle2.BackColor = System.Drawing.Color.Aqua + Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -1134,6 +1134,14 @@ Partial Class frmDokumentart_Konfig Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn1, Me.DataGridViewTextBoxColumn3, Me.DataGridViewTextBoxColumn5, Me.DataGridViewTextBoxColumn6, Me.DataGridViewTextBoxColumn7, Me.DataGridViewTextBoxColumn8, Me.DataGridViewTextBoxColumn9}) Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.DataSource = Me.TBPMO_WD_FORMVIEW_DOKTYPESBindingSource + DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle3.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(CType(CType(32, Byte), Integer), CType(CType(31, Byte), Integer), CType(CType(53, Byte), Integer)) + DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.DefaultCellStyle = DataGridViewCellStyle3 Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.Location = New System.Drawing.Point(11, 106) Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.Name = "TBPMO_WD_FORMVIEW_DOKTYPESDataGridView" Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.ReadOnly = True @@ -1206,7 +1214,6 @@ Partial Class frmDokumentart_Konfig 'btnAddDokart_Entity ' Me.btnAddDokart_Entity.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.btnAddDokart_Entity.Image = Global.DD_Record_Organiser.My.Resources.Resources.add Me.btnAddDokart_Entity.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnAddDokart_Entity.Location = New System.Drawing.Point(291, 76) Me.btnAddDokart_Entity.Name = "btnAddDokart_Entity" diff --git a/app/DD-Record-Organiser/frmDokumentart_Konfig.resx b/app/DD-Record-Organiser/frmDokumentart_Konfig.resx index 019b78d..1c3daa6 100644 --- a/app/DD-Record-Organiser/frmDokumentart_Konfig.resx +++ b/app/DD-Record-Organiser/frmDokumentart_Konfig.resx @@ -252,6 +252,12 @@ dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= + + 17, 17 + + + 905, 95 + 905, 95 @@ -353,12 +359,18 @@ dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= + + 1036, 56 + 255, 95 1190, 56 + + 1190, 56 + 1036, 56 diff --git a/app/DD-Record-Organiser/frmDokumentart_NameConvention.designer.vb b/app/DD-Record-Organiser/frmDokumentart_NameConvention.designer.vb index ffeb72e..22abce5 100644 --- a/app/DD-Record-Organiser/frmDokumentart_NameConvention.designer.vb +++ b/app/DD-Record-Organiser/frmDokumentart_NameConvention.designer.vb @@ -26,6 +26,7 @@ Partial Class frmDokumentart_NameConvention Me.Label1 = New System.Windows.Forms.Label() Me.txtnamenKonv = New System.Windows.Forms.TextBox() Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.Label2 = New System.Windows.Forms.Label() Me.btnAddIndexM = New System.Windows.Forms.Button() Me.cmbIndex_AUTO = New System.Windows.Forms.ComboBox() Me.TBDD_INDEX_AUTOMBindingSource = New System.Windows.Forms.BindingSource(Me.components) @@ -50,9 +51,8 @@ Partial Class frmDokumentart_NameConvention Me.VERSION_DELIMITERTextBox = New System.Windows.Forms.TextBox() Me.FILE_DELIMITERTextBox = New System.Windows.Forms.TextBox() Me.GroupBox3 = New System.Windows.Forms.GroupBox() - Me.Label6 = New System.Windows.Forms.Label() Me.Label5 = New System.Windows.Forms.Label() - Me.Label2 = New System.Windows.Forms.Label() + Me.Label6 = New System.Windows.Forms.Label() Me.GroupBox1.SuspendLayout() CType(Me.TBDD_INDEX_AUTOMBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit() @@ -93,10 +93,21 @@ Partial Class frmDokumentart_NameConvention Me.GroupBox1.TabIndex = 2 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Automatische Indexe:" + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label2.Location = New System.Drawing.Point(6, 21) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(202, 39) + Me.Label2.TabIndex = 9 + Me.Label2.Text = "Diese Indexe werden automatisch gesetzt," & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "können aber auch zur Dateibenennung" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "ge" & _ + "nutzt werden." ' 'btnAddIndexM ' - Me.btnAddIndexM.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_add_16xMD + Me.btnAddIndexM.Image = Global.DD_Record_Organiser.My.Resources.Resources.add Me.btnAddIndexM.Location = New System.Drawing.Point(197, 70) Me.btnAddIndexM.Name = "btnAddIndexM" Me.btnAddIndexM.Size = New System.Drawing.Size(30, 23) @@ -149,7 +160,7 @@ Partial Class frmDokumentart_NameConvention 'btnAddIndexA ' Me.btnAddIndexA.Enabled = False - Me.btnAddIndexA.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_add_16xMD + Me.btnAddIndexA.Image = Global.DD_Record_Organiser.My.Resources.Resources.add Me.btnAddIndexA.Location = New System.Drawing.Point(423, 74) Me.btnAddIndexA.Name = "btnAddIndexA" Me.btnAddIndexA.Size = New System.Drawing.Size(30, 23) @@ -194,7 +205,7 @@ Partial Class frmDokumentart_NameConvention ' 'Button1 ' - Me.Button1.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_add_16xMD + Me.Button1.Image = Global.DD_Record_Organiser.My.Resources.Resources.add Me.Button1.Location = New System.Drawing.Point(180, 72) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(30, 23) @@ -203,7 +214,7 @@ Partial Class frmDokumentart_NameConvention ' 'btnTrennzeichen ' - Me.btnTrennzeichen.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_add_16xMD + Me.btnTrennzeichen.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_add_16xLG Me.btnTrennzeichen.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnTrennzeichen.Location = New System.Drawing.Point(6, 24) Me.btnTrennzeichen.Name = "btnTrennzeichen" @@ -243,7 +254,7 @@ Partial Class frmDokumentart_NameConvention ' 'btnOK ' - Me.btnOK.Image = Global.DD_Record_Organiser.My.Resources.Resources.save_16xLG + Me.btnOK.Image = Global.DD_Record_Organiser.My.Resources.Resources.save Me.btnOK.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnOK.Location = New System.Drawing.Point(248, 355) Me.btnOK.Name = "btnOK" @@ -255,7 +266,7 @@ Partial Class frmDokumentart_NameConvention ' 'btnclose ' - Me.btnclose.Image = Global.DD_Record_Organiser.My.Resources.Resources.cancel1 + Me.btnclose.Image = Global.DD_Record_Organiser.My.Resources.Resources.cancel Me.btnclose.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnclose.Location = New System.Drawing.Point(369, 355) Me.btnclose.Name = "btnclose" @@ -296,8 +307,8 @@ Partial Class frmDokumentart_NameConvention Me.TableAdapterManager.TBPMO_KONFIGURATIONTableAdapter = Me.TBPMO_KONFIGURATIONTableAdapter Me.TableAdapterManager.TBPMO_RECORD_LOG_CONFIGTableAdapter = Nothing Me.TableAdapterManager.TBPMO_RECORDTableAdapter = Nothing - Me.TableAdapterManager.TBPMO_TEMPLATE_PATTERNTableAdapter = Nothing Me.TableAdapterManager.TBPMO_TEMPLATE_ENTITYTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_TEMPLATE_PATTERNTableAdapter = Nothing Me.TableAdapterManager.TBPMO_TEMPLATETableAdapter = Nothing Me.TableAdapterManager.TBPMO_WD_FVIEW_DT_INDEXTableAdapter = Nothing Me.TableAdapterManager.TBPMO_WD_OBJECTTYPETableAdapter = Nothing @@ -348,16 +359,6 @@ Partial Class frmDokumentart_NameConvention Me.GroupBox3.TabStop = False Me.GroupBox3.Text = "Entitäts-abhängige Indexe:" ' - 'Label6 - ' - Me.Label6.AutoSize = True - Me.Label6.Font = New System.Drawing.Font("Segoe UI Semibold", 9.75!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label6.Location = New System.Drawing.Point(12, 73) - Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(177, 17) - Me.Label6.TabIndex = 12 - Me.Label6.Text = "Aktuelle Namenkonvention:" - ' 'Label5 ' Me.Label5.AutoSize = True @@ -369,16 +370,15 @@ Partial Class frmDokumentart_NameConvention Me.Label5.Text = "Zur Dateibenennung können Sie auch Werte aus " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "dem zur Laufzeit aktuellen Datensa" & _ "tzes nutzen." ' - 'Label2 + 'Label6 ' - Me.Label2.AutoSize = True - Me.Label2.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label2.Location = New System.Drawing.Point(6, 21) - Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(202, 39) - Me.Label2.TabIndex = 9 - Me.Label2.Text = "Diese Indexe werden automatisch gesetzt," & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "können aber auch zur Dateibenennung" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "ge" & _ - "nutzt werden." + Me.Label6.AutoSize = True + Me.Label6.Font = New System.Drawing.Font("Segoe UI Semibold", 9.75!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label6.Location = New System.Drawing.Point(12, 73) + Me.Label6.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(177, 17) + Me.Label6.TabIndex = 12 + Me.Label6.Text = "Aktuelle Namenkonvention:" ' 'frmDokumentart_NameConvention ' diff --git a/app/DD-Record-Organiser/frmForm_Constructor.designer.vb b/app/DD-Record-Organiser/frmForm_Constructor.designer.vb index 67eabb4..8944458 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor.designer.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor.designer.vb @@ -236,7 +236,7 @@ Partial Class frmForm_Constructor Me.GridControlParentEntity.Location = New System.Drawing.Point(3, 3) Me.GridControlParentEntity.MainView = Me.GridViewParentEntity Me.GridControlParentEntity.Name = "GridControlParentEntity" - Me.GridControlParentEntity.Size = New System.Drawing.Size(307, 285) + Me.GridControlParentEntity.Size = New System.Drawing.Size(304, 288) Me.GridControlParentEntity.TabIndex = 14 Me.GridControlParentEntity.TabStop = False Me.GridControlParentEntity.UseEmbeddedNavigator = True @@ -408,7 +408,7 @@ Partial Class frmForm_Constructor Me.TabPageDetails.Controls.Add(Me.pnlDetails) Me.TabPageDetails.Image = Global.DD_Record_Organiser.My.Resources.Resources.grid_Data_16xMD Me.TabPageDetails.Name = "TabPageDetails" - Me.TabPageDetails.Size = New System.Drawing.Size(758, 309) + Me.TabPageDetails.Size = New System.Drawing.Size(762, 312) Me.TabPageDetails.Text = "Detailansicht:" ' 'pnlDetails @@ -417,7 +417,7 @@ Partial Class frmForm_Constructor Me.pnlDetails.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlDetails.Location = New System.Drawing.Point(0, 0) Me.pnlDetails.Name = "pnlDetails" - Me.pnlDetails.Size = New System.Drawing.Size(758, 309) + Me.pnlDetails.Size = New System.Drawing.Size(762, 312) Me.pnlDetails.TabIndex = 0 ' 'TabPageWD_Files @@ -579,7 +579,6 @@ Partial Class frmForm_Constructor 'btnAddUser_WV ' Me.btnAddUser_WV.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.btnAddUser_WV.Image = Global.DD_Record_Organiser.My.Resources.Resources.add Me.btnAddUser_WV.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnAddUser_WV.Location = New System.Drawing.Point(193, 94) Me.btnAddUser_WV.Name = "btnAddUser_WV" @@ -668,7 +667,7 @@ Partial Class frmForm_Constructor Me.ListViewFollowUp.Location = New System.Drawing.Point(11, 28) Me.ListViewFollowUp.MultiSelect = False Me.ListViewFollowUp.Name = "ListViewFollowUp" - Me.ListViewFollowUp.Size = New System.Drawing.Size(345, 258) + Me.ListViewFollowUp.Size = New System.Drawing.Size(345, 255) Me.ListViewFollowUp.TabIndex = 0 Me.ListViewFollowUp.UseCompatibleStateImageBehavior = False Me.ListViewFollowUp.View = System.Windows.Forms.View.Details @@ -695,7 +694,7 @@ Partial Class frmForm_Constructor Me.XtraTabControl1.Location = New System.Drawing.Point(0, 0) Me.XtraTabControl1.Name = "XtraTabControl1" Me.XtraTabControl1.SelectedTabPage = Me.TabPageParentEntity - Me.XtraTabControl1.Size = New System.Drawing.Size(532, 340) + Me.XtraTabControl1.Size = New System.Drawing.Size(525, 340) Me.XtraTabControl1.TabIndex = 0 Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabPageParentEntity}) ' @@ -709,15 +708,15 @@ Partial Class frmForm_Constructor Me.TabPageParentEntity.Controls.Add(Me.Label4) Me.TabPageParentEntity.Controls.Add(Me.GridControlParentEntity) Me.TabPageParentEntity.Name = "TabPageParentEntity" - Me.TabPageParentEntity.Size = New System.Drawing.Size(526, 312) + Me.TabPageParentEntity.Size = New System.Drawing.Size(523, 315) Me.TabPageParentEntity.Text = "Parent-Entity" ' 'Button1 ' Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Button1.Image = Global.DD_Record_Organiser.My.Resources.Resources.Close_16xLG + Me.Button1.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button1.Location = New System.Drawing.Point(405, 261) + Me.Button1.Location = New System.Drawing.Point(402, 264) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(98, 27) Me.Button1.TabIndex = 18 @@ -732,11 +731,10 @@ Partial Class frmForm_Constructor Me.btnRefreshPEntity.BackColor = System.Drawing.SystemColors.Control Me.btnRefreshPEntity.FlatAppearance.BorderColor = System.Drawing.Color.DarkOrange Me.btnRefreshPEntity.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.btnRefreshPEntity.Image = Global.DD_Record_Organiser.My.Resources.Resources.refresh_16xLG Me.btnRefreshPEntity.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnRefreshPEntity.Location = New System.Drawing.Point(3, 293) + Me.btnRefreshPEntity.Location = New System.Drawing.Point(3, 296) Me.btnRefreshPEntity.Name = "btnRefreshPEntity" - Me.btnRefreshPEntity.Size = New System.Drawing.Size(500, 31) + Me.btnRefreshPEntity.Size = New System.Drawing.Size(497, 31) Me.btnRefreshPEntity.TabIndex = 17 Me.btnRefreshPEntity.Text = "Parent-Datensatz aktualisieren" Me.btnRefreshPEntity.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -748,7 +746,7 @@ Partial Class frmForm_Constructor Me.lblParentID.AutoSize = True Me.lblParentID.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblParentID.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer)) - Me.lblParentID.Location = New System.Drawing.Point(316, 38) + Me.lblParentID.Location = New System.Drawing.Point(313, 38) Me.lblParentID.Name = "lblParentID" Me.lblParentID.Size = New System.Drawing.Size(168, 16) Me.lblParentID.TabIndex = 16 @@ -759,7 +757,7 @@ Partial Class frmForm_Constructor Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label4.AutoSize = True Me.Label4.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label4.Location = New System.Drawing.Point(316, 12) + Me.Label4.Location = New System.Drawing.Point(313, 12) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(160, 16) Me.Label4.TabIndex = 15 @@ -785,7 +783,7 @@ Partial Class frmForm_Constructor ' 'tsbtnRecordSave ' - Me.tsbtnRecordSave.Image = Global.DD_Record_Organiser.My.Resources.Resources.save_16xLG1 + Me.tsbtnRecordSave.Image = Global.DD_Record_Organiser.My.Resources.Resources.save_16xLG Me.tsbtnRecordSave.ImageTransparentColor = System.Drawing.Color.Magenta Me.tsbtnRecordSave.Name = "tsbtnRecordSave" Me.tsbtnRecordSave.Size = New System.Drawing.Size(79, 22) @@ -825,7 +823,6 @@ Partial Class frmForm_Constructor ' 'VorlageToolStripMenuItem ' - Me.VorlageToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.page_white_office Me.VorlageToolStripMenuItem.Name = "VorlageToolStripMenuItem" Me.VorlageToolStripMenuItem.Size = New System.Drawing.Size(228, 22) Me.VorlageToolStripMenuItem.Text = "Office-Vorlagen" @@ -1089,8 +1086,8 @@ Partial Class frmForm_Constructor Me.TableAdapterManager.TBPMO_KONFIGURATIONTableAdapter = Nothing Me.TableAdapterManager.TBPMO_RECORD_LOG_CONFIGTableAdapter = Nothing Me.TableAdapterManager.TBPMO_RECORDTableAdapter = Nothing - Me.TableAdapterManager.TBPMO_TEMPLATE_PATTERNTableAdapter = Nothing Me.TableAdapterManager.TBPMO_TEMPLATE_ENTITYTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_TEMPLATE_PATTERNTableAdapter = Nothing Me.TableAdapterManager.TBPMO_TEMPLATETableAdapter = Nothing Me.TableAdapterManager.TBPMO_WD_FVIEW_DT_INDEXTableAdapter = Nothing Me.TableAdapterManager.TBPMO_WD_OBJECTTYPETableAdapter = Nothing diff --git a/app/DD-Record-Organiser/frmForm_Constructor.resx b/app/DD-Record-Organiser/frmForm_Constructor.resx index 5cd15fa..73e7a7d 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor.resx +++ b/app/DD-Record-Organiser/frmForm_Constructor.resx @@ -157,7 +157,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABS - CQAAAk1TRnQBSQFMAgEBAgEAAVgBCQFYAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAgEAAWgBCQFoAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/app/DD-Record-Organiser/frmForm_Input.Designer.vb b/app/DD-Record-Organiser/frmForm_Input.Designer.vb index 4dc0617..c711f94 100644 --- a/app/DD-Record-Organiser/frmForm_Input.Designer.vb +++ b/app/DD-Record-Organiser/frmForm_Input.Designer.vb @@ -22,15 +22,16 @@ Partial Class frmFormInput 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFormInput)) Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() Me.tsstat_lbl = New System.Windows.Forms.ToolStripStatusLabel() Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet() - Me.VWPMO_CONTROL_SCREENBindingSource = New System.Windows.Forms.BindingSource() + Me.VWPMO_CONTROL_SCREENBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.VWPMO_CONTROL_SCREENTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_CONTROL_SCREENTableAdapter() Me.TableAdapterManager = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager() - Me.VWPMO_CONTROL_SCREENBindingNavigator = New System.Windows.Forms.BindingNavigator() - Me.BindingSourceDGV = New System.Windows.Forms.BindingSource() + Me.VWPMO_CONTROL_SCREENBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components) + Me.BindingSourceDGV = New System.Windows.Forms.BindingSource(Me.components) Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel() Me.BindingNavigatorMoveFirstItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorMovePreviousItem = New System.Windows.Forms.ToolStripButton() @@ -59,11 +60,11 @@ Partial Class frmFormInput Me.AxObjectListControl = New AxOBJECTLISTCONTROLLib.AxObjectListControl() Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() Me.tslblAnzahl_Dokumente = New System.Windows.Forms.ToolStripLabel() - Me.TBPMO_RECORDBindingSource = New System.Windows.Forms.BindingSource() + Me.TBPMO_RECORDBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBPMO_RECORDTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_RECORDTableAdapter() - Me.TooltipControl = New System.Windows.Forms.ToolTip() - Me.ttTooltip = New System.Windows.Forms.ToolTip() - Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip() + Me.TooltipControl = New System.Windows.Forms.ToolTip(Me.components) + Me.ttTooltip = New System.Windows.Forms.ToolTip(Me.components) + Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.StammdatenEditierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.StatusStrip1.SuspendLayout() CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit() @@ -104,9 +105,8 @@ Partial Class frmFormInput ' 'tsstat_lbl ' - Me.tsstat_lbl.Image = Global.DD_Record_Organiser.My.Resources.Resources.flag_green Me.tsstat_lbl.Name = "tsstat_lbl" - Me.tsstat_lbl.Size = New System.Drawing.Size(69, 17) + Me.tsstat_lbl.Size = New System.Drawing.Size(53, 17) Me.tsstat_lbl.Text = "tsstat_lbl" Me.tsstat_lbl.Visible = False ' @@ -128,19 +128,30 @@ Partial Class frmFormInput ' Me.TableAdapterManager.BackupDataSetBeforeUpdate = False Me.TableAdapterManager.Connection = Nothing + Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing Me.TableAdapterManager.TBDD_DOKUMENTARTTableAdapter = Nothing Me.TableAdapterManager.TBDD_EINGANGSARTENTableAdapter = Nothing + Me.TableAdapterManager.TBDD_EMAIL_ACCOUNTTableAdapter = Nothing Me.TableAdapterManager.TBDD_GROUPS_USERTableAdapter = Nothing Me.TableAdapterManager.TBDD_INDEX_AUTOMTableAdapter = Nothing Me.TableAdapterManager.TBDD_USER_GROUPSTableAdapter = Nothing Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_FILES_USERTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_FOLLOW_UP_EMAILTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_FOLLUPEMAIL_USERTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FORM_CONSTRUCTORTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FORM_TYPETableAdapter = Nothing Me.TableAdapterManager.TBPMO_FORM_VIEWTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FORMTableAdapter = Nothing Me.TableAdapterManager.TBPMO_KONFIGURATIONTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_RECORD_LOG_CONFIGTableAdapter = Nothing Me.TableAdapterManager.TBPMO_RECORDTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_TEMPLATE_ENTITYTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_TEMPLATE_PATTERNTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_TEMPLATETableAdapter = Nothing Me.TableAdapterManager.TBPMO_WD_FVIEW_DT_INDEXTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_WD_OBJECTTYPETableAdapter = Nothing Me.TableAdapterManager.TBPMO_WORKFLOW_FORMTableAdapter = Nothing Me.TableAdapterManager.TBPMO_WORKFLOW_TASK_STATETableAdapter = Nothing Me.TableAdapterManager.TBPMO_WORKFLOWTableAdapter = Nothing @@ -366,7 +377,7 @@ Partial Class frmFormInput ' 'tsButtonAdd ' - Me.tsButtonAdd.Image = Global.DD_Record_Organiser.My.Resources.Resources.add + Me.tsButtonAdd.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_add_16xLG Me.tsButtonAdd.ImageTransparentColor = System.Drawing.Color.Magenta Me.tsButtonAdd.Name = "tsButtonAdd" Me.tsButtonAdd.Size = New System.Drawing.Size(89, 22) @@ -374,6 +385,7 @@ Partial Class frmFormInput ' 'tsButtonDelete ' + Me.tsButtonDelete.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_Cancel_16xLG Me.tsButtonDelete.ImageTransparentColor = System.Drawing.Color.Magenta Me.tsButtonDelete.Name = "tsButtonDelete" Me.tsButtonDelete.Size = New System.Drawing.Size(71, 22) @@ -402,7 +414,7 @@ Partial Class frmFormInput Me.XtraTabPage1.Controls.Add(Me.AxObjectListControl) Me.XtraTabPage1.Controls.Add(Me.ToolStrip1) Me.XtraTabPage1.Name = "XtraTabPage1" - Me.XtraTabPage1.Size = New System.Drawing.Size(913, 236) + Me.XtraTabPage1.Size = New System.Drawing.Size(917, 239) Me.XtraTabPage1.Text = "Windream-Suche" ' 'AxObjectListControl @@ -412,7 +424,7 @@ Partial Class frmFormInput Me.AxObjectListControl.Location = New System.Drawing.Point(0, 25) Me.AxObjectListControl.Name = "AxObjectListControl" Me.AxObjectListControl.OcxState = CType(resources.GetObject("AxObjectListControl.OcxState"), System.Windows.Forms.AxHost.State) - Me.AxObjectListControl.Size = New System.Drawing.Size(913, 211) + Me.AxObjectListControl.Size = New System.Drawing.Size(917, 214) Me.AxObjectListControl.TabIndex = 4 ' 'ToolStrip1 @@ -420,7 +432,7 @@ Partial Class frmFormInput Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblAnzahl_Dokumente}) Me.ToolStrip1.Location = New System.Drawing.Point(0, 0) Me.ToolStrip1.Name = "ToolStrip1" - Me.ToolStrip1.Size = New System.Drawing.Size(913, 25) + Me.ToolStrip1.Size = New System.Drawing.Size(917, 25) Me.ToolStrip1.TabIndex = 0 Me.ToolStrip1.Text = "ToolStrip1" ' diff --git a/app/DD-Record-Organiser/frmForm_Input.resx b/app/DD-Record-Organiser/frmForm_Input.resx index 02c5475..eb7aff5 100644 --- a/app/DD-Record-Organiser/frmForm_Input.resx +++ b/app/DD-Record-Organiser/frmForm_Input.resx @@ -200,15 +200,12 @@ 695, 56 - - 588, 56 - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACFTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5BeEhvc3QrU3RhdGUBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAJQAAAAIB - AAAAAQAAAAAAAAAAAAAAABAAAAAAAAEAXF4AAM8VAAAAAAAACw== + AAAAAQAAAAAAAAAAAAAAABAAAAAAAAEAxl4AAB4WAAAAAAAACw== diff --git a/app/DD-Record-Organiser/frmSQLEditor.Designer.vb b/app/DD-Record-Organiser/frmSQLEditor.Designer.vb index ccbf24f..58bac55 100644 --- a/app/DD-Record-Organiser/frmSQLEditor.Designer.vb +++ b/app/DD-Record-Organiser/frmSQLEditor.Designer.vb @@ -23,12 +23,12 @@ Partial Class frmSQLEditor _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSQLEditor)) Me.Button1 = New System.Windows.Forms.Button() Me.txtValue = New System.Windows.Forms.TextBox() @@ -189,7 +189,7 @@ Partial Class frmSQLEditor ' 'btnAddPlaceholder ' - Me.btnAddPlaceholder.Image = Global.DD_Record_Organiser.My.Resources.Resources.AddMark_10580 + Me.btnAddPlaceholder.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_add_16xLG Me.btnAddPlaceholder.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnAddPlaceholder.Location = New System.Drawing.Point(181, 17) Me.btnAddPlaceholder.Name = "btnAddPlaceholder" @@ -200,7 +200,7 @@ Partial Class frmSQLEditor ' 'btnRefreshConnections ' - Me.btnRefreshConnections.Image = Global.DD_Record_Organiser.My.Resources.Resources.arrow_refresh + Me.btnRefreshConnections.Image = Global.DD_Record_Organiser.My.Resources.Resources.refresh_16xLG Me.btnRefreshConnections.Location = New System.Drawing.Point(488, 19) Me.btnRefreshConnections.Name = "btnRefreshConnections" Me.btnRefreshConnections.Size = New System.Drawing.Size(35, 23) @@ -211,26 +211,26 @@ Partial Class frmSQLEditor ' Me.dgvPlaceholders.AllowUserToAddRows = False Me.dgvPlaceholders.AllowUserToDeleteRows = False - DataGridViewCellStyle7.BackColor = System.Drawing.Color.Cyan - Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7 - DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle8.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvPlaceholders.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle8 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.Cyan + Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle2.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvPlaceholders.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2 Me.dgvPlaceholders.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvPlaceholders.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colPlaceholder, Me.colReplace}) - DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle9.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvPlaceholders.DefaultCellStyle = DataGridViewCellStyle9 + DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle3.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvPlaceholders.DefaultCellStyle = DataGridViewCellStyle3 Me.dgvPlaceholders.Enabled = False Me.dgvPlaceholders.Location = New System.Drawing.Point(9, 458) Me.dgvPlaceholders.Name = "dgvPlaceholders" @@ -252,25 +252,25 @@ Partial Class frmSQLEditor ' Me.dgvResult.AllowUserToAddRows = False Me.dgvResult.AllowUserToDeleteRows = False - DataGridViewCellStyle10.BackColor = System.Drawing.Color.Cyan - Me.dgvResult.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10 - DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle11.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvResult.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle11 + DataGridViewCellStyle4.BackColor = System.Drawing.Color.Cyan + Me.dgvResult.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle5.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvResult.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle5 Me.dgvResult.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle12.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvResult.DefaultCellStyle = DataGridViewCellStyle12 + DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle6.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvResult.DefaultCellStyle = DataGridViewCellStyle6 Me.dgvResult.Location = New System.Drawing.Point(365, 458) Me.dgvResult.Name = "dgvResult" Me.dgvResult.ReadOnly = True diff --git a/app/DD-Record-Organiser/frmSQLEditor.vb b/app/DD-Record-Organiser/frmSQLEditor.vb index ba8d879..7f78861 100644 --- a/app/DD-Record-Organiser/frmSQLEditor.vb +++ b/app/DD-Record-Organiser/frmSQLEditor.vb @@ -97,7 +97,6 @@ Public Class frmSQLEditor Dim ds As DataSet = ExecuteWithConnection(cmbConnection.SelectedValue, query) If ds IsNot Nothing Then - lbResultsCount.Text = ds.Tables(0).Rows.Count.ToString & " Ergebnisse" dgvResult.DataSource = ds.Tables(0) End If