pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Localize Wizard

pull/567/head
Peter Forstmeier 11 years ago
parent
93cdccbca4
commit
f7b19e535a
9 changed files with 108 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 36
      data/resources/StringResources.resx
  2. 4
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/ICSharpCode.Reporting.Addin.csproj
  3. 13
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/BaseSettingsPage.xaml
  4. 3
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/PullModelPage.xaml
  5. 35
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/PushDataReport.xaml
  6. 36
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/PushDataReport.xaml.cs
  7. 4
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/ReportWizard.xaml
  8. 2
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/ReportWizard.xaml.cs
  9. 5
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/WelcomePage.xaml

36
data/resources/StringResources.resx
Unescape View File

@ -6713,7 +6713,8 @@ The resources files have been renamed/moved accordingly.</value> @@ -6713,7 +6713,8 @@ The resources files have been renamed/moved accordingly.</value>
<value>Section Visible</value>
</data>
<data name="SharpReport.ContextMenu.Settings" xml:space="preserve">
<value>Base Settings</value>
<value>Base Settings
</value>
</data>
<data name="SharpReport.Design" xml:space="preserve">
<value>Design</value>
@ -6736,10 +6737,6 @@ The resources files have been renamed/moved accordingly.</value> @@ -6736,10 +6737,6 @@ The resources files have been renamed/moved accordingly.</value>
<data name="SharpReport.DesignView.Toolbar.Printer" xml:space="preserve">
<value>Send report to printer</value>
</data>
<data name="Sharpreport.Error.NoPrinter" xml:space="preserve">
<value>To run SharpDevelop Reports you need at least one(1) installed Printer</value>
<comment>Errormessage when no printer is installed</comment>
</data>
<data name="SharpReport.Error.NoReport" xml:space="preserve">
<value>This is not a valid report created with 'SharpReport'.</value>
</data>
@ -6853,19 +6850,13 @@ The resources files have been renamed/moved accordingly.</value> @@ -6853,19 +6850,13 @@ The resources files have been renamed/moved accordingly.</value>
<value>Label</value>
</data>
<data name="SharpReport.Wizard.BaseSettings" xml:space="preserve">
<value>Base settings</value>
<value>Basic Report Settings</value>
</data>
<data name="SharpReport.Wizard.BaseSettings,ReportType" xml:space="preserve">
<value>Report Type</value>
</data>
<data name="SharpReport.Wizard.BaseSettings.FileName" xml:space="preserve">
<value>File Name</value>
</data>
<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>
<value>File Name :</value>
</data>
<data name="SharpReport.Wizard.BaseSettings.ReportModel" xml:space="preserve">
<value>Report Model</value>
@ -6880,7 +6871,7 @@ The resources files have been renamed/moved accordingly.</value> @@ -6880,7 +6871,7 @@ The resources files have been renamed/moved accordingly.</value>
<value>Push Data</value>
</data>
<data name="SharpReport.Wizard.BaseSettings.ReportName" xml:space="preserve">
<value>Report Name</value>
<value>Report Name :</value>
</data>
<data name="SharpReport.Wizard.BaseSettings.ReportType" xml:space="preserve">
<value>Report Type</value>
@ -6909,9 +6900,6 @@ The resources files have been renamed/moved accordingly.</value> @@ -6909,9 +6900,6 @@ The resources files have been renamed/moved accordingly.</value>
<data name="SharpReport.Wizard.PullModel.CommandText.ToolTip" xml:space="preserve">
<value>[Delete this text and enter a valid Sql String]</value>
</data>
<data name="SharpReport.Wizard.PushModel" xml:space="preserve">
<value>Push Data Model</value>
</data>
<data name="SharpReport.Wizard.PushModel.AvailableFields" xml:space="preserve">
<value>Available Fields</value>
</data>
@ -7510,7 +7498,7 @@ The resources files have been renamed/moved accordingly.</value> @@ -7510,7 +7498,7 @@ The resources files have been renamed/moved accordingly.</value>
<value>WPF Navigation Application</value>
</data>
<data name="Templates.SharpReport.NewReport" xml:space="preserve">
<value>Create a new report using the Report Wizard</value>
<value>Create a new Report using the Report Wizard</value>
</data>
<data name="XML.FormsDesigner.SideBar.CustomizeSidebar" xml:space="preserve">
<value>Configure Sidebar...</value>
@ -8216,4 +8204,16 @@ a line break</value> @@ -8216,4 +8204,16 @@ a line break</value>
<data name="Dialog.Options.IDEOptions.Debugging.ChooseExceptions" xml:space="preserve">
<value>Choose exceptions</value>
</data>
<data name="SharpReport.Wizard.BaseSettings.Description" xml:space="preserve">
<value>Base Settings and Page Layout</value>
</data>
<data name="SharpReport.Wizard.PageLayout" xml:space="preserve">
<value>Page Layout :</value>
</data>
<data name="SharpReport.Wizard.Welcome" xml:space="preserve">
<value>Welcome to the SharpDevelop ReportWizard</value>
</data>
<data name="SharpReport.Wizard.PushModel.SelectProject" xml:space="preserve">
<value>Select a Project</value>
</data>
</root>

