MS frmMain Sync

This commit is contained in:
2021-03-25 14:08:28 +01:00
parent 0aa24e7909
commit 810fba1859
4 changed files with 214 additions and 195 deletions

View File

@@ -651,9 +651,9 @@ Partial Class frmMain
'
resources.ApplyResources(Me.BarButtonItemGhostMode, "BarButtonItemGhostMode")
Me.BarButtonItemGhostMode.Id = 21
Me.BarButtonItemGhostMode.ImageOptions.Image = CType(resources.GetObject("BarButtonItem2.ImageOptions.Image"), System.Drawing.Image)
Me.BarButtonItemGhostMode.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.LargeImage"), System.Drawing.Image)
Me.BarButtonItemGhostMode.ItemAppearance.Normal.Font = CType(resources.GetObject("BarButtonItem2.ItemAppearance.Normal.Font"), System.Drawing.Font)
Me.BarButtonItemGhostMode.ImageOptions.Image = CType(resources.GetObject("BarButtonItemGhostMode.ImageOptions.Image"), System.Drawing.Image)
Me.BarButtonItemGhostMode.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItemGhostMode.ImageOptions.LargeImage"), System.Drawing.Image)
Me.BarButtonItemGhostMode.ItemAppearance.Normal.Font = CType(resources.GetObject("BarButtonItemGhostMode.ItemAppearance.Normal.Font"), System.Drawing.Font)
Me.BarButtonItemGhostMode.ItemAppearance.Normal.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
Me.BarButtonItemGhostMode.ItemAppearance.Normal.Options.UseFont = True
Me.BarButtonItemGhostMode.ItemAppearance.Normal.Options.UseForeColor = True
@@ -709,7 +709,6 @@ Partial Class frmMain
'RibbonPageGroup2
'
Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
Me.RibbonPageGroup2.ItemLinks.Add(Me.bbtniMetadataFile)
Me.RibbonPageGroup2.ItemLinks.Add(Me.bbtnitDashboardInv)
Me.RibbonPageGroup2.ItemLinks.Add(Me.bbtniMonitor)
Me.RibbonPageGroup2.Name = "RibbonPageGroup2"

View File

