v.1.1.6.0

サブコンソールの追加、一部コマンドの結果をサブコンソールに展開するように処理変更
duplicateコマンドに-pオプション追加(見積もり時間もコピーする)
短めスクロール(ctrl+pgup/down)を追加
タスク表示処理をBaseForm側に委譲。
user.dbにインデックス再付与。

diff --git a/base/Properties/AssemblyInfo.cs b/base/Properties/AssemblyInfo.cs
index e2dea06..8e48bc5 100644 (file)
--- a/base/Properties/AssemblyInfo.cs
+++ b/base/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@ using System.Resources;
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を \r
 // 既定値にすることができます:\r
 // [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("1.1.4.0")]\r
-[assembly: AssemblyFileVersion("1.1.4.0")]\r
+[assembly: AssemblyVersion("1.1.6.0")]\r
+[assembly: AssemblyFileVersion("1.1.6.0")]\r
 [assembly: NeutralResourcesLanguageAttribute("ja")]\r

diff --git a/base/data/DAO/TimeAreaData.cs b/base/data/DAO/TimeAreaData.cs
index 519dcbd..d4788b5 100644 (file)
--- a/base/data/DAO/TimeAreaData.cs
+++ b/base/data/DAO/TimeAreaData.cs
@@ -73,6 +73,21 @@ namespace com.andoutomo.kybernetes.data.DAO
             get;\r
             set;\r
         }\r
+\r
+        public string Indicator\r
+        {\r
+            get\r
+            {\r
+                if (ForcastMin > Span)\r
+                {\r
+                    return "+";\r
+                }\r
+                else\r
+                {\r
+                    return "-";\r
+                }\r
+            }\r
+        }\r
     }\r
 \r
 }\r

diff --git a/base/view/BaseForm.Designer.cs b/base/view/BaseForm.Designer.cs
index 8e5514b..3b894dc 100644 (file)
--- a/base/view/BaseForm.Designer.cs
+++ b/base/view/BaseForm.Designer.cs
@@ -31,17 +31,23 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BaseForm));\r
             this.pnlTask = new System.Windows.Forms.Panel();\r
             this.txtInput = new System.Windows.Forms.TextBox();\r
-            this.rConsole = new System.Windows.Forms.RichTextBox();\r
             this.expData = new System.Windows.Forms.SaveFileDialog();\r
             this.dmpData = new System.Windows.Forms.SaveFileDialog();\r
             this.selSh = new System.Windows.Forms.OpenFileDialog();\r
             this.BGColorDlg = new System.Windows.Forms.ColorDialog();\r
             this.FRColorDlg = new System.Windows.Forms.ColorDialog();\r
             this.splBase = new System.Windows.Forms.SplitContainer();\r
+            this.splConsole = new System.Windows.Forms.SplitContainer();\r
+            this.rSubConsole = new System.Windows.Forms.RichTextBox();\r
+            this.rConsole = new System.Windows.Forms.TextBox();\r
             ((System.ComponentModel.ISupportInitialize)(this.splBase)).BeginInit();\r
             this.splBase.Panel1.SuspendLayout();\r
             this.splBase.Panel2.SuspendLayout();\r
             this.splBase.SuspendLayout();\r
+            ((System.ComponentModel.ISupportInitialize)(this.splConsole)).BeginInit();\r
+            this.splConsole.Panel1.SuspendLayout();\r
+            this.splConsole.Panel2.SuspendLayout();\r
+            this.splConsole.SuspendLayout();\r
             this.SuspendLayout();\r
             // \r
             // pnlTask\r
@@ -52,10 +58,11 @@
             this.pnlTask.AutoScroll = true;\r
             this.pnlTask.BackColor = System.Drawing.Color.Black;\r
             this.pnlTask.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
+            this.pnlTask.Font = new System.Drawing.Font("ＭＳ ゴシック", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));\r
             this.pnlTask.ForeColor = System.Drawing.Color.White;\r
             this.pnlTask.Location = new System.Drawing.Point(3, 3);\r
             this.pnlTask.Name = "pnlTask";\r
-            this.pnlTask.Size = new System.Drawing.Size(836, 446);\r
+            this.pnlTask.Size = new System.Drawing.Size(836, 479);\r
             this.pnlTask.TabIndex = 0;\r
             // \r
             // txtInput\r
@@ -65,30 +72,12 @@
             this.txtInput.BackColor = System.Drawing.Color.Black;\r
             this.txtInput.Font = new System.Drawing.Font("ＭＳ ゴシック", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));\r
             this.txtInput.ForeColor = System.Drawing.Color.White;\r
-            this.txtInput.Location = new System.Drawing.Point(3, 234);\r
+            this.txtInput.Location = new System.Drawing.Point(3, 255);\r
             this.txtInput.Name = "txtInput";\r
-            this.txtInput.Size = new System.Drawing.Size(836, 19);\r
+            this.txtInput.Size = new System.Drawing.Size(450, 19);\r
             this.txtInput.TabIndex = 1;\r
             this.txtInput.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtInput_KeyDown);\r
             // \r
