Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions .github/src-catalog.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Extensive catalog of shared dialogs covering backup/restore, project setup, writ
Paratext plug-in exposing FLEx lexicons via LexiconPlugin interfaces with project pickers, data wrappers, and UI so translators can consume FieldWorks lexical content inside Paratext.

### FwResources
Shared image and string libraries (FwStrings, FwTMStrings, HelpTopicPaths, toolbar assets) plus helper utilities that provide consistent branding and localization across the suite.
Shared image and string libraries (FwStrings, HelpTopicPaths, toolbar assets) plus helper utilities that provide consistent branding and localization across the suite.

### GenerateHCConfig
Command-line tool that loads FLEx morphology/phonology data and exports HermitCrab XML configuration so the parser can run outside FieldWorks.
Expand Down Expand Up @@ -122,9 +122,6 @@ Paratext interoperability layer supplying project discovery, scripture text acce
### Common/SimpleRootSite
Simplified IVwRootSite implementation with editing, selection, printing, and activation helpers that makes hosting Views content easy for most UI scenarios.

### Common/UIAdapterInterfaces
Adapter contracts (ITMAdapter, ISIBInterface, helpers) that decouple XCore mediator tooling from concrete WinForms controls and enable UI test doubles.

### Common/ViewsInterfaces
Managed COM interface definitions and wrappers (IVw* families, DispPropOverrideFactory, ComWrapper utilities) that bridge .NET code to the native Views text-rendering engine.

Expand Down
449 changes: 0 additions & 449 deletions DistFiles/FwTMDefinition.xml

This file was deleted.

20 changes: 0 additions & 20 deletions FieldWorks.sln
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleRootSite", "Src\Commo
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleRootSiteTests", "Src\Common\SimpleRootSite\SimpleRootSiteTests\SimpleRootSiteTests.csproj", "{D2BAD63B-0914-5014-BCE8-8D767A871F06}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UIAdapterInterfaces", "Src\Common\UIAdapterInterfaces\UIAdapterInterfaces.csproj", "{98E5183C-F4A6-5DAA-AFB8-B63F75ACA860}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnicodeCharEditor", "Src\UnicodeCharEditor\UnicodeCharEditor.csproj", "{FDC1EE9E-73F7-5EF2-9868-E44ACB00F168}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnicodeCharEditorTests", "Src\UnicodeCharEditor\UnicodeCharEditorTests\UnicodeCharEditorTests.csproj", "{515DEC49-6C0F-5F02-AC05-69AC6AF51639}"
Expand Down Expand Up @@ -1858,24 +1856,6 @@ Global
{D2BAD63B-0914-5014-BCE8-8D767A871F06}.Release|Any CPU.Build.0 = Release|Any CPU
{D2BAD63B-0914-5014-BCE8-8D767A871F06}.Release|x86.ActiveCfg = Release|Any CPU
{D2BAD63B-0914-5014-BCE8-8D767A871F06}.Release|x86.Build.0 = Release|Any CPU
{98E5183C-F4A6-5DAA-AFB8-B63F75ACA860}.Bounds|x64.ActiveCfg = Release|x64
{98E5183C-F4A6-5DAA-AFB8-B63F75ACA860}.Bounds|x64.Build.0 = Release|x64
{98E5183C-F4A6-5DAA-AFB8-B63F75ACA860}.Bounds|Any CPU.ActiveCfg = Bounds|Any CPU
{98E5183C-F4A6-5DAA-AFB8-B63F75ACA860}.Bounds|Any CPU.Build.0 = Bounds|Any CPU
{98E5183C-F4A6-5DAA-AFB8-B63F75ACA860}.Bounds|x86.ActiveCfg = Bounds|Any CPU
{98E5183C-F4A6-5DAA-AFB8-B63F75ACA860}.Bounds|x86.Build.0 = Bounds|Any CPU
{98E5183C-F4A6-5DAA-AFB8-B63F75ACA860}.Debug|x64.ActiveCfg = Debug|x64
{98E5183C-F4A6-5DAA-AFB8-B63F75ACA860}.Debug|x64.Build.0 = Debug|x64
{98E5183C-F4A6-5DAA-AFB8-B63F75ACA860}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{98E5183C-F4A6-5DAA-AFB8-B63F75ACA860}.Debug|Any CPU.Build.0 = Debug|Any CPU
{98E5183C-F4A6-5DAA-AFB8-B63F75ACA860}.Debug|x86.ActiveCfg = Debug|Any CPU
{98E5183C-F4A6-5DAA-AFB8-B63F75ACA860}.Debug|x86.Build.0 = Debug|Any CPU
{98E5183C-F4A6-5DAA-AFB8-B63F75ACA860}.Release|x64.ActiveCfg = Release|x64
{98E5183C-F4A6-5DAA-AFB8-B63F75ACA860}.Release|x64.Build.0 = Release|x64
{98E5183C-F4A6-5DAA-AFB8-B63F75ACA860}.Release|Any CPU.ActiveCfg = Release|Any CPU
{98E5183C-F4A6-5DAA-AFB8-B63F75ACA860}.Release|Any CPU.Build.0 = Release|Any CPU
{98E5183C-F4A6-5DAA-AFB8-B63F75ACA860}.Release|x86.ActiveCfg = Release|Any CPU
{98E5183C-F4A6-5DAA-AFB8-B63F75ACA860}.Release|x86.Build.0 = Release|Any CPU
{FDC1EE9E-73F7-5EF2-9868-E44ACB00F168}.Bounds|x64.ActiveCfg = Release|x64
{FDC1EE9E-73F7-5EF2-9868-E44ACB00F168}.Bounds|x64.Build.0 = Release|x64
{FDC1EE9E-73F7-5EF2-9868-E44ACB00F168}.Bounds|Any CPU.ActiveCfg = Bounds|Any CPU
Expand Down
1 change: 0 additions & 1 deletion Src/AppCore/AfDef.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ Last reviewed:
#define kcidTyping 123
#define kcidDeleteKey 124

