From acea5da0a2495a463ddad13752aecd610fa2d1e5 Mon Sep 17 00:00:00 2001 From: tsukumijima Date: Thu, 13 Aug 2020 11:11:24 +0900 Subject: [PATCH] release v1.0.0-launcher --- App.xaml | 4 ++-- App.xaml.cs | 18 ++++++++-------- LICENSE.txt | 9 ++++++++ MainWindow.xaml | 10 ++++----- MainWindow.xaml.cs | 2 +- NotifyIconWrapper.Designer.cs | 2 +- NotifyIconWrapper.resx | 2 +- README.md | 39 +++++++++++++++++++++++++++++++++++ 8 files changed, 67 insertions(+), 19 deletions(-) create mode 100644 LICENSE.txt create mode 100644 README.md diff --git a/App.xaml b/App.xaml index 0ff2397..f431e78 100644 --- a/App.xaml +++ b/App.xaml @@ -15,7 +15,7 @@ - + @@ -52,7 +52,7 @@ - diff --git a/App.xaml.cs b/App.xaml.cs index 567cdbc..6057b8d 100644 --- a/App.xaml.cs +++ b/App.xaml.cs @@ -214,18 +214,18 @@ public void OnProcessExited(object sender, System.EventArgs e) $"Exit code : {this.Apache.ExitCode}\n" + $"Elapsed time : {Math.Round((this.Apache.ExitTime - this.Apache.StartTime).TotalMilliseconds)}"); - // エラーダイアログ - var dialog = new TaskDialog(); - dialog.Caption = "エラー"; - dialog.InstructionText = "サーバー (Apache) が異常終了しました"; - dialog.Text = "サーバー (Apache) の設定を開き、ログを確認してください。"; - dialog.Icon = TaskDialogStandardIcon.Error; - dialog.StandardButtons = TaskDialogStandardButtons.Ok; - dialog.Show(); - // ログを全てのページで見られるように保存 if (this.Log != null && Application.Current != null) // 正常終了時に行わない { + // エラーダイアログ + var dialog = new TaskDialog(); + dialog.Caption = "エラー"; + dialog.InstructionText = "サーバー (Apache) が異常終了しました"; + dialog.Text = "サーバー (Apache) の設定を開き、ログを確認してください。"; + dialog.Icon = TaskDialogStandardIcon.Error; + dialog.StandardButtons = TaskDialogStandardButtons.Ok; + dialog.Show(); + this.Log.Add("サーバー (Apache) が異常終了しました。 " + "終了コード: " + this.Apache.ExitCode + " 終了時刻: " + this.Apache.ExitTime + " " + "経過時間: " + Math.Round((this.Apache.ExitTime - this.Apache.StartTime).TotalMilliseconds) + "ms"); diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..aaeff4d --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,9 @@ +The MIT License (MIT) + +Copyright (c) 2019-2020 tsukumijima + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/MainWindow.xaml b/MainWindow.xaml index 6d2a362..fa01aba 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -83,7 +83,7 @@