-            // rConsole\r
-            // \r
-            this.rConsole.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) \r
-            | System.Windows.Forms.AnchorStyles.Left) \r
-            | System.Windows.Forms.AnchorStyles.Right)));\r
-            this.rConsole.BackColor = System.Drawing.Color.Black;\r
-            this.rConsole.Font = new System.Drawing.Font("ＭＳ ゴシック", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));\r
-            this.rConsole.ForeColor = System.Drawing.Color.White;\r
-            this.rConsole.Location = new System.Drawing.Point(3, 0);\r
-            this.rConsole.Name = "rConsole";\r
-            this.rConsole.ReadOnly = true;\r
-            this.rConsole.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.ForcedVertical;\r
-            this.rConsole.Size = new System.Drawing.Size(836, 233);\r
-            this.rConsole.TabIndex = 0;\r
-            this.rConsole.TabStop = false;\r
-            this.rConsole.Text = "";\r
-            this.rConsole.MouseUp += new System.Windows.Forms.MouseEventHandler(this.rConsole_MouseUp);\r
-            // \r
             // expData\r
             // \r
             this.expData.DefaultExt = "csv";\r
@@ -125,29 +114,86 @@
             // \r
             // splBase.Panel2\r
             // \r
-            this.splBase.Panel2.Controls.Add(this.txtInput);\r
-            this.splBase.Panel2.Controls.Add(this.rConsole);\r
-            this.splBase.Size = new System.Drawing.Size(840, 710);\r
-            this.splBase.SplitterDistance = 450;\r
+            this.splBase.Panel2.Controls.Add(this.splConsole);\r
+            this.splBase.Size = new System.Drawing.Size(840, 761);\r
+            this.splBase.SplitterDistance = 481;\r
             this.splBase.TabIndex = 0;\r
             this.splBase.TabStop = false;\r
             this.splBase.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.splBase_SplitterMoved);\r
             // \r
+            // splConsole\r
+            // \r
+            this.splConsole.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) \r
+            | System.Windows.Forms.AnchorStyles.Left) \r
+            | System.Windows.Forms.AnchorStyles.Right)));\r
+            this.splConsole.Location = new System.Drawing.Point(0, 0);\r
+            this.splConsole.Name = "splConsole";\r
+            // \r
+            // splConsole.Panel1\r
+            // \r
+            this.splConsole.Panel1.Controls.Add(this.rConsole);\r
+            this.splConsole.Panel1.Controls.Add(this.txtInput);\r
+            // \r
+            // splConsole.Panel2\r
+            // \r
+            this.splConsole.Panel2.Controls.Add(this.rSubConsole);\r
+            this.splConsole.Size = new System.Drawing.Size(836, 275);\r
+            this.splConsole.SplitterDistance = 447;\r
+            this.splConsole.TabIndex = 1;\r
+            this.splConsole.TabStop = false;\r
+            this.splConsole.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.splConsole_SplitterMoved);\r
+            // \r
+            // rSubConsole\r
+            // \r
+            this.rSubConsole.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) \r
+            | System.Windows.Forms.AnchorStyles.Left) \r
+            | System.Windows.Forms.AnchorStyles.Right)));\r
+            this.rSubConsole.BackColor = System.Drawing.Color.Black;\r
+            this.rSubConsole.Font = new System.Drawing.Font("ＭＳ ゴシック", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));\r
+            this.rSubConsole.ForeColor = System.Drawing.Color.White;\r
+            this.rSubConsole.Location = new System.Drawing.Point(0, 0);\r
+            this.rSubConsole.Name = "rSubConsole";\r
+            this.rSubConsole.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical;\r
+            this.rSubConsole.Size = new System.Drawing.Size(388, 275);\r
+            this.rSubConsole.TabIndex = 0;\r
+            this.rSubConsole.TabStop = false;\r
+            this.rSubConsole.Text = "";\r
+            this.rSubConsole.MouseUp += new System.Windows.Forms.MouseEventHandler(this.rSubConsole_MouseUp);\r
+            // \r
+            // rConsole\r
+            // \r
+            this.rConsole.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) \r
+            | System.Windows.Forms.AnchorStyles.Left) \r
+            | System.Windows.Forms.AnchorStyles.Right)));\r
+            this.rConsole.BackColor = System.Drawing.Color.Black;\r
+            this.rConsole.ForeColor = System.Drawing.Color.White;\r
+            this.rConsole.Location = new System.Drawing.Point(3, 0);\r
+            this.rConsole.Multiline = true;\r
+            this.rConsole.Name = "rConsole";\r
+            this.rConsole.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;\r
+            this.rConsole.Size = new System.Drawing.Size(448, 255);\r
+            this.rConsole.TabIndex = 2;\r
+            this.rConsole.TabStop = false;\r
+            this.rConsole.MouseUp += new System.Windows.Forms.MouseEventHandler(this.rConsole_MouseUp);\r
+            // \r
             // BaseForm\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
-            this.ClientSize = new System.Drawing.Size(844, 712);\r
+            this.ClientSize = new System.Drawing.Size(844, 763);\r
             this.Controls.Add(this.splBase);\r
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
             this.Name = "BaseForm";\r
             this.Text = "Kybernetes v1.0.0";\r
-            this.ResizeEnd += new System.EventHandler(this.BaseForm_ResizeEnd);\r
             this.splBase.Panel1.ResumeLayout(false);\r
             this.splBase.Panel2.ResumeLayout(false);\r
