layout

data/resources/StringResources.resx

@@ -6864,9 +6864,6 @@ The resources files have been renamed/moved accordingly.</value>
   <data name="SharpReport.Wizard.BaseSettings.GraphicsUnit" xml:space="preserve">
     <value>Graphics Unit</value>
   </data>
-  <data name="SharpReport.Wizard.BaseSettings.Group" xml:space="preserve">
-    <value>Basic report settings</value>
-  </data>
   <data name="SharpReport.Wizard.BaseSettings.ReportModel" xml:space="preserve">
     <value>Report Model</value>
   </data>
@@ -6915,17 +6912,6 @@ The resources files have been renamed/moved accordingly.</value>
   <data name="SharpReport.Wizard.PushModel.AvailableFields" xml:space="preserve">
     <value>Available Fields</value>
   </data>
-  <data name="SharpReport.Wizard.PushModel.Path" xml:space="preserve">
-    <value>Path to Schema (.xsd) File</value>
-  </data>
-  <data name="SharpReport.Wizard.ResultPanel.SaveXsdComplete" xml:space="preserve">
-    <value>Save Result (Schema and Data)</value>
-    <comment>Save displayed Data to *.xsd File</comment>
-  </data>
-  <data name="SharpReport.Wizard.ResultPanel.SaveXsdSchemaOnly" xml:space="preserve">
-    <value>Save Result (Schema only)</value>
-    <comment>Save only the Schema to *.xsd File</comment>
-  </data>
   <data name="SharpReport.Wizard.ShowQueryResult" xml:space="preserve">
     <value>Show Query result</value>
   </data>
@@ -8303,7 +8289,7 @@ a line break</value>
     <value>Basic report settings</value>
   </data>
   <data name="SharpReport.Wizard.PushModel.SelectProject" xml:space="preserve">
-    <value>Classes in selected Projecct</value>
+    <value>Classes in selected Project</value>
   </data>
   <data name="SharpReport.Wizard.PageLayout" xml:space="preserve">
     <value>Page Layout </value>

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/BaseSettingsPage.xaml

@@ -60,19 +60,21 @@
 		          ItemsSource="{Binding Source={StaticResource reportTypeEnum}}">
 		</ComboBox>
 		
-		
 		<Label Content="{core:Localize SharpReport.Wizard.BaseSettings.ReportName}" Margin="0,5,0,5" Grid.Column="1" Grid.Row="4"></Label>
 		<TextBox Name="_ReportName" Margin="10,5,0,5"  Grid.Row="4" Grid.Column="2" Grid.ColumnSpan="3"></TextBox>
 		
 		<Label Content="{core:Localize SharpReport.Wizard.BaseSettings.FileName}" Margin="0,5,0,5" Grid.Column="1" Grid.Row="5"></Label>
 		<TextBox Name="_Filename" Margin="10,5,0,5" Grid.Row="5" Grid.Column="2" Grid.ColumnSpan="3"></TextBox>
 		
-		
+		<GroupBox Grid.Row="6"  Grid.Column="1" Margin="0,5,0,5" Grid.ColumnSpan="2" VerticalContentAlignment="Stretch" BorderThickness="2">
-		<Label Content="{core:Localize SharpReport.Wizard.PageLayout}" Grid.Column="1" Grid.Row="6"  Margin="0,5,0,5"></Label>
+			<GroupBox.Header>
-		
+			<Label Content="{core:Localize SharpReport.Wizard.PageLayout}"></Label>
-		<RadioButton Name="_Legal" GroupName="PageLayout" Content="Legal" Grid.Column="1" Grid.Row="7"  Margin="0,5,0,5" ></RadioButton>
+			</GroupBox.Header>
-		<RadioButton Name="_Landscape" GroupName="PageLayout" Content="Landscape"  Grid.Row="7" Grid.Column="2" Margin="0,5,0,5"></RadioButton>
+			<StackPanel Orientation="Horizontal">
-	
+				<RadioButton Name="_Legal" GroupName="PageLayout" Content="Legal"   Margin="10,5,0,5" ></RadioButton>
+				<RadioButton Name="_Landscape" GroupName="PageLayout" Content="Landscape"  Grid.Column="2" Margin="30,5,0,5"></RadioButton>
+			</StackPanel>
+		</GroupBox>
 	</Grid>
 
 </xctk:WizardPage>

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/PushDataReport.xaml

@@ -12,9 +12,9 @@
                  CanSelectPreviousPage="true"
             	  CanSelectNextPage="false">
 	
-	<Grid ShowGridLines="true" >
+	<Grid>
 		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="150"></ColumnDefinition>
+			<ColumnDefinition Width="Auto"></ColumnDefinition>
 			<ColumnDefinition></ColumnDefinition>
 		</Grid.ColumnDefinitions>
 		
@@ -24,16 +24,16 @@
 			<RowDefinition Height="200"></RowDefinition>
 		</Grid.RowDefinitions>
 		
-		<TextBlock Text="{core:Localize SharpReport.Wizard.PushModel.SelectProject}" FontSize="15" ></TextBlock>
+		<TextBlock Text="{core:Localize SharpReport.Wizard.PushModel.SelectProject}"
-		<TextBlock Text="{core:Localize SharpReport.Wizard.PushModel.AvailableFields}" FontSize="15" Grid.Column ="1" Margin="30,0,0,0"></TextBlock>
+		           Grid.ColumnSpan="2" FontSize="15" ></TextBlock>
-		
+		<ComboBox Name="_cboTypes" Visibility="Hidden" Grid.Row="1" SelectionChanged="_cboTypes_SelectionChanged" MinWidth="100" ></ComboBox>
-		<ComboBox Name="_cboTypes" Visibility="Hidden" Grid.Row="1" SelectionChanged="_cboTypes_SelectionChanged" ></ComboBox>
 		
+		<TextBlock Text="{core:Localize SharpReport.Wizard.PushModel.AvailableFields}" FontSize="15" Grid.Column ="1" Margin="15,0,0,0"></TextBlock>
 		<DataGrid  Name="_DataGrid"
 		          ItemsSource="{Binding}"
 		          CanUserAddRows="True"
 		          CanUserDeleteRows="True"
-		          AutoGenerateColumns="False" Grid.Row="1" Grid.RowSpan="2" Margin="30,10,30,5" Width="400" Grid.Column="1">
+		          AutoGenerateColumns="False" Grid.Row="2" Grid.RowSpan="2" Margin="5,10,30,5" Width="400" Grid.Column="1">
 			<DataGrid.Columns>
 				<DataGridTextColumn Header="ColumnName" Binding="{Binding ColumnName}" Width="200"></DataGridTextColumn>
 				<DataGridComboBoxColumn Header="DataType" x:Name="cboType" SelectedItemBinding="{Binding DataTypeName}" Width="*"></DataGridComboBoxColumn>