From 41b8addd680eaad4aa4f9edfa346188a21a7b0f2 Mon Sep 17 00:00:00 2001 From: chi Date: Mon, 8 Jun 2020 01:37:16 +0900 Subject: [PATCH] .. --- SpreadNet.v13/Epole/History.txt | 3 +- SpreadNet.v13/Epole/MakeList.Designer.vb | 41 ++++- SpreadNet.v13/Epole/MakeList.resx | 41 +++-- .../Epole/My Project/AssemblyInfo.vb | 4 +- .../Epole/dialogForm/SplashScreen.vb | 3 +- SpreadNet.v13/Setup/Setup.vdproj | 20 +-- SpreadNet.v5/Epole/History.txt | 3 +- SpreadNet.v5/Epole/MakeList.Designer.vb | 15 +- SpreadNet.v5/Epole/MakeList.resx | 41 +++-- SpreadNet.v5/Setup/Setup.vdproj | 161 +++++++++++------- 10 files changed, 200 insertions(+), 132 deletions(-) diff --git a/SpreadNet.v13/Epole/History.txt b/SpreadNet.v13/Epole/History.txt index b75ce81..59b53d5 100644 --- a/SpreadNet.v13/Epole/History.txt +++ b/SpreadNet.v13/Epole/History.txt @@ -1,2 +1,3 @@ -190223 chi 스타일목록에서 마우스 우클릭으로 숨김/표시 처리가 가능함(단 관리자 로그인 시) +200608 chi 메인화면 dock 설정 +190223 chi 스타일목록에서 마우스 우클릭으로 숨김/표시 처리가 가능함(단 관리자 로그인 시) 180117 chi *cls_tonshin 에서 간선과 전주번호 길이 최대값을 10에서 20으로 수정 \ No newline at end of file diff --git a/SpreadNet.v13/Epole/MakeList.Designer.vb b/SpreadNet.v13/Epole/MakeList.Designer.vb index 5c9b5c4..dceded9 100644 --- a/SpreadNet.v13/Epole/MakeList.Designer.vb +++ b/SpreadNet.v13/Epole/MakeList.Designer.vb @@ -88,7 +88,7 @@ Partial Class MakeList Me.ToolStripMenuItem4 = New System.Windows.Forms.ToolStripMenuItem() Me.ta_main = New EpoleNetv3.DataSetTableAdapters.MainTableTableAdapter() Me.ta_jju = New EpoleNetv3.DataSetTableAdapters.Detail_tongsinTableAdapter() - Me.view1 = New NewFp() + Me.view1 = New ArinNewFp.NewFp() Me.view1_Sheet1 = New FarPoint.Win.Spread.SheetView() Me.StatusStrip1.SuspendLayout() CType(Me.bn, System.ComponentModel.ISupportInitialize).BeginInit() @@ -551,26 +551,25 @@ Partial Class MakeList 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.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle 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.0!, 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(0, 41) + Me.view1.Location = New System.Drawing.Point(0, 38) 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(883, 498) + Me.view1.Size = New System.Drawing.Size(883, 504) Me.view1.TabIndex = 18 Me.view1.VerticalScrollBarPolicy = FarPoint.Win.Spread.ScrollBarPolicy.AsNeeded + Me.view1.SetActiveViewport(0, 1, 0) ' 'view1_Sheet1 ' @@ -579,9 +578,16 @@ Partial Class MakeList 'Formulas and custom names must be loaded with R1C1 reference style Me.view1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1 Me.view1_Sheet1.ColumnCount = 10 + 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 = "보기" @@ -592,6 +598,9 @@ Partial Class MakeList Me.view1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "단가" Me.view1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "금액" Me.view1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "종류" + 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 @@ -612,7 +621,7 @@ Partial Class MakeList Me.view1_Sheet1.Columns.Get(2).Label = "보기" Me.view1_Sheet1.Columns.Get(2).Width = 39.0! Me.view1_Sheet1.Columns.Get(3).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) @@ -670,6 +679,7 @@ Partial Class MakeList Me.view1_Sheet1.Columns.Get(8).Locked = True Me.view1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center Me.view1_Sheet1.Columns.Get(8).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", "1", "2", "3", "4", "5", "6", "7", "8"} @@ -685,14 +695,29 @@ Partial Class MakeList 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 - Me.view1.SetActiveViewport(0, -1, 0) ' 'MakeList ' diff --git a/SpreadNet.v13/Epole/MakeList.resx b/SpreadNet.v13/Epole/MakeList.resx index 889415a..0f02c4a 100644 --- a/SpreadNet.v13/Epole/MakeList.resx +++ b/SpreadNet.v13/Epole/MakeList.resx @@ -112,12 +112,12 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 @@ -141,25 +141,25 @@ lqK93IN4/QUjgLsVXMNmNAAAAABJRU5ErkJggg== - + 193, 17 - + 424, 17 - + 542, 17 - + 360, 17 - + 293, 17 - + 735, 17 - + 895, 17 @@ -285,13 +285,13 @@ bpf2nNmjA+SooQeN0v63h34pPPQ//22hmr8BhVovRlQUlYQAAAAASUVORK5CYII= - + 17, 17 - + 112, 17 - + 608, 17 @@ -309,16 +309,15 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEttc2NvcmxpYiwgVmVyc2lvbj0yLjAuMC4wLCBDdWx0dXJlPW5l - dXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0ZW0uR2xvYmFsaXph - dGlvbi5HcmVnb3JpYW5DYWxlbmRhcgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0 - WWVhck1heBpDYWxlbmRhcittX2N1cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2Fs - ZW5kYXIrdHdvRGlnaXRZZWFyTWF4BAAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNh - bGVuZGFyVHlwZXMCAAAACAgIAQgCAAAABf3///8rU3lzdGVtLkdsb2JhbGl6YXRpb24uR3JlZ29yaWFu - Q2FsZW5kYXJUeXBlcwEAAAAHdmFsdWVfXwAIAgAAAAEAAAD/////7QcAAP////8A7QcAAAs= + AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh + cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1 + cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4 + AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+//// + K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA + AAD/////AQgAAP////8AAQgAAAs= - + 87 diff --git a/SpreadNet.v13/Epole/My Project/AssemblyInfo.vb b/SpreadNet.v13/Epole/My Project/AssemblyInfo.vb index b768e43..6c9ad31 100644 --- a/SpreadNet.v13/Epole/My Project/AssemblyInfo.vb +++ b/SpreadNet.v13/Epole/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' 지정되도록 할 수 있습니다. ' - - + + diff --git a/SpreadNet.v13/Epole/dialogForm/SplashScreen.vb b/SpreadNet.v13/Epole/dialogForm/SplashScreen.vb index e76b01c..d3c33d0 100644 --- a/SpreadNet.v13/Epole/dialogForm/SplashScreen.vb +++ b/SpreadNet.v13/Epole/dialogForm/SplashScreen.vb @@ -229,7 +229,8 @@ Return True End If Try - Auto_Log = CType(Arinini.Read("MAIN", "log"), Boolean) + Dim str_log As String = Arinini.Read("MAIN", "log") + Auto_Log = IIf(str_log = "1", True, False) Common.PICmanFile = Arinini.Read("MAIN", "PICMAN") Common.MakeState = Arinini.Read("main", "makestate") Common.PoleState = Arinini.Read("main", "polestate") diff --git a/SpreadNet.v13/Setup/Setup.vdproj b/SpreadNet.v13/Setup/Setup.vdproj index cbb349b..d5d00fe 100644 --- a/SpreadNet.v13/Setup/Setup.vdproj +++ b/SpreadNet.v13/Setup/Setup.vdproj @@ -2710,13 +2710,7 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_5A7EDE7ADBC49194FDC2B75347C35F81" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_293B3C763C444A1BB8E51CAF9E1CA8E2" + "OwnerKey" = "8:_167C0AA26F5C455D969F8E6E57CD3755" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -2728,7 +2722,7 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_167C0AA26F5C455D969F8E6E57CD3755" + "OwnerKey" = "8:_293B3C763C444A1BB8E51CAF9E1CA8E2" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -2857,6 +2851,12 @@ "OwnerKey" = "8:_CE9E666B137EC87AF2D6B551E85C0A9D" "MsmSig" = "8:_UNDEFINED" } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_5A7EDE7ADBC49194FDC2B75347C35F81" + "MsmSig" = "8:_UNDEFINED" + } } "Configurations" { @@ -2865,7 +2865,7 @@ "DisplayName" = "8:Debug" "IsDebugOnly" = "11:TRUE" "IsReleaseOnly" = "11:FALSE" - "OutputFilename" = "8:..\\..\\..\\Runtime\\Setup_KT번호찰(FP13)_190524\\EpoleSetup.msi" + "OutputFilename" = "8:..\\..\\..\\Runtime\\Setup_KT번호찰(FP13)_190524_v2\\EpoleSetup.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" @@ -6673,7 +6673,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:ThoughtWorks.QRCode, Version=1.0.7449.35335, Culture=neutral, processorArchitecture=x86" + "AssemblyAsmDisplayName" = "8:ThoughtWorks.QRCode, Version=1.0.7464.2505, Culture=neutral, processorArchitecture=x86" "ScatterAssemblies" { "_6B7914B3DF6671B5BDCCDC3202D00236" diff --git a/SpreadNet.v5/Epole/History.txt b/SpreadNet.v5/Epole/History.txt index b75ce81..59b53d5 100644 --- a/SpreadNet.v5/Epole/History.txt +++ b/SpreadNet.v5/Epole/History.txt @@ -1,2 +1,3 @@ -190223 chi 스타일목록에서 마우스 우클릭으로 숨김/표시 처리가 가능함(단 관리자 로그인 시) +200608 chi 메인화면 dock 설정 +190223 chi 스타일목록에서 마우스 우클릭으로 숨김/표시 처리가 가능함(단 관리자 로그인 시) 180117 chi *cls_tonshin 에서 간선과 전주번호 길이 최대값을 10에서 20으로 수정 \ No newline at end of file diff --git a/SpreadNet.v5/Epole/MakeList.Designer.vb b/SpreadNet.v5/Epole/MakeList.Designer.vb index 5c9b5c4..f983a88 100644 --- a/SpreadNet.v5/Epole/MakeList.Designer.vb +++ b/SpreadNet.v5/Epole/MakeList.Designer.vb @@ -88,7 +88,7 @@ Partial Class MakeList Me.ToolStripMenuItem4 = New System.Windows.Forms.ToolStripMenuItem() Me.ta_main = New EpoleNetv3.DataSetTableAdapters.MainTableTableAdapter() Me.ta_jju = New EpoleNetv3.DataSetTableAdapters.Detail_tongsinTableAdapter() - Me.view1 = New NewFp() + Me.view1 = New ArinNewFp.NewFp() Me.view1_Sheet1 = New FarPoint.Win.Spread.SheetView() Me.StatusStrip1.SuspendLayout() CType(Me.bn, System.ComponentModel.ISupportInitialize).BeginInit() @@ -551,26 +551,25 @@ Partial Class MakeList 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.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle 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.0!, 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(0, 41) + Me.view1.Location = New System.Drawing.Point(0, 38) 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(883, 498) + Me.view1.Size = New System.Drawing.Size(883, 504) Me.view1.TabIndex = 18 Me.view1.VerticalScrollBarPolicy = FarPoint.Win.Spread.ScrollBarPolicy.AsNeeded + Me.view1.SetActiveViewport(0, -1, -1) ' 'view1_Sheet1 ' @@ -578,7 +577,8 @@ Partial Class MakeList 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 - Me.view1_Sheet1.ColumnCount = 10 + view1_Sheet1.ColumnCount = 10 + Me.view1_Sheet1.ActiveColumnIndex = -1 Me.view1_Sheet1.ActiveRowIndex = -1 Me.view1_Sheet1.AllowNoteEdit = False Me.view1_Sheet1.AutoGenerateColumns = False @@ -692,7 +692,6 @@ Partial Class MakeList Me.view1_Sheet1.SelectionBackColor = System.Drawing.Color.Transparent Me.view1_Sheet1.SelectionForeColor = System.Drawing.Color.Black Me.view1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1 - Me.view1.SetActiveViewport(0, -1, 0) ' 'MakeList ' diff --git a/SpreadNet.v5/Epole/MakeList.resx b/SpreadNet.v5/Epole/MakeList.resx index 889415a..0f02c4a 100644 --- a/SpreadNet.v5/Epole/MakeList.resx +++ b/SpreadNet.v5/Epole/MakeList.resx @@ -112,12 +112,12 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 @@ -141,25 +141,25 @@ lqK93IN4/QUjgLsVXMNmNAAAAABJRU5ErkJggg== - + 193, 17 - + 424, 17 - + 542, 17 - + 360, 17 - + 293, 17 - + 735, 17 - + 895, 17 @@ -285,13 +285,13 @@ bpf2nNmjA+SooQeN0v63h34pPPQ//22hmr8BhVovRlQUlYQAAAAASUVORK5CYII= - + 17, 17 - + 112, 17 - + 608, 17 @@ -309,16 +309,15 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEttc2NvcmxpYiwgVmVyc2lvbj0yLjAuMC4wLCBDdWx0dXJlPW5l - dXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0ZW0uR2xvYmFsaXph - dGlvbi5HcmVnb3JpYW5DYWxlbmRhcgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0 - WWVhck1heBpDYWxlbmRhcittX2N1cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2Fs - ZW5kYXIrdHdvRGlnaXRZZWFyTWF4BAAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNh - bGVuZGFyVHlwZXMCAAAACAgIAQgCAAAABf3///8rU3lzdGVtLkdsb2JhbGl6YXRpb24uR3JlZ29yaWFu - Q2FsZW5kYXJUeXBlcwEAAAAHdmFsdWVfXwAIAgAAAAEAAAD/////7QcAAP////8A7QcAAAs= + AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh + cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1 + cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4 + AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+//// + K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA + AAD/////AQgAAP////8AAQgAAAs= - + 87 diff --git a/SpreadNet.v5/Setup/Setup.vdproj b/SpreadNet.v5/Setup/Setup.vdproj index bd2b9a7..4b3d836 100644 --- a/SpreadNet.v5/Setup/Setup.vdproj +++ b/SpreadNet.v5/Setup/Setup.vdproj @@ -51,6 +51,18 @@ } "Entry" { + "MsmKey" = "8:_04C527D5F1A1A708740DBEFDCC4D3C8A" + "OwnerKey" = "8:_EC3DA98CB631ED29A6F180725A10608E" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_04C527D5F1A1A708740DBEFDCC4D3C8A" + "OwnerKey" = "8:_4FE2C752FE594D438A3B0A578EE058A8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_04C5BC82190744F397499F21C7642DA8" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -183,12 +195,6 @@ } "Entry" { - "MsmKey" = "8:_162916251C9A23B8C7F7CBAACD9C6510" - "OwnerKey" = "8:_4FE2C752FE594D438A3B0A578EE058A8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_165D2C117761455EB6357365DCF2B8B2" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -897,6 +903,12 @@ } "Entry" { + "MsmKey" = "8:_5E24C2C278C6C3F1A2E7EB5A5F1E06E8" + "OwnerKey" = "8:_4FE2C752FE594D438A3B0A578EE058A8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_5F20A10D56A8FA5A74A6270A5153E969" "OwnerKey" = "8:_4FE2C752FE594D438A3B0A578EE058A8" "MsmSig" = "8:_UNDEFINED" @@ -1029,12 +1041,6 @@ } "Entry" { - "MsmKey" = "8:_6B7914B3DF6671B5BDCCDC3202D00236" - "OwnerKey" = "8:_EC3DA98CB631ED29A6F180725A10608E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_6C173FEF3B714685881A4C74579CC9BC" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2554,13 +2560,7 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_C886BC5C7B589CF4AC6E501288F100C9" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_62F047F1F6CD4197BF7D702A37FF7B77" + "OwnerKey" = "8:_4FE2C752FE594D438A3B0A578EE058A8" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -2572,7 +2572,7 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_4FE2C752FE594D438A3B0A578EE058A8" + "OwnerKey" = "8:_62F047F1F6CD4197BF7D702A37FF7B77" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -2602,6 +2602,12 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_04C527D5F1A1A708740DBEFDCC4D3C8A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_6B7914B3DF6671B5BDCCDC3202D00236" "MsmSig" = "8:_UNDEFINED" } @@ -2626,12 +2632,6 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_162916251C9A23B8C7F7CBAACD9C6510" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_5F20A10D56A8FA5A74A6270A5153E969" "MsmSig" = "8:_UNDEFINED" } @@ -2665,6 +2665,18 @@ "OwnerKey" = "8:_772A6DB6BAC2BE0F2BE3EE619CFB1782" "MsmSig" = "8:_UNDEFINED" } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_C886BC5C7B589CF4AC6E501288F100C9" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_5E24C2C278C6C3F1A2E7EB5A5F1E06E8" + "MsmSig" = "8:_UNDEFINED" + } } "Configurations" { @@ -2673,7 +2685,7 @@ "DisplayName" = "8:Debug" "IsDebugOnly" = "11:TRUE" "IsReleaseOnly" = "11:FALSE" - "OutputFilename" = "8:..\\..\\..\\Runtime\\Setup_KT번호찰(FP5)_190524\\EpoleSetup.msi" + "OutputFilename" = "8:..\\..\\..\\Runtime\\Setup_KT번호찰(FP5)_190524_v2\\EpoleSetup.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" @@ -2896,6 +2908,37 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_04C527D5F1A1A708740DBEFDCC4D3C8A" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:ThoughtWorks.QRCode, Version=1.0.7464.1904, Culture=neutral, processorArchitecture=x86" + "ScatterAssemblies" + { + "_04C527D5F1A1A708740DBEFDCC4D3C8A" + { + "Name" = "8:ThoughtWorks.QRCode.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:ThoughtWorks.QRCode.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_7471CA69072F4F95860BBA159D3A4293" + "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}:_04C5BC82190744F397499F21C7642DA8" { "SourcePath" = "8:..\\..\\..\\Runtime\\설치원본_KT통신번호찰\\StyleTS\\style1224025452.A" @@ -3336,37 +3379,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_162916251C9A23B8C7F7CBAACD9C6510" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - "_162916251C9A23B8C7F7CBAACD9C6510" - { - "Name" = "8:stdole.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:stdole.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_7471CA69072F4F95860BBA159D3A4293" - "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}:_165D2C117761455EB6357365DCF2B8B2" { "SourcePath" = "8:..\\..\\..\\Runtime\\설치원본_KT통신번호찰\\StyleTS\\KT광단자함번호찰(A형).Z" @@ -5660,6 +5672,37 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5E24C2C278C6C3F1A2E7EB5A5F1E06E8" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "ScatterAssemblies" + { + "_5E24C2C278C6C3F1A2E7EB5A5F1E06E8" + { + "Name" = "8:stdole.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:stdole.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_7471CA69072F4F95860BBA159D3A4293" + "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:" + } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5F20A10D56A8FA5A74A6270A5153E969" { "AssemblyRegister" = "3:1" @@ -6066,7 +6109,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:ThoughtWorks.QRCode, Version=1.0.7449.35286, Culture=neutral, processorArchitecture=x86" + "AssemblyAsmDisplayName" = "8:ThoughtWorks.QRCode, Version=1.0.7464.2535, Culture=neutral, processorArchitecture=x86" "ScatterAssemblies" { "_6B7914B3DF6671B5BDCCDC3202D00236"