-            this.splBase.Panel2.PerformLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.splBase)).EndInit();\r
             this.splBase.ResumeLayout(false);\r
+            this.splConsole.Panel1.ResumeLayout(false);\r
+            this.splConsole.Panel1.PerformLayout();\r
+            this.splConsole.Panel2.ResumeLayout(false);\r
+            ((System.ComponentModel.ISupportInitialize)(this.splConsole)).EndInit();\r
+            this.splConsole.ResumeLayout(false);\r
             this.ResumeLayout(false);\r
 \r
         }\r
@@ -156,13 +202,15 @@
 \r
         private System.Windows.Forms.Panel pnlTask;\r
         private System.Windows.Forms.TextBox txtInput;\r
-        private System.Windows.Forms.RichTextBox rConsole;\r
         private System.Windows.Forms.SaveFileDialog expData;\r
         private System.Windows.Forms.SaveFileDialog dmpData;\r
         private System.Windows.Forms.OpenFileDialog selSh;\r
         private System.Windows.Forms.ColorDialog BGColorDlg;\r
         private System.Windows.Forms.ColorDialog FRColorDlg;\r
         private System.Windows.Forms.SplitContainer splBase;\r
+        private System.Windows.Forms.SplitContainer splConsole;\r
+        private System.Windows.Forms.RichTextBox rSubConsole;\r
+        private System.Windows.Forms.TextBox rConsole;\r
     }\r
 }\r
 \r

diff --git a/base/view/BaseForm.cs b/base/view/BaseForm.cs
index c6164e4..ba9382f 100644 (file)
--- a/base/view/BaseForm.cs
+++ b/base/view/BaseForm.cs
@@ -6,6 +6,7 @@ using com.andoutomo.kybernetes.data.DAO;
 using System.Drawing;\r
 using com.andoutomo.kybernetes.data.accessor;\r
 using System.Runtime.InteropServices;\r
+using com.andoutomo.kybernetes.data;\r
 \r
 \r
 namespace com.andoutomo.kybernetes.view\r
@@ -53,7 +54,7 @@ namespace com.andoutomo.kybernetes.view
         {\r
             Credit creditForm = new Credit();\r
             creditForm.StartPosition = FormStartPosition.CenterParent;\r
-            \r
+\r
             creditForm.ShowDialog();\r
         }\r
         /// <summary>\r