#define kcidFilePageSetup 125
#define kcidEditSelAll 126
#define kcidFmtFnt 127
#define kcidFmtWrtgSys 128
Expand Down
84 changes: 0 additions & 84 deletions Src/Common/FieldWorks/WindowsInstallerQuery.cs

This file was deleted.

1 change: 0 additions & 1 deletion Src/Common/Framework/Framework.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
<ProjectReference Include="../FwUtils/FwUtils.csproj" />
<ProjectReference Include="../RootSite/RootSite.csproj" />
<ProjectReference Include="../SimpleRootSite/SimpleRootSite.csproj" />
<ProjectReference Include="../UIAdapterInterfaces/UIAdapterInterfaces.csproj" />
<ProjectReference Include="../ViewsInterfaces/ViewsInterfaces.csproj" />
</ItemGroup>
<ItemGroup>
Expand Down
27 changes: 0 additions & 27 deletions Src/Common/Framework/FrameworkTests/MainWindowDelegateTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,6 @@ public void OnStylesRenamedOrDeleted()
throw new NotImplementedException();
}

/// <summary/>
public bool PopulateParaStyleListOverride()
{
throw new NotImplementedException();
}

/// <summary/>
public LcmCache Cache { get; set; }

Expand Down Expand Up @@ -107,27 +101,6 @@ public int HvoAppRootObject {
throw new NotImplementedException();
}
}

/// <summary/>
public int MaxStyleLevelToShow {
get {
throw new NotImplementedException();
}
}

/// <summary/>
public bool ShowTEStylesComboInStylesDialog {
get {
throw new NotImplementedException();
}
}

/// <summary/>
public bool CanSelectParagraphBackgroundColor {
get {
throw new NotImplementedException();
}
}
#endregion

#region IWin32Window implementation
Expand Down
4 changes: 1 addition & 3 deletions Src/Common/Framework/FwEditingHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -439,9 +439,7 @@ public void InsertPicture(ICmPicture pict)

/// ------------------------------------------------------------------------------------
/// <summary>
/// This method is broken out so TeEditingHelper can override and adjust annotations.
/// Probably anything else that does it will need to adjust annotations, too, but nothing
/// else yet uses this kind of picture in an StText.
/// Inserts an ORC for the picture into the string and stores the result in the property.
/// </summary>
/// <param name="pict">The picture to insert an ORC for</param>
/// <param name="tss">The initial value of the TsString into which the ORC is to be
Expand Down
53 changes: 5 additions & 48 deletions Src/Common/Framework/MainWindowDelegate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,8 @@ bool ShowStylesDialog(string paraStyleName, string charStyleName,
/// </summary>
/// <param name="paraStyleName">Name of the initially selected paragraph style.</param>
/// <param name="charStyleName">Name of the initially selected character style.</param>
/// <param name="maxStyleLevel">The maximum style level that will be shown in this
/// dialog. (apps that do not use style levels in their stylesheets can pass 0)</param>
/// ------------------------------------------------------------------------------------
void ShowApplyStyleDialog(string paraStyleName, string charStyleName, int maxStyleLevel);
void ShowApplyStyleDialog(string paraStyleName, string charStyleName);

/// ------------------------------------------------------------------------------------
/// <summary>
Expand Down Expand Up @@ -178,33 +176,9 @@ public interface IMainWindowDelegateCallbacks : IWin32Window
/// </summary>
int HvoAppRootObject { get; }
/// <summary>
/// Gets the maximum style level to show. Default value is max int to show all styles.
/// </summary>
int MaxStyleLevelToShow { get; }
/// <summary>
/// Called when styles are renamed or deleted.
/// </summary>
void OnStylesRenamedOrDeleted();
/// <summary>
/// Allows individual implementations to override the default behavior when populating
/// the paragraph style list.
/// </summary>
/// <returns><c>true</c> if implementation overrides the default; <c>false</c> if the
/// default behavior is desired.</returns>
bool PopulateParaStyleListOverride();
/// <summary>
/// Gets or sets a value indicating whether or not to show the TE style type combo box
/// in the styles dialog where the user can select the type of styles to show
/// (all, basic, or custom styles). False indicates a FLEx style type combo box
/// (all, basic, dictionary, or custom styles).
/// </summary>
bool ShowTEStylesComboInStylesDialog { get; }
/// <summary>
/// Gets a value indicating whether the user can select a background color on the
/// paragraph tab in the styles dialog. This is possible in all apps except TE.
/// </summary>
/// <value>The default implementation always return <c>true</c>.</value>
bool CanSelectParagraphBackgroundColor { get; }
}
#endregion