@@ -125,7 +125,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw
CAAAAk1TRnQBSQFMAgEBAgEAAWgBBwFoAQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CAAAAk1TRnQBSQFMAgEBAgEAAXgBBwF4AQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -176,6 +176,108 @@
<value>863, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="CMGroupStart.Size" type="System.Drawing.Size, System.Drawing">
<value>269, 26</value>
</data>
<data name="CMGroupStart.Text" xml:space="preserve">
<value>Validierung für Gruppe/Profil starten</value>
</data>
<data name="CMFileStart.Size" type="System.Drawing.Size, System.Drawing">
<value>269, 26</value>
</data>
<data name="CMFileStart.Text" xml:space="preserve">
<value>Validierung für Datei starten</value>
</data>
<data name="CMFileMetadata.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wwAADsMBx2+oZAAAANNJREFUOE+1k80NgzAMRhmlI3QGZuGeLdiBXjoEU2QaCk3gSPssjJIQBXpopE9y
7M/PCT9VuuZ5XgsanHP3zZpfGOu6zqpt23NICYBOISHgNYyRipBlWW7e+ycAa63Ivd06jdMBEEKkGRIb
mpExRqR7QLmTUJPJ32Bomkaa+r7fDcTkqIWQCKDHxqiFVHoavY7mBcB0Ap3cdY99EjE5anj0FCkgmq6N
CtI8Hu/8fwCXr6CeCPDLQ0w9Arj6GjHndOlDolb8gVjBp7yDiMlR22zJqqoPDtN4ChAfojUAAAAASUVO
RK5CYII=
</value>
</data>
<data name="CMFileMetadata.Size" type="System.Drawing.Size, System.Drawing">
<value>269, 26</value>
</data>
<data name="CMFileMetadata.Text" xml:space="preserve">
<value>Metadaten Datei anzeigen</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="CMFileMetadata.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="ToolStripSeparator4.Size" type="System.Drawing.Size, System.Drawing">
<value>266, 6</value>
</data>
<data name="tsmiMarkedFilesFinish.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wwAADsMBx2+oZAAAAM5JREFUOE9jwAa+fv3a8O3bt/9I+D0QCECl8QOQQpAG+fTl/xmC5/yvXnryP8hA
qDRhALJx1s4rYM38sYv+P3/zAcUlX758MYAqhQAkSbACEI1se2Rk5H8nJycwTklJ+f/8+XNUQ0CakDUg
2754xVq4ZpyGgPyHrAnZsI8fPv3/8P4jHOfl5mEagh5oyLYja0Y2AGYISB+GK2C2g/yObgAMwwwBhRfY
AJgrQAIgvHnzZrACbJpBGMMAZAAShCnAphmER5IBhDDtDCAef/sPAEGjQ6y45GCmAAAAAElFTkSuQmCC
</value>
</data>
<data name="tsmiMarkedFilesFinish.Size" type="System.Drawing.Size, System.Drawing">
<value>269, 26</value>
</data>
<data name="tsmiMarkedFilesFinish.Text" xml:space="preserve">
<value>Massenabschluss markierte Dateien</value>
</data>
<data name="ToolStripSeparator2.Size" type="System.Drawing.Size, System.Drawing">
<value>266, 6</value>
</data>
<data name="LöscheAlleFilterToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wwAADsMBx2+oZAAAAP9JREFUOE9jAIHv3787fHz5/P/DQ3v+f/v2jSQMNuDr168NZ/qa/i9U4/1/sCQF
RcGRPbvAYk/v3fkfGRn538nJCY7hBgBdkPDs/Kn/y4xlwIYcaywGS17YueX/Gget/6fnTv6fkpKCohnF
ABAAcV7fufl/o68l3BCQgddWzIe7BhuGaocYAMKgsIC5ZFuUO4YGdAzVjukCkNNBNC7no3gBGIj7b29d
C7cZFpAg54PEbh/Zjz8MQM4GaUTWDMOgwAW5CkQji8Mw2AAg4z1IIygq0RUQwmADvnz5YgDi4PIrLgw3
AARAHGyK8GEMA8jBUO1UMgCbM/Fh6htAOv72HwANMrXhfARkwAAAAABJRU5ErkJggg==
</value>
</data>
<data name="LöscheAlleFilterToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>269, 26</value>
</data>
<data name="LöscheAlleFilterToolStripMenuItem.Text" xml:space="preserve">
<value>Lösche alle Filter</value>
</data>
<data name="TabellenlayoutZurücksetzenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>269, 26</value>
</data>
<data name="TabellenlayoutZurücksetzenToolStripMenuItem.Text" xml:space="preserve">
<value>Layout zurücksetzen</value>
</data>
<data name="LayoutSpeichernToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>269, 26</value>
</data>
<data name="LayoutSpeichernToolStripMenuItem.Text" xml:space="preserve">
<value>Layout speichern</value>
</data>
<data name="ToolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing">
<value>266, 6</value>
</data>
<data name="DateiAlsLinkVersendenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>200, 22</value>
</data>
<data name="DateiAlsLinkVersendenToolStripMenuItem.Text" xml:space="preserve">
<value>Datei als Link versenden</value>
</data>
<data name="AktionenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>269, 26</value>
</data>
<data name="AktionenToolStripMenuItem.Text" xml:space="preserve">
<value>Aktionen Datei</value>
</data>
<data name="ExportierenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>269, 26</value>
</data>
<data name="ExportierenToolStripMenuItem.Text" xml:space="preserve">
<value>Exportieren</value>
</data>
<data name="ContextMenuGrid.Size" type="System.Drawing.Size, System.Drawing">
<value>270, 256</value>
</data>
@@ -195,7 +297,6 @@
<data name="GridControl_Docs.Size" type="System.Drawing.Size, System.Drawing">
<value>1114, 335</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="GridControl_Docs.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
</data>
@@ -317,6 +418,12 @@
<metadata name="cmsNavPane.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 56</value>
</metadata>
<data name="tsmiValidationProfil.Size" type="System.Drawing.Size, System.Drawing">
<value>219, 26</value>
</data>
<data name="tsmiValidationProfil.Text" xml:space="preserve">
<value>Starte Validierung für Profil</value>
</data>
<data name="cmsNavPane.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 30</value>
</data>
@@ -497,119 +604,33 @@
<data name="&gt;&gt;Panel1.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="CMGroupStart.Size" type="System.Drawing.Size, System.Drawing">
<value>269, 26</value>
</data>
<data name="CMGroupStart.Text" xml:space="preserve">
<value>Validierung für Gruppe/Profil starten</value>
</data>
<data name="CMFileStart.Size" type="System.Drawing.Size, System.Drawing">
<value>269, 26</value>
</data>
<data name="CMFileStart.Text" xml:space="preserve">
<value>Validierung für Datei starten</value>
</data>
<data name="CMFileMetadata.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wwAADsMBx2+oZAAAANNJREFUOE+1k80NgzAMRhmlI3QGZuGeLdiBXjoEU2QaCk3gSPssjJIQBXpopE9y
7M/PCT9VuuZ5XgsanHP3zZpfGOu6zqpt23NICYBOISHgNYyRipBlWW7e+ycAa63Ivd06jdMBEEKkGRIb
mpExRqR7QLmTUJPJ32Bomkaa+r7fDcTkqIWQCKDHxqiFVHoavY7mBcB0Ap3cdY99EjE5anj0FCkgmq6N
CtI8Hu/8fwCXr6CeCPDLQ0w9Arj6GjHndOlDolb8gVjBp7yDiMlR22zJqqoPDtN4ChAfojUAAAAASUVO
RK5CYII=
</value>
</data>
<data name="CMFileMetadata.Size" type="System.Drawing.Size, System.Drawing">
<value>269, 26</value>
</data>
<data name="CMFileMetadata.Text" xml:space="preserve">
<value>Metadaten Datei anzeigen</value>
</data>
<data name="CMFileMetadata.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="ToolStripSeparator4.Size" type="System.Drawing.Size, System.Drawing">
<value>266, 6</value>
</data>
<data name="tsmiMarkedFilesFinish.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wwAADsMBx2+oZAAAAM5JREFUOE9jwAa+fv3a8O3bt/9I+D0QCECl8QOQQpAG+fTl/xmC5/yvXnryP8hA
qDRhALJx1s4rYM38sYv+P3/zAcUlX758MYAqhQAkSbACEI1se2Rk5H8nJycwTklJ+f/8+XNUQ0CakDUg
2754xVq4ZpyGgPyHrAnZsI8fPv3/8P4jHOfl5mEagh5oyLYja0Y2AGYISB+GK2C2g/yObgAMwwwBhRfY
AJgrQAIgvHnzZrACbJpBGMMAZAAShCnAphmER5IBhDDtDCAef/sPAEGjQ6y45GCmAAAAAElFTkSuQmCC
</value>
</data>
<data name="tsmiMarkedFilesFinish.Size" type="System.Drawing.Size, System.Drawing">
<value>269, 26</value>
</data>
<data name="tsmiMarkedFilesFinish.Text" xml:space="preserve">
<value>Massenabschluss markierte Dateien</value>
</data>
<data name="ToolStripSeparator2.Size" type="System.Drawing.Size, System.Drawing">
<value>266, 6</value>
</data>
<data name="LöscheAlleFilterToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wwAADsMBx2+oZAAAAP9JREFUOE9jAIHv3787fHz5/P/DQ3v+f/v2jSQMNuDr168NZ/qa/i9U4/1/sCQF
RcGRPbvAYk/v3fkfGRn538nJCY7hBgBdkPDs/Kn/y4xlwIYcaywGS17YueX/Gget/6fnTv6fkpKCohnF
ABAAcV7fufl/o68l3BCQgddWzIe7BhuGaocYAMKgsIC5ZFuUO4YGdAzVjukCkNNBNC7no3gBGIj7b29d
C7cZFpAg54PEbh/Zjz8MQM4GaUTWDMOgwAW5CkQji8Mw2AAg4z1IIygq0RUQwmADvnz5YgDi4PIrLgw3
AARAHGyK8GEMA8jBUO1UMgCbM/Fh6htAOv72HwANMrXhfARkwAAAAABJRU5ErkJggg==
</value>
</data>
<data name="LöscheAlleFilterToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>269, 26</value>
</data>
<data name="LöscheAlleFilterToolStripMenuItem.Text" xml:space="preserve">
<value>Lösche alle Filter</value>
</data>
<data name="TabellenlayoutZurücksetzenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>269, 26</value>
</data>
<data name="TabellenlayoutZurücksetzenToolStripMenuItem.Text" xml:space="preserve">
<value>Layout zurücksetzen</value>
</data>
<data name="LayoutSpeichernToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>269, 26</value>
</data>
<data name="LayoutSpeichernToolStripMenuItem.Text" xml:space="preserve">
<value>Layout speichern</value>
</data>
<data name="ToolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing">
<value>266, 6</value>
</data>
<data name="AktionenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>269, 26</value>
</data>
<data name="AktionenToolStripMenuItem.Text" xml:space="preserve">
<value>Aktionen Datei</value>
</data>
<data name="DateiAlsLinkVersendenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>200, 22</value>
</data>
<data name="DateiAlsLinkVersendenToolStripMenuItem.Text" xml:space="preserve">
<value>Datei als Link versenden</value>
</data>
<data name="ExportierenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>269, 26</value>
</data>
<data name="ExportierenToolStripMenuItem.Text" xml:space="preserve">
<value>Exportieren</value>
</data>
<data name="tsmiValidationProfil.Size" type="System.Drawing.Size, System.Drawing">
<value>219, 26</value>
</data>
<data name="tsmiValidationProfil.Text" xml:space="preserve">
<value>Starte Validierung für Profil</value>
</data>
<metadata name="NotifyIcon1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>490, 17</value>
</metadata>
<metadata name="ContextMenuNotifyIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>640, 56</value>
</metadata>
<data name="PopupErinnerungInaktivierenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>234, 22</value>
</data>
<data name="PopupErinnerungInaktivierenToolStripMenuItem.Text" xml:space="preserve">
<value>Popup Erinnerung inaktivieren</value>
</data>
<data name="ToolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
<value>231, 6</value>
</data>
<data name="AnzeigenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>234, 22</value>
</data>
<data name="AnzeigenToolStripMenuItem.Text" xml:space="preserve">
<value>Bring to Front</value>
</data>
<data name="OutOfRangePMFixierenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>234, 22</value>
</data>
<data name="OutOfRangePMFixierenToolStripMenuItem.Text" xml:space="preserve">
<value>Out of Range - PM fixieren</value>
</data>
<data name="ContextMenuNotifyIcon.Size" type="System.Drawing.Size, System.Drawing">
<value>235, 76</value>
</data>
@@ -791,27 +812,6 @@
<data name="NotifyIcon1.Visible" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="PopupErinnerungInaktivierenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>234, 22</value>
</data>
<data name="PopupErinnerungInaktivierenToolStripMenuItem.Text" xml:space="preserve">
<value>Popup Erinnerung inaktivieren</value>
</data>
<data name="ToolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
<value>231, 6</value>
</data>
<data name="AnzeigenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>234, 22</value>
</data>
<data name="AnzeigenToolStripMenuItem.Text" xml:space="preserve">
<value>Bring to Front</value>
</data>
<data name="OutOfRangePMFixierenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>234, 22</value>
</data>
<data name="OutOfRangePMFixierenToolStripMenuItem.Text" xml:space="preserve">
<value>Out of Range - PM fixieren</value>
</data>
<metadata name="TimerRefresh.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>605, 17</value>
</metadata>
@@ -1269,7 +1269,7 @@
<data name="BarButtonItemGhostMode.Caption" xml:space="preserve">
<value>Ghost Mode inaktivieren</value>
</data>
<data name="BarButtonItem2.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="BarButtonItemGhostMode.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAQdEVYdFRpdGxlAE1hc2s7Um9sZTu6seyzAAAA3klE
@@ -1279,7 +1279,7 @@
6ND9GYC1eAiKbZDRqW78Y8dG3EXzGI+s1q8JD762g7gZPOM1enHwAUbOxAVvaZeAAAAAAElFTkSuQmCC
</value>
</data>
<data name="BarButtonItem2.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="BarButtonItemGhostMode.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAQdEVYdFRpdGxlAE1hc2s7Um9sZTu6seyzAAACmUlE
@@ -1297,7 +1297,7 @@
auQPQiXhdkHlGrsAAAAASUVORK5CYII=
</value>
</data>
<data name="BarButtonItem2.ItemAppearance.Normal.Font" type="System.Drawing.Font, System.Drawing">
<data name="BarButtonItemGhostMode.ItemAppearance.Normal.Font" type="System.Drawing.Font, System.Drawing">
<value>Tahoma, 9.75pt, style=Bold</value>
</data>
<data name="SearchItem1.Caption" xml:space="preserve">
@@ -1377,6 +1377,21 @@
<data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="RibbonPageGroup1.Text" xml:space="preserve">
<value>Allgemein</value>
</data>
<data name="RibbonPageGroup2.Text" xml:space="preserve">
<value>Auswertungen</value>
</data>
<data name="RibbonPageGroup3.Text" xml:space="preserve">
<value>Verwaltung</value>
</data>
<data name="RibbonPageGroupBasicConf.Text" xml:space="preserve">
<value>Grundeinstellungen</value>
</data>
<data name="RibbonPageGroup4.Text" xml:space="preserve">
<value>Funktionen/App Start</value>
</data>
<data name="RibbonPage1.Text" xml:space="preserve">
<value>Start</value>
</data>
@@ -1413,21 +1428,6 @@
<data name="&gt;&gt;RibbonControl1.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="RibbonPageGroup1.Text" xml:space="preserve">
<value>Allgemein</value>
</data>
<data name="RibbonPageGroup2.Text" xml:space="preserve">
<value>Auswertungen</value>
</data>
<data name="RibbonPageGroup3.Text" xml:space="preserve">
<value>Verwaltung</value>
</data>
<data name="RibbonPageGroupBasicConf.Text" xml:space="preserve">
<value>Grundeinstellungen</value>
</data>
<data name="RibbonPageGroup4.Text" xml:space="preserve">
<value>Funktionen/App Start</value>
</data>
<data name="barDockControlTop.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Top</value>
</data>
@@ -2718,9 +2718,6 @@
<data name="miView.Caption" xml:space="preserve">
<value>&amp;Ansicht</value>
</data>
<data name="miBackground.Caption" xml:space="preserve">
<value>&amp;Hintergrund</value>
</data>
<data name="miPageLayout.Caption" xml:space="preserve">
<value>&amp;Seiten Layout</value>
</data>
@@ -2733,6 +2730,9 @@
<data name="miToolbars.Caption" xml:space="preserve">
<value>Bars</value>
</data>
<data name="miBackground.Caption" xml:space="preserve">
<value>&amp;Hintergrund</value>
</data>
<data name="PrintPreviewBarCheckItem1.Caption" xml:space="preserve">
<value>PDF Dokument</value>
</data>