4
src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/ICSharpCode.Reporting.Addin.csproj
Unescape View File

@ -228,6 +228,10 @@ @@ -228,6 +228,10 @@
<Name>ICSharpCode.Core</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj">
<Project>{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}</Project>
<Name>ICSharpCode.Core.Presentation</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj">
<Project>{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}</Project>
<Name>ICSharpCode.Core.WinForms</Name>

13
src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/BaseSettingsPage.xaml
Unescape View File

@ -4,8 +4,9 @@ @@ -4,8 +4,9 @@
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"
Title="Base Settings"
Description="Basic Settings and Layout"
xmlns:core="clr-namespace:ICSharpCode.Core.Presentation;assembly=ICSharpCode.Core.Presentation"
Title="{core:Localize SharpReport.Wizard.BaseSettings}"
Description="{core:Localize SharpReport.Wizard.BaseSettings.Description}"
PageType="Interior"
CanFinish="true"
CanSelectNextPage="false">
@ -46,7 +47,7 @@ @@ -46,7 +47,7 @@
<ColumnDefinition></ColumnDefinition>
</Grid.ColumnDefinitions>
<Label Content="DataModel :" Grid.Column="1"></Label>
<Label Content="{core:Localize SharpReport.Wizard.BaseSettings.ReportType}" Grid.Column="1"></Label>
<ComboBox Name="_DataModel" Margin="10,5,0,5"
Grid.Column="2"
SelectionChanged="_DataModel_SelectionChanged"
@ -60,14 +61,14 @@ @@ -60,14 +61,14 @@
</ComboBox>
<Label Content="Report Name :" Margin="0,5,0,5" Grid.Column="1" Grid.Row="4"></Label>
<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="Filename :" Margin="0,5,0,5" Grid.Column="1" Grid.Row="5"></Label>
<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>
<Label Content="Page Layout :" Grid.Column="1" Grid.Row="6" Margin="0,5,0,5"></Label>
<Label Content="{core:Localize SharpReport.Wizard.PageLayout}" Grid.Column="1" Grid.Row="6" Margin="0,5,0,5"></Label>
<RadioButton Name="_Legal" GroupName="PageLayout" Content="Legal" Grid.Column="1" Grid.Row="7" Margin="0,5,0,5" ></RadioButton>
<RadioButton Name="_Landscape" GroupName="PageLayout" Content="Landscape" Grid.Row="7" Grid.Column="2" Margin="0,5,0,5"></RadioButton>

3
src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/PullModelPage.xaml
Unescape View File

@ -4,7 +4,8 @@ @@ -4,7 +4,8 @@
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"
Description="Create PullData Report"
xmlns:core="clr-namespace:ICSharpCode.Core.Presentation;assembly=ICSharpCode.Core.Presentation"
Description="{core:Localize SharpReport.Wizard.BaseSettings.ReportModel.Pull}"
CanSelectPreviousPage="true"
CanSelectNextPage="false"
CanCancel="true"

35
src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/PushDataReport.xaml
Unescape View File

@ -4,14 +4,15 @@ @@ -4,14 +4,15 @@
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"
Title="SharpDevelop Reporting"
xmlns:core="clr-namespace:ICSharpCode.Core.Presentation;assembly=ICSharpCode.Core.Presentation"
Title="{core:Localize SharpReport.Wizard.BaseSettings.ReportModel.Push}"
PageType="Interior"
CanFinish="true"
CancelButtonVisibility="Visible"
CanSelectPreviousPage="true"
CanSelectNextPage="false">
<Grid >
<Grid ShowGridLines="true" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="150"></ColumnDefinition>
<ColumnDefinition></ColumnDefinition>
@ -22,7 +23,9 @@ @@ -22,7 +23,9 @@
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="200"></RowDefinition>
</Grid.RowDefinitions>
<TextBlock Text="Create Columns for PushData Reporting" FontSize="15" Grid.Column ="1"></TextBlock>
<TextBlock Text="{core:Localize SharpReport.Wizard.PushModel.SelectProject}" FontSize="15" ></TextBlock>
<TextBlock Text="{core:Localize SharpReport.Wizard.PushModel.AvailableFields}" FontSize="15" Grid.Column ="1" Margin="30,0,0,0"></TextBlock>
<ComboBox Name="_cboTypes" Visibility="Hidden" Grid.Row="1" SelectionChanged="_cboTypes_SelectionChanged" ></ComboBox>
@ -38,3 +41,29 @@ @@ -38,3 +41,29 @@
</DataGrid>
</Grid>
</xctk:WizardPage>
<!--http://stackoverflow.com/questions/17114603/checkbox-with-datagrid-wpf
http://www.scottlogic.com/blog/2008/11/26/multiselect-datagrid-with-checkboxes.html
-->
<!--<DataGrid ItemsSource="{Binding Path=TestItems}" AutoGenerateColumns="False" Name="MyDataGrid"
CanUserAddRows="False">
<DataGrid.Columns>
<DataGridCheckBoxColumn Binding="{Binding IsSelected}" Width="50" >
<DataGridCheckBoxColumn.HeaderTemplate>
<DataTemplate x:Name="dtAllChkBx">
<CheckBox Name="cbxAll" Content="All" IsChecked="{Binding Path=DataContext.AllSelected,RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
</DataTemplate>
</DataGridCheckBoxColumn.HeaderTemplate>
</DataGridCheckBoxColumn>
<DataGridTemplateColumn Header="Name" Width="SizeToCells" IsReadOnly="True">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<TextBlock Text="{Binding Name}" />
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
</DataGrid.Columns>
</DataGrid>
</StackPanel>-->

