Browse Source

Consequential changes for new FastReports WPF engine

frogsoftware 1 năm trước cách đây
mục cha
commit
a9002c981c

+ 1 - 1
prs.desktop/Forms/EmailInterfaceForm.xaml.cs

@@ -339,7 +339,7 @@ namespace PRSDesktop
         {
             InitializeComponent();
 
-            Preview.HideToolbar = true;
+            Preview.VisibleButtons = RichTextEditorButtons.None;
 
             Emails.OnSelectItem += Emails_OnSelectItem;
 

+ 1 - 1
prs.desktop/Panels/Notifications/NotificationForm.xaml

@@ -45,7 +45,7 @@
 
         <Label Content="Message Content:" Grid.Row="4" Grid.Column="1" />
         <dynamicgrid:RichTextEditor x:Name="ContentEdit" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="3"
-                                    Background="LightYellow" Margin="0,0,5,0" LostFocus="LostFocus" HideToolbar="False"
+                                    Background="LightYellow" Margin="0,0,5,0" LostFocus="LostFocus" VisibleButtons="Simple"
                                     ZoomFactor="150" />
 
         <Label Content="Attach To Job:" Grid.Row="6" Grid.Column="1" />

+ 0 - 2
prs.desktop/Panels/PurchaseOrders/SupplierPurchaseOrderItemOneToMany.cs

@@ -5,12 +5,10 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media.Imaging;
 using Comal.Classes;
-using FastReport.DevComponents.WinForms.Drawing;
 using InABox.Clients;
 using InABox.Core;
 using InABox.DynamicGrid;
 using InABox.WPF;
-using static InABox.DynamicGrid.DynamicMenuColumn;
 
 namespace PRSDesktop;
 

+ 9 - 5
prs.desktop/Panels/Quotes/Proposals/QuoteProposalDetails.xaml.cs

@@ -30,14 +30,20 @@ namespace PRSDesktop
         public QuoteProposalDetails()
         {
             InitializeComponent();
-
-            Preamble.EditorDefinition = new RichTextEditor();
+            
+            Preamble.EditorDefinition = (CoreUtils.GetProperty<QuoteProposal>(nameof(QuoteProposal.Preamble))?
+                .GetEditor() as RichTextEditor)?
+                .Clone() as RichTextEditor 
+                ?? new RichTextEditor();
             Preamble.ColumnName = "Preamble";
             Preamble.Configure();
             Preamble.OnEditorValueChanged += Preamble_OnEditorValueChanged;
             Preamble.Loaded = true;
 
-            Summary.EditorDefinition = new RichTextEditor();
+            Summary.EditorDefinition = (CoreUtils.GetProperty<QuoteProposal>(nameof(QuoteProposal.Summary))?
+                .GetEditor() as RichTextEditor)?
+                .Clone() as RichTextEditor 
+                ?? new RichTextEditor();
             Summary.ColumnName = "Summary";
             Summary.Configure();
             Summary.OnEditorValueChanged += Summary_OnEditorValueChanged;
@@ -61,8 +67,6 @@ namespace PRSDesktop
             IncTax.Loaded = true;
 
         }
-
-
         
         public void Refresh(bool columns, bool data)
         {

+ 0 - 6
prs.shared/Database Update Scripts/Update_7_31.cs

@@ -1,12 +1,6 @@
 using Comal.Classes;
-using FastReport.DevComponents.DotNetBar;
 using InABox.Core;
 using InABox.Database;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace PRS.Shared
 {