AppStd/Modules
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename frmMain to frmAdmin, work on result forms

Browse Source
This commit is contained in:
Jonathan Jenne
2019-09-26 12:30:11 +02:00
parent f5d43edeef
commit 6a4992412f
13 changed files with 161 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ZooFlow/ClassInit.vb
View File

@@ -8,12 +8,12 @@ Imports DigitalData.GUIs.ZooFlow.ClassInitLoader
Imports DigitalData.GUIs.ZooFlow.ClassConstants
Public Class ClassInit
Private _MainForm As frmMain
Private _MainForm As frmAdmin
Private _Logger As Logger
Public Event Completed As EventHandler
Public Sub New(LogConfig As LogConfig, ParentForm As frmMain)
Public Sub New(LogConfig As LogConfig, ParentForm As frmAdmin)
_MainForm = ParentForm
_Logger = LogConfig.GetLogger()
End Sub

2
ZooFlow/My Project/Application.Designer.vb generated
View File

@@ -32,7 +32,7 @@ Namespace My
<Global.System.Diagnostics.DebuggerStepThroughAttribute()> _
Protected Overrides Sub OnCreateMainForm()
Me.MainForm = Global.DigitalData.GUIs.ZooFlow.frmMain
Me.MainForm = Global.DigitalData.GUIs.ZooFlow.frmAdmin
End Sub
End Class
End Namespace

2
ZooFlow/MyApplication.vb
View File

@@ -26,7 +26,7 @@ Namespace My
End Property
Property LogConfig As LogConfig
Property MainForm As frmMain
Property MainForm As frmAdmin
Property Database As MSSQLServer
Property Queries As New ClassQueries
End Module

10
ZooFlow/ZooFlow.vbproj
View File

@@ -107,11 +107,11 @@
<Compile Include="frmConfigDatabase.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmMain.vb">
<Compile Include="frmAdmin.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmMain.Designer.vb">
<DependentUpon>frmMain.vb</DependentUpon>
<Compile Include="frmAdmin.Designer.vb">
<DependentUpon>frmAdmin.vb</DependentUpon>
</Compile>
<Compile Include="frmFlowForm.Designer.vb">
<DependentUpon>frmFlowForm.vb</DependentUpon>
@@ -141,8 +141,8 @@
<EmbeddedResource Include="frmConfigDatabase.resx">
<DependentUpon>frmConfigDatabase.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmMain.resx">
<DependentUpon>frmMain.vb</DependentUpon>
<EmbeddedResource Include="frmAdmin.resx">
<DependentUpon>frmAdmin.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmFlowForm.resx">
<DependentUpon>frmFlowForm.vb</DependentUpon>

45
ZooFlow/frmMain.Designer.vb → ZooFlow/frmAdmin.Designer.vb generated
View File

