Skip to content

Fix new problem with LT-11746: Make Preview aware of publication #858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jtmaxwell3 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix new problem with LT-11746: Make Preview aware of publication #858

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 42 additions & 1 deletion Src/xWorks/XhtmlRecordDocView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using SIL.Windows.Forms.HtmlBrowser;
using System;
using System.Drawing;
using System.Linq;
using System.Windows.Forms;
using System.Xml;
using XCore;
Expand All @@ -25,6 +26,38 @@ public class XhtmlRecordDocView : RecordView, IVwNotifyChange
{
private XWebBrowser m_mainView;
internal string m_configObjectName;
private DictionaryPublicationDecorator m_pubDecorator;

public DictionaryPublicationDecorator PublicationDecorator
{
get
{
if (m_pubDecorator == null)
{
m_pubDecorator = new DictionaryPublicationDecorator(Cache, Clerk.VirtualListPublisher, Clerk.VirtualFlid);
}
var pubName = GetCurrentPublication();
if (xWorksStrings.AllEntriesPublication == pubName)
{
// A null publication means show everything
m_pubDecorator.Publication = null;
}
else
{
// look up the publication object

var pub = (from item in Cache.LangProject.LexDbOA.PublicationTypesOA.PossibilitiesOS
where item.Name.UserDefaultWritingSystem.Text == pubName
select item).FirstOrDefault();
if (pub != null && pub != m_pubDecorator.Publication)
{
// change the publication if it is different from the current one
m_pubDecorator.Publication = pub;
}
}
return m_pubDecorator;
}
}

public override void Init(Mediator mediator, PropertyTable propertyTable, XmlNode configurationParameters)
{
Expand Down Expand Up @@ -56,6 +89,13 @@ protected override void ReadParameters()
m_configObjectName = XmlUtils.GetOptionalAttributeValue(m_configurationParameters, "configureObjectName", null);
}

private string GetCurrentPublication()
{
// Returns the current publication and use '$$all_entries$$' if none has yet been set
return m_propertyTable.GetStringProperty("SelectedPublication",
xWorksStrings.AllEntriesPublication);
}

/// <summary>
/// Handle a mouse click in the web browser displaying the xhtml.
/// </summary>
Expand Down Expand Up @@ -126,7 +166,8 @@ protected override void ShowRecord()
return;
}
var configuration = new DictionaryConfigurationModel(configurationFile, Cache);
var xhtmlPath = LcmXhtmlGenerator.SavePreviewHtmlWithStyles(new [] { cmo.Hvo }, Clerk, null, configuration, m_propertyTable);
PublicationDecorator.Refresh();
var xhtmlPath = LcmXhtmlGenerator.SavePreviewHtmlWithStyles(new [] { cmo.Hvo }, Clerk, PublicationDecorator, configuration, m_propertyTable);
m_mainView.Url = new Uri(xhtmlPath);
m_mainView.Refresh(WebBrowserRefreshOption.Completely);
}
Expand Down
Loading