From f7b19e535a4744691485274cc052b45674677e33 Mon Sep 17 00:00:00 2001 From: Peter Forstmeier Date: Thu, 28 Aug 2014 20:12:25 +0200 Subject: [PATCH] Localize Wizard --- data/resources/StringResources.resx | 36 +++++++++--------- .../ICSharpCode.Reporting.Addin.csproj | 4 ++ .../ReportWizard/Dialog/BaseSettingsPage.xaml | 13 ++++--- .../ReportWizard/Dialog/PullModelPage.xaml | 3 +- .../ReportWizard/Dialog/PushDataReport.xaml | 37 +++++++++++++++++-- .../Dialog/PushDataReport.xaml.cs | 36 ++++++++++++++++++ .../src/ReportWizard/Dialog/ReportWizard.xaml | 4 +- .../ReportWizard/Dialog/ReportWizard.xaml.cs | 2 +- .../src/ReportWizard/Dialog/WelcomePage.xaml | 7 ++-- 9 files changed, 108 insertions(+), 34 deletions(-) diff --git a/data/resources/StringResources.resx b/data/resources/StringResources.resx index aebaee76a4..8de72bfcb8 100644 --- a/data/resources/StringResources.resx +++ b/data/resources/StringResources.resx @@ -6713,7 +6713,8 @@ The resources files have been renamed/moved accordingly. Section Visible - Base Settings + Base Settings + Design @@ -6736,10 +6737,6 @@ The resources files have been renamed/moved accordingly. Send report to printer - - To run SharpDevelop Reports you need at least one(1) installed Printer - Errormessage when no printer is installed - This is not a valid report created with 'SharpReport'. @@ -6853,19 +6850,13 @@ The resources files have been renamed/moved accordingly. Label - Base settings + Basic Report Settings Report Type - File Name - - - Graphics Unit - - - Basic report settings + File Name : Report Model @@ -6880,7 +6871,7 @@ The resources files have been renamed/moved accordingly. Push Data - Report Name + Report Name : Report Type @@ -6909,9 +6900,6 @@ The resources files have been renamed/moved accordingly. [Delete this text and enter a valid Sql String] - - Push Data Model - Available Fields @@ -7510,7 +7498,7 @@ The resources files have been renamed/moved accordingly. WPF Navigation Application - Create a new report using the Report Wizard + Create a new Report using the Report Wizard Configure Sidebar... @@ -8216,4 +8204,16 @@ a line break Choose exceptions + + Base Settings and Page Layout + + + Page Layout : + + + Welcome to the SharpDevelop ReportWizard + + + Select a Project + \ No newline at end of file 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 35fdf67bba..ba8c669d69 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 @@ -228,6 +228,10 @@ ICSharpCode.Core False + + {7E4A7172-7FF5-48D0-B719-7CD959DD1AC9} + ICSharpCode.Core.Presentation + {857CA1A3-FC88-4BE0-AB6A-D1EE772AB288} ICSharpCode.Core.WinForms diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/BaseSettingsPage.xaml b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/BaseSettingsPage.xaml index 97f72bd610..7aa0b6e487 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/BaseSettingsPage.xaml +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/BaseSettingsPage.xaml @@ -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 @@ - + - + - + - + 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 index 9705a42681..9cfa024d69 100644 --- 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 @@ -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" 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 fcca9007dc..ab9f1625a3 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 @@ -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"> - + @@ -22,7 +23,9 @@ - + + + @@ -37,4 +40,30 @@ - \ No newline at end of file + + + + + + diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/PushDataReport.xaml.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/PushDataReport.xaml.cs index cf9ff97b7d..d7092bd4c3 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/PushDataReport.xaml.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/PushDataReport.xaml.cs @@ -94,4 +94,40 @@ namespace ICSharpCode.Reporting.Addin.ReportWizard.Dialog #endregion } + + /* + private void PopulateTestItems() + { + TestItems = new ObservableCollection(); + 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 _TestItems; + public ObservableCollection TestItems + { + get { return _TestItems; } + set + { + _TestItems = value; + NotifyPropertyChanged(m => m.TestItems); + } + }*/ } \ No newline at end of file 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 b48c9f89ec..16fc30b767 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 @@ -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"> + + + diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/ReportWizard.xaml.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/ReportWizard.xaml.cs index fd65d6d0c6..5b2231eb87 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/ReportWizard.xaml.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/ReportWizard.xaml.cs @@ -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; diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/WelcomePage.xaml b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/WelcomePage.xaml index a9cfc9a88f..27a5000df2 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/WelcomePage.xaml +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/WelcomePage.xaml @@ -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="SharpDevelop Reporting" - PageType="Exterior" + 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 @@ - + \ No newline at end of file