메인목록 dock 설정

2020-06-08 01:38:13 +09:00
parent 32ebea03fb
commit fc66714f53
12 changed files with 167 additions and 125 deletions
--- a/Epole.fp5/AboutBox1.Designer.vb
+++ b/Epole.fp5/AboutBox1.Designer.vb
@@ -141,7 +141,7 @@ Partial Class AboutBox1
        Me.TextBoxDescription.Size = New System.Drawing.Size(301, 113)
        Me.TextBoxDescription.TabIndex = 0
        Me.TextBoxDescription.TabStop = False
-        Me.TextBoxDescription.Text = "설명:" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(런타임에 레이블의 텍스트는 응용 프로그램의 어셈블리 정보로 바뀝니다." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "응용 프로그램의 어셈블리 정보를 사용자 지정하려면 프로젝트 " & _
+        Me.TextBoxDescription.Text = "설명:" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(런타임에 레이블의 텍스트는 응용 프로그램의 어셈블리 정보로 바뀝니다." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "응용 프로그램의 어셈블리 정보를 사용자 지정하려면 프로젝트 " &
    "디자이너의 [응용 프로그램] 창을 사용하십시오.)"
        '
        'OKButton
--- a/Epole.fp5/Frm_Main.Designer.vb
+++ b/Epole.fp5/Frm_Main.Designer.vb
@@ -96,7 +96,7 @@ Partial Class Frm_Main
        Me.bt_aa = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripSeparator()
        Me.bt_howto = New System.Windows.Forms.ToolStripMenuItem()
-        Me.view1 = New NewFp()
+        Me.view1 = New EpoleNet.NewFp()
        Me.view1_Sheet1 = New FarPoint.Win.Spread.SheetView()
        Me.TA_Main = New EpoleNet.ireaDataSetTableAdapters.MainTableTableAdapter()
        Me.TA_JUNJU = New EpoleNet.ireaDataSetTableAdapters.jjutableTableAdapter()
@@ -631,23 +631,21 @@ Partial Class Frm_Main
        Me.view1.AllowDragFill = True
        Me.view1.AllowUserFormulas = True
        Me.view1.AMessageLabel = Nothing
-        Me.view1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.view1.ANextRow_ColIndex = -1
        Me.view1.ASameRowheight = True
        Me.view1.BackColor = System.Drawing.Color.Transparent
        Me.view1.ButtonDrawMode = FarPoint.Win.Spread.ButtonDrawModes.CurrentCell
        Me.view1.ContextMenuStrip = Me.ContextMenuStrip1
+        Me.view1.Dock = System.Windows.Forms.DockStyle.Fill
        Me.view1.EditModeReplace = True
        Me.view1.EnableCrossSheetReference = False
        Me.view1.Font = New System.Drawing.Font("굴림", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(129, Byte))
        Me.view1.HorizontalScrollBarPolicy = FarPoint.Win.Spread.ScrollBarPolicy.AsNeeded
-        Me.view1.Location = New System.Drawing.Point(1, 73)
+        Me.view1.Location = New System.Drawing.Point(0, 71)
        Me.view1.Name = "view1"
        Me.view1.RightToLeft = System.Windows.Forms.RightToLeft.No
        Me.view1.Sheets.AddRange(New FarPoint.Win.Spread.SheetView() {Me.view1_Sheet1})
-        Me.view1.Size = New System.Drawing.Size(1277, 464)
+        Me.view1.Size = New System.Drawing.Size(1277, 470)
        Me.view1.TabIndex = 18
        Me.view1.VerticalScrollBarPolicy = FarPoint.Win.Spread.ScrollBarPolicy.AsNeeded
        Me.view1.SetActiveViewport(0, -1, -1)
@@ -859,8 +857,8 @@ Partial Class Frm_Main
        '
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None
        Me.ClientSize = New System.Drawing.Size(1277, 602)
-        Me.Controls.Add(Me.ToolStrip1)
        Me.Controls.Add(Me.view1)
+        Me.Controls.Add(Me.ToolStrip1)
        Me.Controls.Add(Me.bn)
        Me.Controls.Add(Me.StatusStrip1)
        Me.Controls.Add(Me.MenuStrip1)
--- a/Epole.fp5/Frm_Main.resx
+++ b/Epole.fp5/Frm_Main.resx
@@ -201,7 +201,7 @@
        cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4
        AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+////
        K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA
-        AAD///////////////8A/////ws=
+        AAD/////AQgAAP////8AAQgAAAs=
 </value>
  </data>
  <metadata name="TA_Main.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' 지정되도록 할 수 있습니다.
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("19.05.05.2200")> 
-<Assembly: AssemblyFileVersion("19.05.05.2200")> 
+<Assembly: AssemblyVersion("20.06.08.0100")>
+<Assembly: AssemblyFileVersion("20.06.08.0100")>
--- a/Epole.fp5/ReadMe.txt
+++ b/Epole.fp5/ReadMe.txt
@@ -1,4 +1,5 @@
-190505	* 인증방법변경 및 인증키와 연동 작업 (일자만 인증한다)
+200608	메인화면 dock 설정
+190505	* 인증방법변경 및 인증키와 연동 작업 (일자만 인증한다)
 190502	* 기존 QR이 존재하는 화면에 배경색 전경색을 추가함
 170715	* 가공-선로화살표를 비고 앞에 놓이도록 수정
 		* 엑셀불러오기에 선로화살표 기능추가
--- a/Epole.fp5/SplashScreen.vb
+++ b/Epole.fp5/SplashScreen.vb
@@ -32,26 +32,26 @@ Public NotInheritable Class SplashScreen
        If Not LoadINI() Then End

        '//인증사용안함 191125 -
-        'If Command() <> "ARIN" AndAlso Not ReadAuth() Then '//에러났을떄는 카운터를 확인
-        '    '//사용횟수가 10번ㅇ르 초과했는지 확인
-        '    Runcnt = Me.ReadAuthcount
-        '    Dim f As New fAuth()
-        '    If (f.ShowDialog <> Windows.Forms.DialogResult.OK) Then
-        '        End
-        '    End If
-        '    'If Runcnt >= 10 Then
-        '    '    Dim NewKey As String = InputBox("인증번호를 입력하세요 (인증번호는 숫자로만 이루어져 있습니다)")
-        '    '    If IsNumeric(NewKey) = False Then
-        '    '        MsgBox("프로그램을 재실행 하세요", MsgBoxStyle.Information, "확인")
-        '    '        End
-        '    '    End If
-        '    '    auth.SetAuth(NewKey, My.Application.Info.DirectoryPath & "\epole.ini")
-        '    '    MsgBox("프로그램을 재실행 하세요", MsgBoxStyle.Information, "확인")
-        '    '    End
-        '    'Else
-        '    '    MsgBox(CStr(10 - Runcnt) & "번의 사용횟수가 남았습니다", MsgBoxStyle.Critical, "실행확인")
-        '    'End If
-        'End If
+        If Command() <> "ARIN" AndAlso Not ReadAuth() Then '//에러났을떄는 카운터를 확인
+            '//사용횟수가 10번ㅇ르 초과했는지 확인
+            Runcnt = Me.ReadAuthcount
+            Dim f As New fAuth()
+            If (f.ShowDialog <> Windows.Forms.DialogResult.OK) Then
+                End
+            End If
+            'If Runcnt >= 10 Then
+            '    Dim NewKey As String = InputBox("인증번호를 입력하세요 (인증번호는 숫자로만 이루어져 있습니다)")
+            '    If IsNumeric(NewKey) = False Then
+            '        MsgBox("프로그램을 재실행 하세요", MsgBoxStyle.Information, "확인")
+            '        End
+            '    End If
+            '    auth.SetAuth(NewKey, My.Application.Info.DirectoryPath & "\epole.ini")
+            '    MsgBox("프로그램을 재실행 하세요", MsgBoxStyle.Information, "확인")
+            '    End
+            'Else
+            '    MsgBox(CStr(10 - Runcnt) & "번의 사용횟수가 남았습니다", MsgBoxStyle.Critical, "실행확인")
+            'End If
+        End If
        If Not LoadReg() Then End
        If Not Connect() Then End
        Me.lb_msg.Text = ""