jj_25_11

app/DD-Record-Organiser/ModuleHelperMethods.vb

@@ -151,8 +151,8 @@
         CURRENT_SCREEN_ID = ScreenID
 
         Dim frm As New frmFormInput
-        frm.MdiParent = frmMain
-        'frmMain.tscMain.ContentPanel.Controls.Add(frm)
+        frm.MdiParent = MAIN_FORM
+
         frm.Show()
         frm.BringToFront()
     End Sub
@@ -161,51 +161,57 @@
         Dim frm As New frmCalendar
         frm = frmCalendar.Instance()
         If My.Settings.User_Calendar_isChild = True Then
-            frm.MdiParent = frmMain
+            frm.MdiParent = MAIN_FORM
         End If
 
-        'frmMain.tscMain.ContentPanel.Controls.Add(frm)
+
         frm.Show()
     End Sub
 
     Public Sub OpenFormOverview()
         Dim frm As New frmForm_Overview
         frm = frmForm_Overview.Instance()
-        frm.MdiParent = frmMain
-        'frmMain.tscMain.ContentPanel.Controls.Add(frm)
+        frm.MdiParent = MAIN_FORM
+
         frm.Show()
     End Sub
 
     Public Sub OpenFormLevelDesigner()
         Dim frm As New frmLevel_Designer
         frm = frmLevel_Designer.Instance
-        frm.MdiParent = frmMain
-        'frmMain.tscMain.ContentPanel.Controls.Add(frm)
+        frm.MdiParent = MAIN_FORM
+
         frm.Show()
 
         Dim frm2 As New frmTool_ControlDesigner
         frm2 = frmTool_ControlDesigner.Instance
         If My.Settings.User_DesignPanels_areChild = True Then
-            frm2.MdiParent = frmMain
+            frm2.MdiParent = MAIN_FORM
         End If
 
-        'frmMain.tscMain.ContentPanel.Controls.Add(frm2)
         frm2.Show()
 
         Dim frm3 As New frmTool_ControlProperties
         frm3 = frmTool_ControlProperties.Instance
         If My.Settings.User_DesignPanels_areChild = True Then
-            frm3.MdiParent = frmMain
+            frm3.MdiParent = MAIN_FORM
         End If
-        'frmMain.tscMain.ContentPanel.Controls.Add(frm3)
+
         frm3.Show()
     End Sub
     Public Sub OpenFormConstructor(id As Integer)
         CURRENT_CONSTRUCTOR_ID = id
-        Dim frm As New frmForm_Constructor
-        ' frm = frmForm_Constructor.Instance()
-        frm.MdiParent = frmMain
+        Dim frm As New frmForm_Constructor()
+
+        Dim activeChild As Form = MAIN_FORM.ActiveMdiChild
+        If activeChild IsNot Nothing Then
+            activeChild.WindowState = FormWindowState.Normal
+        End If
+
+        frm.MdiParent = MAIN_FORM
         frm.Show()
+        ' frm = frmForm_Constructor.Instance()
+        
     End Sub
 
     ' TODO: NUR FÜR WINDREAM CON!!!
@@ -214,7 +220,13 @@
             CURRENT_CONSTRUCTOR_ID = id
             Dim frm As New frmForm_Constructor_Main_2()
             ' frm = frmForm_Constructor.Instance()
-            frm.MdiParent = frmMain
+
+            Dim activeChild As Form = MAIN_FORM.ActiveMdiChild
+            If activeChild IsNot Nothing Then
+                activeChild.WindowState = FormWindowState.Normal
+            End If
+
+            frm.MdiParent = MAIN_FORM
             frm.Show()
         Catch ex As Exception
             ClassLogger.Add(ex)
@@ -226,59 +238,107 @@
     Public Sub OpenTaskmanagement()
         Dim frm As New frmTaskmanagement
         frm = frmTaskmanagement.Instance()
-        frm.MdiParent = frmMain
-        'frmMain.tscMain.ContentPanel.Controls.Add(frm)
+        frm.MdiParent = MAIN_FORM
+
+        Dim activeChild As Form = MAIN_FORM.ActiveMdiChild
+        If activeChild IsNot Nothing Then
+            activeChild.WindowState = FormWindowState.Normal
+        End If
+
         frm.Show()
     End Sub
     Public Sub OpenDokumentartt()
         Dim frm As New frmDokumentart_Konfig
         frm = frmDokumentart_Konfig.Instance()
