変更）検索条件編集画面を修正（OK/Cancel）
branches/experimental/1e/Kotoli/KotoliForm.cs (diff) branches/experimental/1e/Kotoli/Kotoli.csproj (diff) branches/experimental/1e/Kotoli/ContainerPanel.Designer.cs (diff) branches/experimental/1e/Kotoli/QueryPanel.Designer.cs (diff)| @@ -179,6 +179,7 @@ | ||
| 179 | 179 | // Formを作成 |
| 180 | 180 | Form searchForm = new Form(); |
| 181 | 181 | Panel rootPanel = new Panel(); |
| 182 | + SearchDecisionPanel dicisionPanel = new SearchDecisionPanel(); | |
| 182 | 183 | rootPanel.Height = 0; |
| 183 | 184 | rootPanel.Tag = "RootPanel"; |
| 184 | 185 |
| @@ -192,7 +193,7 @@ | ||
| 192 | 193 | date > 2010/08/05 |
| 193 | 194 | } |
| 194 | 195 | }"); |
| 195 | - | |
| 196 | + | |
| 196 | 197 | // UIをQueryTreeから作成 |
| 197 | 198 | CreateSearchPanel(q, rootPanel); |
| 198 | 199 |
| @@ -202,11 +203,14 @@ | ||
| 202 | 203 | // Formに追加 |
| 203 | 204 | searchForm.Controls.Add(rootPanel); |
| 204 | 205 | |
| 206 | + // OK/Cancelボタンを追加 | |
| 207 | + searchForm.Controls.Add(dicisionPanel); | |
| 208 | + | |
| 205 | 209 | // 高さ、幅、座標を計算 |
| 206 | 210 | SetPanelHeight(rootPanel, 0); |
| 207 | 211 | |
| 208 | 212 | // Formのサイズを更新 |
| 209 | - searchForm.Size = new Size(rootPanel.Width, rootPanel.Height); | |
| 213 | + searchForm.Size = new Size(rootPanel.Width, rootPanel.Height + dicisionPanel.Height); | |
| 210 | 214 | |
| 211 | 215 | // 戻す |
| 212 | 216 | this.ResumeLayout(); |
| @@ -232,7 +236,6 @@ | ||
| 232 | 236 | else |
| 233 | 237 | { |
| 234 | 238 | UserControl qPanel = new QueryPanel(); |
| 235 | - //qPanel.Tag = queryNode.ToString(); | |
| 236 | 239 | parent.Controls.Add(qPanel); |
| 237 | 240 | } |
| 238 | 241 |
| @@ -276,12 +279,10 @@ | ||
| 276 | 279 | |
| 277 | 280 | tabIndex++; |
| 278 | 281 | |
| 279 | - //MessageBox.Show("Parent Height : " + parent.Height + "\n" + panelType + " Height : " + c.Height); | |
| 280 | 282 | } |
| 281 | 283 | else // container以外のパネルの場合 |
| 282 | 284 | { |
| 283 | 285 | // QueryPanelの場合 |
| 284 | - //MessageBox.Show("Parent Height : " + parent.Height + "\n" + panelType + " Height : " + c.Height); | |
| 285 | 286 | parent.Height += c.Height + Indent; |
| 286 | 287 | parent.Width = c.Width; |
| 287 | 288 |
| @@ -54,6 +54,7 @@ | ||
| 54 | 54 | // |
| 55 | 55 | this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); |
| 56 | 56 | this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; |
| 57 | + this.BackColor = System.Drawing.Color.Transparent; | |
| 57 | 58 | this.Controls.Add(this.TopPanel); |
| 58 | 59 | this.Name = "ContainerPanel"; |
| 59 | 60 | this.Size = new System.Drawing.Size(518, 64); |
| @@ -88,6 +88,7 @@ | ||
| 88 | 88 | // |
| 89 | 89 | this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); |
| 90 | 90 | this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; |
| 91 | + this.BackColor = System.Drawing.Color.Transparent; | |
| 91 | 92 | this.Controls.Add(this.detailButton); |
| 92 | 93 | this.Controls.Add(this.removeButton); |
| 93 | 94 | this.Controls.Add(this.addButton); |