@@ -62,7 +63,7 @@ namespace com.andoutomo.kybernetes.view
         /// <returns></returns>\r
         public string invokeExpDialog()\r
         {\r
-            DialogResult result =this.expData.ShowDialog();\r
+            DialogResult result = this.expData.ShowDialog();\r
             if (result == DialogResult.OK)\r
             {\r
                 return this.expData.FileName;\r
@@ -91,7 +92,7 @@ namespace com.andoutomo.kybernetes.view
         /// <returns></returns>\r
         public string invokeShellDialog()\r
         {\r
-            \r
+\r
             DialogResult result = this.selSh.ShowDialog();\r
             if (result == DialogResult.OK)\r
             {\r
@@ -157,17 +158,17 @@ namespace com.andoutomo.kybernetes.view
             set { exitSwitch = value; }\r
         }\r
 \r
-        private int lastRow=17;\r
+        private int lastRow = 17;\r
         /// <summary>\r
         /// パネルを追加します。\r
         /// </summary>\r
         /// <param name="data"></param>\r
         public void addPanel(TaskData data)\r
         {\r
-            Panel targetPanel = new PanelController(this).createRow(lastRow,data);\r
-            \r
+            Panel targetPanel = new PanelController(this).createRow(lastRow, data);\r
+\r
             pnlTask.Controls.Add(targetPanel);\r
-            lastRow += targetPanel.Height-1;\r
+            lastRow += targetPanel.Height - 1;\r
         }\r
         /// <summary>\r
         /// インデックスパネルを追加します\r
@@ -176,7 +177,7 @@ namespace com.andoutomo.kybernetes.view
         public void addIndexPanel(string timeArea)\r
         {\r
             Panel targetPanel = new IndexPanelController().createRow(timeArea, this.pnlTask.Width, lastRow, frColor);\r
-            \r
+\r
             pnlTask.Controls.Add(targetPanel);\r
             lastRow += targetPanel.Height - 1;\r
         }\r
@@ -204,7 +205,7 @@ namespace com.andoutomo.kybernetes.view
             for (int h = dummy; h > 0; h--)\r
             {\r
                 Control ctrl = pnlTask.Controls[h - 1];\r
-                \r
+\r
                 for (int i = ctrl.Controls.Count; i > 0; i--)\r
                 {\r
                     ctrl.Controls[i - 1].Dispose();\r
@@ -217,7 +218,7 @@ namespace com.andoutomo.kybernetes.view
             //先頭行は足す\r
             pnlTask.Controls.Add(new CaptionPanelController().createRow(this.pnlTask.Width, frColor));\r
             lastRow = 17;\r
-            \r
+\r
         }\r
         /// <summary>\r
         /// コマンド内容を表示するかどうかを決定します。\r
@@ -235,13 +236,13 @@ namespace com.andoutomo.kybernetes.view
         private void txtInput_KeyDown(object sender, KeyEventArgs e)\r
         {\r
             int currentYPosition;\r
-            int currentScrollHeight = this.pnlTask.Height - 20;\r
+            int currentScrollHeight = this.pnlTask.Height - 25;\r
             switch (e.KeyCode)\r
             {\r
                 case Keys.Enter:\r
                     e.SuppressKeyPress = true;\r
                     doCommand();\r
-                    \r
+\r
                     break;\r
 \r
                 case Keys.Space:\r
@@ -265,25 +266,40 @@ namespace com.andoutomo.kybernetes.view
                     break;\r
                 case Keys.Up:\r
                     e.SuppressKeyPress = true;\r
+\r
                     txtInput.Text = history.prevCommand();\r
                     txtInput.Select(this.txtInput.Text.Length, 0);\r
+\r
                     break;\r
                 case Keys.Down:\r
                     e.SuppressKeyPress = true;\r
+\r
                     txtInput.Text = history.nextCommand();\r
                     txtInput.Select(this.txtInput.Text.Length, 0);\r
-                    break;\r
 \r
+                    break;\r
                 case Keys.PageDown:\r
                     currentYPosition = Math.Abs(this.pnlTask.AutoScrollPosition.Y);\r
-                    this.pnlTask.AutoScrollPosition = new Point(0, currentYPosition + currentScrollHeight);\r
-\r
+                    if (e.Control)\r
+                    {\r
+                        this.pnlTask.AutoScrollPosition = new Point(0, currentYPosition + 25);\r
+                    }\r
+                    else\r
+                    {\r
+                        this.pnlTask.AutoScrollPosition = new Point(0, currentYPosition + currentScrollHeight);\r
+                    }\r
                     break;\r
 \r
                 case Keys.PageUp:\r
                     currentYPosition = Math.Abs(this.pnlTask.AutoScrollPosition.Y);\r
-                    this.pnlTask.AutoScrollPosition = new Point(0, currentYPosition - currentScrollHeight);\r
-\r
+                    if (e.Control)\r
+                    {\r
+                        this.pnlTask.AutoScrollPosition = new Point(0, currentYPosition - 25);\r
+                    }\r
+                    else\r
+                    {\r
+                        this.pnlTask.AutoScrollPosition = new Point(0, currentYPosition - currentScrollHeight);\r
+                    }\r
                     break;\r
             }\r
         }\r
@@ -293,14 +309,14 @@ namespace com.andoutomo.kybernetes.view
         private void doCommand()\r
         {\r
             rConsole.Focus();\r
-            \r
+\r
             if (Echo)\r
             {\r
                 addText(txtInput.Text);\r
             }\r
             KybernetesLogger.Log.trace("[dispatch]" + txtInput.Text);\r
-            \r
-            \r
+\r
+\r
             string result = wkOnCmdDispatch(txtInput.Text.Trim());\r
             if (!string.IsNullOrEmpty(result))\r
             {\r
@@ -398,7 +414,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)\r
         {\r
             DropBoxInputBox inputBox = new DropBoxInputBox(prompt);\r
             inputBox.StartPosition = FormStartPosition.CenterParent;\r
@@ -422,7 +438,7 @@ namespace com.andoutomo.kybernetes.view
         /// <returns></returns>\r
         public string showDropBoxInputBox(List<SimpleDataBean> list, string prompt, string defaultData)\r
         {\r
-            DropBoxInputBox inputBox = new DropBoxInputBox(prompt,defaultData);\r
+            DropBoxInputBox inputBox = new DropBoxInputBox(prompt, defaultData);\r
             inputBox.StartPosition = FormStartPosition.CenterParent;\r
             inputBox.setDropData(list);\r
 \r
@@ -443,35 +459,28 @@ namespace com.andoutomo.kybernetes.view
         /// <param name="e"></param>\r
         private void rConsole_MouseUp(object sender, MouseEventArgs e)\r
         {\r
+\r
             Clipboard.SetDataObject(rConsole.SelectedText.Trim());\r
             //txtInput.Text += rConsole.SelectedText.Trim();\r
             txtInput.Focus();\r
             //選択状態を解除する\r
             this.txtInput.Select(this.txtInput.Text.Length, 0);\r
-            \r
         }\r
         /// <summary>\r
-        /// ウィンドウ全体のサイズ変更時イベントハンドラです。\r
+        /// 選択対象をクリップボードにコピーします。サブコンソール版です。\r
         /// </summary>\r
         /// <param name="sender"></param>\r
         /// <param name="e"></param>\r
-        private void BaseForm_ResizeEnd(object sender, EventArgs e)\r
+        private void rSubConsole_MouseUp(object sender, MouseEventArgs e)\r
         {\r
-        //    panelResize();\r
+            Clipboard.SetDataObject(rSubConsole.SelectedText.Trim());\r
 \r
+            txtInput.Focus();\r
+            this.txtInput.Select(this.txtInput.Text.Length, 0);\r
         }\r
+\r
         /// <summary>\r
-        /// タスクパネルの大きさ調整を行います。\r
-        /// 起動されるのは、ウィンドウ全体のサイズ変更時、及びコマンド実行時です。\r
-        /// </summary>\r
-        //private void panelResize()\r
-        //{\r
-            //rConsole.Size = new Size(this.Width - 30, this.Height / 3);\r
-            //pnlTask.Size = new Size(this.Size.Width - 30, this.Size.Height - rConsole.Height-80);\r
-            //rConsole.Location = new Point(5,pnlTask.Size.Height + 10);\r
-        //}\r
-        /// <summary>\r
-        /// 背景色設定を呼び出します。\r
+        /// 背景色設定を呼び出します。パネルとサブコンソールが対象です。\r
         /// </summary>\r
         public bool setPnlBackground()\r
         {\r
@@ -479,10 +488,11 @@ namespace com.andoutomo.kybernetes.view
             if (res == System.Windows.Forms.DialogResult.OK)\r
             {\r
                 pnlTask.BackColor = BGColorDlg.Color;\r
+                rSubConsole.BackColor = BGColorDlg.Color;\r
                 return true;\r
             }\r
             else { return false; }\r
-         \r
+\r
         }\r
         /// <summary>\r
         /// 前景色設定を呼び出します.\r
@@ -494,6 +504,7 @@ namespace com.andoutomo.kybernetes.view
             if (res == System.Windows.Forms.DialogResult.OK)\r
             {\r
                 frColor = FRColorDlg.Color;\r
+                rSubConsole.ForeColor = FRColorDlg.Color;\r
                 return true;\r
             }\r
             else { return false; }\r
@@ -508,7 +519,7 @@ namespace com.andoutomo.kybernetes.view
         {\r
             txtInput.Focus();\r
         }\r
-\r
+        \r
         /// <summary>\r
         /// タイマーを呼び出します。\r
         /// タイマーはモードレスダイアログとして表示されます。\r
@@ -528,12 +539,17 @@ namespace com.andoutomo.kybernetes.view
             form.Owner = this;\r
             form.Show();\r
         }\r
+        /// <summary>\r
+        /// タイマーを呼び出します。タイトルも付けます。\r
+        /// </summary>\r
+        /// <param name="second"></param>\r
+        /// <param name="title"></param>\r
         public void showTimer(int second, string title)\r
         {\r
             ClockForm form;\r
             if (second > 0)\r
             {\r
-                form = new ClockForm(second * 60,title);\r
+                form = new ClockForm(second * 60, title);\r
             }\r
             else\r
             {\r
@@ -582,22 +598,40 @@ namespace com.andoutomo.kybernetes.view
             FlashWindowEx(ref fInfo);\r
         }\r
         #endregion\r
-\r
+        /// <summary>\r
+        /// バッチコマンド用です。ちょっと迂遠ですが、バッチで読み込んだコマンドを\r
+        /// フォームで受け取り、さらにもう一回ディスパッチをフォームから依頼します。\r
+        /// </summary>\r
+        /// <param name="command"></param>\r
         public void cmdForBatch(string command)\r
         {\r
-            this.addText( wkOnCmdDispatch(command));\r
+            this.addText(wkOnCmdDispatch(command));\r
         }\r
 \r
-\r
+        /// <summary>\r
+        /// コマンド実行時のハンドラです。\r
+        /// </summary>\r
+        /// <param name="sender"></param>\r
+        /// <param name="e"></param>\r
         public delegate void CmdDispatchEventHandler(object sender, CmdDispatchEventArg e);\r
+\r
+        /// <summary>\r
+        /// コマンドイベントです。コマンド実行時処理をここに設定してください。\r
+        /// </summary>\r
         public event CmdDispatchEventHandler onCmdDispatch;\r
+        /// <summary>\r
+        /// コマンドディスパッチを実施し、戻り値(CmdDispatchEventArg.Result)から\r
+        /// 画面表示用のテキストを受領します。\r
+        /// </summary>\r
+        /// <param name="command"></param>\r
+        /// <returns></returns>\r
         string wkOnCmdDispatch(string command)\r
         {\r
             if (onCmdDispatch != null)\r
             {\r
                 CmdDispatchEventArg args = new CmdDispatchEventArg();\r
                 args.Command = command;\r
-                \r
+\r
                 onCmdDispatch(this, args);\r
 \r
                 return args.Result;\r
@@ -607,8 +641,50 @@ namespace com.andoutomo.kybernetes.view
                 throw new KybernetesApplicationException();\r
             }\r
         }\r
-    }\r
 \r
+        public void showOnSubConsole(List<string> estTimeStr)\r
+        {\r
+            this.rSubConsole.Text = System.Environment.NewLine;\r
+\r
+            foreach (string str in estTimeStr)\r
+            {\r
+                this.rSubConsole.AppendText(\r
+                    str + System.Environment.NewLine);\r
+            }\r
+        }\r
 \r
+        public void showOnPanel(List<TaskData> taskList)\r
+        {\r
+\r
+            clearPanel();\r
+            string wkAreaForIndex = "";\r
+            DateComponent wkIndexDate = new DateComponent("19000101");\r
+            foreach (TaskData data in taskList)\r
+            {\r
+                //data.Today = todayDate;\r
+                if (!data.isComplete)\r
+                {\r
+                    if (wkAreaForIndex != data.TimeArea || wkIndexDate.calculateDateDiff(data.DoDate) != 0)\r
+                    {\r
+                        string wkIndex = "- " + data.TimeArea + " - on " + data.DoDate.getDateString("yyyy/MM/dd");\r
+                        addIndexPanel(wkIndex);\r
+                    }\r
+\r
+                    wkAreaForIndex = data.TimeArea;\r
+                    wkIndexDate = data.DoDate;\r
+                }\r
+                addPanel(data);\r
+\r
+            }\r
+        }\r
+\r
+        private void splConsole_SplitterMoved(object sender, SplitterEventArgs e)\r
+        {\r
+            txtInput.Focus();\r
+        }\r
+\r
+\r
+\r
+    }\r
 \r
-}\r
+}
\ No newline at end of file

diff --git a/base/view/BaseForm.resx b/base/view/BaseForm.resx
index 3a0d304..4683cb1 100644 (file)
--- a/base/view/BaseForm.resx
+++ b/base/view/BaseForm.resx
@@ -132,6 +132,9 @@
   <metadata name="FRColorDlg.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>428, 17</value>\r
   </metadata>\r
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+    <value>25</value>\r
+  </metadata>\r
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r

diff --git a/kybernetes2.suo b/kybernetes2.suo
index dea73a5..0e1ffcb 100644 (file)
Binary files a/kybernetes2.suo and b/kybernetes2.suo differ

diff --git a/main/Properties/AssemblyInfo.cs b/main/Properties/AssemblyInfo.cs
index f11b622..67e1f8f 100644 (file)
--- a/main/Properties/AssemblyInfo.cs
+++ b/main/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@ using System.Resources;
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を \r
 // 既定値にすることができます:\r
 // [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("1.1.5.1")]\r
-[assembly: AssemblyFileVersion("1.1.5.1")]\r
+[assembly: AssemblyVersion("1.1.6.0")]\r
+[assembly: AssemblyFileVersion("1.1.6.0")]\r
 [assembly: NeutralResourcesLanguageAttribute("ja")]\r

diff --git a/main/bin/Debug/setting.db b/main/bin/Debug/setting.db
index 11bf670..a28b288 100644 (file)
Binary files a/main/bin/Debug/setting.db and b/main/bin/Debug/setting.db differ

diff --git a/main/bin/Debug/user.db b/main/bin/Debug/user.db
index fa404e7..d9e56b4 100644 (file)
Binary files a/main/bin/Debug/user.db and b/main/bin/Debug/user.db differ

diff --git a/main/command/CRUD/EstimateCommand.cs b/main/command/CRUD/EstimateCommand.cs
index 22ce2f5..21dd896 100644 (file)
--- a/main/command/CRUD/EstimateCommand.cs
+++ b/main/command/CRUD/EstimateCommand.cs
@@ -11,6 +11,7 @@ namespace com.andoutomo.kybernetes.command.reference
         {\r
             EstimateCommandArg param = (EstimateCommandArg)argument;\r
             string targetDate=string.Empty;\r
+            bool isToday;\r
 \r
             //タスクリストを取得\r
             List<TaskData> taskList;\r
@@ -18,12 +19,13 @@ namespace com.andoutomo.kybernetes.command.reference
             {\r
                 taskList = TaskDataAccessor.getObject.getToDayTaskList();\r
                 targetDate="本日";\r
+                isToday = true;\r
             }\r
             else\r
             {\r
                 taskList = TaskDataAccessor.getObject.getDailyTaskList(param.targetDate);\r
                 targetDate = param.targetDate.getDateString();\r
-\r
+                isToday = false;\r
             }\r
             //タイムエリアマスタからマスターリストを取得\r
             List<TimeAreaCalcData> timeAreaList = TimeAreaDataAccessor.getObject.getAllTimeAreaForCalc();\r
@@ -55,13 +57,13 @@ namespace com.andoutomo.kybernetes.command.reference
             }\r
 \r
             List<string> msgList = new List<string>();\r
-            //msgList.Add(targetDate + "の作業見積もり及び実績");\r
-            //msgList.Add(string.Empty);\r
+            msgList.Add(targetDate + "の作業見積もり及び実績");\r
+            msgList.Add(string.Empty);\r
             msgList.Add(" @ FROM-TO     Span  Forecast REAL  REMAIN ");\r
             foreach (TimeAreaCalcData area_ in timeAreaList)\r
             {\r
                 // image: @ FROM-TO     Span  Forecast REAL  REMAIN \r
-                // image: A 09:00-12:00  3:00  2:40     3:20  1:10\r
+                // image: A 09:00-12:00 3:00  2:40     3:20  1:10  \r
                 string estimateStr = " " + area_.AreaStr;\r
                 estimateStr += " ";\r
                 estimateStr += getFiveLengthTimeStr(area_.StartTime);\r
@@ -75,16 +77,20 @@ namespace com.andoutomo.kybernetes.command.reference
                 estimateStr += new TimeComponent(area_.ActualMin).ToString();\r
                 estimateStr += " ";\r
                 estimateStr += new TimeComponent(area_.RemainMin).ToString();\r
-\r
+                //estimateStr += "   ";\r
+                //estimateStr += area_.Indicator;\r
                 msgList.Add(estimateStr);\r
             }\r
             msgList.Add(string.Empty);\r
-            msgList.Add("現在時刻    : " + TimeComponent.justNow().ToString());\r
-            msgList.Add("残り作業    : " + new TimeComponent(minuteRemains).ToString());\r
-            msgList.Add("予想終了時刻: " + TimeComponent.justNow().add(minuteRemains).ToString());\r
-            //msgList.Add(string.Empty);\r
-\r
-            form.addMultiText(msgList);\r
+            //本日分だけ予想終了時刻を算出する\r
+            if (isToday)\r
+            {\r
+                msgList.Add("現在時刻    : " + TimeComponent.justNow().ToString());\r
+                msgList.Add("残り作業    : " + new TimeComponent(minuteRemains).ToString());\r
+                msgList.Add("予想終了時刻: " + TimeComponent.justNow().add(minuteRemains).ToString());\r
+                //msgList.Add(string.Empty);\r
+            }\r
+            form.showOnSubConsole(msgList);\r
             return true;\r
         }\r
 \r

diff --git a/main/command/CRUD/ListCommand.cs b/main/command/CRUD/ListCommand.cs
index 4ccb057..38dee18 100644 (file)
--- a/main/command/CRUD/ListCommand.cs
+++ b/main/command/CRUD/ListCommand.cs
@@ -47,25 +47,7 @@ namespace com.andoutomo.kybernetes.command
                     }\r
                 }\r
 \r
