...

ArinWarev1/MdiMain.vb

@@ -124,6 +124,7 @@ Public Class MdiMain
                 bt_계산결과.Visible = False
                 bt_인증평가서.Visible = False
                 btImport.Visible = False
+                btMacro.Visible = False
                 '//서버로부터 사용여부 체크
                 'If L.Check_guest <> "OK" Then
                 '    MsgBox("일반사용자에게는 아직 오픈되지 않았습니다.", MsgBoxStyle.Information, "확인")
@@ -138,6 +139,7 @@ Public Class MdiMain
                 'bt_계산결과그래프q.Visible = True
                 bt_인증평가서.Visible = True
                 btImport.Visible = True
+                btMacro.Visible = False
             Case "BOTH1"
                 bt_데이터관리.Visible = True
                 Me.bt_etc.Visible = False
@@ -147,6 +149,7 @@ Public Class MdiMain
                 'bt_계산결과그래프q.Visible = True
                 bt_인증평가서.Visible = True
                 btImport.Visible = True
+                btMacro.Visible = False
             Case "BOTH2"
                 bt_데이터관리.Visible = False
                 Me.bt_etc.Visible = False
@@ -156,6 +159,7 @@ Public Class MdiMain
                 'bt_계산결과그래프q.Visible = False
                 bt_인증평가서.Visible = False
                 btImport.Visible = False
+                btMacro.Visible = False
             Case Else
                 bt_데이터관리.Visible = False
                 bt_계산결과그래프.Visible = False
@@ -164,8 +168,11 @@ Public Class MdiMain
                 bt_계산결과.Visible = False
                 bt_인증평가서.Visible = False
                 btImport.Visible = False
+                btMacro.Visible = False
         End Select
 
+        btMacro2.Visible = btMacro.Visible
+
         If Prj.UserAuthType_Real.StartsWith("BOTH_C_") Then
             btcustomprofile.Visible = True
         End If
@@ -3470,61 +3477,6 @@ ENDSTAT:  '//오류발생시 강제종료를 위한 분기문
 
     End Sub
 
-    Private Sub 신규코드업로드ToolStripMenuItem_Click(sender As Object, e As EventArgs)
-
-        If Prj.Opened Then
-            Work_msg_timer("열려있는 파일을 닫아야 사용 가능합니다", 10)
-            Return
-        End If
-
-        If MsgBox("신규파일의 코드를 갱신하시겠습니까?", MsgBoxStyle.Information Or MsgBoxStyle.YesNo, "확인") = MsgBoxResult.Yes Then
-
-            '물어야하니 if
-            Dim new_string As String
-            If Prj.UserAuthType = "ADMIN" OrElse Prj.UserAuthType = "BOTH" OrElse Prj.UserAuthType = "BOTH2" OrElse Prj.UserAuthType = "BOTH1" Then  '//2011.03.09 추가
-                new_string = "\new"
-            Else
-                new_string = "\new1"
-            End If
-            Dim Srcfile As New System.IO.FileInfo(My.Application.Info.DirectoryPath & new_string)
-            Me.Open_File(Srcfile.FullName, True)
-        End If
-    End Sub
-
-    Private Sub 신규코드업로드ToolStripMenuItem_Click_1(sender As Object, e As EventArgs) Handles 신규코드업로드ToolStripMenuItem.Click
-
-        If Prj.Opened Then
-            Work_msg_timer("열려있는 파일을 닫아주세요", 10)
-            Return
-        End If
-
-
-
-        '물어야하니 if
-        If MsgBox("새파일소스를 업데이트 하시겠습니까?", MsgBoxStyle.Information Or MsgBoxStyle.OkCancel, "확인") <> MsgBoxResult.Ok Then Return '//ok 안하면 빠져나가기
-        Dim new_string As String
-        If Prj.UserAuthType = "ADMIN" OrElse Prj.UserAuthType = "BOTH" OrElse Prj.UserAuthType = "BOTH2" OrElse Prj.UserAuthType = "BOTH1" Then  '//2011.03.09 추가
-            new_string = "\new"
-        Else
-            new_string = "\new1"
-        End If
-        Dim Srcfile As New System.IO.FileInfo(My.Application.Info.DirectoryPath & new_string)
-        If Srcfile.Exists = False Then
-            MsgBox("원본샘플파일이 존재하지않습니다", MsgBoxStyle.Critical, "확인")
-            Return '//복사할원본이 없으면 빠져나가기
-        End If
-
-        '/////////////////////////////////////////////////////////////////////////////////////////////////////////////저장파일 변조2011.03.16추가
-        'If Not (Prj.UserAuthType = "ADMIN" OrElse Prj.UserAuthType = "BOTH" OrElse Prj.UserAuthType = "BOTH2" OrElse Prj.UserAuthType = "BOTH1") Then  '//2011.03.09 추가
-        '    Dim Desbuf() As Byte = {}
-        '    Dim Source() As Byte = My.Computer.FileSystem.ReadAllBytes(SD.FileName)
-        '    Desbuf = DeCryptArea(Source, New Byte() {&HAC, &H29, &H55, &H42})
-        '    My.Computer.FileSystem.WriteAllBytes(SD.FileName, Desbuf, False)   
-        'End If
-        '/////////////////////////////////////////////////////////////////////////////////////////////////////////////저장파일 변조2011.03.16추가
-        Me.Open_File(Srcfile.FullName, True)
-    End Sub
-
     Private Sub CascadeToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles CascadeToolStripMenuItem.Click
         Me.LayoutMdi(MdiLayout.Cascade)
     End Sub
@@ -4003,4 +3955,10 @@ ENDSTAT:  '//오류발생시 강제종료를 위한 분기문
         f.ControlBox = True
         f.ShowDialog()
     End Sub
+
+    Private Sub MacroIIToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles btMacro2.Click
+        Menu_건물개요()
+        Dim f As New Frm_Macro2
+        f.Show()
+    End Sub
 End Class