1.1.0.2 マイナーチェンジ

ウィンドウサイズの変更に対応
DBインデックス調整

diff --git a/KyberNetes/Properties/AssemblyInfo.cs b/KyberNetes/Properties/AssemblyInfo.cs
index 9987b5c..b56a844 100644 (file)
--- a/KyberNetes/Properties/AssemblyInfo.cs
+++ b/KyberNetes/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を \r
 // 既定値にすることができます:\r
 // [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("1.1.0.1")]\r
-[assembly: AssemblyFileVersion("1.1.0.1")]\r
+[assembly: AssemblyVersion("1.1.0.2")]\r
+[assembly: AssemblyFileVersion("1.1.0.2")]\r

diff --git a/KyberNetes/bin/Release/setting.db b/KyberNetes/bin/Release/setting.db
new file mode 100644 (file)
index 0000000..b8ae25c
Binary files /dev/null and b/KyberNetes/bin/Release/setting.db differ

diff --git a/KyberNetes/bin/Release/user.db b/KyberNetes/bin/Release/user.db
new file mode 100644 (file)
index 0000000..07120fc
Binary files /dev/null and b/KyberNetes/bin/Release/user.db differ

diff --git a/KyberNetes/view/BaseForm.Designer.cs b/KyberNetes/view/BaseForm.Designer.cs
index 6f3a4c4..52567a3 100644 (file)
--- a/KyberNetes/view/BaseForm.Designer.cs
+++ b/KyberNetes/view/BaseForm.Designer.cs
@@ -38,12 +38,13 @@
             // \r
             // pnlTask\r
             // \r
-            this.pnlTask.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));\r
+            this.pnlTask.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.pnlTask.AutoScroll = true;\r
             this.pnlTask.AutoSize = true;\r
             this.pnlTask.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             this.pnlTask.Location = new System.Drawing.Point(5, 5);\r
-            this.pnlTask.MaximumSize = new System.Drawing.Size(780, 400);\r
             this.pnlTask.MinimumSize = new System.Drawing.Size(780, 400);\r
             this.pnlTask.Name = "pnlTask";\r
             this.pnlTask.Size = new System.Drawing.Size(780, 400);\r

diff --git a/KyberNetes/view/BaseForm.cs b/KyberNetes/view/BaseForm.cs
index ec2b52d..3605a93 100644 (file)
--- a/KyberNetes/view/BaseForm.cs
+++ b/KyberNetes/view/BaseForm.cs
@@ -33,7 +33,10 @@ namespace com.andoutomo.kybernetes.view
         }\r
         private CmdHistory history;\r
 \r
-\r
+        /// <summary>\r
+        /// カテゴリ設定ダイアログを表示します。\r
+        /// </summary>\r
+        /// <param name="arg"></param>\r
         internal void invokeCategSettingDialog(List<CategoryData> arg)\r
         {\r
             CategorySetting categSetting = new CategorySetting();\r
@@ -68,6 +71,10 @@ namespace com.andoutomo.kybernetes.view
                 return string.Empty;\r
             }\r
         }\r
+        /// <summary>\r
+        /// ダンプ用のファイルダイアログを開いて選択したファイルパスを返します。\r
+        /// </summary>\r
+        /// <returns></returns>\r
         internal string invokeDmpDialog()\r
         {\r
             DialogResult result = this.dmpData.ShowDialog();\r
@@ -117,14 +124,16 @@ namespace com.andoutomo.kybernetes.view
             rConsole.AppendText("> ");\r
         }\r
 \r
-\r
+        internal int getPanelSize()\r
+        {\r
+            return this.pnlTask.Width;\r
+        }\r
         /// <summary>\r
         /// コンソールをクリアします。\r
         /// </summary>\r
         internal void clearText()\r
         {\r
             rConsole.Clear();\r
-            \r
         }\r
 \r
         private bool exitSwitch = false;\r
@@ -165,7 +174,7 @@ namespace com.andoutomo.kybernetes.view
         {\r
             pnlTask.Controls.Clear();\r
             //先頭行は足す\r
-            pnlTask.Controls.Add(new CaptionPanelController().createRow());\r
+            pnlTask.Controls.Add(new CaptionPanelController().createRow(this.pnlTask.Width));\r
             lastRow = 17;\r
         }\r
         /// <summary>\r

