diff --git a/unimarc/unimarc/Main.cs b/unimarc/unimarc/Main.cs index add2ed3..711a9f0 100644 --- a/unimarc/unimarc/Main.cs +++ b/unimarc/unimarc/Main.cs @@ -105,10 +105,43 @@ namespace WindowsFormsApp1 SetBtnName(); } catch (Exception ex) { MessageBox.Show(ex.ToString()); } + + UpdaterCheck(); } - + + /// + /// factory client update checkd + /// + static void UpdaterCheck() + { + var fi = new System.IO.FileInfo("_Factory_Client.exe"); + var fio = new System.IO.FileInfo("Factory_Client.exe"); + if (fi.Exists) + { + if (fio.Exists == false) + { + fi.CopyTo(fio.FullName); + fio.LastWriteTime = fi.LastWriteTime; + fio.LastAccessTime = fi.LastAccessTime; + } + else + { + //check size + if (fi.Length != fio.Length || fi.LastWriteTime != fio.LastWriteTime) + { + fi.CopyTo(fio.FullName, true); + fio.LastWriteTime = fi.LastWriteTime; + fio.LastAccessTime = fi.LastAccessTime; + } + } + Console.WriteLine("updater patch"); + } + } + + + #region 즐겨찾기 버튼 세팅 public void SetBtnName() @@ -224,7 +257,7 @@ namespace WindowsFormsApp1 "마크통계", "장비관리" }; ToolStripMenuItem[] MarcT = { 마크작성, 마크목록, 소장자료검색, 마크정리, iSBN조회, 목록, 편목, 마크반입, - 마크반출, 복본조사1, dLS복본조사, 마크수집, 전집관리, + 마크반출, 복본조사1, 복본조사2, dLS복본조사, 마크수집, 전집관리, 검수, 저자기호, DLS조회, 서류작성, 마크통계, 장비관리 }; diff --git a/unimarc/unimarc/Program.cs b/unimarc/unimarc/Program.cs index 4f629f6..b501d02 100644 --- a/unimarc/unimarc/Program.cs +++ b/unimarc/unimarc/Program.cs @@ -17,8 +17,15 @@ namespace WindowsFormsApp1 Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); //AR.UTIL.MsgE("unitmarc"); - DB_InitSetting(); - UpdaterCheck(); + try + { + DB_InitSetting(); + + } + catch (Exception ex) + { + MessageBox.Show(ex.Message); + } Application.Run(new Main()); } @@ -28,34 +35,6 @@ namespace WindowsFormsApp1 - /// - /// factory client update checkd - /// - static void UpdaterCheck() - { - var fi = new System.IO.FileInfo("_Factory_Client.exe"); - var fio = new System.IO.FileInfo("Factory_Client.exe"); - if (fi.Exists) - { - if (fio.Exists == false) - { - fi.CopyTo(fio.FullName); - fio.LastWriteTime = fi.LastWriteTime; - fio.LastAccessTime = fi.LastAccessTime; - } - else - { - //check size - if(fi.Length != fio.Length || fi.LastWriteTime != fio.LastWriteTime) - { - fi.CopyTo(fio.FullName,true); - fio.LastWriteTime = fi.LastWriteTime; - fio.LastAccessTime = fi.LastAccessTime; - } - } - Console.WriteLine("updater patch"); - } - } static void DB_InitSetting() { UniMarc.Properties.Settings.Default.IP = ConvertIP(UniMarc.Properties.Settings.Default.IP); diff --git a/unimarc/unimarc/Properties/AssemblyInfo.cs b/unimarc/unimarc/Properties/AssemblyInfo.cs index 44f29dc..0040b76 100644 --- a/unimarc/unimarc/Properties/AssemblyInfo.cs +++ b/unimarc/unimarc/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 // 기본값으로 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.187.1")] -[assembly: AssemblyFileVersion("1.0.187.1")] +[assembly: AssemblyVersion("1.0.187.3")] +[assembly: AssemblyFileVersion("1.0.187.3")] diff --git a/unimarc/unimarc/UniMarc.csproj b/unimarc/unimarc/UniMarc.csproj index 4123c43..bc3ec37 100644 --- a/unimarc/unimarc/UniMarc.csproj +++ b/unimarc/unimarc/UniMarc.csproj @@ -74,6 +74,9 @@ UniMarc_TemporaryKey.pfx + + UniMarc.ico + ..\packages\AngleSharp.1.0.4\lib\net472\AngleSharp.dll @@ -1920,6 +1923,7 @@ + diff --git a/unimarc/unimarc/UniMarc.ico b/unimarc/unimarc/UniMarc.ico new file mode 100644 index 0000000..8513893 Binary files /dev/null and b/unimarc/unimarc/UniMarc.ico differ diff --git a/unimarc/unimarc/obj/Debug/Interop.SHDocVw.dll b/unimarc/unimarc/obj/Debug/Interop.SHDocVw.dll index 82a5c7a..ea6527a 100644 Binary files a/unimarc/unimarc/obj/Debug/Interop.SHDocVw.dll and b/unimarc/unimarc/obj/Debug/Interop.SHDocVw.dll differ