diff --git a/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb b/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb index d5f41b0..2bcb61f 100644 --- a/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb +++ b/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb @@ -46,7 +46,7 @@ Partial Class frmAdministration Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() Me.TabPageGeneralSettings = New DevExpress.XtraTab.XtraTabPage() Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() - Me.textEdit3 = New DevExpress.XtraEditors.TextEdit() + Me.txtProfileName = New DevExpress.XtraEditors.TextEdit() Me.textEdit4 = New DevExpress.XtraEditors.TextEdit() Me.CheckEdit1 = New DevExpress.XtraEditors.CheckEdit() Me.RibbonControl2 = New DevExpress.XtraBars.Ribbon.RibbonControl() @@ -121,7 +121,7 @@ Partial Class frmAdministration Me.TextEdit15 = New DevExpress.XtraEditors.TextEdit() Me.TextEdit18 = New DevExpress.XtraEditors.TextEdit() Me.CHANGED_WHOTextBox2 = New DevExpress.XtraEditors.TextEdit() - Me.TextEdit16 = New DevExpress.XtraEditors.TextEdit() + Me.txtDocSearchName = New DevExpress.XtraEditors.TextEdit() Me.LookUpEdit1 = New DevExpress.XtraEditors.LookUpEdit() Me.TBDD_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.MemoEdit5 = New DevExpress.XtraEditors.MemoEdit() @@ -160,7 +160,7 @@ Partial Class frmAdministration Me.CHANGED_WHOTextBox1 = New DevExpress.XtraEditors.TextEdit() Me.TextEdit11 = New DevExpress.XtraEditors.TextEdit() Me.CheckEdit2 = New DevExpress.XtraEditors.CheckEdit() - Me.TextEdit9 = New DevExpress.XtraEditors.TextEdit() + Me.txtDataSearchName = New DevExpress.XtraEditors.TextEdit() Me.ComboBoxEdit2 = New DevExpress.XtraEditors.LookUpEdit() Me.MemoEdit3 = New DevExpress.XtraEditors.MemoEdit() Me.MemoEdit4 = New DevExpress.XtraEditors.MemoEdit() @@ -254,7 +254,7 @@ Partial Class frmAdministration Me.TabPageGeneralSettings.SuspendLayout() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.LayoutControl1.SuspendLayout() - CType(Me.textEdit3.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtProfileName.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.textEdit4.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.CheckEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl2, System.ComponentModel.ISupportInitialize).BeginInit() @@ -289,7 +289,7 @@ Partial Class frmAdministration CType(Me.TextEdit15.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit18.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.CHANGED_WHOTextBox2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextEdit16.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtDocSearchName.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LookUpEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MemoEdit5.Properties, System.ComponentModel.ISupportInitialize).BeginInit() @@ -326,7 +326,7 @@ Partial Class frmAdministration CType(Me.CHANGED_WHOTextBox1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit11.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.CheckEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextEdit9.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtDataSearchName.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ComboBoxEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MemoEdit3.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MemoEdit4.Properties, System.ComponentModel.ISupportInitialize).BeginInit() @@ -537,7 +537,7 @@ Partial Class frmAdministration ' 'LayoutControl1 ' - Me.LayoutControl1.Controls.Add(Me.textEdit3) + Me.LayoutControl1.Controls.Add(Me.txtProfileName) Me.LayoutControl1.Controls.Add(Me.textEdit4) Me.LayoutControl1.Controls.Add(Me.CheckEdit1) Me.LayoutControl1.Controls.Add(Me.textEdit2) @@ -557,14 +557,14 @@ Partial Class frmAdministration Me.LayoutControl1.TabIndex = 22 Me.LayoutControl1.Text = "LayoutControl1" ' - 'textEdit3 + 'txtProfileName ' - Me.textEdit3.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "NAME", True)) - Me.textEdit3.Location = New System.Drawing.Point(131, 60) - Me.textEdit3.Name = "textEdit3" - Me.textEdit3.Size = New System.Drawing.Size(245, 20) - Me.textEdit3.StyleController = Me.LayoutControl1 - Me.textEdit3.TabIndex = 6 + Me.txtProfileName.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "NAME", True)) + Me.txtProfileName.Location = New System.Drawing.Point(131, 60) + Me.txtProfileName.Name = "txtProfileName" + Me.txtProfileName.Size = New System.Drawing.Size(245, 20) + Me.txtProfileName.StyleController = Me.LayoutControl1 + Me.txtProfileName.TabIndex = 6 ' 'textEdit4 ' @@ -1121,7 +1121,7 @@ Partial Class frmAdministration ' 'layoutControlItem3 ' - Me.layoutControlItem3.Control = Me.textEdit3 + Me.layoutControlItem3.Control = Me.txtProfileName Me.layoutControlItem3.CustomizationFormText = "Name" Me.layoutControlItem3.Location = New System.Drawing.Point(0, 48) Me.layoutControlItem3.MinSize = New System.Drawing.Size(149, 24) @@ -1167,7 +1167,7 @@ Partial Class frmAdministration Me.LayoutControlDocs.Controls.Add(Me.TextEdit15) Me.LayoutControlDocs.Controls.Add(Me.TextEdit18) Me.LayoutControlDocs.Controls.Add(Me.CHANGED_WHOTextBox2) - Me.LayoutControlDocs.Controls.Add(Me.TextEdit16) + Me.LayoutControlDocs.Controls.Add(Me.txtDocSearchName) Me.LayoutControlDocs.Controls.Add(Me.LookUpEdit1) Me.LayoutControlDocs.Controls.Add(Me.MemoEdit5) Me.LayoutControlDocs.Controls.Add(Me.MemoEdit6) @@ -1236,15 +1236,15 @@ Partial Class frmAdministration Me.CHANGED_WHOTextBox2.StyleController = Me.LayoutControlDocs Me.CHANGED_WHOTextBox2.TabIndex = 6 ' - 'TextEdit16 + 'txtDocSearchName ' - Me.TextEdit16.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "TAB_TITLE", True)) - Me.TextEdit16.EditValue = "" - Me.TextEdit16.Location = New System.Drawing.Point(140, 60) - Me.TextEdit16.Name = "TextEdit16" - Me.TextEdit16.Size = New System.Drawing.Size(171, 20) - Me.TextEdit16.StyleController = Me.LayoutControlDocs - Me.TextEdit16.TabIndex = 9 + Me.txtDocSearchName.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "TAB_TITLE", True)) + Me.txtDocSearchName.EditValue = "" + Me.txtDocSearchName.Location = New System.Drawing.Point(140, 60) + Me.txtDocSearchName.Name = "txtDocSearchName" + Me.txtDocSearchName.Size = New System.Drawing.Size(171, 20) + Me.txtDocSearchName.StyleController = Me.LayoutControlDocs + Me.txtDocSearchName.TabIndex = 9 ' 'LookUpEdit1 ' @@ -1372,7 +1372,7 @@ Partial Class frmAdministration ' 'LayoutControlItem29 ' - Me.LayoutControlItem29.Control = Me.TextEdit16 + Me.LayoutControlItem29.Control = Me.txtDocSearchName Me.LayoutControlItem29.CustomizationFormText = "Titel:" Me.LayoutControlItem29.Location = New System.Drawing.Point(0, 48) Me.LayoutControlItem29.Name = "LayoutControlItem29" @@ -1581,7 +1581,7 @@ Partial Class frmAdministration Me.LayoutControlData.Controls.Add(Me.CHANGED_WHOTextBox1) Me.LayoutControlData.Controls.Add(Me.TextEdit11) Me.LayoutControlData.Controls.Add(Me.CheckEdit2) - Me.LayoutControlData.Controls.Add(Me.TextEdit9) + Me.LayoutControlData.Controls.Add(Me.txtDataSearchName) Me.LayoutControlData.Controls.Add(Me.ComboBoxEdit2) Me.LayoutControlData.Controls.Add(Me.MemoEdit3) Me.LayoutControlData.Controls.Add(Me.MemoEdit4) @@ -1651,16 +1651,16 @@ Partial Class frmAdministration Me.CheckEdit2.StyleController = Me.LayoutControlData Me.CheckEdit2.TabIndex = 8 ' - 'TextEdit9 + 'txtDataSearchName ' - Me.TextEdit9.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DATA_SEARCHBindingSource, "TAB_TITLE", True)) - Me.TextEdit9.EditValue = "" - Me.TextEdit9.Location = New System.Drawing.Point(140, 60) - Me.TextEdit9.MenuManager = Me.RibbonControl2 - Me.TextEdit9.Name = "TextEdit9" - Me.TextEdit9.Size = New System.Drawing.Size(173, 20) - Me.TextEdit9.StyleController = Me.LayoutControlData - Me.TextEdit9.TabIndex = 9 + Me.txtDataSearchName.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DATA_SEARCHBindingSource, "TAB_TITLE", True)) + Me.txtDataSearchName.EditValue = "" + Me.txtDataSearchName.Location = New System.Drawing.Point(140, 60) + Me.txtDataSearchName.MenuManager = Me.RibbonControl2 + Me.txtDataSearchName.Name = "txtDataSearchName" + Me.txtDataSearchName.Size = New System.Drawing.Size(173, 20) + Me.txtDataSearchName.StyleController = Me.LayoutControlData + Me.txtDataSearchName.TabIndex = 9 ' 'ComboBoxEdit2 ' @@ -1836,7 +1836,7 @@ Partial Class frmAdministration ' 'LayoutControlItem11 ' - Me.LayoutControlItem11.Control = Me.TextEdit9 + Me.LayoutControlItem11.Control = Me.txtDataSearchName Me.LayoutControlItem11.Location = New System.Drawing.Point(0, 48) Me.LayoutControlItem11.Name = "LayoutControlItem11" Me.LayoutControlItem11.Size = New System.Drawing.Size(305, 24) @@ -2465,7 +2465,7 @@ Partial Class frmAdministration Me.TabPageGeneralSettings.ResumeLayout(False) CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.LayoutControl1.ResumeLayout(False) - CType(Me.textEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtProfileName.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.textEdit4.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.CheckEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RibbonControl2, System.ComponentModel.ISupportInitialize).EndInit() @@ -2500,7 +2500,7 @@ Partial Class frmAdministration CType(Me.TextEdit15.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit18.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.CHANGED_WHOTextBox2.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextEdit16.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtDocSearchName.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LookUpEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.MemoEdit5.Properties, System.ComponentModel.ISupportInitialize).EndInit() @@ -2537,7 +2537,7 @@ Partial Class frmAdministration CType(Me.CHANGED_WHOTextBox1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit11.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.CheckEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextEdit9.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtDataSearchName.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ComboBoxEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.MemoEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.MemoEdit4.Properties, System.ComponentModel.ISupportInitialize).EndInit() @@ -2682,7 +2682,7 @@ Partial Class frmAdministration Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl Friend WithEvents TabPageGeneralSettings As DevExpress.XtraTab.XtraTabPage Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl - Friend WithEvents textEdit3 As DevExpress.XtraEditors.TextEdit + Friend WithEvents txtProfileName As DevExpress.XtraEditors.TextEdit Friend WithEvents textEdit4 As DevExpress.XtraEditors.TextEdit Friend WithEvents CheckEdit1 As DevExpress.XtraEditors.CheckEdit Friend WithEvents textEdit2 As DevExpress.XtraEditors.LookUpEdit @@ -2711,7 +2711,7 @@ Partial Class frmAdministration Friend WithEvents TextEdit15 As DevExpress.XtraEditors.TextEdit Friend WithEvents TextEdit18 As DevExpress.XtraEditors.TextEdit Friend WithEvents CHANGED_WHOTextBox2 As DevExpress.XtraEditors.TextEdit - Friend WithEvents TextEdit16 As DevExpress.XtraEditors.TextEdit + Friend WithEvents txtDocSearchName As DevExpress.XtraEditors.TextEdit Friend WithEvents LookUpEdit1 As DevExpress.XtraEditors.LookUpEdit Friend WithEvents MemoEdit5 As DevExpress.XtraEditors.MemoEdit Friend WithEvents MemoEdit6 As DevExpress.XtraEditors.MemoEdit @@ -2740,7 +2740,7 @@ Partial Class frmAdministration Friend WithEvents CHANGED_WHOTextBox1 As DevExpress.XtraEditors.TextEdit Friend WithEvents TextEdit11 As DevExpress.XtraEditors.TextEdit Friend WithEvents CheckEdit2 As DevExpress.XtraEditors.CheckEdit - Friend WithEvents TextEdit9 As DevExpress.XtraEditors.TextEdit + Friend WithEvents txtDataSearchName As DevExpress.XtraEditors.TextEdit Friend WithEvents ComboBoxEdit2 As DevExpress.XtraEditors.LookUpEdit Friend WithEvents MemoEdit3 As DevExpress.XtraEditors.MemoEdit Friend WithEvents MemoEdit4 As DevExpress.XtraEditors.MemoEdit diff --git a/app/DD_Clipboard_Searcher/frmAdministration.vb b/app/DD_Clipboard_Searcher/frmAdministration.vb index c8fa1c1..2abd81f 100644 --- a/app/DD_Clipboard_Searcher/frmAdministration.vb +++ b/app/DD_Clipboard_Searcher/frmAdministration.vb @@ -372,10 +372,11 @@ Public Class frmAdministration End Sub Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick - Save_Profile() - - 'ClassInit.Refresh_Profile_Links() - 'Refresh_ProfileScreen() + If txtProfileName.EditValue <> String.Empty Then + Save_Profile() + Else + MsgBox("Profil kann nicht ohne Profil-Name gespeichert werden!", MsgBoxStyle.Exclamation, Text) + End If End Sub Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick @@ -562,7 +563,7 @@ Public Class frmAdministration End If End Sub - Private Sub BarButtonItem22_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem22.ItemClick + Private Sub Save_DataSearch() Try TBCW_PROF_DATA_SEARCHBindingSource.EndEdit() If Not IsNothing(MyDataset.TBCW_PROF_DATA_SEARCH.GetChanges) Then @@ -574,10 +575,18 @@ Public Class frmAdministration End If Catch ex As Exception Logger.Error(ex) - 'MsgBox("Unexpected Error while saving Data Search: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) + MsgBox("Unexpected Error while saving Data Search: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try End Sub + Private Sub BarButtonItem22_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem22.ItemClick + If txtDataSearchName.EditValue <> String.Empty Then + Save_DataSearch() + Else + MsgBox("Daten-Suche kann nicht ohne Titel gespeichert werden!", MsgBoxStyle.Exclamation, Text) + End If + End Sub + Private Sub BarButtonItem20_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem20.ItemClick If TBCW_PROF_DATA_SEARCHBindingSource.Count = MAX_DATA_SEARCHES Then MsgBox($"Es können nicht mehr als {MAX_DATA_SEARCHES} Daten-Suchen angelegt werden!", MsgBoxStyle.Exclamation, Text) @@ -596,7 +605,7 @@ Public Class frmAdministration End If End Sub - Private Sub BarButtonItem19_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem19.ItemClick + Private Sub Save_DocSearch() Try TBCW_PROF_DOC_SEARCHBindingSource.EndEdit() If Not IsNothing(MyDataset.TBCW_PROF_DOC_SEARCH.GetChanges) Then @@ -607,10 +616,19 @@ Public Class frmAdministration Status_Changed("Dokument-Suche gespeichert") End If Catch ex As Exception + MsgBox("Unexpected Error while saving Document Search: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) Logger.Error(ex) End Try End Sub + Private Sub BarButtonItem19_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem19.ItemClick + If txtDocSearchName.EditValue <> String.Empty Then + Save_DocSearch() + Else + MsgBox("Dokument-Suche kann nicht ohne Titel gespeichert werden!", MsgBoxStyle.Exclamation, Text) + End If + End Sub + Private Sub frmAdministration_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing ClassInit.Refresh_Connections() ClassInit.Refresh_Profile_Links()