diff --git a/KyberNetes/view/CaptionPanelController.cs b/KyberNetes/view/CaptionPanelController.cs
index 872e533..e9b5836 100644 (file)
--- a/KyberNetes/view/CaptionPanelController.cs
+++ b/KyberNetes/view/CaptionPanelController.cs
@@ -5,8 +5,11 @@ namespace com.andoutomo.kybernetes.view
 {\r
     class CaptionPanelController\r
     {\r
-        internal Panel createRow()\r
+        internal Panel createRow(int totalRowSize)\r
         {\r
+            int wkContentSize = totalRowSize - 570;\r
+            int wkDelaySize = wkContentSize - 210;\r
+\r
             Panel rowPanel = new Panel();\r
             rowPanel.Controls.Add(new CustomLabel("□", Color.FromArgb(0, 0, 0), Color.FromArgb(255, 255, 255), FontStyle.Regular, 9F, 0, 21, 16, ContentAlignment.MiddleCenter));\r
             rowPanel.Controls.Add(new CustomLabel("Date", Color.FromArgb(0, 0, 0), Color.FromArgb(255, 255, 255), FontStyle.Regular, 9F, 20, 56, 16, ContentAlignment.MiddleCenter));\r
@@ -14,17 +17,17 @@ namespace com.andoutomo.kybernetes.view
             rowPanel.Controls.Add(new CustomLabel("＠", Color.FromArgb(0, 0, 0), Color.FromArgb(255, 255, 255), FontStyle.Regular, 9F, 100, 21, 16, ContentAlignment.MiddleCenter));\r
             rowPanel.Controls.Add(new CustomLabel("ID", Color.FromArgb(0, 0, 0), Color.FromArgb(255, 255, 255), FontStyle.Regular, 9F, 120, 41, 16, ContentAlignment.MiddleCenter));\r
             rowPanel.Controls.Add(new CustomLabel("Category", Color.FromArgb(0, 0, 0), Color.FromArgb(255, 255, 255), FontStyle.Regular, 9F, 160, 81, 16, ContentAlignment.MiddleCenter));\r
-            rowPanel.Controls.Add(new CustomLabel("作業内容", Color.FromArgb(0, 0, 0), Color.FromArgb(255, 255, 255), FontStyle.Regular, 9F, 240, 211, 16, ContentAlignment.MiddleCenter));\r
-            rowPanel.Controls.Add(new CustomLabel("見積H", Color.FromArgb(0, 0, 0), Color.FromArgb(255, 255, 255), FontStyle.Regular, 9F, 450, 51, 16, ContentAlignment.MiddleCenter));\r
-            rowPanel.Controls.Add(new CustomLabel("見積m", Color.FromArgb(0, 0, 0), Color.FromArgb(255, 255, 255), FontStyle.Regular, 9F, 500, 51, 16, ContentAlignment.MiddleCenter));\r
-            rowPanel.Controls.Add(new CustomLabel("実績", Color.FromArgb(0, 0, 0), Color.FromArgb(255, 255, 255), FontStyle.Regular, 9F, 550, 51, 16, ContentAlignment.MiddleCenter));\r
-            rowPanel.Controls.Add(new CustomLabel("開始", Color.FromArgb(0, 0, 0), Color.FromArgb(255, 255, 255), FontStyle.Regular, 9F, 600, 61, 16, ContentAlignment.MiddleCenter));\r
-            rowPanel.Controls.Add(new CustomLabel("終了", Color.FromArgb(0, 0, 0), Color.FromArgb(255, 255, 255), FontStyle.Regular, 9F, 660, 61, 16, ContentAlignment.MiddleCenter));\r
-            rowPanel.Controls.Add(new CustomLabel("R", Color.FromArgb(0, 0, 0), Color.FromArgb(255, 255, 255), FontStyle.Regular, 9F, 720, 21, 16, ContentAlignment.MiddleCenter));\r
-            rowPanel.Controls.Add(new CustomLabel("C", Color.FromArgb(0, 0, 0), Color.FromArgb(255, 255, 255), FontStyle.Regular, 9F, 740, 21, 16, ContentAlignment.MiddleCenter));\r
+            rowPanel.Controls.Add(new CustomLabel("作業内容", Color.FromArgb(0, 0, 0), Color.FromArgb(255, 255, 255), FontStyle.Regular, 9F, 240, wkContentSize, 16, ContentAlignment.MiddleCenter));\r
+            rowPanel.Controls.Add(new CustomLabel("見積H", Color.FromArgb(0, 0, 0), Color.FromArgb(255, 255, 255), FontStyle.Regular, 9F, wkDelaySize + 450, 51, 16, ContentAlignment.MiddleCenter));\r
+            rowPanel.Controls.Add(new CustomLabel("見積m", Color.FromArgb(0, 0, 0), Color.FromArgb(255, 255, 255), FontStyle.Regular, 9F, wkDelaySize + 500, 51, 16, ContentAlignment.MiddleCenter));\r
+            rowPanel.Controls.Add(new CustomLabel("実績", Color.FromArgb(0, 0, 0), Color.FromArgb(255, 255, 255), FontStyle.Regular, 9F, wkDelaySize + 550, 51, 16, ContentAlignment.MiddleCenter));\r
+            rowPanel.Controls.Add(new CustomLabel("開始", Color.FromArgb(0, 0, 0), Color.FromArgb(255, 255, 255), FontStyle.Regular, 9F, wkDelaySize + 600, 61, 16, ContentAlignment.MiddleCenter));\r
+            rowPanel.Controls.Add(new CustomLabel("終了", Color.FromArgb(0, 0, 0), Color.FromArgb(255, 255, 255), FontStyle.Regular, 9F, wkDelaySize + 660, 61, 16, ContentAlignment.MiddleCenter));\r
+            rowPanel.Controls.Add(new CustomLabel("R", Color.FromArgb(0, 0, 0), Color.FromArgb(255, 255, 255), FontStyle.Regular, 9F, wkDelaySize + 720, 21, 16, ContentAlignment.MiddleCenter));\r
+            rowPanel.Controls.Add(new CustomLabel("C", Color.FromArgb(0, 0, 0), Color.FromArgb(255, 255, 255), FontStyle.Regular, 9F, wkDelaySize + 740, 21, 16, ContentAlignment.MiddleCenter));\r
 \r
             rowPanel.Location = new Point(0, 0);\r
-            rowPanel.Size = new Size(761, 16);\r
+            rowPanel.Size = new Size(wkContentSize + 570 - 19, 16);\r
 \r
             rowPanel.TabStop = false;\r
 \r

diff --git a/KyberNetes/view/PanelController.cs b/KyberNetes/view/PanelController.cs
index 3ebb793..3a03a52 100644 (file)
--- a/KyberNetes/view/PanelController.cs
+++ b/KyberNetes/view/PanelController.cs
@@ -80,6 +80,12 @@ namespace com.andoutomo.kybernetes.view
                 }\r
 \r
             }\r
+            //全体サイズからContentの長さを決める。\r
+            \r
+            int wkPanelSize = baseForm.getPanelSize();\r
+\r
+            int wkContentSize = wkPanelSize - 570;\r
+            int wkDelaySize = wkContentSize - 210;\r
             sortID = data.SortID;\r
 \r
             rowPanel.Controls.Add(new CustomLabel(data.Indicator, frColor, bgColor, FontStyle.Regular, 9F, 0, 21, rowsize,ContentAlignment.MiddleCenter));\r
@@ -88,17 +94,17 @@ namespace com.andoutomo.kybernetes.view
             rowPanel.Controls.Add(new CustomLabel(data.TimeArea, frColor, bgColor, style, 9F, 100, 21, rowsize,ContentAlignment.MiddleCenter));\r
             rowPanel.Controls.Add(new CustomLabel(data.SortID.ToString(), frColor, bgColor, style, 9F, 120, 41, rowsize,ContentAlignment.MiddleRight));\r
             rowPanel.Controls.Add(new CustomLabel(data.Category, frColor, bgColor, style, 9F, 160, 81, rowsize));\r
-            rowPanel.Controls.Add(new CustomLabel(data.Contents, frColor, bgColor, style, 9F, 240, 211, rowsize));\r
-            rowPanel.Controls.Add(new CustomLabel(data.getForcastHourStr, frColor, bgColor, timeStyle, fontsize, 450, 51, rowsize,ContentAlignment.MiddleRight));\r
-            rowPanel.Controls.Add(new CustomLabel(data.ForecastMin.ToString(), frColor, bgColor, timeStyle, fontsize, 500, 51, rowsize,ContentAlignment.MiddleRight));\r
-            rowPanel.Controls.Add(new CustomLabel(data.RealMin.ToString(), frColor, bgColor, timeStyle, fontsize, 550, 51, rowsize,ContentAlignment.MiddleRight));\r
-            rowPanel.Controls.Add(new CustomLabel(data.StartTime.ToString(), frColor, bgColor, style, 9F, 600, 61, rowsize,ContentAlignment.MiddleCenter));\r
-            rowPanel.Controls.Add(new CustomLabel(data.EndTime.ToString(), frColor, bgColor, style, 9F, 660, 61, rowsize,ContentAlignment.MiddleCenter));\r
-            rowPanel.Controls.Add(new CustomLabel((data.IsRepeat == 1 ? "R" : ""), frColor, bgColor, style, 9F, 720, 21, rowsize,ContentAlignment.MiddleCenter));\r
-            rowPanel.Controls.Add(new CustomLabel((data.HasComment==1 ? "*" : ""), frColor, bgColor, style, 9F, 740, 21, rowsize,ContentAlignment.MiddleCenter));\r
+            rowPanel.Controls.Add(new CustomLabel(data.Contents, frColor, bgColor, style, 9F, 240, wkContentSize + 1, rowsize));\r
+            rowPanel.Controls.Add(new CustomLabel(data.getForcastHourStr, frColor, bgColor, timeStyle, fontsize, wkDelaySize + 450, 51, rowsize,ContentAlignment.MiddleRight));\r
+            rowPanel.Controls.Add(new CustomLabel(data.ForecastMin.ToString(), frColor, bgColor, timeStyle, fontsize, wkDelaySize + 500, 51, rowsize, ContentAlignment.MiddleRight));\r
+            rowPanel.Controls.Add(new CustomLabel(data.RealMin.ToString(), frColor, bgColor, timeStyle, fontsize, wkDelaySize + 550, 51, rowsize, ContentAlignment.MiddleRight));\r
+            rowPanel.Controls.Add(new CustomLabel(data.StartTime.ToString(), frColor, bgColor, style, 9F, wkDelaySize + 600, 61, rowsize, ContentAlignment.MiddleCenter));\r
+            rowPanel.Controls.Add(new CustomLabel(data.EndTime.ToString(), frColor, bgColor, style, 9F, wkDelaySize + 660, 61, rowsize, ContentAlignment.MiddleCenter));\r
+            rowPanel.Controls.Add(new CustomLabel((data.IsRepeat == 1 ? "R" : ""), frColor, bgColor, style, 9F, wkDelaySize + 720, 21, rowsize, ContentAlignment.MiddleCenter));\r
+            rowPanel.Controls.Add(new CustomLabel((data.HasComment == 1 ? "*" : ""), frColor, bgColor, style, 9F, wkDelaySize + 740, 21, rowsize, ContentAlignment.MiddleCenter));\r
 \r
             rowPanel.Location = new Point(0, point);\r
-            rowPanel.Size = new Size(761, rowsize);\r
+            rowPanel.Size = new Size(wkPanelSize - 19, rowsize);\r
             \r
             rowPanel.TabStop = false;\r
             foreach (Control eachControls in rowPanel.Controls)\r
@@ -136,6 +142,7 @@ namespace com.andoutomo.kybernetes.view
             this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             this.TabIndex = 0;\r
             this.TextAlign = ContentAlignment.MiddleLeft;\r
+            this.Anchor = (AnchorStyles.Left | AnchorStyles.Top);\r
         }\r
         internal CustomLabel(string text, Color FRColor, Color BGColor, FontStyle style, float size, int location, int colsize, int rowSize, ContentAlignment align)\r
             :this(text,FRColor,BGColor,style,size,location,colsize,rowSize)\r

diff --git a/kybernetes_prj.suo b/kybernetes_prj.suo
index f5d8474..9a39177 100644 (file)
Binary files a/kybernetes_prj.suo and b/kybernetes_prj.suo differ