diff --git a/app/DD-Record-Organizer/ClassInit.vb b/app/DD-Record-Organizer/ClassInit.vb index 42daf36..10a99c2 100644 --- a/app/DD-Record-Organizer/ClassInit.vb +++ b/app/DD-Record-Organizer/ClassInit.vb @@ -8,12 +8,10 @@ Public Class ClassInit End Sub Public Sub InitLogger() - LOGCONFIG = New LogConfig(LogConfig.PathType.CustomPath, - Application.LocalUserAppDataPath & "\Log", - Nothing, + LOGCONFIG = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing, My.Application.Info.CompanyName, - My.Application.Info.ProductName) - LOGGER = LOGCONFIG.GetLogger("ADDI") + "ADDI") + LOGGER = LOGCONFIG.GetLogger() LOGGER.Info("## ADDI started - {0}", Now) Try diff --git a/app/DD-Record-Organizer/DD-Record-Organizer.vbproj b/app/DD-Record-Organizer/DD-Record-Organizer.vbproj index fb13e82..bc0603e 100644 --- a/app/DD-Record-Organizer/DD-Record-Organizer.vbproj +++ b/app/DD-Record-Organizer/DD-Record-Organizer.vbproj @@ -1479,6 +1479,7 @@ + diff --git a/app/DD-Record-Organizer/My Project/Resources.resx b/app/DD-Record-Organizer/My Project/Resources.resx index e81694a..3549c8b 100644 --- a/app/DD-Record-Organizer/My Project/Resources.resx +++ b/app/DD-Record-Organizer/My Project/Resources.resx @@ -133,8 +133,11 @@ ..\Resources\UserInterfaceEditor_5845_32x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\windream-Logo-transparent.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\email_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Carousel_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\DD_Icons-ADDI.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -169,6 +172,9 @@ ..\Resources\Files_7954.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\asset_pie-series-chart_on_12X12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Men3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -178,12 +184,6 @@ ..\Resources\Arrow_RedoRetry_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Login_6031_32x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\lock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -205,8 +205,11 @@ ..\Resources\userAccounts.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\email_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\key_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\mail.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\user_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -217,9 +220,6 @@ ..\Resources\bell_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dtp1.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\checkbox_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -262,18 +262,18 @@ ..\Resources\table.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\changechartlegendalignment_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\database_error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\page_excel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\database_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\dtp.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Reports-collapsed_12995_32x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\text1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -292,26 +292,20 @@ ..\Resources\1480524473_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\database_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\magifier_zoom_out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\brick_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\DateOrTimePicker_675.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\calendar_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\folder_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Carousel_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\dtp1.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\f5.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -325,9 +319,6 @@ ..\Resources\flag_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\add1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\ComboBox_672.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -340,8 +331,8 @@ ..\Resources\save.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\save_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\windream-Logo-transparent_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -352,8 +343,8 @@ ..\Resources\base_globe_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\AddTable_5632.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\arrow_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\lightbulb.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -364,6 +355,9 @@ ..\Resources\delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\arrow_Forward_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Arrow_RedoRetry_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -379,6 +373,9 @@ ..\Resources\Property_501.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\action_Cancel_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Works Finished (nonXP).ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -394,9 +391,6 @@ ..\Resources\WMI_Task_21x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Connection_Manager.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Link.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -415,9 +409,15 @@ ..\Resources\lock_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\database_go1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\sql.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\doc_excel_csv.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\database_lightning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -430,8 +430,8 @@ ..\Resources\Label_684.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\benutzer3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\DateOrTimePicker_675.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\bug_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -469,9 +469,6 @@ ..\Resources\view_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\f3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -484,8 +481,14 @@ ..\Resources\database_key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\key_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\AddTable_5632.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\windream-Logo-transparent.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\1532_Flag_Blue.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\xml.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -496,8 +499,8 @@ ..\Resources\f2.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\database_go1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\save_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\refresh_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -520,6 +523,9 @@ ..\Resources\dwg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\benutzer3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\folder_Open_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -529,9 +535,6 @@ ..\Resources\user_suit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\windream-Logo-transparent_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\WebUserControl(ascx)_11270_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -553,11 +556,11 @@ ..\Resources\action_add_16xSM.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\arrow_Forward_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\email_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\mail.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Connection_Manager.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\bricks.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -586,17 +589,14 @@ ..\Resources\folder_Open_32xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Men5.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\page_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\bell_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\database_error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\f3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\note_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -610,8 +610,8 @@ ..\Resources\Table_748.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\doc_excel_csv.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\add1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\bug_edit1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -619,8 +619,8 @@ ..\Resources\Men4.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\asset_pie-series-chart_on_12X12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\lock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\keinbild.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -628,11 +628,11 @@ ..\Resources\UserInterfaceEditor_5845.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\1532_Flag_Blue.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\changechartlegendalignment_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\email_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Login_6031_32x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\database_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -640,8 +640,8 @@ ..\Resources\f1.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\arrow_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\database_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\_blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -688,8 +688,8 @@ ..\Resources\138_PushPin_32x42_721.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\database_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Men5.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\database_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -712,10 +712,13 @@ ..\Resources\112_RefreshArrow_Blue_24x24_721.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\action_Cancel_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Reports-collapsed_12995_32x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\NetworkPipes_32xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\folder_Open_16xMD.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-Organizer/Resources/folder_Open_16xMD.png b/app/DD-Record-Organizer/Resources/folder_Open_16xMD.png new file mode 100644 index 0000000..939d93b Binary files /dev/null and b/app/DD-Record-Organizer/Resources/folder_Open_16xMD.png differ diff --git a/app/DD-Record-Organizer/frmConfig_Basic.Designer.vb b/app/DD-Record-Organizer/frmConfig_Basic.Designer.vb index 8becc04..434ee7b 100644 --- a/app/DD-Record-Organizer/frmConfig_Basic.Designer.vb +++ b/app/DD-Record-Organizer/frmConfig_Basic.Designer.vb @@ -362,14 +362,14 @@ Partial Class frmConfig_Basic ' 'Button1 ' - Me.Button1.Image = Global.DD_Record_Organizer.My.Resources.Resources.folder_go + Me.Button1.Image = Global.DD_Record_Organizer.My.Resources.Resources.folder_Open_16xLG resources.ApplyResources(Me.Button1, "Button1") Me.Button1.Name = "Button1" Me.Button1.UseVisualStyleBackColor = True ' 'btnApplicationFolder ' - Me.btnApplicationFolder.Image = Global.DD_Record_Organizer.My.Resources.Resources.folder_go + Me.btnApplicationFolder.Image = Global.DD_Record_Organizer.My.Resources.Resources.folder_Open_16xLG resources.ApplyResources(Me.btnApplicationFolder, "btnApplicationFolder") Me.btnApplicationFolder.Name = "btnApplicationFolder" Me.btnApplicationFolder.UseVisualStyleBackColor = True diff --git a/app/DD-Record-Organizer/frmConfig_Basic.vb b/app/DD-Record-Organizer/frmConfig_Basic.vb index 31cacc5..ee6336d 100644 --- a/app/DD-Record-Organizer/frmConfig_Basic.vb +++ b/app/DD-Record-Organizer/frmConfig_Basic.vb @@ -2,6 +2,8 @@ Imports System.Globalization Imports DevExpress.LookAndFeel Imports DD_LIB_Standards +Imports System.IO + Public Class frmConfig_Basic Private _Helper As New ClassHelper Dim formloaded As Boolean = False @@ -181,7 +183,8 @@ Public Class frmConfig_Basic End Sub Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click - Process.Start(LOGCONFIG.LogFile) + Process.Start(LOGCONFIG.LogDirectory) + End Sub Private Sub chkLogErrorsOnly_CheckedChanged(sender As Object, e As EventArgs) Handles chkLogErrorsOnly.CheckedChanged diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb index 8b9d54b..7a9efb7 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.vb @@ -2983,7 +2983,6 @@ Public Class frmConstructor_Main For Each Column As DataColumn In DT.Columns Dim index As Integer = DT.Columns.IndexOf(Column) - Dim RECORDID_Column As TileViewItemElement Dim ImageColumn As TileViewItemElement Dim HeadlineColumn As TileViewItemElement Dim TextColumn As TileViewItemElement @@ -3787,11 +3786,11 @@ Public Class frmConstructor_Main If CURRENT_DOCSEARCH_SQL = "" Then - CURRENT_DOCSEARCH_SQL = String.Format("SELECT DISTINCT T.* " & vbNewLine & - "FROM " & vbNewLine & - "VWPMO_DOC_SEARCH T" & vbNewLine & - "WHERE T.DocID IN (select DISTINCT T.DOC_ID from TBPMO_DOC_RECORD_LINK T, TBPMO_RECORD T1 WHERE T.RECORD_ID = T1.GUID AND T1.FORM_ID = {0}) " & vbNewLine & - "AND T.DocID IN (SELECT dwObjectID FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwUserOrGroupID = {2} AND dwObjectID = T.DocID)", ENTITY_ID, USER_LANGUAGE, USERID_FK_INT_ECM) + CURRENT_DOCSEARCH_SQL = $"SELECT DISTINCT T.* + FROM + TBPMO_DOCRESULT_LIST T INNER JOIN TBPMO_DOC_RECORD_LINK T1 ON T.DocID = T1.DOC_ID + INNER JOIN TBPMO_RECORD T2 ON T1.RECORD_ID = T2.GUID + WHERE T2.FORM_ID = {ENTITY_ID} AND T2.DELETED = 0)" Else CURRENT_DOCSEARCH_SQL = CURRENT_DOCSEARCH_SQL.Replace("@ENTITY_ID", ENTITY_ID) CURRENT_DOCSEARCH_SQL = CURRENT_DOCSEARCH_SQL.Replace("@USER_LANGUAGE", USER_LANGUAGE) diff --git a/app/DD-Record-Organizer/frmDocSearchResult.Designer.vb b/app/DD-Record-Organizer/frmDocSearchResult.Designer.vb index 35996e8..2fcd89e 100644 --- a/app/DD-Record-Organizer/frmDocSearchResult.Designer.vb +++ b/app/DD-Record-Organizer/frmDocSearchResult.Designer.vb @@ -23,7 +23,7 @@ Partial Class frmDocSearchResult _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() + Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmDocSearchResult)) Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() Me.tslblDocID = New System.Windows.Forms.ToolStripStatusLabel() @@ -42,6 +42,7 @@ Partial Class frmDocSearchResult Me.docCM_PropertiesFile = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator25 = New System.Windows.Forms.ToolStripSeparator() Me.GridViewDoc_Search = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.ToolStripButton3 = New System.Windows.Forms.ToolStripButton() Me.StatusStrip1.SuspendLayout() Me.ToolStrip1.SuspendLayout() CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).BeginInit() @@ -66,7 +67,7 @@ Partial Class frmDocSearchResult ' 'ToolStrip1 ' - Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripLabelCaption, Me.ToolStripButton1, Me.ToolStripButton2}) + Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripLabelCaption, Me.ToolStripButton1, Me.ToolStripButton2, Me.ToolStripButton3}) Me.ToolStrip1.Location = New System.Drawing.Point(0, 0) Me.ToolStrip1.Name = "ToolStrip1" Me.ToolStrip1.Size = New System.Drawing.Size(1083, 25) @@ -101,8 +102,8 @@ Partial Class frmDocSearchResult ' Me.GridControlDocSearch.ContextMenuStrip = Me.ContextMenuStripResultFiles Me.GridControlDocSearch.Dock = System.Windows.Forms.DockStyle.Fill - GridLevelNode1.RelationName = "Level1" - Me.GridControlDocSearch.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1}) + GridLevelNode2.RelationName = "Level1" + Me.GridControlDocSearch.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode2}) Me.GridControlDocSearch.Location = New System.Drawing.Point(0, 25) Me.GridControlDocSearch.MainView = Me.GridViewDoc_Search Me.GridControlDocSearch.Name = "GridControlDocSearch" @@ -126,6 +127,7 @@ Partial Class frmDocSearchResult ' 'OrdnerÖffnenToolStripMenuItem ' + Me.OrdnerÖffnenToolStripMenuItem.Image = Global.DD_Record_Organizer.My.Resources.Resources.folder_Open_16xLG Me.OrdnerÖffnenToolStripMenuItem.Name = "OrdnerÖffnenToolStripMenuItem" Me.OrdnerÖffnenToolStripMenuItem.Size = New System.Drawing.Size(255, 26) Me.OrdnerÖffnenToolStripMenuItem.Text = "Ordner öffnen" @@ -156,7 +158,7 @@ Partial Class frmDocSearchResult ' 'docCM_PropertiesFile ' - Me.docCM_PropertiesFile.Image = Global.DD_Record_Organizer.My.Resources.Resources.PropertyGridEditorPart_6041 + Me.docCM_PropertiesFile.Image = Global.DD_Record_Organizer.My.Resources.Resources.Property_501 Me.docCM_PropertiesFile.Name = "docCM_PropertiesFile" Me.docCM_PropertiesFile.Size = New System.Drawing.Size(255, 26) Me.docCM_PropertiesFile.Text = "Eigenschaften Datei" @@ -187,6 +189,14 @@ Partial Class frmDocSearchResult Me.GridViewDoc_Search.OptionsView.ShowAutoFilterRow = True Me.GridViewDoc_Search.OptionsView.ShowHorizontalLines = DevExpress.Utils.DefaultBoolean.[True] ' + 'ToolStripButton3 + ' + Me.ToolStripButton3.Image = Global.DD_Record_Organizer.My.Resources.Resources.delete + Me.ToolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripButton3.Name = "ToolStripButton3" + Me.ToolStripButton3.Size = New System.Drawing.Size(134, 22) + Me.ToolStripButton3.Text = "Layout zurücksetzen" + ' 'frmDocSearchResult ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -228,4 +238,5 @@ Partial Class frmDocSearchResult Friend WithEvents ToolStripSeparator25 As ToolStripSeparator Friend WithEvents ToolStripButton1 As ToolStripButton Friend WithEvents ToolStripButton2 As ToolStripButton + Friend WithEvents ToolStripButton3 As ToolStripButton End Class diff --git a/app/DD-Record-Organizer/frmDocSearchResult.resx b/app/DD-Record-Organizer/frmDocSearchResult.resx index 2690516..41a6a20 100644 --- a/app/DD-Record-Organizer/frmDocSearchResult.resx +++ b/app/DD-Record-Organizer/frmDocSearchResult.resx @@ -124,7 +124,7 @@ 134, 17 - 799, 56 + 241, 17 diff --git a/app/DD-Record-Organizer/frmDocSearchResult.vb b/app/DD-Record-Organizer/frmDocSearchResult.vb index 728b12c..fa29f3d 100644 --- a/app/DD-Record-Organizer/frmDocSearchResult.vb +++ b/app/DD-Record-Organizer/frmDocSearchResult.vb @@ -7,6 +7,7 @@ Public Class frmDocSearchResult Public Shared Function ShellExecuteEx(ByRef lpExecInfo As SHELLEXECUTEINFO) As Boolean End Function + Public Structure SHELLEXECUTEINFO Public cbSize As Integer Public fMask As Integer @@ -28,24 +29,30 @@ Public Class frmDocSearchResult Private Const SEE_MASK_NOCLOSEPROCESS = &H40 Private Const SEE_MASK_FLAG_NO_UI = &H400 Public Const SW_SHOW As Short = 5 - Public Sub LoadDocSearch() + Private DT_RESULT As DataTable + Public Sub LoadDocSearch(reload As Boolean) Try Cursor = Cursors.WaitCursor - Dim DTRESULT As DataTable = ClassDatabase.Return_Datatable(CURRENT_DOCSEARCH_SQL, True) - GridControlDocSearch.DataSource = Nothing - GridViewDoc_Search.Columns.Clear() - GridControlDocSearch.DataSource = DTRESULT - GridViewDoc_Search.BestFitColumns(True) - ToolStripLabelCaption.Text = $"{CURRENT_DOCSEARCH_CAPTION} ({DTRESULT.Rows.Count} rows)" - Load_DocGrid_Layout() - GridControlDocSearch.DataSource = DTRESULT - GridControlDocSearch.DataSource = DTRESULT - If GridViewDoc_Search.RowCount > 15000 Then - ToolStripButton2.Enabled = False - Else - ToolStripButton2.Enabled = True + + If reload = False Then + DT_RESULT = ClassDatabase.Return_Datatable(CURRENT_DOCSEARCH_SQL, True) End If + DT_RESULT = DT_RESULT + GridControlDocSearch.DataSource = Nothing + GridViewDoc_Search.Columns.Clear() + GridControlDocSearch.DataSource = DT_RESULT + GridViewDoc_Search.BestFitColumns(True) + ToolStripLabelCaption.Text = $"{CURRENT_DOCSEARCH_CAPTION} ({DT_RESULT.Rows.Count} rows)" + Load_DocGrid_Layout() + GridControlDocSearch.DataSource = DT_RESULT + GridControlDocSearch.DataSource = DT_RESULT + 'If GridViewDoc_Search.RowCount > 15000 Then + ' ToolStripButton2.Enabled = False + 'Else + ' ToolStripButton2.Enabled = True + 'End If + ToolStripButton2.Enabled = True Catch ex As Exception LOGGER.Warn("Unexpected Error in LoadDocSearch: " & ex.Message) End Try @@ -99,7 +106,7 @@ Public Class frmDocSearchResult End If For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows ClassHelper.File_open(row.Item("DOC_PATH"), row.Item("DOC_ID")) - If CURRENT_OFFICE_FILE_CHANGED = True Then LoadDocSearch() + If CURRENT_OFFICE_FILE_CHANGED = True Then LoadDocSearch(True) Next Else ClassHelper.MSGBOX_Handler("ERROR", "", "File does not exist! Please contact your admin!") @@ -181,7 +188,7 @@ Public Class frmDocSearchResult End Sub Private Sub frmDocSearchResult_Load(sender As Object, e As EventArgs) Handles Me.Load - LoadDocSearch() + LoadDocSearch(False) Me.Text = CURRENT_DOCSEARCH_CAPTION End Sub Sub Save_DocGrid_Layout() @@ -231,7 +238,7 @@ Public Class frmDocSearchResult End Sub Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click - LoadDocSearch() + LoadDocSearch(False) End Sub Private Sub ToolStripButton2_Click(sender As Object, e As EventArgs) Handles ToolStripButton2.Click @@ -260,4 +267,12 @@ Public Class frmDocSearchResult End Try Cursor = Cursors.Default End Sub + + Private Sub ToolStripButton3_Click(sender As Object, e As EventArgs) Handles ToolStripButton3.Click + Dim XMLPath = Get_DocGrid_Layout_Filename() + If File.Exists(XMLPath) Then + File.Delete(XMLPath) + LoadDocSearch(True) + End If + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmGlobalSearch.Designer.vb b/app/DD-Record-Organizer/frmGlobalSearch.Designer.vb index c806b82..e58593d 100644 --- a/app/DD-Record-Organizer/frmGlobalSearch.Designer.vb +++ b/app/DD-Record-Organizer/frmGlobalSearch.Designer.vb @@ -36,6 +36,10 @@ Partial Class frmGlobalSearch Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton() Me.tsbtnviewDetail = New System.Windows.Forms.ToolStripButton() Me.GridControlFiles = New DevExpress.XtraGrid.GridControl() + Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.DateiÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.OrdnerÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.EigenschaftenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GridViewFiles = New DevExpress.XtraGrid.Views.Grid.GridView() Me.ToolStripDokumente = New System.Windows.Forms.ToolStrip() Me.tslblDocView = New System.Windows.Forms.ToolStripLabel() @@ -51,10 +55,7 @@ Partial Class frmGlobalSearch Me.txtSearch = New System.Windows.Forms.TextBox() Me.Label2 = New System.Windows.Forms.Label() Me.GroupBox1 = New System.Windows.Forms.GroupBox() - Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.DateiÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.OrdnerÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.EigenschaftenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.VerknüpfungenAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerMain.SuspendLayout() CType(Me.GridControlRecords, System.ComponentModel.ISupportInitialize).BeginInit() @@ -62,12 +63,12 @@ Partial Class frmGlobalSearch CType(Me.GridViewRecords, System.ComponentModel.ISupportInitialize).BeginInit() Me.ToolStripRecords.SuspendLayout() CType(Me.GridControlFiles, System.ComponentModel.ISupportInitialize).BeginInit() + Me.ContextMenuStrip1.SuspendLayout() CType(Me.GridViewFiles, System.ComponentModel.ISupportInitialize).BeginInit() Me.ToolStripDokumente.SuspendLayout() Me.ToolStripMain.SuspendLayout() Me.Panel1.SuspendLayout() Me.GroupBox1.SuspendLayout() - Me.ContextMenuStrip1.SuspendLayout() Me.SuspendLayout() ' 'SplitContainerMain @@ -163,6 +164,29 @@ Partial Class frmGlobalSearch Me.GridControlFiles.Name = "GridControlFiles" Me.GridControlFiles.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewFiles}) ' + 'ContextMenuStrip1 + ' + Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiÖffnenToolStripMenuItem, Me.OrdnerÖffnenToolStripMenuItem, Me.EigenschaftenToolStripMenuItem, Me.VerknüpfungenAnzeigenToolStripMenuItem}) + Me.ContextMenuStrip1.Name = "ContextMenuStrip1" + resources.ApplyResources(Me.ContextMenuStrip1, "ContextMenuStrip1") + ' + 'DateiÖffnenToolStripMenuItem + ' + Me.DateiÖffnenToolStripMenuItem.Name = "DateiÖffnenToolStripMenuItem" + resources.ApplyResources(Me.DateiÖffnenToolStripMenuItem, "DateiÖffnenToolStripMenuItem") + ' + 'OrdnerÖffnenToolStripMenuItem + ' + Me.OrdnerÖffnenToolStripMenuItem.Image = Global.DD_Record_Organizer.My.Resources.Resources.folder_Open_16xLG + Me.OrdnerÖffnenToolStripMenuItem.Name = "OrdnerÖffnenToolStripMenuItem" + resources.ApplyResources(Me.OrdnerÖffnenToolStripMenuItem, "OrdnerÖffnenToolStripMenuItem") + ' + 'EigenschaftenToolStripMenuItem + ' + Me.EigenschaftenToolStripMenuItem.Image = Global.DD_Record_Organizer.My.Resources.Resources.Property_501 + Me.EigenschaftenToolStripMenuItem.Name = "EigenschaftenToolStripMenuItem" + resources.ApplyResources(Me.EigenschaftenToolStripMenuItem, "EigenschaftenToolStripMenuItem") + ' 'GridViewFiles ' Me.GridViewFiles.Appearance.EvenRow.BackColor = System.Drawing.Color.Orange @@ -272,26 +296,11 @@ Partial Class frmGlobalSearch Me.GroupBox1.Name = "GroupBox1" Me.GroupBox1.TabStop = False ' - 'ContextMenuStrip1 + 'VerknüpfungenAnzeigenToolStripMenuItem ' - Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiÖffnenToolStripMenuItem, Me.OrdnerÖffnenToolStripMenuItem, Me.EigenschaftenToolStripMenuItem}) - Me.ContextMenuStrip1.Name = "ContextMenuStrip1" - resources.ApplyResources(Me.ContextMenuStrip1, "ContextMenuStrip1") - ' - 'DateiÖffnenToolStripMenuItem - ' - Me.DateiÖffnenToolStripMenuItem.Name = "DateiÖffnenToolStripMenuItem" - resources.ApplyResources(Me.DateiÖffnenToolStripMenuItem, "DateiÖffnenToolStripMenuItem") - ' - 'OrdnerÖffnenToolStripMenuItem - ' - Me.OrdnerÖffnenToolStripMenuItem.Name = "OrdnerÖffnenToolStripMenuItem" - resources.ApplyResources(Me.OrdnerÖffnenToolStripMenuItem, "OrdnerÖffnenToolStripMenuItem") - ' - 'EigenschaftenToolStripMenuItem - ' - Me.EigenschaftenToolStripMenuItem.Name = "EigenschaftenToolStripMenuItem" - resources.ApplyResources(Me.EigenschaftenToolStripMenuItem, "EigenschaftenToolStripMenuItem") + Me.VerknüpfungenAnzeigenToolStripMenuItem.Image = Global.DD_Record_Organizer.My.Resources.Resources.Link + Me.VerknüpfungenAnzeigenToolStripMenuItem.Name = "VerknüpfungenAnzeigenToolStripMenuItem" + resources.ApplyResources(Me.VerknüpfungenAnzeigenToolStripMenuItem, "VerknüpfungenAnzeigenToolStripMenuItem") ' 'frmGlobalSearch ' @@ -309,6 +318,7 @@ Partial Class frmGlobalSearch Me.ToolStripRecords.ResumeLayout(False) Me.ToolStripRecords.PerformLayout() CType(Me.GridControlFiles, System.ComponentModel.ISupportInitialize).EndInit() + Me.ContextMenuStrip1.ResumeLayout(False) CType(Me.GridViewFiles, System.ComponentModel.ISupportInitialize).EndInit() Me.ToolStripDokumente.ResumeLayout(False) Me.ToolStripDokumente.PerformLayout() @@ -318,7 +328,6 @@ Partial Class frmGlobalSearch Me.Panel1.PerformLayout() Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.PerformLayout() - Me.ContextMenuStrip1.ResumeLayout(False) Me.ResumeLayout(False) End Sub @@ -353,4 +362,5 @@ Partial Class frmGlobalSearch Friend WithEvents DateiÖffnenToolStripMenuItem As ToolStripMenuItem Friend WithEvents OrdnerÖffnenToolStripMenuItem As ToolStripMenuItem Friend WithEvents EigenschaftenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents VerknüpfungenAnzeigenToolStripMenuItem As ToolStripMenuItem End Class diff --git a/app/DD-Record-Organizer/frmGlobalSearch.resx b/app/DD-Record-Organizer/frmGlobalSearch.resx index 5721195..106728d 100644 --- a/app/DD-Record-Organizer/frmGlobalSearch.resx +++ b/app/DD-Record-Organizer/frmGlobalSearch.resx @@ -235,25 +235,31 @@ 571, 17 - 149, 22 + 205, 22 Datei öffnen - 149, 22 + 205, 22 Ordner öffnen - 149, 22 + 205, 22 Eigenschaften + + 205, 22 + + + Verknüpfungen anzeigen + - 150, 70 + 206, 114 ContextMenuStrip1 @@ -739,6 +745,24 @@ System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + DateiÖffnenToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + OrdnerÖffnenToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + EigenschaftenToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + GridViewFiles @@ -763,22 +787,10 @@ System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - DateiÖffnenToolStripMenuItem + + VerknüpfungenAnzeigenToolStripMenuItem - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - OrdnerÖffnenToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - EigenschaftenToolStripMenuItem - - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/app/DD-Record-Organizer/frmGlobalSearch.vb b/app/DD-Record-Organizer/frmGlobalSearch.vb index 92a221b..25b26f3 100644 --- a/app/DD-Record-Organizer/frmGlobalSearch.vb +++ b/app/DD-Record-Organizer/frmGlobalSearch.vb @@ -77,11 +77,11 @@ Public Class frmGlobalSearch Sub PREPARE_FT_SQL() Dim sqlft = SQL_FULLTEXT sqlft = sqlft.Replace("@FULLTEXT", txtSearch.Text) - Dim selDoc = String.Format("SELECT T.[DocID],T.[FULL_FILENAME],T.[Filename],T.[DISPLAY_NAME],T.[Doctype],T.[Creation_DateTime] As CreatedWhen,T.[Change_DateTime] as ChangedWhen,T.[IN_WORK] as [InWork?] " & - "FROM VWPMO_DOC_SEARCH T INNER JOIN ( " & vbNewLine & - "{0}) Y ON T.DocID = Y.dwDocID " & vbNewLine & - "INNER JOIN VWPMO_WD_OBJECT_RIGHTS TRIGHT ON T.DocID = TRIGHT.dwObjectID WHERE TRIGHT.dwUserOrGroupID = {1}", sqlft, USERID_FK_INT_ECM) - sel_FT = selDoc + 'Dim selDoc = String.Format("SELECT T.[DocID],T.[FULL_FILENAME],T.[Filename],T.[DISPLAY_NAME],T.[Doctype],T.[Creation_DateTime] As CreatedWhen,T.[Change_DateTime] as ChangedWhen,T.[IN_WORK] as [InWork?] " & + ' "FROM VWPMO_DOC_SEARCH T INNER JOIN ( " & vbNewLine & + ' "{0}) Y ON T.DocID = Y.dwDocID " & vbNewLine & + ' "INNER JOIN VWPMO_WD_OBJECT_RIGHTS TRIGHT ON T.DocID = TRIGHT.dwObjectID WHERE TRIGHT.dwUserOrGroupID = {1}", sqlft, USERID_FK_INT_ECM) + sel_FT = sqlft End Sub Sub PREPARE_RECORD_SQL() @@ -330,6 +330,22 @@ Public Class frmGlobalSearch Show_File_Properties() End Sub + Private Sub VerknüpfungenAnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VerknüpfungenAnzeigenToolStripMenuItem.Click + Try + ClassWindreamDocGrid.GetDocItems(GridViewFiles) + If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then + MsgBox("Could not read File Parameters (LinkRecord)!", MsgBoxStyle.Exclamation) + Exit Sub + End If + + Dim frm As New frmDoc_Links + frm.Show() + frm.BringToFront() + Catch ex As Exception + MsgBox("Unexpected Error in Showing DocLinks: " & ex.Message, MsgBoxStyle.Critical) + End Try + End Sub + Sub File_open() Me.Cursor = Cursors.WaitCursor diff --git a/app/Setup_NoUpdaterVS19/Product.wxs b/app/Setup_NoUpdaterVS19/Product.wxs index e56a02f..0315fa6 100644 --- a/app/Setup_NoUpdaterVS19/Product.wxs +++ b/app/Setup_NoUpdaterVS19/Product.wxs @@ -85,6 +85,10 @@ + + + + @@ -143,7 +147,7 @@ - + @@ -293,6 +297,7 @@ +