ｖ1.1.6.6

[kybernetes/Kybernetes.git] / base / view / BaseForm.cs

diff --git a/base/view/BaseForm.cs b/base/view/BaseForm.cs
index 656c25c..f33d0e2 100644 (file)
--- a/base/view/BaseForm.cs
+++ b/base/view/BaseForm.cs
@@ -303,6 +303,12 @@ namespace com.andoutomo.kybernetes.view
                         this.pnlTask.AutoScrollPosition = new Point(0, currentYPosition - currentScrollHeight);\r
                     }\r
                     break;\r
+                case Keys.Tab:\r
+                    if (e.Control)\r
+                    {\r
+                        tabChange();\r
+                    }\r
+                    break;\r
             }\r
         }\r
         /// <summary>\r
@@ -389,6 +395,7 @@ namespace com.andoutomo.kybernetes.view
         /// <returns></returns>\r
         public string showInputBox(string prompt, ImeMode imeMode)\r
         {\r
+\r
             return showInputBox(prompt, string.Empty, imeMode);\r
         }\r
 \r
@@ -416,7 +423,7 @@ namespace com.andoutomo.kybernetes.view
         /// </summary>\r
         /// <param name="prompt"></param>\r
         /// <returns></returns>\r
-        public string showDropBoxInputBox(List<SimpleDataBean> list, string prompt)\r
+        public string showDropBoxInputBox(List<SimpleDataBean> list, string prompt,out bool isOK)\r
         {\r
             DropBoxInputBox inputBox = new DropBoxInputBox(prompt);\r
             inputBox.StartPosition = FormStartPosition.CenterParent;\r
@@ -427,8 +434,10 @@ namespace com.andoutomo.kybernetes.view
             DialogResult res = inputBox.ShowDialog();\r
             if (res == DialogResult.OK)\r
             {\r
+                isOK = true;\r
                 return InputDialogData;\r
             }\r
+            isOK = false;\r
             return null;\r
         }\r
         /// <summary>\r
@@ -438,7 +447,7 @@ namespace com.andoutomo.kybernetes.view
         /// <param name="prompt"></param>\r
         /// <param name="defaultData"></param>\r
         /// <returns></returns>\r
-        public string showDropBoxInputBox(List<SimpleDataBean> list, string prompt, string defaultData)\r
+        public string showDropBoxInputBox(List<SimpleDataBean> list, string prompt, string defaultData ,out bool isOK)\r
         {\r
             DropBoxInputBox inputBox = new DropBoxInputBox(prompt, defaultData);\r
             inputBox.StartPosition = FormStartPosition.CenterParent;\r
@@ -449,8 +458,10 @@ namespace com.andoutomo.kybernetes.view
             DialogResult res = inputBox.ShowDialog();\r
             if (res == DialogResult.OK)\r
             {\r
+                isOK = true;\r
                 return InputDialogData;\r
             }\r
+            isOK = false;\r
             return null;\r
         }\r
 \r
@@ -731,7 +742,7 @@ namespace com.andoutomo.kybernetes.view
 \r
             }\r
         }\r
-\r
+        \r
         private void splConsole_SplitterMoved(object sender, SplitterEventArgs e)\r
         {\r
             txtInput.Focus();\r
@@ -754,6 +765,40 @@ namespace com.andoutomo.kybernetes.view
             txtInput.Focus();\r
             this.txtInput.Select(this.txtInput.Text.Length, 0);\r
         }\r
+\r
+        public TaskData taskFromTemplate\r
+        {\r
+            private get;\r
+            set;\r
+        }\r
+        public TaskData showTemplateTaskBox(List<TemplateData> dataList)\r
+        {\r
+            TemplateBox tempBox = new TemplateBox();\r
+            tempBox.setTemplateData(dataList);\r
+            tempBox.Owner = this;\r
+            \r
+            DialogResult res = tempBox.ShowDialog();\r
+\r
+            if (res == DialogResult.OK)\r
+            {\r
+                return taskFromTemplate;\r
+            }\r
+            return null;\r
+        }\r
+\r
+        private void tabChange()\r
+        {\r
+\r
+            if (tabInfo.SelectedIndex == 0)\r
+            {\r
+                tabInfo.SelectedIndex = 1;\r
+            }\r
+            else\r
+            {\r
+                tabInfo.SelectedIndex = 0;\r
+            }\r
+        }\r
+\r
     }\r
     /// <summary>\r
     /// 見積もり用コンソールの文字列クラス\r