@@ -1,4 +1,4 @@
Partial Public Class frmMain
Partial Public Class frmAdmin
Inherits DevExpress.XtraBars.Ribbon.RibbonForm
''' <summary>
@@ -24,27 +24,25 @@
''' the contents of this method with the code editor.
''' </summary>
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim SplashScreenManager As DevExpress.XtraSplashScreen.SplashScreenManager = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, GetType(Global.DigitalData.GUIs.ZooFlow.frmSplash), True, True)
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain))
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAdmin))
Me.ribbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
Me.ApplicationMenu = New DevExpress.XtraBars.Ribbon.ApplicationMenu(Me.components)
Me.ApplicationMenu = New DevExpress.XtraBars.Ribbon.ApplicationMenu()
Me.ButtonSettings = New DevExpress.XtraBars.BarButtonItem()
Me.ButtonExit = New DevExpress.XtraBars.BarButtonItem()
Me.SkinDropDownButtonItem1 = New DevExpress.XtraBars.SkinDropDownButtonItem()
Me.ribbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
Me.ribbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.NotifyIconMain = New System.Windows.Forms.NotifyIcon(Me.components)
Me.ContextMenuStripMain = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.NotifyIconMain = New System.Windows.Forms.NotifyIcon()
Me.ContextMenuStripMain = New System.Windows.Forms.ContextMenuStrip()
Me.AnzeigenVersteckenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.AdministrationToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
Me.BeendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToastNotificationsManager = New DevExpress.XtraBars.ToastNotifications.ToastNotificationsManager(Me.components)
Me.TimerRefreshData = New System.Windows.Forms.Timer(Me.components)
Me.ImageListDebugTree = New System.Windows.Forms.ImageList(Me.components)
Me.ToastNotificationsManager = New DevExpress.XtraBars.ToastNotifications.ToastNotificationsManager()
Me.TimerRefreshData = New System.Windows.Forms.Timer()
Me.ImageListDebugTree = New System.Windows.Forms.ImageList()
CType(Me.ribbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.ApplicationMenu, System.ComponentModel.ISupportInitialize).BeginInit()
Me.ContextMenuStripMain.SuspendLayout()
@@ -113,42 +111,38 @@
'
'ContextMenuStripMain
'
Me.ContextMenuStripMain.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AnzeigenVersteckenToolStripMenuItem, Me.AdministrationToolStripMenuItem, Me.ToolStripSeparator2, Me.ToolStripMenuItem1, Me.ToolStripSeparator1, Me.BeendenToolStripMenuItem})
Me.ContextMenuStripMain.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AnzeigenVersteckenToolStripMenuItem, Me.AdministrationToolStripMenuItem, Me.ToolStripSeparator2, Me.ToolStripSeparator1, Me.BeendenToolStripMenuItem})
Me.ContextMenuStripMain.Name = "ContextMenuStripMain"
Me.ContextMenuStripMain.Size = New System.Drawing.Size(204, 104)
Me.ContextMenuStripMain.Size = New System.Drawing.Size(185, 82)
'
'AnzeigenVersteckenToolStripMenuItem
'
Me.AnzeigenVersteckenToolStripMenuItem.Name = "AnzeigenVersteckenToolStripMenuItem"
Me.AnzeigenVersteckenToolStripMenuItem.Size = New System.Drawing.Size(203, 22)
Me.AnzeigenVersteckenToolStripMenuItem.Size = New System.Drawing.Size(184, 22)
Me.AnzeigenVersteckenToolStripMenuItem.Text = "Anzeigen/Verstecken"
'
'AdministrationToolStripMenuItem
'
Me.AdministrationToolStripMenuItem.Name = "AdministrationToolStripMenuItem"
Me.AdministrationToolStripMenuItem.Size = New System.Drawing.Size(203, 22)
Me.AdministrationToolStripMenuItem.Size = New System.Drawing.Size(184, 22)
Me.AdministrationToolStripMenuItem.Text = "Administration"
'
'ToolStripSeparator2
'
Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
Me.ToolStripSeparator2.Size = New System.Drawing.Size(200, 6)
'
'ToolStripMenuItem1
'
Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1"
Me.ToolStripMenuItem1.Size = New System.Drawing.Size(203, 22)
Me.ToolStripMenuItem1.Text = "Clipboard Überwachung"
Me.ToolStripSeparator2.Size = New System.Drawing.Size(181, 6)
Me.ToolStripSeparator2.Tag = "MODULE_ITEM_START"
'
'ToolStripSeparator1
'
Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
Me.ToolStripSeparator1.Size = New System.Drawing.Size(200, 6)
Me.ToolStripSeparator1.Size = New System.Drawing.Size(181, 6)
Me.ToolStripSeparator1.Tag = "MODULE_ITEM_END"
'
'BeendenToolStripMenuItem
'
Me.BeendenToolStripMenuItem.Name = "BeendenToolStripMenuItem"
Me.BeendenToolStripMenuItem.Size = New System.Drawing.Size(203, 22)
Me.BeendenToolStripMenuItem.Size = New System.Drawing.Size(184, 22)
Me.BeendenToolStripMenuItem.Text = "Beenden"
'
'ToastNotificationsManager
@@ -173,13 +167,13 @@
Me.ImageListDebugTree.Images.SetKeyName(3, "WindowsForm_817.ico")
Me.ImageListDebugTree.Images.SetKeyName(4, "process_16xMD.png")
'
'frmMain
'frmAdmin
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(906, 587)
Me.Controls.Add(Me.ribbonControl1)
Me.Name = "frmMain"
Me.Name = "frmAdmin"
Me.Ribbon = Me.ribbonControl1
Me.Text = "Zoo Flow"
CType(Me.ribbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
@@ -200,7 +194,6 @@
Friend WithEvents ContextMenuStripMain As ContextMenuStrip
Friend WithEvents AdministrationToolStripMenuItem As ToolStripMenuItem
Friend WithEvents ToolStripSeparator2 As ToolStripSeparator
Friend WithEvents ToolStripMenuItem1 As ToolStripMenuItem
Friend WithEvents ToolStripSeparator1 As ToolStripSeparator
Friend WithEvents BeendenToolStripMenuItem As ToolStripMenuItem
Friend WithEvents AnzeigenVersteckenToolStripMenuItem As ToolStripMenuItem

2
ZooFlow/frmMain.resx → ZooFlow/frmAdmin.resx
View File

@@ -380,7 +380,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABU
CwAAAk1TRnQBSQFMAgEBBQEAATgBAAE4AQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CwAAAk1TRnQBSQFMAgEBBQEAAVgBAAFYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

20
ZooFlow/frmMain.vb → ZooFlow/frmAdmin.vb
View File

@@ -9,7 +9,7 @@ Imports DigitalData.Modules.ZooFlow.Params
Imports DigitalData.GUIs.ZooFlow.OnFlowFormStateChangedEvent.FlowFormState
Imports DigitalData.Modules.ClipboardWatcher
Partial Public Class frmMain
Partial Public Class frmAdmin
Private WithEvents FlowForm As frmFlowForm
Private Init As ClassInit
@@ -35,8 +35,6 @@ Partial Public Class frmMain
EventBus.Instance.Register(Me)
End Sub
Private Sub frmMain_FormClosed(sender As Object, e As FormClosedEventArgs)
EventBus.Instance.Unregister(Me)
End Sub
@@ -73,6 +71,16 @@ Partial Public Class frmMain
FlowForm = New frmFlowForm(My.Application.ModulesActive)
FlowForm.Show()
Dim oModuleItemsIndex = 0
' === Setup Notification Icon
For Each oItem As ToolStripItem In ContextMenuStripMain.Items
If oItem.Tag IsNot Nothing AndAlso oItem.Tag.ToString = "MODULE_ITEM_START" Then
oModuleItemsIndex = ContextMenuStripMain.Items.IndexOf(oItem)
Exit For
End If
Next
ContextMenuStripMain.Items.Insert(oModuleItemsIndex + 1, New ToolStripMenuItem("Test"))
' === Load Data ===
RefreshData()
End Sub
@@ -163,10 +171,6 @@ Partial Public Class frmMain
frmSettings.ShowDialog()
End Sub
Private Sub ButtonExit_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles ButtonExit.ItemClick
End Sub
Private Sub frmMain_StyleChanged(sender As Object, e As EventArgs) Handles Me.StyleChanged
If Loading = False Then
My.UIConfig.SkinName = LookAndFeel.ActiveSkinName
@@ -196,6 +200,4 @@ Partial Public Class frmMain
Logger.Error(ex)
End Try
End Sub
End Class