Expand Down Expand Up @@ -300,16 +274,6 @@ private ComboBox WritingSystemSelector
get { return m_callbacks.WritingSystemSelector; }
}

/// ------------------------------------------------------------------------------------
/// <summary>
/// Gets the setting for the maximum style level to show.
/// </summary>
/// ------------------------------------------------------------------------------------
private int MaxStyleLevelToShow
{
get { return m_callbacks.MaxStyleLevelToShow; }
}

/// ------------------------------------------------------------------------------------
/// <summary>
/// Gets the hvo of the main "root object" associated with the application to which this
Expand Down Expand Up @@ -588,9 +552,6 @@ public void UpdateWritingSystemSelectorForSelection(IVwRootBox rootbox)
/// ------------------------------------------------------------------------------------
public void RefreshParaStyleComboBoxList(IStStyle style, IRootSite view)
{
if (m_callbacks.PopulateParaStyleListOverride())
return;

if (ParaStyleListHelper.ActiveView == view && style != null &&
m_prevParaStyleContext == style.Context)
{
Expand Down Expand Up @@ -684,14 +645,13 @@ public bool ShowStylesDialog(string paraStyleName, string charStyleName,
Cache, ActiveStyleSheet, (vc == null) ? false : vc.RightToLeft,
Cache.ServiceLocator.WritingSystems.AllWritingSystems.Any(ws => ws.RightToLeftScript),
ActiveStyleSheet.GetDefaultBasedOnStyleName(),
MaxStyleLevelToShow, m_app.MeasurementSystem, paraStyleName, charStyleName,
m_app.MeasurementSystem, paraStyleName, charStyleName,
HvoAppRootObject, m_app, m_app))
{
stylesDlg.SetPropsToFactorySettings = setPropsToFactorySettings;
stylesDlg.StylesRenamedOrDeleted += m_callbacks.OnStylesRenamedOrDeleted;
stylesDlg.AllowSelectStyleTypes = true;
stylesDlg.ShowTEStyleTypes = m_callbacks.ShowTEStylesComboInStylesDialog;
stylesDlg.CanSelectParagraphBackgroundColor = m_callbacks.CanSelectParagraphBackgroundColor;
stylesDlg.CanSelectParagraphBackgroundColor = true;
return (stylesDlg.ShowDialog(m_callbacks) == DialogResult.OK &&
((stylesDlg.ChangeType & StyleChangeType.DefChanged) > 0 ||
(stylesDlg.ChangeType & StyleChangeType.Added) > 0));
Expand All @@ -718,10 +678,8 @@ public static int ContextValuesToInt(ContextValues context)
/// </summary>
/// <param name="paraStyleName">Name of the para style.</param>
/// <param name="charStyleName">Name of the char style.</param>
/// <param name="maxStyleLevel">The maximum style level that will be shown in this
/// dialog. (apps that do not use style levels in their stylesheets can pass 0)</param>
/// ------------------------------------------------------------------------------------
public void ShowApplyStyleDialog(string paraStyleName, string charStyleName, int maxStyleLevel)
public void ShowApplyStyleDialog(string paraStyleName, string charStyleName)
{
SimpleRootSite rootsite = (ActiveView as SimpleRootSite);
try
Expand All @@ -742,7 +700,7 @@ public void ShowApplyStyleDialog(string paraStyleName, string charStyleName, int
ActiveView.CastAsIVwRootSite().RootBox.GetRootObject(out hvoRoot, out vc, out frag, out ss);
using (FwApplyStyleDlg applyStyleDlg = new FwApplyStyleDlg(ActiveView.CastAsIVwRootSite(),
Cache, ActiveStyleSheet.RootObjectHvo, StyleSheetOwningFlid,
ActiveStyleSheet.GetDefaultBasedOnStyleName(), maxStyleLevel,
ActiveStyleSheet.GetDefaultBasedOnStyleName(),
paraStyleName, charStyleName, hvoRoot, m_app, m_app))
{
if (FwEditingHelper != null)
Expand All @@ -756,7 +714,6 @@ public void ShowApplyStyleDialog(string paraStyleName, string charStyleName, int
if (m_app.DefaultStyleContexts != null)
applyStyleDlg.ApplicableStyleContexts = m_app.DefaultStyleContexts;
}
applyStyleDlg.AllowSelectStyleTypes = m_callbacks.ShowTEStylesComboInStylesDialog;
applyStyleDlg.CanApplyCharacterStyle = sel.CanFormatChar;
applyStyleDlg.CanApplyParagraphStyle = sel.CanFormatPara;

Expand Down
Loading
Loading