36
src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/PushDataReport.xaml.cs
Unescape View File

@ -94,4 +94,40 @@ namespace ICSharpCode.Reporting.Addin.ReportWizard.Dialog @@ -94,4 +94,40 @@ namespace ICSharpCode.Reporting.Addin.ReportWizard.Dialog
#endregion
}
/*
private void PopulateTestItems()
{
TestItems = new ObservableCollection<TestItem>();
for (int i = 0; i < 5; i++)
{
TestItem ti = new TestItem();
ti.Name = "TestItem" + i;
ti.IsSelected = true;
TestItems.Add(ti);
}
}
private bool _AllSelected;
public bool AllSelected
{
get { return _AllSelected; }
set
{
_AllSelected = value;
TestItems.ToList().ForEach(x => x.IsSelected = value);
NotifyPropertyChanged(m => m.AllSelected);
}
}
private ObservableCollection<TestItem> _TestItems;
public ObservableCollection<TestItem> TestItems
{
get { return _TestItems; }
set
{
_TestItems = value;
NotifyPropertyChanged(m => m.TestItems);
}
}*/
}

4
src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/ReportWizard.xaml
Unescape View File

@ -3,7 +3,6 @@ @@ -3,7 +3,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
xmlns:local="clr-namespace:ICSharpCode.Reporting.Addin.ReportWizard.Dialog"
Title="{Binding Title}"
Height="600" Width="800">
<xctk:Wizard x:Name="_wizard" FinishButtonClosesWindow="True"
@ -13,6 +12,9 @@ @@ -13,6 +12,9 @@
CanHelp="False"
Next="_wizard_Next">
<!--xmlns:core="clr-namespace:ICSharpCode.Core.Presentation;assembly=ICSharpCode.Core.Presentation"-->
<local:WelcomePage x:Name="WelcomePage"></local:WelcomePage>
<local:BaseSettingsPage x:Name="BaseSettingsPage" PreviousPage="{Binding ElementName=WelcomePage}" ></local:BaseSettingsPage>

2
src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/ReportWizard.xaml.cs
Unescape View File

@ -60,7 +60,7 @@ namespace ICSharpCode.Reporting.Addin.ReportWizard.Dialog @@ -60,7 +60,7 @@ namespace ICSharpCode.Reporting.Addin.ReportWizard.Dialog
void _wizard_Next(object sender, Xceed.Wpf.Toolkit.Core.CancelRoutedEventArgs e)
{
var current = this._wizard.CurrentPage;
if (current.Name.Equals("BaseSettings")) {
if (current.Name.Equals("BaseSettingsPage")) {
var hasContext = current as IHasContext;
if (hasContext != null) {
var pushPullModel = ((PageOneContext)hasContext.Context).DataModel;

5
src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/WelcomePage.xaml
Unescape View File

@ -4,7 +4,8 @@ @@ -4,7 +4,8 @@
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"
Title="SharpDevelop Reporting"
xmlns:core="clr-namespace:ICSharpCode.Core.Presentation;assembly=ICSharpCode.Core.Presentation"
Title="{core:Localize SharpReport.Wizard.Welcome}"
PageType="Exterior"
NextButtonVisibility="Visible"
CancelButtonVisibility="Visible">
@ -18,6 +19,6 @@ @@ -18,6 +19,6 @@
<RowDefinition Height="Auto"></RowDefinition>
</Grid.RowDefinitions>
<TextBlock Text="Welcome to SharpDevelop ReportWizard" FontSize="20"></TextBlock>
<TextBlock Text="{core:Localize Templates.SharpReport.NewReport}" FontSize="20"></TextBlock>
</Grid>
</xctk:WizardPage>
Write Preview
Loading…
Cancel
Save