-\r
-            form.clearPanel();\r
-            string wkAreaForIndex = "";\r
-            foreach (TaskData data in dataList)\r
-            {\r
-                data.Today = todayDate;\r
-                if (!data.isComplete)\r
-                {\r
-                    if (wkAreaForIndex != data.TimeArea)\r
-                    {\r
-                        string wkIndex = "- " + data.TimeArea + " - on " + data.DoDate.getDateString("yyyy/MM/dd");\r
-                        form.addIndexPanel(wkIndex);\r
-                    }\r
-                \r
-                wkAreaForIndex = data.TimeArea;\r
-                }\r
-                form.addPanel(data);\r
-                \r
-            }\r
+                form.showOnPanel(dataList);\r
 \r
             message = string.Empty;\r
             return true;\r

diff --git a/main/command/CRUD/LongListCommand.cs b/main/command/CRUD/LongListCommand.cs
index d9be425..0775f78 100644 (file)
--- a/main/command/CRUD/LongListCommand.cs
+++ b/main/command/CRUD/LongListCommand.cs
@@ -23,25 +23,9 @@ namespace com.andoutomo.kybernetes.command.CRUD
             {\r
                 taskList = TaskDataAccessor.getObject.getDailyTaskList(param.targetDate);\r
             }\r
-            \r
-            form.clearPanel();\r
+            //パネルに表示する\r
+            form.showOnPanel(taskList);\r
 \r
