diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanelControl.Designer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanelControl.Designer.cs index 9ce4704a03..323ec31dc1 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanelControl.Designer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanelControl.Designer.cs @@ -32,38 +32,50 @@ namespace ICSharpCode.Reports.Addin.ReportWizard private void InitializeComponent() { this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); this.comboBox1 = new System.Windows.Forms.ComboBox(); this.checkBox1 = new System.Windows.Forms.CheckBox(); this.radioTableLayout = new System.Windows.Forms.RadioButton(); this.radioListLayout = new System.Windows.Forms.RadioButton(); this.groupBox1.SuspendLayout(); + this.groupBox2.SuspendLayout(); this.SuspendLayout(); // // groupBox1 // - this.groupBox1.Controls.Add(this.comboBox1); + this.groupBox1.Controls.Add(this.groupBox2); this.groupBox1.Controls.Add(this.checkBox1); this.groupBox1.Controls.Add(this.radioTableLayout); this.groupBox1.Controls.Add(this.radioListLayout); this.groupBox1.Location = new System.Drawing.Point(17, 18); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(232, 205); + this.groupBox1.Size = new System.Drawing.Size(232, 242); this.groupBox1.TabIndex = 2; this.groupBox1.TabStop = false; this.groupBox1.Text = "Report Layout"; // + // groupBox2 + // + this.groupBox2.Controls.Add(this.comboBox1); + this.groupBox2.Location = new System.Drawing.Point(64, 146); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(200, 64); + this.groupBox2.TabIndex = 6; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "groupBox2"; + this.groupBox2.Visible = false; + // // comboBox1 // this.comboBox1.FormattingEnabled = true; - this.comboBox1.Location = new System.Drawing.Point(64, 160); + this.comboBox1.Location = new System.Drawing.Point(6, 28); this.comboBox1.Name = "comboBox1"; this.comboBox1.Size = new System.Drawing.Size(121, 21); - this.comboBox1.TabIndex = 5; - this.comboBox1.Visible = false; + this.comboBox1.TabIndex = 6; // // checkBox1 // - this.checkBox1.Location = new System.Drawing.Point(64, 116); + this.checkBox1.Location = new System.Drawing.Point(64, 106); this.checkBox1.Name = "checkBox1"; this.checkBox1.Size = new System.Drawing.Size(104, 24); this.checkBox1.TabIndex = 4; @@ -97,10 +109,12 @@ namespace ICSharpCode.Reports.Addin.ReportWizard this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.groupBox1); this.Name = "LayoutPanelControl"; - this.Size = new System.Drawing.Size(270, 252); + this.Size = new System.Drawing.Size(331, 284); this.groupBox1.ResumeLayout(false); + this.groupBox2.ResumeLayout(false); this.ResumeLayout(false); } + private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.CheckBox checkBox1; private System.Windows.Forms.ComboBox comboBox1; private System.Windows.Forms.RadioButton radioTableLayout; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanelControl.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanelControl.cs index 39da9c8733..26e4a6d3d8 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanelControl.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanelControl.cs @@ -22,6 +22,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard public LayoutPanelControl() { InitializeComponent(); + groupBox2.Text = "Select GroupValue"; } @@ -49,6 +50,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard } } + public GlobalEnums.ReportLayout ReportLayout { get { GetLayout(); @@ -61,7 +63,8 @@ namespace ICSharpCode.Reports.Addin.ReportWizard void CheckBox1CheckedChanged(object sender, System.EventArgs e) { - comboBox1.Visible = checkBox1.Checked; + //comboBox1.Visible = checkBox1.Checked; + this.groupBox2.Visible = checkBox1.Checked; } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/PullModelPanel.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/PullModelPanel.cs index 5f0ef18ec1..0a510d9306 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/PullModelPanel.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/PullModelPanel.cs @@ -123,6 +123,9 @@ namespace ICSharpCode.Reports.Addin.ReportWizard if (e.Data.GetFormats().Length > 0) { string draggedFormat = e.Data.GetFormats()[0]; + + String str = String.Format("drag {0}",draggedFormat); + System.Diagnostics.Trace.WriteLine(str); Type draggedType = null;