From 29b29059a9ee7adad6ce1ecbe86f0b902202bc13 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 2 Apr 2020 13:21:38 +0200 Subject: [PATCH] remove scrollbar in frmIndex, fix multiple saved values in lookup control, remove version tag button, fix final messagebox filename, allow null for wd index, delete skipped files --- Global_Indexer/ClassControls.vb | 17 +- Global_Indexer/ClassWindream.vb | 1 + Global_Indexer/MyDataset.Designer.vb | 23 +- Global_Indexer/MyDataset.xsd | 92 +- Global_Indexer/frmAdministration.Designer.vb | 25 +- Global_Indexer/frmAdministration.resx | 44 +- Global_Indexer/frmAdministration.vb | 13 +- Global_Indexer/frmIndex.vb | 16 +- Global_Indexer/frmNamenkonvention.designer.vb | 24 +- Global_Indexer/frmNamenkonvention.en-US.resx | 32 +- Global_Indexer/frmNamenkonvention.resx | 993 +++++++++--------- Global_Indexer/frmNamenkonvention.vb | 2 +- 12 files changed, 607 insertions(+), 675 deletions(-) diff --git a/Global_Indexer/ClassControls.vb b/Global_Indexer/ClassControls.vb index c9e0982..b93dc23 100644 --- a/Global_Indexer/ClassControls.vb +++ b/Global_Indexer/ClassControls.vb @@ -76,10 +76,19 @@ Public Class ClassControls } If Not String.IsNullOrEmpty(Vorgabe) Then - Dim oDefaultValues = Vorgabe. - Split(",").ToList(). - Select(Function(item) item.Trim()). - ToList() + Dim oDefaultValues As New List(Of String) + + If Vorgabe.Contains(",") Then + oDefaultValues = Vorgabe. + Split(",").ToList(). + Select(Function(item) item.Trim()). + ToList() + Else + oDefaultValues = Vorgabe. + Split(ClassConstants.VECTORSEPARATOR).ToList(). + Select(Function(item) item.Trim()). + ToList() + End If oControl.SelectedValues = oDefaultValues End If diff --git a/Global_Indexer/ClassWindream.vb b/Global_Indexer/ClassWindream.vb index 483242e..8935ff6 100644 --- a/Global_Indexer/ClassWindream.vb +++ b/Global_Indexer/ClassWindream.vb @@ -539,6 +539,7 @@ Public Class ClassWindream Case "New version" LOGGER.Info("Creating new version of file [{0}]", NewFileName) oWindreamFilename = ClassFilehandle.Versionierung_Datei(NewFileName).ToString.Substring(2) + CURRENT_NEWFILENAME = oWindreamFilename Case "Question" Dim oMessage = $"Eine Datei mit identischem Namen {vbNewLine}'{NewFileName}'{vbNewLine}existiert bereits!{vbNewLine}Wollen Sie die bestehende Datei ersetzen?" If USER_LANGUAGE <> "de-DE" Then diff --git a/Global_Indexer/MyDataset.Designer.vb b/Global_Indexer/MyDataset.Designer.vb index 99d1ec5..43f5199 100644 --- a/Global_Indexer/MyDataset.Designer.vb +++ b/Global_Indexer/MyDataset.Designer.vb @@ -3563,7 +3563,6 @@ Partial Public Class MyDataset Me.columnDOK_ID.AllowDBNull = false Me.columnNAME.AllowDBNull = false Me.columnNAME.MaxLength = 50 - Me.columnWD_INDEX.AllowDBNull = false Me.columnWD_INDEX.MaxLength = 50 Me.columnCOMMENT.MaxLength = 150 Me.columnDATATYPE.DefaultValue = CType("VARCHAR",String) @@ -13049,7 +13048,11 @@ Partial Public Class MyDataset Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property WD_INDEX() As String Get - Return CType(Me(Me.tableTBDD_INDEX_MAN.WD_INDEXColumn),String) + Try + Return CType(Me(Me.tableTBDD_INDEX_MAN.WD_INDEXColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte WD_INDEX in Tabelle TBDD_INDEX_MAN ist DBNull.", e) + End Try End Get Set Me(Me.tableTBDD_INDEX_MAN.WD_INDEXColumn) = value @@ -13304,6 +13307,18 @@ Partial Public Class MyDataset End Set End Property + _ + Public Function IsWD_INDEXNull() As Boolean + Return Me.IsNull(Me.tableTBDD_INDEX_MAN.WD_INDEXColumn) + End Function + + _ + Public Sub SetWD_INDEXNull() + Me(Me.tableTBDD_INDEX_MAN.WD_INDEXColumn) = Global.System.Convert.DBNull + End Sub + _ Public Function IsCOMMENTNull() As Boolean @@ -20932,7 +20947,7 @@ Namespace MyDatasetTableAdapters Me.Adapter.InsertCommand.Parameters(1).Value = CType(NAME,String) End If If (WD_INDEX Is Nothing) Then - Throw New Global.System.ArgumentNullException("WD_INDEX") + Me.Adapter.InsertCommand.Parameters(2).Value = Global.System.DBNull.Value Else Me.Adapter.InsertCommand.Parameters(2).Value = CType(WD_INDEX,String) End If @@ -21030,7 +21045,7 @@ Namespace MyDatasetTableAdapters Me.Adapter.UpdateCommand.Parameters(1).Value = CType(NAME,String) End If If (WD_INDEX Is Nothing) Then - Throw New Global.System.ArgumentNullException("WD_INDEX") + Me.Adapter.UpdateCommand.Parameters(2).Value = Global.System.DBNull.Value Else Me.Adapter.UpdateCommand.Parameters(2).Value = CType(WD_INDEX,String) End If diff --git a/Global_Indexer/MyDataset.xsd b/Global_Indexer/MyDataset.xsd index 479df22..fadd1af 100644 --- a/Global_Indexer/MyDataset.xsd +++ b/Global_Indexer/MyDataset.xsd @@ -379,7 +379,7 @@ SELECT GUID, DOK_ID, NAME, WD_INDEX, COMMENT, DATATYPE, SUGGESTION, DEFAULT_VALU - + @@ -421,7 +421,7 @@ SELECT GUID, DOK_ID, NAME, WD_INDEX, COMMENT, DATATYPE, SUGGESTION, DEFAULT_VALU - + @@ -1691,7 +1691,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1756,7 +1756,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1839,7 +1839,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1876,7 +1876,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1890,7 +1890,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1904,7 +1904,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1916,7 +1916,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1986,7 +1986,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2059,7 +2059,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2172,7 +2172,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2268,7 +2268,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2323,7 +2323,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2331,7 +2331,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2381,7 +2381,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2453,7 +2453,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2534,7 +2534,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2548,7 +2548,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2557,7 +2557,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2582,7 +2582,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2621,7 +2621,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2693,7 +2693,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2732,7 +2732,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2746,7 +2746,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2792,7 +2792,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2852,7 +2852,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2884,7 +2884,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2922,7 +2922,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2944,7 +2944,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2956,7 +2956,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -3092,21 +3092,21 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Global_Indexer/frmAdministration.Designer.vb b/Global_Indexer/frmAdministration.Designer.vb index 525060b..601054d 100644 --- a/Global_Indexer/frmAdministration.Designer.vb +++ b/Global_Indexer/frmAdministration.Designer.vb @@ -118,10 +118,8 @@ Partial Class frmAdministration Me.BarButtonItem26 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem27 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem28 = New DevExpress.XtraBars.BarButtonItem() - Me.RibbonPageCategoryUserGroups = New DevExpress.XtraBars.Ribbon.RibbonPageCategory() Me.RibbonPageUserGroups = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageCategoryMisc = New DevExpress.XtraBars.Ribbon.RibbonPageCategory() Me.RibbonPageEmail = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageStart = New DevExpress.XtraBars.Ribbon.RibbonPage() @@ -527,8 +525,7 @@ Partial Class frmAdministration resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") Me.RibbonControl1.MaxItemId = 38 Me.RibbonControl1.Name = "RibbonControl1" - Me.RibbonControl1.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategoryUserGroups, Me.RibbonPageCategoryMisc}) - Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart}) + Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart, Me.RibbonPageUserGroups, Me.RibbonPageEmail}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowToolbarCustomizeItem = False Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 @@ -750,15 +747,6 @@ Partial Class frmAdministration Me.BarButtonItem28.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem28.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem28.Name = "BarButtonItem28" ' - 'RibbonPageCategoryUserGroups - ' - Me.RibbonPageCategoryUserGroups.Appearance.BackColor = System.Drawing.Color.SeaGreen - Me.RibbonPageCategoryUserGroups.Appearance.Options.UseBackColor = True - Me.RibbonPageCategoryUserGroups.AutoStretchPageHeaders = True - Me.RibbonPageCategoryUserGroups.Name = "RibbonPageCategoryUserGroups" - Me.RibbonPageCategoryUserGroups.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageUserGroups}) - resources.ApplyResources(Me.RibbonPageCategoryUserGroups, "RibbonPageCategoryUserGroups") - ' 'RibbonPageUserGroups ' Me.RibbonPageUserGroups.Appearance.BackColor = System.Drawing.Color.SeaGreen @@ -773,15 +761,6 @@ Partial Class frmAdministration Me.RibbonPageGroup3.Name = "RibbonPageGroup3" resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3") ' - 'RibbonPageCategoryMisc - ' - Me.RibbonPageCategoryMisc.Appearance.BackColor = System.Drawing.Color.DarkCyan - Me.RibbonPageCategoryMisc.Appearance.Options.UseBackColor = True - Me.RibbonPageCategoryMisc.AutoStretchPageHeaders = True - Me.RibbonPageCategoryMisc.Name = "RibbonPageCategoryMisc" - Me.RibbonPageCategoryMisc.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageEmail}) - resources.ApplyResources(Me.RibbonPageCategoryMisc, "RibbonPageCategoryMisc") - ' 'RibbonPageEmail ' Me.RibbonPageEmail.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup4}) @@ -2946,7 +2925,6 @@ Partial Class frmAdministration Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents RibbonPageCategoryUserGroups As DevExpress.XtraBars.Ribbon.RibbonPageCategory Friend WithEvents RibbonPageUserGroups As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents BarButtonItem6 As DevExpress.XtraBars.BarButtonItem @@ -2970,7 +2948,6 @@ Partial Class frmAdministration Friend WithEvents BarButtonItem8 As DevExpress.XtraBars.BarButtonItem Friend WithEvents txtStatus As DevExpress.XtraBars.BarStaticItem Friend WithEvents RibbonPage8 As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents RibbonPageCategoryMisc As DevExpress.XtraBars.Ribbon.RibbonPageCategory Friend WithEvents RibbonPageEmail As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents BarButtonItem9 As DevExpress.XtraBars.BarButtonItem diff --git a/Global_Indexer/frmAdministration.resx b/Global_Indexer/frmAdministration.resx index 4ad68e2..25c778b 100644 --- a/Global_Indexer/frmAdministration.resx +++ b/Global_Indexer/frmAdministration.resx @@ -820,24 +820,6 @@ 0, 0 - - Gruppenzuordnung - - - Profil-Zuordnung - - - Profil-Einstellungen - - - E-Mail Indexierung - - - E-Mail Indexierung - - - Weitere Einstellungen - Grundeinstellungen @@ -857,7 +839,19 @@ Automatische Profilauswahl - Start + Profil-Verwaltung + + + Gruppenzuordnung + + + Profil-Zuordnung + + + E-Mail Indexierung + + + E-Mail Indexierung 1376, 158 @@ -7506,12 +7500,6 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageCategoryUserGroups - - - DevExpress.XtraBars.Ribbon.RibbonPageCategory, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - RibbonPageUserGroups @@ -7524,12 +7512,6 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageCategoryMisc - - - DevExpress.XtraBars.Ribbon.RibbonPageCategory, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - RibbonPageEmail diff --git a/Global_Indexer/frmAdministration.vb b/Global_Indexer/frmAdministration.vb index 1cd513b..66d35da 100644 --- a/Global_Indexer/frmAdministration.vb +++ b/Global_Indexer/frmAdministration.vb @@ -48,8 +48,8 @@ Public Class frmAdministration oDragDropManager.AddGridView(viewAssignedUsers) oDragDropManager.AddGridView(viewAvailableUsers) - RibbonPageCategoryUserGroups.Visible = False - RibbonPageCategoryMisc.Visible = False + RibbonPageUserGroups.Visible = False + RibbonPageEmail.Visible = False Dim oDatatable As New DataTable() oDatatable.Columns.Add("VALUE_TEXT") @@ -190,6 +190,7 @@ Public Class frmAdministration If MyDataset.TBDD_DOKUMENTART.GetChanges Is Nothing = False Then Me.GEANDERTWERTextBox.Text = Environment.UserName + Try Me.TBDD_DOKUMENTARTBindingSource.EndEdit() Catch ex As Exception @@ -464,14 +465,14 @@ Public Class frmAdministration End If If oSelectedPageName = XtraTabPageUsersGroups.Name Then - RibbonPageCategoryUserGroups.Visible = True + RibbonPageUserGroups.Visible = True RibbonControl1.SelectedPage = RibbonPageUserGroups Else - RibbonPageCategoryUserGroups.Visible = False + RibbonPageUserGroups.Visible = False End If If oSelectedPageName = XtraTabPageEmail.Name Then - RibbonPageCategoryMisc.Visible = True + RibbonPageEmail.Visible = True If oSelectedPageName = XtraTabPageEmail.Name Then RibbonControl1.SelectedPage = RibbonPageEmail @@ -479,7 +480,7 @@ Public Class frmAdministration Else - RibbonPageCategoryMisc.Visible = False + RibbonPageEmail.Visible = False End If Select Case XtraTabControl1.SelectedTabPageIndex diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb index cba2dfe..e3c3a04 100644 --- a/Global_Indexer/frmIndex.vb +++ b/Global_Indexer/frmIndex.vb @@ -76,13 +76,14 @@ Public Class frmIndex End Sub Sub addLabel(indexname As String, hinweis As String, ylbl As Integer, anz As String) - Dim lbl As New Label - lbl.Name = "lbl" & indexname - lbl.Size = New Size(CInt(hinweis.Length * 15), 18) 'CInt(hinweis.Length * 9) - lbl.Text = hinweis + Dim lbl As New Label With { + .Name = "lbl" & indexname, + .AutoSize = True, + .Text = hinweis, + .Location = New Point(11, ylbl) + } pnlIndex.Controls.Add(lbl) - lbl.Location = New Point(11, ylbl) End Sub Function Indexwert_checkValueDB(indexname As String, wert As String) @@ -1557,7 +1558,7 @@ Public Class frmIndex End Try End Sub ' _ - Function Check_HistoryValues(Indexname As String, Dokart As String) + Function Check_HistoryValues(Indexname As String, Dokart As String) As String Try Dim result = Nothing Dim DT As DataTable = MyDataset.TBTEMP_INDEXRESULTS @@ -1573,6 +1574,7 @@ Public Class frmIndex End If Catch ex As Exception MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in Check_HistoryValues:") + Return Nothing End Try End Function @@ -2623,6 +2625,8 @@ Public Class frmIndex End Sub Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + ClassDatabase.Execute_non_Query($"DELETE FROM TBGI_FILES_USER WHERE GUID = {CURRENT_WORKFILE_GUID}", True) + CancelAttempts = 2 Close() End Sub diff --git a/Global_Indexer/frmNamenkonvention.designer.vb b/Global_Indexer/frmNamenkonvention.designer.vb index fa8fd27..b062cea 100644 --- a/Global_Indexer/frmNamenkonvention.designer.vb +++ b/Global_Indexer/frmNamenkonvention.designer.vb @@ -40,7 +40,6 @@ Partial Class frmNamenkonvention Me.Button2 = New System.Windows.Forms.Button() Me.btnVersionTZ = New System.Windows.Forms.Button() Me.btnTrennzeichen = New System.Windows.Forms.Button() - Me.btnVersion = New System.Windows.Forms.Button() Me.btndelete = New System.Windows.Forms.Button() Me.btnOK = New System.Windows.Forms.Button() Me.btnclose = New System.Windows.Forms.Button() @@ -74,13 +73,13 @@ Partial Class frmNamenkonvention ' 'GroupBox1 ' - resources.ApplyResources(Me.GroupBox1, "GroupBox1") Me.GroupBox1.Controls.Add(Me.btnAddIndexA) Me.GroupBox1.Controls.Add(Me.btnAddIndexM) Me.GroupBox1.Controls.Add(Me.cmbIndex_A) Me.GroupBox1.Controls.Add(Me.cmbIndex_m) Me.GroupBox1.Controls.Add(Me.Label3) Me.GroupBox1.Controls.Add(Me.Label2) + resources.ApplyResources(Me.GroupBox1, "GroupBox1") Me.GroupBox1.Name = "GroupBox1" Me.GroupBox1.TabStop = False ' @@ -98,10 +97,10 @@ Partial Class frmNamenkonvention ' 'cmbIndex_A ' - resources.ApplyResources(Me.cmbIndex_A, "cmbIndex_A") Me.cmbIndex_A.DataSource = Me.TBDD_INDEX_AUTOMBindingSource Me.cmbIndex_A.DisplayMember = "INDEXNAME" Me.cmbIndex_A.FormattingEnabled = True + resources.ApplyResources(Me.cmbIndex_A, "cmbIndex_A") Me.cmbIndex_A.Name = "cmbIndex_A" Me.cmbIndex_A.ValueMember = "GUID" ' @@ -117,10 +116,10 @@ Partial Class frmNamenkonvention ' 'cmbIndex_m ' - resources.ApplyResources(Me.cmbIndex_m, "cmbIndex_m") Me.cmbIndex_m.DataSource = Me.TBDD_INDEX_MANBindingSource Me.cmbIndex_m.DisplayMember = "NAME" Me.cmbIndex_m.FormattingEnabled = True + resources.ApplyResources(Me.cmbIndex_m, "cmbIndex_m") Me.cmbIndex_m.Name = "cmbIndex_m" Me.cmbIndex_m.ValueMember = "GUID" ' @@ -141,11 +140,10 @@ Partial Class frmNamenkonvention ' 'GroupBox2 ' - resources.ApplyResources(Me.GroupBox2, "GroupBox2") Me.GroupBox2.Controls.Add(Me.Button2) Me.GroupBox2.Controls.Add(Me.btnVersionTZ) Me.GroupBox2.Controls.Add(Me.btnTrennzeichen) - Me.GroupBox2.Controls.Add(Me.btnVersion) + resources.ApplyResources(Me.GroupBox2, "GroupBox2") Me.GroupBox2.Name = "GroupBox2" Me.GroupBox2.TabStop = False ' @@ -167,30 +165,24 @@ Partial Class frmNamenkonvention Me.btnTrennzeichen.Name = "btnTrennzeichen" Me.btnTrennzeichen.UseVisualStyleBackColor = True ' - 'btnVersion - ' - resources.ApplyResources(Me.btnVersion, "btnVersion") - Me.btnVersion.Name = "btnVersion" - Me.btnVersion.UseVisualStyleBackColor = True - ' 'btndelete ' - resources.ApplyResources(Me.btndelete, "btndelete") Me.btndelete.Image = Global.Global_Indexer.My.Resources.Resources.delete2 + resources.ApplyResources(Me.btndelete, "btndelete") Me.btndelete.Name = "btndelete" Me.btndelete.UseVisualStyleBackColor = True ' 'btnOK ' - resources.ApplyResources(Me.btnOK, "btnOK") Me.btnOK.Image = Global.Global_Indexer.My.Resources.Resources.save_16xLG + resources.ApplyResources(Me.btnOK, "btnOK") Me.btnOK.Name = "btnOK" Me.btnOK.UseVisualStyleBackColor = True ' 'btnclose ' - resources.ApplyResources(Me.btnclose, "btnclose") Me.btnclose.Image = Global.Global_Indexer.My.Resources.Resources.Close_16xLG + resources.ApplyResources(Me.btnclose, "btnclose") Me.btnclose.Name = "btnclose" Me.btnclose.UseVisualStyleBackColor = True ' @@ -215,6 +207,7 @@ Partial Class frmNamenkonvention Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing Me.TableAdapterManager.TBGI_CONFIGURATIONTableAdapter = Nothing Me.TableAdapterManager.TBGI_OBJECTTYPE_EMAIL_INDEXTableAdapter = Nothing + Me.TableAdapterManager.TBGI_REGEX_DOCTYPETableAdapter = Nothing Me.TableAdapterManager.TBHOTKEY_PATTERNS_REWORKTableAdapter = Nothing Me.TableAdapterManager.TBHOTKEY_PATTERNSTableAdapter = Nothing Me.TableAdapterManager.TBHOTKEY_PROFILETableAdapter = Nothing @@ -307,7 +300,6 @@ Partial Class frmNamenkonvention Friend WithEvents Label2 As System.Windows.Forms.Label Friend WithEvents btnAddIndexA As System.Windows.Forms.Button Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox - Friend WithEvents btnVersion As System.Windows.Forms.Button Friend WithEvents btndelete As System.Windows.Forms.Button Friend WithEvents btnOK As System.Windows.Forms.Button Friend WithEvents btnclose As System.Windows.Forms.Button diff --git a/Global_Indexer/frmNamenkonvention.en-US.resx b/Global_Indexer/frmNamenkonvention.en-US.resx index c4cc551..126b005 100644 --- a/Global_Indexer/frmNamenkonvention.en-US.resx +++ b/Global_Indexer/frmNamenkonvention.en-US.resx @@ -125,6 +125,9 @@ Define the Nameconvention for the selected Documenttype. You can assemble the filename from the Indicies and Textpatterns below. + + Indicies: + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -153,8 +156,8 @@ You can assemble the filename from the Indicies and Textpatterns below. Manual Index: - - Indicies: + + Variables: @@ -165,7 +168,7 @@ You can assemble the filename from the Indicies and Textpatterns below. - 6, 139 + 6, 107 Add original filename @@ -179,10 +182,10 @@ You can assemble the filename from the Indicies and Textpatterns below. - 6, 91 + 6, 59 - Add Versionseperator: + Add Versionseparator: @@ -192,25 +195,14 @@ You can assemble the filename from the Indicies and Textpatterns below. TkSuQmCC + + 6, 24 + 163, 29 - Add Fileseperator: - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn - yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF - TkSuQmCC - - - - Add Version: - - - Variables: + Add Fileseparator: Save diff --git a/Global_Indexer/frmNamenkonvention.resx b/Global_Indexer/frmNamenkonvention.resx index 393b64a..a6479fb 100644 --- a/Global_Indexer/frmNamenkonvention.resx +++ b/Global_Indexer/frmNamenkonvention.resx @@ -117,240 +117,246 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn - yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF - TkSuQmCC - + + 9, 20 - - cmbdivers + + 438, 51 - - System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0 - - GroupBox1 + + Definieren Sie hier die Namenskonvention zur ausgewählten Dokumentart. +Sie haben die Möglichkeit den Dateinamen aus den unten aufgeführten +Indizes und Textbausteinen zusammenzustellen. - - - 5 + + Label1 - - Global_Indexer.MyDataset, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + 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 + + $this - - 172, 25 + + 12 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 12, 74 - - Variablen: + + 401, 25 - - $this + + 1 - - - 3, 4, 3, 4 + + txtnamenKonv - - 3 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 2 + + $this - - Global_Indexer.MyDatasetTableAdapters.TableAdapterManager, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + 11 - - Segoe UI, 9pt + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn + yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF + TkSuQmCC + - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 187, 89 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 30, 23 - - Segoe UI, 9pt + + 5 - - 21, 308 + + btnAddIndexA - + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Datum-Struktur: - - - MiddleLeft + + GroupBox1 - - MiddleRight + + 0 - - 172, 25 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn + yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF + TkSuQmCC + - - Manueller Index: + + 187, 41 - + 30, 23 - - Versionstrennzeichen einfügen - - - Button2 - - - TBDD_INDEX_MANBindingSource + + 4 - - 6 + + btnAddIndexM - - TBDD_INDEX_AUTOMBindingSource + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + GroupBox1 - - Segoe UI, 9.75pt + + 1 - - 9, 20 + + 1004, 17 + + + 257, 17 + + + 9, 89 - - Assistent zur Namenskonvention: + + 172, 25 - - 5 + + 3 - - 6 + + cmbIndex_A - - cmbDate + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 261, 303 + + GroupBox1 - - $this + + 2 - - Label1 + + 367, 17 + + + 9, 41 - - 6, 56 + + 172, 25 - - 1 + + 2 - - $this + + cmbIndex_m - - GroupBox2 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 7, 17 + + GroupBox1 - - 99, 17 + + 3 - - 419, 74 + + True - - btnTrennzeichen + + 6, 69 - - True + + 129, 17 - - MiddleLeft + + 1 - - True + + Automatischer Index: - - btnclose + + Label3 - - btnVersionTZ + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1 + + GroupBox1 - - 11 + + 4 - - Label4 + + True - - cmbIndex_m + + 6, 21 - - $this + + 104, 17 - - 199, 257 + + 0 - - 12 + + Manueller Index: - - 4 + + Label2 - - $this + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 9 + + GroupBox1 - + 5 - - GroupBox2 - - - 3 + + 12, 114 - - cmbIndex_A + + 237, 122 - - 5 + + 2 - - 187, 41 + + Indexe zur Auswahl: - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + GroupBox1 - - 6 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + $this - - NoControl + + 10 - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn @@ -358,76 +364,75 @@ TkSuQmCC - - YY_MM_DD + + MiddleLeft - - 104, 17 + + 6, 121 - - 12 + + 163, 29 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 8 - - 12, 74 + + OriginalName - - YYYY_MM_DD + + MiddleRight - - 163, 43 + + Button2 - - 7 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Label3 + + GroupBox2 - + 0 - - GroupBox1 - - - 6, 69 - - - 0 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn + yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF + TkSuQmCC + - - TableAdapterManager + + MiddleLeft - - 4 + + 6, 73 - - Usercode + + 163, 43 - - Abbruch + + 7 - - 86, 36 + + Versionstrennzeichen einfügen - + MiddleRight - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 5 - - - GroupBox1 + + btnVersionTZ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + GroupBox2 + + + 1 + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn @@ -435,244 +440,258 @@ TkSuQmCC - - GroupBox1 + + MiddleLeft - - CenterScreen + + 6, 24 - - 7 + + 163, 43 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 6 Dateitrennzeichen einfügen - - 0 + + MiddleRight - - MyDataset + + btnTrennzeichen - - System.Windows.Forms.BindingSource, 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 - - DD_MM_YYYY + + GroupBox2 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 2 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 255, 114 - - $this + + 192, 183 - - 30, 23 + + 3 + + + Variablen: + + + GroupBox2 - - Label2 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - MiddleRight + + $this - - 3 + + 9 - - txtnamenKonv + + 419, 74 28, 25 - - MiddleLeft - - - DD_MM_YY + + 4 - - 18, 288 + + btndelete - - 9 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn - yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF - TkSuQmCC - + + $this - - TBDD_INDEX_MANTableAdapter + + 8 - - 3 + + MiddleLeft - - 18, 239 + + 261, 303 - - 2 + + 94, 36 - - btnAddIndexA + + 5 Speichern - - 4 + + MiddleRight - - GroupBox1 + + btnOK - - $this + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 1 - - - Global_Indexer.MyDatasetTableAdapters.TBDD_INDEX_AUTOMTableAdapter, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - Username + + 7 - - Label20 + + MiddleLeft - - 0 + + 361, 303 - - 10 + + 86, 36 - - $this + + 6 - - GroupBox2 + + Abbruch - - 2 + + MiddleRight - - 6, 21 + + btnclose - - OriginalName + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - MiddleRight + + $this - - MiddleRight + + 6 - - btnAddIndexM + + 17, 17 + + + 602, 17 + + + 831, 17 + + + 1254, 17 + + + Segoe UI, 9pt - - MiddleLeft + + YY_MM_DD - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn - yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF - TkSuQmCC - + + YYYY_MM_DD - - 199, 306 + + DD_MM_YY - - MiddleLeft + + DD_MM_YYYY YYMMDD - - 401, 25 + + YYYYMMDD - - frmNamenkonvention + + DDMMYY + + + DDMMYYYY + + + 21, 259 172, 23 - - btnVersion - - - True + + 8 - - Definieren Sie hier die Namenskonvention zur ausgewählten Dokumentart. -Sie haben die Möglichkeit den Dateinamen aus den unten aufgeführten -Indizes und Textbausteinen zusammenzustellen. + + cmbDate - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4 - - MiddleRight + + True - - TBKONFIGURATIONBindingSource + + 18, 239 - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 99, 17 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 7 - - MiddleLeft + + Datum-Struktur: - - DDMMYYYY + + Label20 - - btndelete + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - btnAddDate + + $this - - 172, 23 + + 5 - - $this + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn + yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF + TkSuQmCC + - - 12, 114 + + 199, 257 - - 0 + + 30, 23 + + + 9 + + + btnAddDate + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3 - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn @@ -680,218 +699,158 @@ Indizes und Textbausteinen zusammenzustellen. TkSuQmCC - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 4 + + + NoControl - - DDMMYY + + 199, 306 - + 30, 23 - - Automatischer Index: - - - System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 7 + + 12 - - 6, 153 + + btnAddDivers - - GroupBox1 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn - yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF - TkSuQmCC - - - - GroupBox2 + + 0 - - 10 + + Segoe UI, 9pt - - 9, 89 + + Username - - GroupBox2 + + Usercode - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 21, 308 - - 438, 51 + + 172, 23 11 - - 6, 21 - - - 2 - - - YYYYMMDD + + cmbdivers - - 163, 43 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 47, 17 + + $this - - 163, 29 + + 1 - - Versionstag einfügen + + True - - 2 + + NoControl - - 467, 343 + + 18, 288 - - 1 + + 47, 17 - - btnOK + + 10 Divers: - - 237, 122 - - - 8 + + Label4 - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn - yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF - TkSuQmCC - + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 129, 17 - - - 21, 259 + + 2 - - btnAddDivers + + True + + + 7, 17 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 467, 343 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Segoe UI, 9.75pt - - 187, 89 + + 3, 4, 3, 4 - - NoControl + + CenterScreen - - TBDD_INDEX_AUTOMTableAdapter + + Assistent zur Namenskonvention: - - 163, 29 + + TBDD_INDEX_AUTOMBindingSource - - True + + System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 94, 36 + + MyDataset - - 30, 23 + + Global_Indexer.MyDataset, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - 9, 41 + + TBDD_INDEX_MANBindingSource - - 6, 105 + + System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 192, 183 + + TBKONFIGURATIONBindingSource - - 8 + + System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 255, 114 + + TBDD_INDEX_MANTableAdapter - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Global_Indexer.MyDatasetTableAdapters.TBDD_INDEX_MANTableAdapter, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - Indexe zur Auswahl: + + TableAdapterManager - - 3 + + Global_Indexer.MyDatasetTableAdapters.TableAdapterManager, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - 1 + + TBDD_INDEX_AUTOMTableAdapter - - Global_Indexer.MyDatasetTableAdapters.TBDD_INDEX_MANTableAdapter, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + Global_Indexer.MyDatasetTableAdapters.TBDD_INDEX_AUTOMTableAdapter, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - 361, 303 + + frmNamenkonvention - - 8 + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 257, 17 - - - 831, 17 - - - en-US - - - True - - - 367, 17 - - - 1254, 17 - - - 17, 17 - - - 602, 17 - - - 1004, 17 - \ No newline at end of file diff --git a/Global_Indexer/frmNamenkonvention.vb b/Global_Indexer/frmNamenkonvention.vb index 2828df5..4c5e866 100644 --- a/Global_Indexer/frmNamenkonvention.vb +++ b/Global_Indexer/frmNamenkonvention.vb @@ -47,7 +47,7 @@ End Sub - Private Sub btnVersion_Click(sender As Object, e As EventArgs) Handles btnVersion.Click + Private Sub btnVersion_Click(sender As Object, e As EventArgs) If txtnamenKonv.Text.Contains("[%Version]") Then If USER_LANGUAGE = "de-DE" Then MsgBox("Versionstag ist bereits enthalten!", MsgBoxStyle.Exclamation)