diff --git a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.Designer.vb b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.Designer.vb index 1e59aa34..1ac37e99 100644 --- a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.Designer.vb +++ b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.Designer.vb @@ -33,9 +33,9 @@ Partial Class frmObjectPropertyDialog Me.TabPageLifecycle = New DevExpress.XtraBars.TabFormPage() Me.TabFormContentContainer3 = New DevExpress.XtraBars.TabFormContentContainer() Me.PanelControl1 = New DevExpress.XtraEditors.PanelControl() - Me.Button1 = New System.Windows.Forms.Button() - Me.Button2 = New System.Windows.Forms.Button() Me.Button3 = New System.Windows.Forms.Button() + Me.Button2 = New System.Windows.Forms.Button() + Me.Button1 = New System.Windows.Forms.Button() CType(Me.TabFormControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabFormContentContainer1.SuspendLayout() CType(Me.LayoutControlProperties, System.ComponentModel.ISupportInitialize).BeginInit() @@ -117,7 +117,7 @@ Partial Class frmObjectPropertyDialog Me.TabFormContentContainer3.Dock = System.Windows.Forms.DockStyle.Fill Me.TabFormContentContainer3.Location = New System.Drawing.Point(0, 71) Me.TabFormContentContainer3.Name = "TabFormContentContainer3" - Me.TabFormContentContainer3.Size = New System.Drawing.Size(800, 379) + Me.TabFormContentContainer3.Size = New System.Drawing.Size(572, 534) Me.TabFormContentContainer3.TabIndex = 3 ' 'PanelControl1 @@ -131,14 +131,14 @@ Partial Class frmObjectPropertyDialog Me.PanelControl1.Size = New System.Drawing.Size(572, 51) Me.PanelControl1.TabIndex = 1 ' - 'Button1 + 'Button3 ' - Me.Button1.Location = New System.Drawing.Point(454, 6) - Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(106, 33) - Me.Button1.TabIndex = 0 - Me.Button1.Text = "Übernehmen" - Me.Button1.UseVisualStyleBackColor = True + Me.Button3.Location = New System.Drawing.Point(230, 6) + Me.Button3.Name = "Button3" + Me.Button3.Size = New System.Drawing.Size(106, 33) + Me.Button3.TabIndex = 0 + Me.Button3.Text = "OK" + Me.Button3.UseVisualStyleBackColor = True ' 'Button2 ' @@ -149,14 +149,14 @@ Partial Class frmObjectPropertyDialog Me.Button2.Text = "Abbrechen" Me.Button2.UseVisualStyleBackColor = True ' - 'Button3 + 'Button1 ' - Me.Button3.Location = New System.Drawing.Point(230, 6) - Me.Button3.Name = "Button3" - Me.Button3.Size = New System.Drawing.Size(106, 33) - Me.Button3.TabIndex = 0 - Me.Button3.Text = "OK" - Me.Button3.UseVisualStyleBackColor = True + Me.Button1.Location = New System.Drawing.Point(454, 6) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(106, 33) + Me.Button1.TabIndex = 0 + Me.Button1.Text = "Übernehmen" + Me.Button1.UseVisualStyleBackColor = True ' 'frmObjectPropertyDialog ' diff --git a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb index 44c7d00a..20473eb1 100644 --- a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb +++ b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb @@ -7,7 +7,7 @@ Public Class frmObjectPropertyDialog Private _Environment As Environment Private _ObjectId As Int64 - Public Sub New(LogConfig As LogConfig, Environment As Environment, ObjectId As Int64) + Public Sub New(LogConfig As LogConfig, Environment As Environment, ObjectId As Long) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() diff --git a/GUIs.ZooFlow/ClassInit.vb b/GUIs.ZooFlow/ClassInit.vb index 379ecc1c..391647ff 100644 --- a/GUIs.ZooFlow/ClassInit.vb +++ b/GUIs.ZooFlow/ClassInit.vb @@ -8,12 +8,12 @@ Imports DigitalData.GUIs.ZooFlow.ClassInitLoader Imports DigitalData.GUIs.ZooFlow.ClassConstants Public Class ClassInit - Private _MainForm As frmAdmin + Private _MainForm As frmFlowForm Private _Logger As Logger Public Event Completed As EventHandler - Public Sub New(LogConfig As LogConfig, ParentForm As frmAdmin) + Public Sub New(LogConfig As LogConfig, ParentForm As frmFlowForm) _MainForm = ParentForm _Logger = LogConfig.GetLogger() End Sub diff --git a/GUIs.ZooFlow/My Project/Application.Designer.vb b/GUIs.ZooFlow/My Project/Application.Designer.vb index a3af7133..2026c404 100644 --- a/GUIs.ZooFlow/My Project/Application.Designer.vb +++ b/GUIs.ZooFlow/My Project/Application.Designer.vb @@ -32,7 +32,7 @@ Namespace My Protected Overrides Sub OnCreateMainForm() - Me.MainForm = Global.DigitalData.GUIs.ZooFlow.frmAdmin + Me.MainForm = Global.DigitalData.GUIs.ZooFlow.frmFlowForm End Sub End Class End Namespace diff --git a/GUIs.ZooFlow/My Project/Application.myapp b/GUIs.ZooFlow/My Project/Application.myapp index 1243847f..11182106 100644 --- a/GUIs.ZooFlow/My Project/Application.myapp +++ b/GUIs.ZooFlow/My Project/Application.myapp @@ -1,11 +1,10 @@  true - Form1 + frmFlowForm false 0 true 0 - 0 true - + \ No newline at end of file diff --git a/GUIs.ZooFlow/MyApplication.vb b/GUIs.ZooFlow/MyApplication.vb index 08ceb0a2..59659116 100644 --- a/GUIs.ZooFlow/MyApplication.vb +++ b/GUIs.ZooFlow/MyApplication.vb @@ -27,7 +27,7 @@ Namespace My Property DTAttributes As DataTable Property LogConfig As LogConfig - Property MainForm As frmAdmin + Property MainForm As frmAdministrationZooFlow Property SearchForm As frmSearchStart Property Database As MSSQLServer Property Database_IDB As MSSQLServer diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 233c3d73..4395261c 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -62,8 +62,10 @@ ..\packages\NLog.4.7.0\lib\net45\NLog.dll + + @@ -134,12 +136,6 @@ Form - - frmFlowForm_Layered.vb - - - Form - frmSettings.vb @@ -165,9 +161,6 @@ frmConfigDatabase.vb - - frmFlowForm_Layered.vb - frmFlowForm.vb diff --git a/GUIs.ZooFlow/frmAdministrationZooFlow.Designer.vb b/GUIs.ZooFlow/frmAdministrationZooFlow.Designer.vb index 78f94a76..1aec3394 100644 --- a/GUIs.ZooFlow/frmAdministrationZooFlow.Designer.vb +++ b/GUIs.ZooFlow/frmAdministrationZooFlow.Designer.vb @@ -25,9 +25,9 @@ Partial Class frmAdministrationZooFlow Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() + Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -39,7 +39,7 @@ Partial Class frmAdministrationZooFlow Me.RibbonControl1.MaxItemId = 1 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) - Me.RibbonControl1.Size = New System.Drawing.Size(800, 150) + Me.RibbonControl1.Size = New System.Drawing.Size(800, 158) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' 'RibbonPage1 @@ -53,11 +53,6 @@ Partial Class frmAdministrationZooFlow Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "RibbonPageGroup1" ' - 'RibbonPage2 - ' - Me.RibbonPage2.Name = "RibbonPage2" - Me.RibbonPage2.Text = "RibbonPage2" - ' 'RibbonPageGroup2 ' Me.RibbonPageGroup2.Name = "RibbonPageGroup2" @@ -65,19 +60,26 @@ Partial Class frmAdministrationZooFlow ' 'RibbonStatusBar1 ' - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 423) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 426) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(800, 27) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(800, 24) + ' + 'RibbonPage2 + ' + Me.RibbonPage2.Name = "RibbonPage2" + Me.RibbonPage2.Text = "RibbonPage2" ' 'frmAdministrationZooFlow ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(800, 450) - Me.Controls.Add(Me.RibbonControl1) Me.Controls.Add(Me.RibbonStatusBar1) + Me.Controls.Add(Me.RibbonControl1) Me.Name = "frmAdministrationZooFlow" + Me.Ribbon = Me.RibbonControl1 + Me.StatusBar = Me.RibbonStatusBar1 Me.Text = "frmAdministrationZooFlow" CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) diff --git a/GUIs.ZooFlow/frmAdministrationZooFlow.vb b/GUIs.ZooFlow/frmAdministrationZooFlow.vb index ace68bd7..79d84201 100644 --- a/GUIs.ZooFlow/frmAdministrationZooFlow.vb +++ b/GUIs.ZooFlow/frmAdministrationZooFlow.vb @@ -1,3 +1,5 @@ Public Class frmAdministrationZooFlow + Private Sub frmAdministrationZooFlow_Load(sender As Object, e As EventArgs) Handles MyBase.Load + End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/frmFlowForm.Designer.vb b/GUIs.ZooFlow/frmFlowForm.Designer.vb index 7f8ccd48..d45f79f7 100644 --- a/GUIs.ZooFlow/frmFlowForm.Designer.vb +++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb @@ -24,54 +24,56 @@ Partial Class frmFlowForm Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFlowForm)) - Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon(Me.components) + Dim SplashScreenManager As DevExpress.XtraSplashScreen.SplashScreenManager = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, Nothing, True, True) + Me.NotifyIcon = New System.Windows.Forms.NotifyIcon(Me.components) Me.ContextMenuSystray = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.VerwaltungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ZooFlowBeendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.ContextMenuForm = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.AlleAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.PictureBox1 = New System.Windows.Forms.PictureBox() Me.PictureBoxGlobix = New System.Windows.Forms.PictureBox() Me.PictureBoxPM = New System.Windows.Forms.PictureBox() Me.PictureBoxSearch = New System.Windows.Forms.PictureBox() + Me.TimerRefreshData = New System.Windows.Forms.Timer(Me.components) Me.ContextMenuSystray.SuspendLayout() - Me.ContextMenuStrip1.SuspendLayout() + Me.ContextMenuForm.SuspendLayout() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBoxGlobix, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBoxPM, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBoxSearch, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'NotifyIcon1 + 'NotifyIcon ' - Me.NotifyIcon1.ContextMenuStrip = Me.ContextMenuSystray - Me.NotifyIcon1.Icon = CType(resources.GetObject("NotifyIcon1.Icon"), System.Drawing.Icon) - Me.NotifyIcon1.Text = "ZooFlow by Digital Data" - Me.NotifyIcon1.Visible = True + Me.NotifyIcon.ContextMenuStrip = Me.ContextMenuSystray + Me.NotifyIcon.Icon = CType(resources.GetObject("NotifyIcon.Icon"), System.Drawing.Icon) + Me.NotifyIcon.Text = "ZooFlow by Digital Data" + Me.NotifyIcon.Visible = True ' 'ContextMenuSystray ' Me.ContextMenuSystray.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VerwaltungToolStripMenuItem, Me.ZooFlowBeendenToolStripMenuItem}) Me.ContextMenuSystray.Name = "ContextMenuSystray" - Me.ContextMenuSystray.Size = New System.Drawing.Size(181, 70) + Me.ContextMenuSystray.Size = New System.Drawing.Size(170, 48) ' 'VerwaltungToolStripMenuItem ' Me.VerwaltungToolStripMenuItem.Name = "VerwaltungToolStripMenuItem" - Me.VerwaltungToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.VerwaltungToolStripMenuItem.Size = New System.Drawing.Size(169, 22) Me.VerwaltungToolStripMenuItem.Text = "Verwaltung" ' 'ZooFlowBeendenToolStripMenuItem ' Me.ZooFlowBeendenToolStripMenuItem.Name = "ZooFlowBeendenToolStripMenuItem" - Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(169, 22) Me.ZooFlowBeendenToolStripMenuItem.Text = "ZooFlow beenden" ' - 'ContextMenuStrip1 + 'ContextMenuForm ' - Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AlleAnzeigenToolStripMenuItem}) - Me.ContextMenuStrip1.Name = "ContextMenuStrip1" - Me.ContextMenuStrip1.Size = New System.Drawing.Size(145, 26) + Me.ContextMenuForm.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AlleAnzeigenToolStripMenuItem}) + Me.ContextMenuForm.Name = "ContextMenuStrip1" + Me.ContextMenuForm.Size = New System.Drawing.Size(145, 26) ' 'AlleAnzeigenToolStripMenuItem ' @@ -82,7 +84,7 @@ Partial Class frmFlowForm 'PictureBox1 ' Me.PictureBox1.Dock = System.Windows.Forms.DockStyle.Left - Me.PictureBox1.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._1_LOGO_ZOO_FLOW + Me.PictureBox1.Image = CType(resources.GetObject("PictureBox1.Image"), System.Drawing.Image) Me.PictureBox1.Location = New System.Drawing.Point(0, 0) Me.PictureBox1.Name = "PictureBox1" Me.PictureBox1.Size = New System.Drawing.Size(197, 150) @@ -92,7 +94,7 @@ Partial Class frmFlowForm 'PictureBoxGlobix ' Me.PictureBoxGlobix.BackColor = System.Drawing.Color.Transparent - Me.PictureBoxGlobix.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._4_GLOBIX_INAKTIV_ZOO + Me.PictureBoxGlobix.Image = CType(resources.GetObject("PictureBoxGlobix.Image"), System.Drawing.Image) Me.PictureBoxGlobix.Location = New System.Drawing.Point(448, 23) Me.PictureBoxGlobix.Name = "PictureBoxGlobix" Me.PictureBoxGlobix.Size = New System.Drawing.Size(90, 101) @@ -104,7 +106,7 @@ Partial Class frmFlowForm 'PictureBoxPM ' Me.PictureBoxPM.BackColor = System.Drawing.Color.Transparent - Me.PictureBoxPM.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._3_PERSON_INAKTIV_ZOO + Me.PictureBoxPM.Image = CType(resources.GetObject("PictureBoxPM.Image"), System.Drawing.Image) Me.PictureBoxPM.Location = New System.Drawing.Point(335, 23) Me.PictureBoxPM.Name = "PictureBoxPM" Me.PictureBoxPM.Size = New System.Drawing.Size(90, 101) @@ -116,7 +118,7 @@ Partial Class frmFlowForm 'PictureBoxSearch ' Me.PictureBoxSearch.BackColor = System.Drawing.Color.Transparent - Me.PictureBoxSearch.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._2_LUPE_INAKTIV_ZOO + Me.PictureBoxSearch.Image = CType(resources.GetObject("PictureBoxSearch.Image"), System.Drawing.Image) Me.PictureBoxSearch.Location = New System.Drawing.Point(220, 23) Me.PictureBoxSearch.Name = "PictureBoxSearch" Me.PictureBoxSearch.Size = New System.Drawing.Size(90, 101) @@ -124,6 +126,10 @@ Partial Class frmFlowForm Me.PictureBoxSearch.TabIndex = 3 Me.PictureBoxSearch.TabStop = False ' + 'SplashScreenManager + ' + SplashScreenManager.ClosingDelay = 500 + ' 'frmFlowForm ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -131,7 +137,7 @@ Partial Class frmFlowForm Me.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(49, Byte), Integer)) Me.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center Me.ClientSize = New System.Drawing.Size(577, 150) - Me.ContextMenuStrip = Me.ContextMenuStrip1 + Me.ContextMenuStrip = Me.ContextMenuForm Me.Controls.Add(Me.PictureBox1) Me.Controls.Add(Me.PictureBoxGlobix) Me.Controls.Add(Me.PictureBoxPM) @@ -144,7 +150,7 @@ Partial Class frmFlowForm Me.Text = "frmFlowForm_Test1" Me.TopMost = True Me.ContextMenuSystray.ResumeLayout(False) - Me.ContextMenuStrip1.ResumeLayout(False) + Me.ContextMenuForm.ResumeLayout(False) CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBoxGlobix, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBoxPM, System.ComponentModel.ISupportInitialize).EndInit() @@ -155,11 +161,12 @@ Partial Class frmFlowForm Friend WithEvents PictureBoxSearch As PictureBox Friend WithEvents PictureBoxPM As PictureBox Friend WithEvents PictureBoxGlobix As PictureBox - Friend WithEvents NotifyIcon1 As NotifyIcon + Friend WithEvents NotifyIcon As NotifyIcon Friend WithEvents ContextMenuSystray As ContextMenuStrip Friend WithEvents VerwaltungToolStripMenuItem As ToolStripMenuItem Friend WithEvents ZooFlowBeendenToolStripMenuItem As ToolStripMenuItem - Friend WithEvents ContextMenuStrip1 As ContextMenuStrip + Friend WithEvents ContextMenuForm As ContextMenuStrip Friend WithEvents AlleAnzeigenToolStripMenuItem As ToolStripMenuItem Friend WithEvents PictureBox1 As PictureBox + Friend WithEvents TimerRefreshData As Timer End Class diff --git a/GUIs.ZooFlow/frmFlowForm.resx b/GUIs.ZooFlow/frmFlowForm.resx index 15f18551..1e160c83 100644 --- a/GUIs.ZooFlow/frmFlowForm.resx +++ b/GUIs.ZooFlow/frmFlowForm.resx @@ -117,14 +117,14 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 17, 17 132, 17 - + AAABAAYAAAAAAAEAIADPJgAAZgAAAICAAAABACAAKAgBADUnAABAQAAAAQAgAChCAABdLwEAMDAAAAEA IACoJQAAhXEBACAgAAABACAAqBAAAC2XAQAQEAAAAQAgAGgEAADVpwEAiVBORw0KGgoAAAANSUhEUgAA @@ -1956,7 +1956,135 @@ AMADAADwDwAA - + 296, 17 + + + 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 + tLySDvrOrwAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAAGsAAABQCAYAAAAeAotiAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAACxIAAAsSAdLdfvwAAASySURBVHhe7Z1/atRAFMd7hB7Bv6y2tdYb9Ag9gkfoDdwj + 9Ag9gn+JiMgiUkREFhFBBCmKCFJQEUQEie+7Mnmz6Ut2kswm8ybvj88fLzub5n2/nR+ZmWS3iqIwlCAe + NNKEg4/3joiZEcSRL+JQcPD/IgojiJkv4lBwYGa1wcxShJmliCTNmhM4PmWgQVWXJM0a5aKSIiFdODCz + ZMys9Hj34Po2cUzMiDlxQRQN4HOUOyXuEtek88aEgwmaRQLDoBMCokuGtGVB4HwbMY6DCZkFMYkzQhI8 + FvgHiDrTwcEEzCLxhjCpSjTTOMjcLBIMfZEk5lDcJ7alawuFg0zNIoEOCfQlkoBD8504lq4zBA4yNIuE + wSgNAknCjcmpdL3r4CAzs0iQsZu9dZxJ190EBxmZBSEqwqQKmufgfoyDTMyi5LUY5ZhLeUhwkIFZlDj6 + KEmQ1AlqEjlQbhYlfFQRQBsnUl4+HCg2ixLFtFGKo762HEr5OTjQbRZuOKXktbGQ8nNwoNQsSlB781el + VnMO9Jq1bikjiM/z3eLb8/3i16uDFS7P94uLxzfE72wINOfirD0HCs2ipHqP/r483S3+vKau4u2dRmDc + gKaJo0MOdJrVuVa9f7hT/Hx5IBrTxNdne+L5NsCVm2UOlJlFyWBVV0oyiN+L2ysm/H1zWPx4cWvZHH56 + cnMJjEGN8ssBNI3SOSNzRXsO9JnVeQSIvskXHzUMNU0qC2Bc1VyYKpWNyEU1Zw4UmUWJ4L5KSnAtEN4X + HbVJKlcFZvqGoZ9rMjgSK/ddLIIuszo3gX4/hSZOKlPHh0c7y+bSfR+DE6lcRFaWUlgEXWZ1mqxFTXBC + A9QyqVwT6K/c99ua3YGVm2QWQZdZnVZ+/SYQzZhUZh2oXe4cQCoTmXJUyCLoMktKai1+rQjtqyT8pnCA + e69ysw2LoMQsXHwlmWB8s/oMv/3hfJemtCXlbDwLMTGzFNWs0gMWQo9ZnfdWKO2zyqknFmICZikcDYJy + 2Z+FmIBZQNl9FpiuWX5TCBKfwQDTNQu0nRvEIKI6Nzjg7Pu0zarWEiDNuqOZq1tGQfnL871lHwY2OCpU + PcCIsowPw+qM6ApqrPS3elJ6wEJMzCxHm5ViV9ukzx197t9q0HtTDISEehO6BwM1UjLJJ7JheqebACUw + 2iM81dFkHRENUz+RO9p+9pCa5YhgWBZLJL32X/QFJkjmSPQ0LIvFx87L+jGQhv5NoN+TzhMAjXw4bxZB + kVmAEhl1y3Rbw1BeOk8DeWyYAZTMqE0haGMYBibSORq4oj0HyswClFCUrdN9CDWsg1n5bPIElFASD8+F + GNayGcxv+zSgxEavXaDJsJYDjDwfTACUWDKP/MAwzIK4NS+Y12Hnbq3mHCg1C1CC9jDd8phXOFUoSXtM + dXnMK5wylGgyzWFHpvEAuIMStlcraAKJV4RInWm+tMRBAtjrgDRBIvTeq7Fhgpo+Hw4yMwuQIPYKO02Q + MPZySG2QSGM3i/ba1TaQWPZCY22QePaqcG2QmPYSfo2QwDDOft5CNQnpwoGZJaPILPuxM0U/dmbImFmK + MLMUYWYpYnSz7Ofaw4k6MxGKeNBIE/GgkSLF1j9I9dPGGKWHXgAAAABJRU5ErkJggg== + + + + 622, 17 + \ No newline at end of file diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index c377cfa9..3bff53db 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -1,30 +1,73 @@ -Imports DigitalData.Modules.Logging +Imports DevExpress.LookAndFeel +Imports DevExpress.XtraSplashScreen +Imports DigitalData.Modules.Logging +Imports DigitalData.Modules.Messaging Public Class frmFlowForm + ' Constants Private Const OPACITY_HIDDEN = 0.65 Private Const OPACITY_SHOWN = 0.85 Private ActiveModules As List(Of String) Private Logger As Logger - - Private ESCHitCount As Integer = 0 - + Private Init As ClassInit Private DTIDB_SEARCHES As DataTable + + ' Runtime Flags + Private ApplicationLoading As Boolean = True Private IDBSearchActive As Boolean = False + ' Runtime Variables + Private ESCHitCount As Integer = 0 + + ' Events Public Event ClipboardChanged As EventHandler(Of IDataObject) + Public Sub New() + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + ' === Hide form initially === + Opacity = 0 + End Sub + + Private Sub frmFlowForm_Load(sender As Object, e As EventArgs) Handles Me.Load ' === Initialize Logger === Logger = My.LogConfig.GetLogger() + ' === Show Splash Screen === + SplashScreenManager.ShowForm(Me, GetType(frmSplash), False, False) + + ' === Initialization === + Init = New ClassInit(My.LogConfig, Me) + AddHandler Init.Completed, AddressOf Init_Completed + Init.InitializeApplication() + End Sub + + Private Sub Init_Completed(sender As Object, e As EventArgs) + ' === Initialization Complete === + ApplicationLoading = False + SplashScreenManager.CloseForm(False) + + ' === Setup Timers === + AddHandler TimerRefreshData.Tick, AddressOf TimerRefreshData_Tick + TimerRefreshData.Enabled = True + + ' === Setup Flow Form === + Location = My.UIConfig.FlowForm.Location + + ' === Register As Event Listener === + EventBus.Instance.Register(Me) + ' === Set Form Properties === TopMost = True AllowDrop = True ShowInTaskbar = False Opacity = OPACITY_HIDDEN - SetFormLocation() + Location = My.UIConfig.FlowForm.Location + ' === Setup Event Handlers === AddHandler KeyDown, AddressOf frmFlowForm_KeyDown AddHandler KeyUp, AddressOf frmFlowForm_KeyDown @@ -33,6 +76,7 @@ Public Class frmFlowForm AddHandler oControl.MouseLeave, AddressOf frmFlowForm_MouseLeave Next + ' TODO: Clean up Dim oSQL = $"SELECT * FROM [dbo].[FNIDB_GET_SEARCH_PROFILES] ({My.Application.User.UserId},'{My.Application.User.Language}')" Dim oDatatable As DataTable = My.Database_IDB.GetDatatable(oSQL) PictureBoxSearch.Visible = False @@ -46,8 +90,9 @@ Public Class frmFlowForm My.DTAttributes = My.Database_IDB.GetDatatable("SELECT * FROM TBIDB_ATTRIBUTE") End Sub - Public Sub SetFormLocation() - Location = My.UIConfig.FlowForm.Location + + Private Sub TimerRefreshData_Tick(sender As Object, e As EventArgs) + 'TODO: Refresh Data End Sub Private Sub frmFlowForm_MouseLeave(sender As Object, e As EventArgs) Handles Me.MouseLeave @@ -68,7 +113,7 @@ Public Class frmFlowForm Private Sub frmFlowForm_KeyDown(ByVal sender As Object, ByVal e As KeyEventArgs) If e.KeyCode = Keys.Escape Then If ESCHitCount > 0 Then - ExitZooflow + ExitZooflow() Else ESCHitCount += 1 End If @@ -78,6 +123,7 @@ Public Class frmFlowForm End If End If End Sub + Sub ExitZooflow() Dim oResult As DialogResult = MessageBox.Show("Exit Zooflow", "Please Varify", MessageBoxButtons.YesNo) If oResult = DialogResult.Yes Then @@ -91,11 +137,16 @@ Public Class frmFlowForm ESCHitCount = 0 End If End Sub + + + Public Sub OnEvent(Params As Object) + Logger.Debug("OnEvent called!") + End Sub + Private Sub PictureBoxSearch_Click(sender As Object, e As EventArgs) Handles PictureBoxSearch.Click Dim oForm As New frmSearchStart(DTIDB_SEARCHES) oForm.Show() End Sub - Private Sub PictureBoxSearch_MouseEnter(sender As Object, e As EventArgs) Handles PictureBoxSearch.MouseEnter PictureBoxSearch.Image = My.Resources._2_LUPE_AKTIV_ZOO End Sub @@ -118,15 +169,12 @@ Public Class frmFlowForm Private Sub ZooFlowBeendenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ZooFlowBeendenToolStripMenuItem.Click ExitZooflow() End Sub - - Private Sub AlleAnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AlleAnzeigenToolStripMenuItem.Click For Each oControl As Control In Me.Controls oControl.Visible = True Next End Sub - Private Sub VerwaltungToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VerwaltungToolStripMenuItem.Click - frmAdmin.Show() + frmAdministrationZooFlow.Show() End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/frmFlowForm_Layered.Designer.vb b/GUIs.ZooFlow/frmFlowForm_Layered.Designer.vb deleted file mode 100644 index 5163d19a..00000000 --- a/GUIs.ZooFlow/frmFlowForm_Layered.Designer.vb +++ /dev/null @@ -1,65 +0,0 @@ - -Partial Class frmFlowForm_Layered - Inherits Form - - 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - End Sub - - 'Wird vom Windows Form-Designer benötigt. - Private components As System.ComponentModel.IContainer - - 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. - 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. - 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - - Private Sub InitializeComponent() - Me.components = New System.ComponentModel.Container() - Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.FlowFormTest1ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.SucheToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ContextMenuStrip1.SuspendLayout() - Me.SuspendLayout() - ' - 'ContextMenuStrip1 - ' - Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SucheToolStripMenuItem, Me.FlowFormTest1ToolStripMenuItem}) - Me.ContextMenuStrip1.Name = "ContextMenuStrip1" - Me.ContextMenuStrip1.Size = New System.Drawing.Size(161, 48) - ' - 'FlowFormTest1ToolStripMenuItem - ' - Me.FlowFormTest1ToolStripMenuItem.Name = "FlowFormTest1ToolStripMenuItem" - Me.FlowFormTest1ToolStripMenuItem.Size = New System.Drawing.Size(160, 22) - Me.FlowFormTest1ToolStripMenuItem.Text = "FlowForm Test 1" - ' - 'SucheToolStripMenuItem - ' - Me.SucheToolStripMenuItem.Name = "SucheToolStripMenuItem" - Me.SucheToolStripMenuItem.Size = New System.Drawing.Size(160, 22) - Me.SucheToolStripMenuItem.Text = "Suchen" - ' - 'frmFlowForm - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(584, 487) - Me.Name = "frmFlowForm" - Me.Text = "frmFlowForm" - Me.ContextMenuStrip1.ResumeLayout(False) - Me.ResumeLayout(False) - - End Sub - - Friend WithEvents ContextMenuStrip1 As ContextMenuStrip - Friend WithEvents SucheToolStripMenuItem As ToolStripMenuItem - Friend WithEvents FlowFormTest1ToolStripMenuItem As ToolStripMenuItem -End Class diff --git a/GUIs.ZooFlow/frmFlowForm_Layered.resx b/GUIs.ZooFlow/frmFlowForm_Layered.resx deleted file mode 100644 index 279a4474..00000000 --- a/GUIs.ZooFlow/frmFlowForm_Layered.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - \ No newline at end of file diff --git a/GUIs.ZooFlow/frmFlowForm_Layered.vb b/GUIs.ZooFlow/frmFlowForm_Layered.vb deleted file mode 100644 index 971e1c08..00000000 --- a/GUIs.ZooFlow/frmFlowForm_Layered.vb +++ /dev/null @@ -1,251 +0,0 @@ -Imports System.ComponentModel -Imports System.Drawing.Imaging -Imports DigitalData.Modules.Logging -Imports DigitalData.Modules.Messaging - -Public Class frmFlowForm_Layered - Private WithEvents Watcher As ClassClipboardWatcher = ClassClipboardWatcher.Singleton - Private ActiveModules As List(Of String) - Private Logger As Logger - - Private ESCHitCount As Integer = 0 - Private CurrentState As OnFlowFormStateChangedEvent.FlowFormState = OnFlowFormStateChangedEvent.FlowFormState.Default - - Private DTIDB_SEARCHES As DataTable - Private IDBSearchActive As Boolean = False - - Const WS_EX_LAYERED As Int32 = &H80000 - - Public Event ClipboardChanged As EventHandler(Of IDataObject) - - Public Sub New() - ' Dieser Aufruf ist für den Designer erforderlich. - InitializeComponent() - - ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. - ActiveModules = New List(Of String) - Logger = My.LogConfig.GetLogger() - End Sub - - - Public Sub New(ActiveModules As List(Of String)) - ' Dieser Aufruf ist für den Designer erforderlich. - InitializeComponent() - - ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. - Me.ActiveModules = ActiveModules - Logger = My.LogConfig.GetLogger() - End Sub - - Private Sub frmFlowForm_Load(sender As Object, e As EventArgs) Handles MyBase.Load - ' === Set Form Properties === - TopMost = True - AllowDrop = True - ShowInTaskbar = False - - SetFormLocation() - SetFormState(OnFlowFormStateChangedEvent.FlowFormState.Default) - - ' === Register Events === - - AddHandler MouseClick, AddressOf Form_MouseClick - AddHandler MouseMove, AddressOf Form_MouseMove - AddHandler KeyDown, AddressOf Form_KeyDown - - ' === Register As Event Listener === - EventBus.Instance.Register(Me) - - ' === TESTING Actions === - - Dim oSQL = $"SELECT * FROM [dbo].[FNIDB_GET_SEARCH_PROFILES] ({My.Application.User.UserId},'{My.Application.User.Language}')" - Dim oDT As DataTable = My.Database_IDB.GetDatatable(oSQL) - SucheToolStripMenuItem.Visible = False - If Not IsNothing(oDT) Then - If oDT.Rows.Count > 0 Then - IDBSearchActive = True - DTIDB_SEARCHES = oDT - SucheToolStripMenuItem.Visible = True - End If - - End If - - My.DTAttributes = My.Database_IDB.GetDatatable("SELECT * FROM TBIDB_ATTRIBUTE") - End Sub - - Private Sub frmFlowForm_Closed(sender As Object, e As EventArgs) Handles Me.Closed - Try - EventBus.Instance.Unregister(Me) - Catch ex As Exception - Logger.Error(ex) - End Try - End Sub - - Private Sub Form_MouseClick(sender As Object, ByVal e As MouseEventArgs) - If e.Button = MouseButtons.Right Then - ContextMenuStrip1.Show(Cursor.Position) - Else - If CurrentState = OnFlowFormStateChangedEvent.FlowFormState.HasSearchResults Then - SetFormState(OnFlowFormStateChangedEvent.FlowFormState.Default) - EventBus.Instance.PostEvent(New OnFlowFormInteractionEvent(OnFlowFormInteractionEvent.FlowFormInteraction.Click)) - End If - End If - - End Sub - - Private Sub Form_MouseMove(ByVal sender As Object, ByVal e As MouseEventArgs) - If e.Button = MouseButtons.Left Then - ClassWin32.ReleaseCapture() - ClassWin32.SendMessage(Handle, ClassWin32.WM_NCLBUTTONDOWN, ClassWin32.HTCAPTION, 0) - End If - End Sub - - Private Sub Form_KeyDown(ByVal sender As Object, ByVal e As KeyEventArgs) - If e.KeyCode = Keys.Escape Then - If ESCHitCount > 0 Then - Dim result As DialogResult = MessageBox.Show("Exit Zooflow", "Please Varify", MessageBoxButtons.YesNo) - If result = DialogResult.Yes Then - Application.Exit() - Else - ESCHitCount = 0 - End If - Else - ESCHitCount += 1 - End If - ElseIf e.KeyCode = Keys.D AndAlso (e.Control) Then - If ActiveModules.Contains(ClassConstants.MODULE_ZOOFLOW) Then - MsgBox("Search") - End If - End If - End Sub - - Public Sub OnEvent(e As OnFlowFormStateChangedEvent) - CurrentState = e.State - SetFormState(e.State) - End Sub - - Public Sub SetFormState(State As OnFlowFormStateChangedEvent.FlowFormState) - Select Case State - Case OnFlowFormStateChangedEvent.FlowFormState.HasSearchResults - SetBitmap(My.Resources.CW_GEFUNDEN_klein) - Case OnFlowFormStateChangedEvent.FlowFormState.HasFileDropped - ' SetBitmap(My.Resources.GLOBIX_GEFUNDEN_klein) - Case Else - SetBitmap(My.Resources._1_LOGO_ZOO_FLOW) - End Select - End Sub - - Public Sub SetFormLocation() - Me.Location = My.UIConfig.FlowForm.Location - End Sub - - Private Sub frmFlowForm_DragOver(sender As Object, e As DragEventArgs) Handles Me.DragOver - If Not ActiveModules.Contains(ClassConstants.MODULE_GLOBAL_INDEXER) Then - e.Effect = DragDropEffects.None - Else - If e.Data.GetDataPresent(DataFormats.FileDrop) Then - ' Handle file dragged from Windows - e.Effect = DragDropEffects.Copy - SetFormState(OnFlowFormStateChangedEvent.FlowFormState.HasFileDropped) - ElseIf e.Data.GetDataPresent("FileGroupDescriptor") Then - ' Handle a message dragged from Outlook - e.Effect = DragDropEffects.Copy - SetFormState(OnFlowFormStateChangedEvent.FlowFormState.HasFileDropped) - ElseIf e.Data.GetDataPresent("aryFileGroupDescriptor") AndAlso (e.Data.GetDataPresent("FileContents")) Then - ' Handle a message dragged from Thunderbird? - e.Effect = DragDropEffects.Copy - SetFormState(OnFlowFormStateChangedEvent.FlowFormState.HasFileDropped) - Else - ' Otherwise, do not handle - e.Effect = DragDropEffects.None - End If - End If - End Sub - - Private Sub frmFlowForm_DragLeave(sender As Object, e As EventArgs) Handles Me.DragLeave - SetFormState(OnFlowFormStateChangedEvent.FlowFormState.Default) - End Sub - - Private Sub Watcher_ClipboardChanged(sender As Object, e As IDataObject) Handles Watcher.ClipboardChanged - If ActiveModules.Contains(ClassConstants.MODULE_CLIPBOARDWATCHER) Then - RaiseEvent ClipboardChanged(sender, e) - End If - End Sub - - '''' - '''' DragDrop Support - '''' - 'Protected Overrides Sub WndProc(ByRef m As Message) - ' If m.Msg = &H84 Then - ' m.Result = CType(2, IntPtr) - ' Return - ' End If - - ' MyBase.WndProc(m) - 'End Sub - - Public Sub SetBitmap(ByVal bitmap As Bitmap) - SetBitmap(bitmap, 255, bitmap.Width, bitmap.Height) - End Sub - - Public Sub SetBitmap(ByVal Bitmap As Bitmap, ByVal Opacity As Byte, ByVal Width As Integer, ByVal Height As Integer) - If Bitmap.PixelFormat <> PixelFormat.Format32bppArgb Then - Throw New ApplicationException("The bitmap must be 32ppp with alpha-channel.") - End If - - Dim oScreenDeviceContext As IntPtr = ClassWin32.GetDC(IntPtr.Zero) - Dim oMemoryDeviceContext As IntPtr = ClassWin32.CreateCompatibleDC(oScreenDeviceContext) - Dim oBitmap As IntPtr = IntPtr.Zero - Dim oOldBitmap As IntPtr = IntPtr.Zero - - Try - oBitmap = Bitmap.GetHbitmap(Color.FromArgb(0)) - oOldBitmap = ClassWin32.SelectObject(oMemoryDeviceContext, oBitmap) - Dim oSize As ClassWin32.Size = New ClassWin32.Size(Width, Height) - Dim oPointSource As ClassWin32.Point = New ClassWin32.Point(0, 0) - Dim oTopPos As ClassWin32.Point = New ClassWin32.Point(Left, Top) - Dim oBlend As ClassWin32.BLENDFUNCTION = New ClassWin32.BLENDFUNCTION With { - .BlendOp = ClassWin32.AC_SRC_OVER, - .BlendFlags = 0, - .SourceConstantAlpha = Opacity, - .AlphaFormat = ClassWin32.AC_SRC_ALPHA - } - ClassWin32.UpdateLayeredWindow(Handle, oScreenDeviceContext, oTopPos, oSize, oMemoryDeviceContext, oPointSource, 0, oBlend, ClassWin32.ULW_ALPHA) - Finally - ClassWin32.ReleaseDC(IntPtr.Zero, oScreenDeviceContext) - - If oBitmap <> IntPtr.Zero Then - ClassWin32.SelectObject(oMemoryDeviceContext, oOldBitmap) - ClassWin32.DeleteObject(oBitmap) - End If - - ClassWin32.DeleteDC(oMemoryDeviceContext) - End Try - End Sub - - ''' - ''' More Info: https://docs.microsoft.com/en-us/windows/win32/winmsg/window-features#layered-windows - ''' - ''' - Protected Overrides ReadOnly Property CreateParams As CreateParams - Get - Dim oParams As CreateParams = MyBase.CreateParams - oParams.ExStyle = oParams.ExStyle Or WS_EX_LAYERED - Return oParams - End Get - End Property - - Private Sub FlowFormTest1ToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles FlowFormTest1ToolStripMenuItem.Click - frmFlowForm.Show() - End Sub - - Private Sub ContextMenuStrip1_Opening(sender As Object, e As CancelEventArgs) Handles ContextMenuStrip1.Opening - - End Sub - - Private Sub SucheToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SucheToolStripMenuItem.Click - Dim oForm As New frmSearchStart(DTIDB_SEARCHES) - oForm.Show() - - - End Sub -End Class \ No newline at end of file