-            string wkAreaForIndex = "";\r
-            foreach (TaskData data in taskList)\r
-            {\r
-                data.Today = today;\r
-                if (!data.isComplete)\r
-                {\r
-                    if (wkAreaForIndex != data.TimeArea)\r
-                    {\r
-                        string wkIndex = "- " + data.TimeArea + " - on " + data.DoDate.getDateString("yyyy/MM/dd");\r
-                        form.addIndexPanel(wkIndex);\r
-                    }\r
-\r
-                    wkAreaForIndex = data.TimeArea;\r
-                }\r
-                form.addPanel(data);\r
-            }\r
             //ベースクラスを呼び出し見積もりを表示する\r
             return base.execute();\r
 \r

diff --git a/main/command/Control/DuplicateCommand.cs b/main/command/Control/DuplicateCommand.cs
index 227a7fd..31fb874 100644 (file)
--- a/main/command/Control/DuplicateCommand.cs
+++ b/main/command/Control/DuplicateCommand.cs
@@ -21,9 +21,13 @@ namespace com.andoutomo.kybernetes.command.Control
             // 次番号を取得\r
             data.TaskID = accessor.getMaxTaskID();\r
             data.SortID = accessor.getMaxSortID();\r
-            //見積もり時間は0にする。\r
-            data.ForecastMin = 0;\r
-\r
+            \r
+            //poptionがない場合\r
+            if (!param.poption)\r
+            {\r
+                //見積もり時間は0にする。\r
+                data.ForecastMin = 0;\r
+            }\r
 \r
             //データをインサート\r
             if (accessor.insertTask(data) \r

diff --git a/main/command/Control/DuplicateCommandArg.cs b/main/command/Control/DuplicateCommandArg.cs
index c9d37d1..9d109f2 100644 (file)
--- a/main/command/Control/DuplicateCommandArg.cs
+++ b/main/command/Control/DuplicateCommandArg.cs
@@ -4,9 +4,22 @@ namespace com.andoutomo.kybernetes.command.Control
 {\r
     class DuplicateCommandArg:StandardCommandArg\r
     {\r
+        internal bool poption\r
+        {\r
+            get;\r
+            private set;\r
+        }\r
 \r
         protected override void split()\r
         {\r
+            poption = false;\r
+            if (base.splitData.Length > 2)\r
+            {\r
+                if (splitData[2] == "-p")\r
+                {\r
+                    poption = true;\r
+                }\r
+            }\r
             return;\r
         }\r
 \r

diff --git a/main/command/SYSTEM/HelpCommand.cs b/main/command/SYSTEM/HelpCommand.cs
index 6b3ce69..cb0c05c 100644 (file)
--- a/main/command/SYSTEM/HelpCommand.cs
+++ b/main/command/SYSTEM/HelpCommand.cs
@@ -30,7 +30,7 @@ namespace com.andoutomo.kybernetes.command
                         resList.Add("  " + help.cmdStr + "    " + help.cmdSummary);\r
                     }\r
 \r
-                    base.form.addMultiText(resList);\r
+                    form.showOnSubConsole(resList);\r
 \r
                     break;\r
                 case HelpCommandType.One:\r
@@ -51,7 +51,7 @@ namespace com.andoutomo.kybernetes.command
                         resList2.Add(string.Empty);\r
                         resList2.Add(data.cmdDetail);\r
 \r
-                        base.form.addMultiText(resList2);\r
+                        form.showOnSubConsole(resList2);\r
                     }\r
                     else\r
                     {\r

diff --git a/main/command/SYSTEM/LinkCommand.cs b/main/command/SYSTEM/LinkCommand.cs
index 020230e..2d3dba9 100644 (file)
--- a/main/command/SYSTEM/LinkCommand.cs
+++ b/main/command/SYSTEM/LinkCommand.cs
@@ -25,7 +25,7 @@ namespace com.andoutomo.kybernetes.command.SYSTEM
                 {\r
                     retList.Add(data.Name + " -> " + data.Val);\r
                 }\r
-                form.addMultiText(retList);\r
+                form.showOnSubConsole(retList);\r
                 retStr = string.Empty;\r
                 return true;\r
             }\r

diff --git a/main/command/reference/FindCommand.cs b/main/command/reference/FindCommand.cs
index 96e09cf..1513fd6 100644 (file)
--- a/main/command/reference/FindCommand.cs
+++ b/main/command/reference/FindCommand.cs
@@ -27,23 +27,7 @@ namespace com.andoutomo.kybernetes.command.reference
                 message = dataList.Count + "件のタスクが見つかりました。";\r
             }\r
 \r
