From 023f6c7649715697c80b9e451e82a47e0263faa0 Mon Sep 17 00:00:00 2001 From: Alexander Mikhailov Date: Tue, 14 May 2019 10:55:30 +0300 Subject: [PATCH] #MailMerge - doesn't work at this time --- OutlookInspiredApp/DevExpress.OutlookInspiredApp/MainForm.cs | 2 +- .../Employee/EmployeeCollectionViewModel.partial.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OutlookInspiredApp/DevExpress.OutlookInspiredApp/MainForm.cs b/OutlookInspiredApp/DevExpress.OutlookInspiredApp/MainForm.cs index 4f82e6c..8d2ab94 100644 --- a/OutlookInspiredApp/DevExpress.OutlookInspiredApp/MainForm.cs +++ b/OutlookInspiredApp/DevExpress.OutlookInspiredApp/MainForm.cs @@ -123,7 +123,7 @@ namespace DevExpress.DevAV { moduleControl.Parent = modulesContainer; navBar.SendToBack(); 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; if(ribbonModuleControl != null) { Ribbon.MergeRibbon(ribbonModuleControl.Ribbon); diff --git a/OutlookInspiredApp/DevExpress.OutlookInspiredApp/ViewModels/Employee/EmployeeCollectionViewModel.partial.cs b/OutlookInspiredApp/DevExpress.OutlookInspiredApp/ViewModels/Employee/EmployeeCollectionViewModel.partial.cs index 7ff73fd..fa5a015 100644 --- a/OutlookInspiredApp/DevExpress.OutlookInspiredApp/ViewModels/Employee/EmployeeCollectionViewModel.partial.cs +++ b/OutlookInspiredApp/DevExpress.OutlookInspiredApp/ViewModels/Employee/EmployeeCollectionViewModel.partial.cs @@ -109,7 +109,7 @@ namespace DevExpress.DevAV.ViewModels { } [Command(UseCommandManager = false, CanExecuteMethodName = "CanPrintProfile")] public void MailMerge() { - ShowDocument("MailMerge", null); + //ShowDocument("MailMerge", null); } [Command] public void QuickLetter(EmployeeMailTemplate mailTemplate) { @@ -119,7 +119,7 @@ namespace DevExpress.DevAV.ViewModels { return CanQuickLetterCore(SelectedEntity, mailTemplate); } protected internal void QuickLetterCore(Employee employee, EmployeeMailTemplate mailTemplate) { - ShowDocument("MailMerge", mailTemplate); + //ShowDocument("MailMerge", mailTemplate); } protected internal bool CanQuickLetterCore(Employee employee, EmployeeMailTemplate mailTemplate) { return employee != null;