diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/ICSharpCode.Reporting.Addin.csproj b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/ICSharpCode.Reporting.Addin.csproj
index f038280feb..6213368704 100644
--- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/ICSharpCode.Reporting.Addin.csproj
+++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/ICSharpCode.Reporting.Addin.csproj
@@ -150,6 +150,10 @@
BaseSettingsPage.xaml
Code
+
+ PullModelPage.xaml
+ Code
+
PushDataReport.xaml
Code
@@ -241,6 +245,7 @@
+
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/BaseSettingsPage.xaml.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/BaseSettingsPage.xaml.cs
index 90f8275d1f..783c62370e 100644
--- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/BaseSettingsPage.xaml.cs
+++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/BaseSettingsPage.xaml.cs
@@ -47,7 +47,6 @@ namespace ICSharpCode.Reporting.Addin.ReportWizard.Dialog{
void UpdateContext(){
-Console.WriteLine("Legal at bbbb {0}",_Legal.IsChecked);
context.DataModel = (PushPullModel) _DataModel.SelectedItem;
context.ReportType = (ReportType) _ReportType.SelectedItem;
context.ReportName = this._ReportName.Text;
@@ -57,17 +56,33 @@ Console.WriteLine("Legal at bbbb {0}",_Legal.IsChecked);
}
- void _DataModel_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e){
+ void _DataModel_SelectionChanged(object sender, SelectionChangedEventArgs e){
var cbo = (ComboBox) sender;
- if (((PushPullModel)cbo.SelectedItem) == PushPullModel.FormSheet) {
- this.CanFinish = true;
- this.CanSelectNextPage = false;
- this._ReportType.SelectedItem = ReportType.FormSheet;
- } else {
- this._ReportType.SelectedItem = ReportType.DataReport;
- this.CanFinish = false;
- this.CanSelectNextPage = true;
+ var pushPullModel = (PushPullModel)cbo.SelectedItem;
+
+ switch (pushPullModel) {
+ case PushPullModel.PushData: {
+ this._ReportType.SelectedItem = ReportType.DataReport;
+ this.CanFinish = false;
+ this.CanSelectNextPage = true;
+ NextPage = new PushDataReport();
+ NextPage.PreviousPage = this;
+ break;
+ }
+
+ case PushPullModel.PullData: {
+ CanSelectNextPage = true;
+ NextPage = new PullModelPage();
+ NextPage.PreviousPage = this;
+ break;
+ }
+
+ case PushPullModel.FormSheet: {
+ this.CanFinish = true;
+ this._ReportType.SelectedItem = ReportType.FormSheet;
+ break;
+ }
}
}
}
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/PullModelPage.xaml b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/PullModelPage.xaml
new file mode 100644
index 0000000000..cddd7668bb
--- /dev/null
+++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/PullModelPage.xaml
@@ -0,0 +1,17 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/PullModelPage.xaml.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/PullModelPage.xaml.cs
new file mode 100644
index 0000000000..5ca804078e
--- /dev/null
+++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/PullModelPage.xaml.cs
@@ -0,0 +1,44 @@
+/*
+ * Created by SharpDevelop.
+ * User: Peter Forstmeier
+ * Date: 16.08.2014
+ * Time: 16:43
+ *
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit;
+
+namespace ICSharpCode.Reporting.Addin.ReportWizard.Dialog
+{
+ ///
+ /// Interaction logic for PullModelPage.xaml
+ ///
+ public partial class PullModelPage : WizardPage,IHasContext
+ {
+ public PullModelPage()
+ {
+ InitializeComponent();
+ }
+
+
+ #region IHasContext implementation
+ public ICSharpCode.Reporting.Addin.ReportWizard.ViewModels.IWizardContext Context {
+ get {
+ throw new NotImplementedException();
+ }
+ }
+ public WizardPageType ReportPageType {
+ get { return WizardPageType.PullModelPage;}
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/PushDataReport.xaml b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/PushDataReport.xaml
index 5c2fb63226..9b37c4d891 100644
--- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/PushDataReport.xaml
+++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/PushDataReport.xaml
@@ -3,13 +3,12 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
xmlns:System="clr-namespace:System;assembly=mscorlib"
-
xmlns:sdr="clr-namespace:ICSharpCode.Reporting.Globals;assembly=ICSharpCode.Reporting"
Name="PushData"
Title="SharpDevelop Reporting"
Description="Welcome to Sharpdevelop Reporting Wizard"
PageType="Interior"
- CanFinish="true"
+ CanFinish="true"
CancelButtonVisibility="Visible">
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/ReportWizard.xaml b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/ReportWizard.xaml
index b316c345a3..d15cb6b291 100644
--- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/ReportWizard.xaml
+++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/ReportWizard.xaml
@@ -16,7 +16,7 @@
-
+