github/netcore-winforms-demos
1
1
Fork 0
mirror of https://github.com/DevExpress/netcore-winforms-demos.git synced 2025-12-22 17:39:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

#MailMerge - doesn't work at this time

Browse Source
This commit is contained in:
Alexander Mikhailov
2019-05-14 10:55:30 +03:00
parent 40274f00c3
commit 023f6c7649
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OutlookInspiredApp/DevExpress.OutlookInspiredApp/MainForm.cs
View File

@@ -123,7 +123,7 @@ namespace DevExpress.DevAV {
moduleControl.Parent = modulesContainer; moduleControl.Parent = modulesContainer;
navBar.SendToBack(); navBar.SendToBack();
modulesContainer.ResumeLayout(); modulesContainer.ResumeLayout();
Text = string.Format("{1} - {0}", ViewModel.GetModuleCaption(ViewModel.SelectedModuleType), "DevAV"); Text = string.Format("{1} - {0}", ViewModel.GetModuleCaption(ViewModel.SelectedModuleType), "DevAV (.Net Core 3.0)");
IRibbonModule ribbonModuleControl = moduleControl as IRibbonModule; IRibbonModule ribbonModuleControl = moduleControl as IRibbonModule;
if(ribbonModuleControl != null) { if(ribbonModuleControl != null) {
Ribbon.MergeRibbon(ribbonModuleControl.Ribbon); Ribbon.MergeRibbon(ribbonModuleControl.Ribbon);

4
OutlookInspiredApp/DevExpress.OutlookInspiredApp/ViewModels/Employee/EmployeeCollectionViewModel.partial.cs
View File

@@ -109,7 +109,7 @@ namespace DevExpress.DevAV.ViewModels {
} }
[Command(UseCommandManager = false, CanExecuteMethodName = "CanPrintProfile")] [Command(UseCommandManager = false, CanExecuteMethodName = "CanPrintProfile")]
public void MailMerge() { public void MailMerge() {
ShowDocument<EmployeeMailMergeViewModel>("MailMerge", null); //ShowDocument<EmployeeMailMergeViewModel>("MailMerge", null);
} }
[Command] [Command]
public void QuickLetter(EmployeeMailTemplate mailTemplate) { public void QuickLetter(EmployeeMailTemplate mailTemplate) {
@@ -119,7 +119,7 @@ namespace DevExpress.DevAV.ViewModels {
return CanQuickLetterCore(SelectedEntity, mailTemplate); return CanQuickLetterCore(SelectedEntity, mailTemplate);
} }
protected internal void QuickLetterCore(Employee employee, EmployeeMailTemplate mailTemplate) { protected internal void QuickLetterCore(Employee employee, EmployeeMailTemplate mailTemplate) {
ShowDocument<EmployeeMailMergeViewModel>("MailMerge", mailTemplate); //ShowDocument<EmployeeMailMergeViewModel>("MailMerge", mailTemplate);
} }
protected internal bool CanQuickLetterCore(Employee employee, EmployeeMailTemplate mailTemplate) { protected internal bool CanQuickLetterCore(Employee employee, EmployeeMailTemplate mailTemplate) {
return employee != null; return employee != null;