-        frm.MdiParent = frmMain
-        'frmMain.tscMain.ContentPanel.Controls.Add(frm)
+        frm.MdiParent = MAIN_FORM
+
+        Dim activeChild As Form = MAIN_FORM.ActiveMdiChild
+        If activeChild IsNot Nothing Then
+            activeChild.WindowState = FormWindowState.Normal
+        End If
+
         frm.Show()
     End Sub
     Public Sub OpenMenuDesigner()
         Dim frm As New frmMenuDesigner
-        frm.MdiParent = frmMain
-        'frmMain.tscMain.ContentPanel.Controls.Add(frm)
+        frm.MdiParent = MAIN_FORM
+
+        Dim activeChild As Form = MAIN_FORM.ActiveMdiChild
+        If activeChild IsNot Nothing Then
+            activeChild.WindowState = FormWindowState.Normal
+        End If
+
         frm.Show()
     End Sub
     Public Sub OpenUserKonfig()
         Dim frm As New frmUserKonfig
         frm = frmUserKonfig.Instance()
-        frm.MdiParent = frmMain
-        'frmMain.tscMain.ContentPanel.Controls.Add(frm)
+        frm.MdiParent = MAIN_FORM
+
+        Dim activeChild As Form = MAIN_FORM.ActiveMdiChild
+        If activeChild IsNot Nothing Then
+            activeChild.WindowState = FormWindowState.Normal
+        End If
+
         frm.Show()
     End Sub
 
     Public Sub OpenImageManager()
         Dim frm As New frmQuickAccessManager
         'frm = frmImageManager.Instance()
-        frm.MdiParent = frmMain
-        'frmMain.tscMain.ContentPanel.Controls.Add(frm)
+        frm.MdiParent = MAIN_FORM
+
+        Dim activeChild As Form = MAIN_FORM.ActiveMdiChild
+        If activeChild IsNot Nothing Then
+            activeChild.WindowState = FormWindowState.Normal
+        End If
+
         frm.Show()
     End Sub
     Public Sub OpenObjecttypeConfig()
         Dim frm As New frmObjecttypeConfig
         frm = frmObjecttypeConfig.Instance()
-        frm.MdiParent = frmMain
-        'frmMain.tscMain.ContentPanel.Controls.Add(frm)
+        frm.MdiParent = MAIN_FORM
+
+        Dim activeChild As Form = MAIN_FORM.ActiveMdiChild
+        If activeChild IsNot Nothing Then
+            activeChild.WindowState = FormWindowState.Normal
+        End If
+
         frm.Show()
     End Sub
     Public Sub OpenWiedervorlage()
         Dim frm As New frmWiedervorlage
-        frm.MdiParent = frmMain
+        frm.MdiParent = MAIN_FORM
+
+        Dim activeChild As Form = MAIN_FORM.ActiveMdiChild
+        If activeChild IsNot Nothing Then
+            activeChild.WindowState = FormWindowState.Normal
+        End If
+
         frm.Show()
     End Sub
     Public Sub OpenLogRecord()
         Dim frm As New frmLogRecord
         frm = frmLogRecord.Instance()
-        frm.MdiParent = frmMain
+        frm.MdiParent = MAIN_FORM
+
+        Dim activeChild As Form = MAIN_FORM.ActiveMdiChild
+        If activeChild IsNot Nothing Then
+            activeChild.WindowState = FormWindowState.Normal
+        End If
+
         frm.Show()
     End Sub
     Public Sub OpenTemplatemanagement()
         Dim frm As New frmTemplates
-        frm.MdiParent = frmMain
+        frm.MdiParent = MAIN_FORM
+
+        Dim activeChild As Form = MAIN_FORM.ActiveMdiChild
+        If activeChild IsNot Nothing Then
+            activeChild.WindowState = FormWindowState.Normal
+        End If
+
         frm.Show()
     End Sub
 End Module