-            form.clearPanel();\r
-            string wkAreaForIndex = "";\r
-            foreach (TaskData data in dataList)\r
-            {\r
-                data.Today = todayDate;\r
-                if (!data.isComplete)\r
-                {\r
-                    if (wkAreaForIndex != data.TimeArea)\r
-                    {\r
-                        string wkIndex = "- " + data.TimeArea + " - on " + data.DoDate.getDateString("yyyy/MM/dd");\r
-                        form.addIndexPanel(wkIndex);\r
-                    }\r
-\r
-                    wkAreaForIndex = data.TimeArea;\r
-                }\r
-                form.addPanel(data);\r
-            }\r
+            form.showOnPanel(dataList);\r
 \r
             return true;\r
         }\r

diff --git a/main/command/reference/PwdCommand.cs b/main/command/reference/PwdCommand.cs
index fa149a7..5abb662 100644 (file)
--- a/main/command/reference/PwdCommand.cs
+++ b/main/command/reference/PwdCommand.cs
@@ -46,7 +46,7 @@ namespace com.andoutomo.kybernetes.command.reference
 \r
             }\r
             \r
-            form.addMultiText(retList);\r
+            form.showOnSubConsole(retList);\r
 \r
             return true;\r
         }\r

diff --git a/main/command/reference/ShowCommand.cs b/main/command/reference/ShowCommand.cs
index 7ac9ed6..c00a859 100644 (file)
--- a/main/command/reference/ShowCommand.cs
+++ b/main/command/reference/ShowCommand.cs
@@ -75,7 +75,7 @@ namespace com.andoutomo.kybernetes.command.reference
             }\r
 \r
 \r
