diff --git a/Epole.fp13/Frm_Main.Designer.vb b/Epole.fp13/Frm_Main.Designer.vb index 264665a..0392d6c 100644 --- a/Epole.fp13/Frm_Main.Designer.vb +++ b/Epole.fp13/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() @@ -175,6 +175,7 @@ Partial Class Frm_Main Me.BindingNavigatorPositionItem.AccessibleName = "위치" Me.BindingNavigatorPositionItem.AutoSize = False Me.BindingNavigatorPositionItem.Enabled = False + Me.BindingNavigatorPositionItem.Font = New System.Drawing.Font("맑은 고딕", 9.0!) Me.BindingNavigatorPositionItem.Name = "BindingNavigatorPositionItem" Me.BindingNavigatorPositionItem.Size = New System.Drawing.Size(25, 21) Me.BindingNavigatorPositionItem.Text = "0" @@ -337,6 +338,7 @@ Partial Class Frm_Main ' Me.ToolStripTextBox1.AccessibleName = "위치" Me.ToolStripTextBox1.AutoSize = False + Me.ToolStripTextBox1.Font = New System.Drawing.Font("맑은 고딕", 9.0!) Me.ToolStripTextBox1.Name = "ToolStripTextBox1" Me.ToolStripTextBox1.Size = New System.Drawing.Size(25, 21) Me.ToolStripTextBox1.Text = "0" @@ -631,26 +633,24 @@ 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) + Me.view1.SetActiveViewport(0, 1, 0) ' 'view1_Sheet1 ' @@ -658,11 +658,17 @@ Partial Class Frm_Main Me.view1_Sheet1.SheetName = "Sheet1" 'Formulas and custom names must be loaded with R1C1 reference style Me.view1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1 - view1_Sheet1.ColumnCount = 16 + Me.view1_Sheet1.ColumnCount = 16 Me.view1_Sheet1.ActiveColumnIndex = -1 Me.view1_Sheet1.ActiveRowIndex = -1 Me.view1_Sheet1.AllowNoteEdit = False Me.view1_Sheet1.AutoGenerateColumns = False + Me.view1_Sheet1.ColumnFooter.DefaultStyle.BackColor = System.Drawing.Color.Empty + Me.view1_Sheet1.ColumnFooter.DefaultStyle.ForeColor = System.Drawing.Color.Empty + Me.view1_Sheet1.ColumnFooter.DefaultStyle.Locked = False + Me.view1_Sheet1.ColumnFooterSheetCornerStyle.BackColor = System.Drawing.Color.Empty + Me.view1_Sheet1.ColumnFooterSheetCornerStyle.ForeColor = System.Drawing.Color.Empty + Me.view1_Sheet1.ColumnFooterSheetCornerStyle.Locked = False Me.view1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "제작ID" Me.view1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "선택" Me.view1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "보기" @@ -679,6 +685,9 @@ Partial Class Frm_Main Me.view1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "관리" Me.view1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "관리1" Me.view1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "관리2" + Me.view1_Sheet1.ColumnHeader.DefaultStyle.BackColor = System.Drawing.Color.Empty + Me.view1_Sheet1.ColumnHeader.DefaultStyle.ForeColor = System.Drawing.Color.Empty + Me.view1_Sheet1.ColumnHeader.DefaultStyle.Locked = False Me.view1_Sheet1.ColumnHeader.Rows.Get(0).Height = 37.0! Me.view1_Sheet1.ColumnHeader.VerticalGridLine = New FarPoint.Win.Spread.GridLine(FarPoint.Win.Spread.GridLineType.Raised, System.Drawing.Color.LightGray, System.Drawing.SystemColors.ControlLightLight, System.Drawing.SystemColors.ControlDark, 3) Me.view1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.Silver @@ -707,7 +716,7 @@ Partial Class Frm_Main Me.view1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center Me.view1_Sheet1.Columns.Get(3).Width = 39.0! Me.view1_Sheet1.Columns.Get(4).AllowAutoSort = True - DateTimeCellType1.Calendar = CType(resources.GetObject("DateTimeCellType1.Calendar"), System.Globalization.Calendar) + DateTimeCellType1.Calendar = New System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized) DateTimeCellType1.CalendarDayFont = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) DateTimeCellType1.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText DateTimeCellType1.DateDefault = New Date(2007, 7, 15, 11, 18, 31, 0) @@ -765,6 +774,7 @@ Partial Class Frm_Main Me.view1_Sheet1.Columns.Get(9).Locked = True Me.view1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center Me.view1_Sheet1.Columns.Get(9).Width = 39.0! + ComboBoxCellType1.AllowEditorVerticalAlign = True ComboBoxCellType1.ButtonAlign = FarPoint.Win.ButtonAlign.Right ComboBoxCellType1.EditorValue = FarPoint.Win.Spread.CellType.EditorValue.ItemData ComboBoxCellType1.ItemData = New String() {"0", "9", "1", "2", "3", "4", "6", "7", "8"} @@ -807,12 +817,28 @@ Partial Class Frm_Main Me.view1_Sheet1.DataAutoHeadings = False Me.view1_Sheet1.DataAutoSizeColumns = False Me.view1_Sheet1.DataSource = Me.bs + Me.view1_Sheet1.DefaultStyle.BackColor = System.Drawing.Color.Empty + Me.view1_Sheet1.DefaultStyle.ForeColor = System.Drawing.Color.Empty + Me.view1_Sheet1.DefaultStyle.Locked = False + Me.view1_Sheet1.FilterBar.DefaultStyle.BackColor = System.Drawing.Color.Empty + Me.view1_Sheet1.FilterBar.DefaultStyle.ForeColor = System.Drawing.Color.Empty + Me.view1_Sheet1.FilterBar.DefaultStyle.Locked = False + Me.view1_Sheet1.FilterBarHeaderStyle.BackColor = System.Drawing.Color.Empty + Me.view1_Sheet1.FilterBarHeaderStyle.ForeColor = System.Drawing.Color.Empty + Me.view1_Sheet1.FilterBarHeaderStyle.Locked = False Me.view1_Sheet1.OperationMode = FarPoint.Win.Spread.OperationMode.RowMode Me.view1_Sheet1.Protect = False Me.view1_Sheet1.RowHeader.Columns.Default.Resizable = False Me.view1_Sheet1.RowHeader.Columns.Get(0).Width = 42.0! + Me.view1_Sheet1.RowHeader.DefaultStyle.BackColor = System.Drawing.Color.Empty + Me.view1_Sheet1.RowHeader.DefaultStyle.ForeColor = System.Drawing.Color.Empty + Me.view1_Sheet1.RowHeader.DefaultStyle.Locked = False Me.view1_Sheet1.SelectionBackColor = System.Drawing.Color.Transparent Me.view1_Sheet1.SelectionForeColor = System.Drawing.Color.Black + Me.view1_Sheet1.SheetCornerStyle.BackColor = System.Drawing.Color.Empty + Me.view1_Sheet1.SheetCornerStyle.ForeColor = System.Drawing.Color.Empty + Me.view1_Sheet1.SheetCornerStyle.Locked = False + Me.view1_Sheet1.SheetCornerStyle.VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center Me.view1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1 ' 'TA_Main @@ -859,8 +885,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) diff --git a/Epole.fp13/My Project/AssemblyInfo.vb b/Epole.fp13/My Project/AssemblyInfo.vb index e8c19d4..9185787 100644 --- a/Epole.fp13/My Project/AssemblyInfo.vb +++ b/Epole.fp13/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' 지정되도록 할 수 있습니다. ' - - + + diff --git a/Epole.fp13/ReadMe.txt b/Epole.fp13/ReadMe.txt index 8d74606..9ce5c9a 100644 --- a/Epole.fp13/ReadMe.txt +++ b/Epole.fp13/ReadMe.txt @@ -1,4 +1,5 @@ -190505 * 인증방법변경 및 인증키와 연동 작업 (일자만 인증한다) +200608 메인화면 dock 설정 +190505 * 인증방법변경 및 인증키와 연동 작업 (일자만 인증한다) 190502 * 기존 QR이 존재하는 화면에 배경색 전경색을 추가함 170715 * 가공-선로화살표를 비고 앞에 놓이도록 수정 * 엑셀불러오기에 선로화살표 기능추가 diff --git a/Epole.fp13/SplashScreen.vb b/Epole.fp13/SplashScreen.vb index 60cec77..e8f902f 100644 --- a/Epole.fp13/SplashScreen.vb +++ b/Epole.fp13/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 <> System.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 <> System.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 = "" diff --git a/Epole.fp5/AboutBox1.Designer.vb b/Epole.fp5/AboutBox1.Designer.vb index 6e08091..8626e9a 100644 --- 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 diff --git a/Epole.fp5/Frm_Main.Designer.vb b/Epole.fp5/Frm_Main.Designer.vb index 264665a..aaa86c7 100644 --- 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) diff --git a/Epole.fp5/Frm_Main.resx b/Epole.fp5/Frm_Main.resx index 172df8b..91c6083 100644 --- 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= diff --git a/Epole.fp5/My Project/AssemblyInfo.vb b/Epole.fp5/My Project/AssemblyInfo.vb index d1c3ca3..d5fcc7b 100644 --- a/Epole.fp5/My Project/AssemblyInfo.vb +++ b/Epole.fp5/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' 지정되도록 할 수 있습니다. ' - - + + diff --git a/Epole.fp5/ReadMe.txt b/Epole.fp5/ReadMe.txt index 8d74606..9ce5c9a 100644 --- a/Epole.fp5/ReadMe.txt +++ b/Epole.fp5/ReadMe.txt @@ -1,4 +1,5 @@ -190505 * 인증방법변경 및 인증키와 연동 작업 (일자만 인증한다) +200608 메인화면 dock 설정 +190505 * 인증방법변경 및 인증키와 연동 작업 (일자만 인증한다) 190502 * 기존 QR이 존재하는 화면에 배경색 전경색을 추가함 170715 * 가공-선로화살표를 비고 앞에 놓이도록 수정 * 엑셀불러오기에 선로화살표 기능추가 diff --git a/Epole.fp5/SplashScreen.vb b/Epole.fp5/SplashScreen.vb index 6b162c7..b93dc2b 100644 --- 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 = "" diff --git a/Setup_fp13/Setup_fp13.vdproj b/Setup_fp13/Setup_fp13.vdproj index 3db3a19..39d3ae1 100644 --- a/Setup_fp13/Setup_fp13.vdproj +++ b/Setup_fp13/Setup_fp13.vdproj @@ -1384,12 +1384,6 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_A6F39E6D4E2DADBEA716F048C5A06404" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_5D21CCCB506342FC9F585B7FAA0F435B" "MsmSig" = "8:_UNDEFINED" } @@ -1483,6 +1477,12 @@ "OwnerKey" = "8:_EB96555005B3B195C51176F20DD13C82" "MsmSig" = "8:_UNDEFINED" } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_A6F39E6D4E2DADBEA716F048C5A06404" + "MsmSig" = "8:_UNDEFINED" + } } "Configurations" { @@ -1491,7 +1491,7 @@ "DisplayName" = "8:Debug" "IsDebugOnly" = "11:TRUE" "IsReleaseOnly" = "11:FALSE" - "OutputFilename" = "8:..\\..\\Runtime\\Setup_한전번호찰(통합-FP13)_200524\\Setup.msi" + "OutputFilename" = "8:..\\..\\Runtime\\Setup_한전번호찰(통합-FP13)_200524_v2\\Setup.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" @@ -1543,6 +1543,14 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + } } } "Deployable" @@ -5199,7 +5207,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:ThoughtWorks.QRCode, Version=1.0.7449.37329, Culture=neutral, processorArchitecture=x86" + "AssemblyAsmDisplayName" = "8:ThoughtWorks.QRCode, Version=1.0.7464.2529, Culture=neutral, processorArchitecture=x86" "ScatterAssemblies" { "_E942449AB022E179ABEFC7721C490DD5" @@ -5963,7 +5971,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:한전번호찰(통합)" "ProductCode" = "8:{5793633B-D5EF-4C77-B996-844680343505}" - "PackageCode" = "8:{20B9798E-051C-4FE4-A187-23054BB14B53}" + "PackageCode" = "8:{7D1267B9-5C13-4064-868C-16CD2C7F418B}" "UpgradeCode" = "8:{2A8FC149-20C0-4F68-BEBF-1AD5BD5E52C6}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" diff --git a/Setup_fp5/Setup_fp5.vdproj b/Setup_fp5/Setup_fp5.vdproj index db2096d..ae5d1e7 100644 --- a/Setup_fp5/Setup_fp5.vdproj +++ b/Setup_fp5/Setup_fp5.vdproj @@ -417,12 +417,6 @@ } "Entry" { - "MsmKey" = "8:_5C55CB11F40D8B0AA7BC6FD05E701E2F" - "OwnerKey" = "8:_35150550C81D4CD6B2ED0B182551A4D5" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_5DB2B5B653B24B61A89ABA8E92C7D36B" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -885,6 +879,12 @@ } "Entry" { + "MsmKey" = "8:_BE18AE6626A2B65356FE433607A9AFA6" + "OwnerKey" = "8:_35150550C81D4CD6B2ED0B182551A4D5" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_BF08D6C60924412AB5771D4AF023A978" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1228,12 +1228,6 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_158211555935985237A5A2DCF447BF59" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_35150550C81D4CD6B2ED0B182551A4D5" "MsmSig" = "8:_UNDEFINED" } @@ -1252,12 +1246,6 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_5C55CB11F40D8B0AA7BC6FD05E701E2F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_B205060B456540676D75E33FBA163DAA" "MsmSig" = "8:_UNDEFINED" } @@ -1291,6 +1279,18 @@ "OwnerKey" = "8:_F54067E3236CF51D5F30AD180315515A" "MsmSig" = "8:_UNDEFINED" } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_158211555935985237A5A2DCF447BF59" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_BE18AE6626A2B65356FE433607A9AFA6" + "MsmSig" = "8:_UNDEFINED" + } } "Configurations" { @@ -1299,7 +1299,7 @@ "DisplayName" = "8:Debug" "IsDebugOnly" = "11:TRUE" "IsReleaseOnly" = "11:FALSE" - "OutputFilename" = "8:..\\..\\Runtime\\Setup_한전번호찰(통합-FP5)_200524\\Setup.msi" + "OutputFilename" = "8:..\\..\\Runtime\\Setup_한전번호찰(통합-FP5)_200524_v2\\Setup.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" @@ -1351,6 +1351,14 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + } } } "Deployable" @@ -2642,37 +2650,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5C55CB11F40D8B0AA7BC6FD05E701E2F" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - "_5C55CB11F40D8B0AA7BC6FD05E701E2F" - { - "Name" = "8:stdole.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:stdole.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_A962CC68BCAE425C99F2F40A3EC2FBDC" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5DB2B5B653B24B61A89ABA8E92C7D36B" { "SourcePath" = "8:..\\..\\Runtime\\설치원본_한전번호찰(통합)\\image\\tr_in.jpg" @@ -4186,6 +4163,37 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BE18AE6626A2B65356FE433607A9AFA6" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "ScatterAssemblies" + { + "_BE18AE6626A2B65356FE433607A9AFA6" + { + "Name" = "8:stdole.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:stdole.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_A962CC68BCAE425C99F2F40A3EC2FBDC" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BF08D6C60924412AB5771D4AF023A978" { "SourcePath" = "8:..\\..\\Runtime\\설치원본_한전번호찰(통합)\\Style\\(b)normal.ini" @@ -4250,7 +4258,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:ThoughtWorks.QRCode, Version=1.0.7449.37362, Culture=neutral, processorArchitecture=x86" + "AssemblyAsmDisplayName" = "8:ThoughtWorks.QRCode, Version=1.0.7464.2575, Culture=neutral, processorArchitecture=x86" "ScatterAssemblies" { "_C2123947B8AE1C005C15839AACF84EFA"