diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index 1495510..77922e0 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -56,6 +56,7 @@ Partial Class frmMain Me.tslblUserLoggedin = New System.Windows.Forms.ToolStripStatusLabel() Me.tslblVersion = New System.Windows.Forms.ToolStripStatusLabel() Me.tsslblLastSysnc = New System.Windows.Forms.ToolStripStatusLabel() + Me.tslblmessage = New System.Windows.Forms.ToolStripStatusLabel() Me.Panel1 = New System.Windows.Forms.Panel() Me.lblViewType = New System.Windows.Forms.Label() Me.NavBarControl1 = New DevExpress.XtraNavBar.NavBarControl() @@ -82,7 +83,6 @@ Partial Class frmMain Me.TBPM_PROFILE_FILESBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBPM_PROFILE_FILESTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FILESTableAdapter() Me.TimerReminder = New System.Windows.Forms.Timer(Me.components) - Me.tslblmessage = New System.Windows.Forms.ToolStripStatusLabel() CType(Me.SplitContainerDashboard, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerDashboard.Panel1.SuspendLayout() Me.SplitContainerDashboard.Panel2.SuspendLayout() @@ -237,8 +237,8 @@ Partial Class frmMain ' Me.TableAdapterManager.BackupDataSetBeforeUpdate = False Me.TableAdapterManager.Connection = Nothing + Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing - Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Nothing Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing Me.TableAdapterManager.TBPM_FILES_USER_NOT_INDEXEDTableAdapter = Nothing @@ -349,6 +349,12 @@ Partial Class frmMain Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom), System.Windows.Forms.ToolStripStatusLabelBorderSides) Me.tsslblLastSysnc.Name = "tsslblLastSysnc" ' + 'tslblmessage + ' + resources.ApplyResources(Me.tslblmessage, "tslblmessage") + Me.tslblmessage.BackColor = System.Drawing.Color.Yellow + Me.tslblmessage.Name = "tslblmessage" + ' 'Panel1 ' resources.ApplyResources(Me.Panel1, "Panel1") @@ -553,12 +559,6 @@ Partial Class frmMain 'TimerReminder ' ' - 'tslblmessage - ' - resources.ApplyResources(Me.tslblmessage, "tslblmessage") - Me.tslblmessage.BackColor = System.Drawing.Color.Yellow - Me.tslblmessage.Name = "tslblmessage" - ' 'frmMain ' resources.ApplyResources(Me, "$this") diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index 768c4f7..ac0163c 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -234,6 +234,9 @@ 233 + + 242, 44 + 0 @@ -261,9 +264,6 @@ 0 - - 3 - TBPM_KONFIGURATIONBindingSource @@ -317,6 +317,9 @@ 443, 141 + + Panel1 + Horizontal @@ -413,9 +416,6 @@ ToolStrip1 - - SplitContainerTop.Panel1 - 0 @@ -434,8 +434,11 @@ Horizontal - - Panel1 + + System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True 223, 81 @@ -459,12 +462,12 @@ ToolStripTopLeft - - 0, 20 - 141, 22 + + Tahoma, 9pt + tsstlblUser @@ -858,6 +861,9 @@ TBPM_KONFIGURATIONTableAdapter + + DevExpress.XtraNavBar.NavBarGroup, DevExpress.XtraNavBar.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1008,15 +1014,15 @@ 0, 0 + + Tahoma, 9pt + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - VWPM_PROFILE_USERBindingSource - AAABAAwAMDAQAAEABABoBgAAxgAAACAgEAABAAQA6AIAAC4HAAAYGBAAAQAEAOgBAAAWCgAAEBAQAAEA @@ -1529,22 +1535,22 @@ 0 - - System.Windows.Forms.NotifyIcon, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Center - - 0, 25 - 5 Magenta + + 443, 81 + + + NavBarGroupProfiles + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -1585,7 +1591,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAfgBAgEIAQMBEAEAARABAAT/AQkBEAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAfgBAgEUAQMBEAEAARABAAT/AQkBEAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -1629,9 +1635,6 @@ Ziehen Sie Spaltenüberschriften in diesen Bereich um nach diesen gruppieren zu lassen - - DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_USERTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - 670, 276 @@ -1671,9 +1674,6 @@ Profilübersicht - - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1716,6 +1716,9 @@ DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + $this + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1731,11 +1734,8 @@ NavBarGroupMore - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 223, 25 915, 25 @@ -1767,6 +1767,9 @@ 0, 25 + + System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null @@ -1794,8 +1797,8 @@ DevExpress.XtraNavBar.NavBarItem, DevExpress.XtraNavBar.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - Tahoma, 9pt + + 3 DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILETableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null @@ -1806,8 +1809,8 @@ 0 - - System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + frmMain @@ -1827,8 +1830,8 @@ Fill - - DevExpress.XtraNavBar.NavBarGroup, DevExpress.XtraNavBar.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_USERTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1909,9 +1912,6 @@ Segoe UI, 9pt, style=Bold, Italic - - 223, 25 - ChartBottomRight @@ -1924,8 +1924,8 @@ Top, Bottom, Left, Right - - $this + + System.Windows.Forms.NotifyIcon, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 6, 25 @@ -1948,9 +1948,6 @@ 1 - - ToolStripBottomRight - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -2064,8 +2061,8 @@ 2 - - 242, 44 + + 0, 25 Übersicht-Profile @@ -2133,14 +2130,17 @@ False + + Verwaltungs-Konsole + 132, 22 Panel1 - - True + + SplitContainerTop.Panel1 Panel1 @@ -2172,15 +2172,12 @@ DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - NavBarGroupProfiles + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 443, 25 - - 0, 25 - 0 @@ -2211,24 +2208,30 @@ Fill - - Verwaltungs-Konsole + + VWPM_PROFILE_USERBindingSource - - 443, 81 + + 0, 25 - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0, 20 System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Tahoma, 9pt + + ToolStripBottomRight + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 638, 56 + + True + 274, 95 @@ -2244,9 +2247,6 @@ 1164, 95 - - zh-Hans - 17, 95 @@ -2262,8 +2262,8 @@ 894, 95 - - 770, 17 + + 17, 17 391, 17 @@ -2295,16 +2295,13 @@ 17, 56 - - 17, 134 - - - 17, 17 + + 770, 17 168, 134 - - True + + 17, 134 \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 874cf9c..b9e67c7 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -19,7 +19,6 @@ Public Class frmMain Private CURR_DT_VWPM_PROFILE_ACTIVE As DataTable Private CURR_DT_PROFILEGRID As DataTable - Private RedDocuments As Integer = 0 Private YellowDocuments As Integer = 0 Private GreenDocuments As Integer = 0 @@ -28,7 +27,7 @@ Public Class frmMain Private GRID_LOAD_TYPE As String = "OVERVIEW" Private GRID_INV_COL_REMOVED As Boolean = False - Private Sub frmProfiles_FormClosing(sender As Object, e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing + Private Sub frmProfiles_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing Try ClassAllgemeineFunktionen.LoginOut("LOGOUT") @@ -43,15 +42,9 @@ Public Class frmMain My.Settings.frmMainSize = Me.Size My.Settings.frmMainPosition = Me.Location My.Settings.Save() - Catch ex As Exception - ClassLogger.Add("Error in Save FormLayout: " & ex.Message) - End Try - Try - 'Dim XMLPath = GetXML_LayoutName() - 'GridViewProfile.SaveLayoutToXml(XMLPath) SaveLayout() Catch ex As Exception - + ClassLogger.Add("Error in Save FormLayout: " & ex.Message) End Try End Sub @@ -124,7 +117,7 @@ Public Class frmMain tsstlblUser.Text = Environment.UserName Decide_Load() - Catch ex As System.Exception + Catch ex As Exception MsgBox("Fehler bei Laden des Formulars: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") End Try If UniversalViewer = "" And Viewer = "uviewer" Then @@ -178,10 +171,10 @@ Public Class frmMain Function Refresh_ConnectionString() Try TBPM_KONFIGURATIONTableAdapter.Connection.ConnectionString = MyConnectionString - Me.TBPM_PROFILETableAdapter.Connection.ConnectionString = MyConnectionString - Me.TBPM_USERTableAdapter.Connection.ConnectionString = MyConnectionString - Me.VWPM_PROFILE_USERTableAdapter.Connection.ConnectionString = MyConnectionString - Me.TBPM_PROFILE_FILESTableAdapter.Connection.ConnectionString = MyConnectionString + TBPM_PROFILETableAdapter.Connection.ConnectionString = MyConnectionString + TBPM_USERTableAdapter.Connection.ConnectionString = MyConnectionString + VWPM_PROFILE_USERTableAdapter.Connection.ConnectionString = MyConnectionString + TBPM_PROFILE_FILESTableAdapter.Connection.ConnectionString = MyConnectionString Return True Catch ex As Exception @@ -653,13 +646,6 @@ Public Class frmMain End Try End If - - - - - - - End If Catch ex As Exception ClassLogger.Add("LoadProfile_PM - Fehler: " & ex.Message) @@ -810,7 +796,7 @@ Public Class frmMain If info.Column.FieldName = "PROFILE_GROUP_TEXT" Then info.GroupText = info.GroupValueText - Dim _color As String + Dim _color As String = "Grey" For Each row As DataRow In CURR_DT_VWPM_PROFILE_ACTIVE.Rows If row.Item("PROFILE_GROUP_TEXT") = info.GroupValueText Then @@ -825,7 +811,7 @@ Public Class frmMain info.Appearance.BackColor = Color.LightGreen Case "Yellow" info.Appearance.BackColor = Color.LightYellow - Case Else + Case "Grey" info.Appearance.BackColor = Color.LightGray End Select diff --git a/app/DD_PM_WINDREAM/frmMain.zh-Hans.resx b/app/DD_PM_WINDREAM/frmMain.zh-Hans.resx index 38e75e7..84a6873 100644 --- a/app/DD_PM_WINDREAM/frmMain.zh-Hans.resx +++ b/app/DD_PM_WINDREAM/frmMain.zh-Hans.resx @@ -122,7 +122,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAQgBAwEIAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAARABAwEQAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -179,9 +179,6 @@ /oib3/jOx9+oFwkFmKITAWKZvH+R9IGdOX6V/8VM/g4Nd1V+xlTSTXpaAAAAAElFTkSuQmCC - - 0, 20 - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m