• R/O
  • SSH
  • HTTPS

kotoli: Commit


Commit MetaInfo

Revision222 (tree)
Time2011-01-19 22:40:35
Authorsiotsu

Log Message

(empty log message)

Change Summary

Incremental Difference

--- branches/experimental/1e/Kotoli/KotoliForm.cs (revision 221)
+++ branches/experimental/1e/Kotoli/KotoliForm.cs (revision 222)
@@ -180,6 +180,7 @@
180180 Form searchForm = new Form();
181181 Panel rootPanel = new Panel();
182182 SearchDecisionPanel dicisionPanel = new SearchDecisionPanel();
183+
183184 rootPanel.Height = 0;
184185 rootPanel.Tag = "RootPanel";
185186
@@ -189,7 +190,6 @@
189190  filename = ""hoge""
190191 OR{
191192 filename = ""foo""
192- filename = ""bar""
193193 date > 2010/08/05
194194 }
195195 }");
@@ -210,12 +210,14 @@
210210 SetPanelHeight(rootPanel, 0);
211211
212212 // Formのサイズを更新
213- searchForm.Size = new Size(rootPanel.Width, rootPanel.Height + dicisionPanel.Height);
213+ searchForm.Size = new Size(rootPanel.Width, rootPanel.Height);
214214
215215 // 戻す
216216 this.ResumeLayout();
217+
218+ searchForm.Show();
217219
218- searchForm.Show();
220+ MessageBox.Show("Width, Height : (" + dicisionPanel.Width + ", " + dicisionPanel.Height + ")");
219221 }
220222
221223 private Control CreateSearchPanel(IQuery queryNode, Control parent)
@@ -224,7 +226,7 @@
224226 if (composite != null)
225227 {
226228 // AND/ORのパネルを作成
227- ContainerPanel cPanel = new ContainerPanel();
229+ ContainerPanel cPanel = new ContainerPanel(); cPanel.BorderStyle = BorderStyle.Fixed3D;
228230 parent.Controls.Add(cPanel);
229231
230232 // 配下の要素にも再帰
@@ -283,7 +285,7 @@
283285 else // container以外のパネルの場合
284286 {
285287 // QueryPanelの場合
286- parent.Height += c.Height + Indent;
288+ parent.Height += c.Height;// +Indent;
287289 parent.Width = c.Width;
288290
289291 if (prevControl != null)
--- branches/experimental/1e/Kotoli/SearchDecisionPanel.cs (nonexistent)
+++ branches/experimental/1e/Kotoli/SearchDecisionPanel.cs (revision 222)
@@ -0,0 +1,19 @@
1+using System;
2+using System.Collections.Generic;
3+using System.ComponentModel;
4+using System.Drawing;
5+using System.Data;
6+using System.Linq;
7+using System.Text;
8+using System.Windows.Forms;
9+
10+namespace Kotoli
11+{
12+ public partial class SearchDecisionPanel : UserControl
13+ {
14+ public SearchDecisionPanel()
15+ {
16+ InitializeComponent();
17+ }
18+ }
19+}
--- branches/experimental/1e/Kotoli/SearchDecisionPanel.Designer.cs (nonexistent)
+++ branches/experimental/1e/Kotoli/SearchDecisionPanel.Designer.cs (revision 222)
@@ -0,0 +1,74 @@
1+namespace Kotoli
2+{
3+ partial class SearchDecisionPanel
4+ {
5+ /// <summary>
6+ /// 必要なデザイナ変数です。
7+ /// </summary>
8+ private System.ComponentModel.IContainer components = null;
9+
10+ /// <summary>
11+ /// 使用中のリソースをすべてクリーンアップします。
12+ /// </summary>
13+ /// <param name="disposing">マネージ リソースが破棄される場合 true、破棄されない場合は false です。</param>
14+ protected override void Dispose(bool disposing)
15+ {
16+ if (disposing && (components != null))
17+ {
18+ components.Dispose();
19+ }
20+ base.Dispose(disposing);
21+ }
22+
23+ #region コンポーネント デザイナで生成されたコード
24+
25+ /// <summary>
26+ /// デザイナ サポートに必要なメソッドです。このメソッドの内容を
27+ /// コード エディタで変更しないでください。
28+ /// </summary>
29+ private void InitializeComponent()
30+ {
31+ this.OKButton = new System.Windows.Forms.Button();
32+ this.CancelButton = new System.Windows.Forms.Button();
33+ this.SuspendLayout();
34+ //
35+ // OKButton
36+ //
37+ this.OKButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
38+ | System.Windows.Forms.AnchorStyles.Right)));
39+ this.OKButton.Location = new System.Drawing.Point(340, 3);
40+ this.OKButton.Name = "OKButton";
41+ this.OKButton.Size = new System.Drawing.Size(74, 25);
42+ this.OKButton.TabIndex = 0;
43+ this.OKButton.Text = "OK";
44+ this.OKButton.UseVisualStyleBackColor = true;
45+ //
46+ // CancelButton
47+ //
48+ this.CancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
49+ | System.Windows.Forms.AnchorStyles.Right)));
50+ this.CancelButton.Location = new System.Drawing.Point(420, 3);
51+ this.CancelButton.Name = "CancelButton";
52+ this.CancelButton.Size = new System.Drawing.Size(74, 25);
53+ this.CancelButton.TabIndex = 1;
54+ this.CancelButton.Text = "Cancel";
55+ this.CancelButton.UseVisualStyleBackColor = true;
56+ //
57+ // SearchDecisionPanel
58+ //
59+ this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
60+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
61+ this.Controls.Add(this.CancelButton);
62+ this.Controls.Add(this.OKButton);
63+ this.Name = "SearchDecisionPanel";
64+ this.Size = new System.Drawing.Size(497, 32);
65+ this.ResumeLayout(false);
66+
67+ }
68+
69+ #endregion
70+
71+ private System.Windows.Forms.Button OKButton;
72+ private System.Windows.Forms.Button CancelButton;
73+ }
74+}
Show on old repository browser