View File

@@ -138,12 +138,6 @@ Public Class frmMain
End Sub
Private Sub frmMain_Load(sender As Object, e As System.EventArgs) Handles Me.Load
If Environment.UserName.ToLower = "schreiberm" Or Environment.UserName.ToLower = "jennej" Or Environment.UserName.ToLower = "marschreiber" Then
bbtniMetadataFile.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
Else
bbtniMetadataFile.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
End If
FormOpenClose = True
LOGGER.Debug("Initializing MainForm....")
@@ -322,7 +316,7 @@ Public Class frmMain
bbtniMonitor.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
End If
Check_Timer_Notification()
Check_Timer_Inactivity()
Timer_Inactivity_Reset_Disable()
FormShown = True
Restore_Form_Position()
@@ -386,7 +380,7 @@ Public Class frmMain
End Try
End Sub
Public Sub Check_Timer_Inactivity()
Public Sub Timer_Inactivity_Reset_Disable()
Try
If INACTIVITY_DURATION <> 0 Then
TimerInactivity.Stop()
@@ -1060,19 +1054,27 @@ Public Class frmMain
Exit Sub
End If
If bwBasicData.IsBusy Then
LOGGER.Info("bwBasicData is busy - no Refreshing")
Exit Sub
End If
If Application.OpenForms().OfType(Of frmValidator).Any Then
Exit Sub
End If
If Application.OpenForms().OfType(Of frmAdministration).Any Then
Exit Sub
End If
If Application.OpenForms().OfType(Of frmAdmin2).Any Then
LOGGER.Info("backGroundWorker BasicData in Action - no Client-Sync")
bsiMessage.Caption = "bwBasicData is busy - no Refreshing"
bsiMessage.ItemAppearance.Normal.BackColor = Color.Yellow
Exit Sub
End If
'If Application.OpenForms().OfType(Of frmValidator).Any Then
' Exit Sub
'End If
'If Application.OpenForms().OfType(Of frmAdministration).Any Then
' Exit Sub
'End If
'If Application.OpenForms().OfType(Of frmAdmin2).Any Then
' Exit Sub
'End If
If USER_LANGUAGE <> "de-DE" Then
bsilastsync.Caption = "Last Client-Sync: " & Now.ToLongTimeString
Else
bsilastsync.Caption = "Letzte Synchronisation: " & Now.ToLongTimeString
End If
If GridControl_Docs.Visible = True And FormOpenClose = False Then RefreshHelper.SaveViewInfo()
'If Not Application.OpenForms().OfType(Of frmValidator).Any Then
' Dim oUpdate = "Not Defined"
@@ -1097,11 +1099,7 @@ Public Class frmMain
Await Decide_Load(False)
oStopWatch.Done()
'bwSync.ReportProgress(95)
If USER_LANGUAGE <> "de-DE" Then
bsilastsync.Caption = "Last Client-Sync: " & Now.ToLongTimeString
Else
bsilastsync.Caption = "Letzte Synchronisation: " & Now.ToLongTimeString
End If
If GridControl_Docs.Visible = True And FormOpenClose = False Then RefreshHelper.LoadViewInfo()
Handling_DEBUG_USER()
@@ -1959,7 +1957,7 @@ Public Class frmMain
Private Async Sub TabellenlayoutZurücksetzenToolStripMenuItem_Click_1(sender As Object, e As EventArgs) Handles TabellenlayoutZurücksetzenToolStripMenuItem.Click
Check_Timer_Inactivity()
Timer_Inactivity_Reset_Disable()
Await Reset_GridLayout(False)
Await Decide_Load(False, True)
SaveGridLayout()
@@ -2081,18 +2079,14 @@ Public Class frmMain
End Sub
Private Sub GridView_Docs_ColumnWidthChanged(sender As Object, e As Views.Base.ColumnEventArgs) Handles GridView_Docs.ColumnWidthChanged
If FormShown = False Then
Exit Sub
End If
Check_Timer_Inactivity()
SaveGridLayout()
GridLayout_Changed()
End Sub
Private Sub GridView_Docs_EndSorting(sender As Object, e As EventArgs) Handles GridView_Docs.EndSorting
' SaveGridLayout()
End Sub
Private Sub LayoutSpeichernToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles LayoutSpeichernToolStripMenuItem.Click
Check_Timer_Inactivity()
Timer_Inactivity_Reset_Disable()
SaveGridLayout()
End Sub
@@ -2118,7 +2112,10 @@ Public Class frmMain
If pMode = "bwBasicData" Then bwBasicData.ReportProgress(10)
ClassParamRefresh.Refresh_Params(DT_CHECKUSER_MODULE)
If pMode <> "Load" Then
ClassParamRefresh.Refresh_Params(DT_CHECKUSER_MODULE)
End If
If pMode = "bwBasicData" Then bwBasicData.ReportProgress(20)
oSQL = String.Format("SELECT T.* FROM VWPM_PROFILE_ACTIVE T WHERE T.FILE_COUNT > 0 AND T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_GET_ACTIVE_PROFILES_USER] ({0}))", USER_ID)
CURR_DT_VWPM_PROFILE_ACTIVE = ClassDatabase.Return_Datatable(oSQL, "GetBaseData2")
@@ -2223,7 +2220,7 @@ Public Class frmMain
End Sub
Private Sub LöscheAlleFilterToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles LöscheAlleFilterToolStripMenuItem.Click
Check_Timer_Inactivity()
Timer_Inactivity_Reset_Disable()
Try
GridView_Docs.ClearFindFilter()
@@ -2499,7 +2496,7 @@ Public Class frmMain
If FormShown = False Then
Exit Sub
End If
Check_Timer_Inactivity()
Timer_Inactivity_Reset_Disable()
Dim objectCount_Descr = GridView_Docs.RowCount.ToString
If USER_LANGUAGE <> "de-DE" Then
objectCount_Descr &= " objects (filtered)"
@@ -2530,23 +2527,33 @@ Public Class frmMain
Private Sub TimerInactivity_Tick(sender As Object, e As EventArgs) Handles TimerInactivity.Tick
Try
If Application.OpenForms().OfType(Of frmValidator).Any Then
Check_Timer_Inactivity()
bsiMessage.Caption = "Validation Active - no Inactivity-Logout"
bsiMessage.ItemAppearance.Normal.BackColor = Color.Yellow
Timer_Inactivity_Reset_Disable()
Exit Sub
End If
If Application.OpenForms().OfType(Of frmAdministration).Any Then
Check_Timer_Inactivity()
bsiMessage.Caption = "Administration Active - no Inactivity-Logout"
bsiMessage.ItemAppearance.Normal.BackColor = Color.Yellow
Timer_Inactivity_Reset_Disable()
Exit Sub
End If
If Application.OpenForms().OfType(Of frmAdmin2).Any Then
Check_Timer_Inactivity()
bsiMessage.Caption = "Administration2 Active - no Inactivity-Logout"
bsiMessage.ItemAppearance.Normal.BackColor = Color.Yellow
Timer_Inactivity_Reset_Disable()
Exit Sub
End If
If Application.OpenForms().OfType(Of frmMonitor).Any Then
Check_Timer_Inactivity()
bsiMessage.Caption = "Monitoring open - no Inactivity-Logout"
bsiMessage.ItemAppearance.Normal.BackColor = Color.Yellow
Timer_Inactivity_Reset_Disable()
Exit Sub
End If
If GHOSTMODE_ACTIVE = True Then
Check_Timer_Inactivity()
If GHOSTMODE_ACTIVE And USER_GHOST_MODE_ACTIVE Then
bsiMessage.Caption = "GhostMode Active - no Inactivity-Logout"
bsiMessage.ItemAppearance.Normal.BackColor = Color.Yellow
Timer_Inactivity_Reset_Disable()
Exit Sub
End If
INACTIVITYRecognized = True
@@ -2603,5 +2610,18 @@ Public Class frmMain
End Try
End Sub
Private Sub GridView_Docs_ColumnPositionChanged(sender As Object, e As EventArgs) Handles GridView_Docs.ColumnPositionChanged
GridLayout_Changed()
End Sub
Sub GridLayout_Changed()
If FormShown = False Then
Exit Sub
End If
Timer_Inactivity_Reset_Disable()
SaveGridLayout()
End Sub
Private Sub GridView_Docs_CustomColumnSort(sender As Object, e As CustomColumnSortEventArgs) Handles GridView_Docs.CustomColumnSort
GridLayout_Changed()
End Sub
End Class

View File

@@ -396,7 +396,7 @@ Public Class frmValidator
End Try
My.Settings.frmValidatorSize = Me.Size
My.Settings.Save()
If INACTIVITY_DURATION <> 0 Then frmMain.Check_Timer_Inactivity()
If INACTIVITY_DURATION <> 0 Then frmMain.Timer_Inactivity_Reset_Disable()
Try
_frmValidatorSearch.Close()