-            form.addMultiText(resultList);\r
+            form.showOnSubConsole(resultList);\r
 \r
             return true;\r
         }\r

diff --git a/main/command/reference/SimulateCommand.cs b/main/command/reference/SimulateCommand.cs
index f95eba1..72706b5 100644 (file)
--- a/main/command/reference/SimulateCommand.cs
+++ b/main/command/reference/SimulateCommand.cs
@@ -70,7 +70,7 @@ namespace com.andoutomo.kybernetes.command.reference
             retList.Add(string.Empty);\r
             retList.Add("終了予定時間 " + baseTime.ToString());\r
 \r
-            form.addMultiText(retList);\r
+            form.showOnSubConsole(retList);\r
 \r
             return true;\r
         }\r

diff --git a/main/command/reference/SumCommand.cs b/main/command/reference/SumCommand.cs
index fc0ea8a..2a04d6c 100644 (file)
--- a/main/command/reference/SumCommand.cs
+++ b/main/command/reference/SumCommand.cs
@@ -36,7 +36,7 @@ namespace com.andoutomo.kybernetes.command.reference
             resultList.Add("予想時間：" + forcast.ToString() + " ( " + forcast.TotalMinute  + " 分)");\r
             resultList.Add("実績時間：" + realTime.ToString() + " ( " + realTime.TotalMinute + " 分)");\r
 \r
-            form.addMultiText(resultList);\r
+            form.showOnSubConsole(resultList);\r
 \r
             return true;\r
         }\r