AppliStation,ハッシュが非整合の時に尋ねるようにする部分の改良

[applistation/AppliStation.git] / AppliStation / AppliStation.Util / ExecutionProgressViewer.cs

diff --git a/AppliStation/AppliStation.Util/ExecutionProgressViewer.cs b/AppliStation/AppliStation.Util/ExecutionProgressViewer.cs
index c4de9a1..94dd6d5 100644 (file)
--- a/AppliStation/AppliStation.Util/ExecutionProgressViewer.cs
+++ b/AppliStation/AppliStation.Util/ExecutionProgressViewer.cs
@@ -170,19 +170,28 @@ namespace AppliStation.Util
                        }\r
                }\r
                \r
-               private NaGetTaskQueryResult onTaskQueryRaised(object sender, NaGetTaskSetEventArgs e)\r
+               private NaGetTaskQueryResult onTaskQueryRaised(object sender, NaGetTaskQueryArgs e)\r
                {\r
-                       DialogResult result = MessageBox.Show(e.TaskMessage, this.Text,\r
-                                       MessageBoxButtons.OKCancel,\r
-                                       (e.Type == NaGetTaskSetEventType.WARNING_QUERY)? MessageBoxIcon.Warning : MessageBoxIcon.Question);\r
+                       MessageBoxButtons buttons = MessageBoxButtons.OKCancel;\r
+                       if (e.SelectionFlag == (NaGetTaskQueryResult.CONTINUE | NaGetTaskQueryResult.RETRY | NaGetTaskQueryResult.CANCEL)) {\r
+                               buttons = MessageBoxButtons.AbortRetryIgnore;\r
+                       } else if (e.SelectionFlag == (NaGetTaskQueryResult.RETRY | NaGetTaskQueryResult.CANCEL)) {\r
+                               buttons = MessageBoxButtons.RetryCancel;\r
+                       } else if (e.SelectionFlag == NaGetTaskQueryResult.CONTINUE) {\r
+                               buttons = MessageBoxButtons.OK;\r
+                       }\r
+                       \r
+                       DialogResult result = MessageBox.Show(e.Message, this.Text, buttons);\r
                        \r
                        switch (result) {\r
                                case DialogResult.OK:\r
-                               //case DialogResult.Ignore:\r
+                               case DialogResult.Ignore:\r
                                        return NaGetTaskQueryResult.CONTINUE;\r
                                case DialogResult.Cancel:\r
-                               //case DialogResult.Abort:\r
+                               case DialogResult.Abort:\r
                                        return NaGetTaskQueryResult.CANCEL;\r
+                               case DialogResult.Retry:\r
+                                       return NaGetTaskQueryResult.RETRY;\r
                                default:\r
                                        return NaGetTaskQueryResult.CANCELED_AUTOMATICALLY;\r
                        }\r