diff --git a/.github/src-catalog.md b/.github/src-catalog.md index 009d0b3b07..655e48c477 100644 --- a/.github/src-catalog.md +++ b/.github/src-catalog.md @@ -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. @@ -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. diff --git a/DistFiles/FwTMDefinition.xml b/DistFiles/FwTMDefinition.xml deleted file mode 100644 index e6d2357950..0000000000 --- a/DistFiles/FwTMDefinition.xml +++ /dev/null @@ -1,449 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/FieldWorks.sln b/FieldWorks.sln index 2b4cffb191..fef00f4b77 100644 --- a/FieldWorks.sln +++ b/FieldWorks.sln @@ -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}" @@ -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 diff --git a/Src/AppCore/AfDef.h b/Src/AppCore/AfDef.h index bf57f6ec86..551f30cbb1 100644 --- a/Src/AppCore/AfDef.h +++ b/Src/AppCore/AfDef.h @@ -61,7 +61,6 @@ Last reviewed: #define kcidTyping 123 #define kcidDeleteKey 124 -#define kcidFilePageSetup 125 #define kcidEditSelAll 126 #define kcidFmtFnt 127 #define kcidFmtWrtgSys 128 diff --git a/Src/Common/FieldWorks/WindowsInstallerQuery.cs b/Src/Common/FieldWorks/WindowsInstallerQuery.cs deleted file mode 100644 index 23f98bc5a6..0000000000 --- a/Src/Common/FieldWorks/WindowsInstallerQuery.cs +++ /dev/null @@ -1,84 +0,0 @@ -// Copyright (c) 2010-2018 SIL International -// This software is licensed under the LGPL, version 2.1 or later -// (http://www.gnu.org/licenses/lgpl-2.1.html) -using System; -using System.Runtime.InteropServices; -using System.Text; - -namespace SIL.FieldWorks -{ - /// - /// Class to find out some details about the current FW installation. - /// - public static class WindowsInstallerQuery - { - private const string InstallerProductCode = "{8E80F1ED-826A-46d5-A59A-D8A203F2F0D9}"; - private const string InstalledProductNameProperty = "InstalledProductName"; - private const string TeFeatureName = "TE"; - - private const int ErrorMoreData = 234; - private const int ErrorUnknownProduct = 1605; - private const int ErrorUnknownFeature = 1606; - - [DllImport("msi.dll", CharSet = CharSet.Unicode, SetLastError = true)] - private static extern Int32 MsiGetProductInfo(string product, string property, - StringBuilder valueBuf, ref Int32 cchValueBuf); - - [DllImport("msi.dll", CharSet = CharSet.Unicode)] - internal static extern uint MsiOpenProduct(string szProduct, out int hProduct); - - [DllImport("msi.dll", CharSet = CharSet.Unicode)] - internal static extern uint MsiGetFeatureInfo(int hProduct, string szFeature, out uint lpAttributes, StringBuilder lpTitleBuf, ref uint cchTitleBuf, StringBuilder lpHelpBuf, ref uint cchHelpBuf); - - /// - /// Check the installer status to see if FW is installed on the user's machine. - /// If not, it can be assumed we are running on a developer's machine. - /// - /// True if this is an installed version - public static bool IsThisInstalled() - { - string productName; - - var status = GetProductInfo(InstalledProductNameProperty, out productName); - - return status != ErrorUnknownProduct; - } - - /// - /// Check the installer status to see if we are running a BTE version of FW. - /// If the product is not installed then we assume this is a developer build - /// and just say it's BTE anyway. - /// - /// True if this is a BTE version - public static bool IsThisBTE() - { - string productName; - - var status = GetProductInfo(InstalledProductNameProperty, out productName); - - if (status == ErrorUnknownProduct) - return true; // Assume it's BTE if we can't find installation information - - return productName.EndsWith("BTE"); - } - - private static Int32 GetProductInfo(string propertyName, out string propertyValue) - { - var sbBuffer = new StringBuilder(); - var len = sbBuffer.Capacity; - sbBuffer.Length = 0; - - var status = MsiGetProductInfo(InstallerProductCode, propertyName, sbBuffer, ref len); - if (status == ErrorMoreData) - { - len++; - sbBuffer.EnsureCapacity(len); - status = MsiGetProductInfo(InstallerProductCode, InstalledProductNameProperty, sbBuffer, ref len); - } - - propertyValue = sbBuffer.ToString(); - - return status; - } - } -} \ No newline at end of file diff --git a/Src/Common/Framework/Framework.csproj b/Src/Common/Framework/Framework.csproj index 291d0936ac..ed7b84701d 100644 --- a/Src/Common/Framework/Framework.csproj +++ b/Src/Common/Framework/Framework.csproj @@ -54,7 +54,6 @@ - diff --git a/Src/Common/Framework/FrameworkTests/MainWindowDelegateTests.cs b/Src/Common/Framework/FrameworkTests/MainWindowDelegateTests.cs index 9779936260..1363537077 100644 --- a/Src/Common/Framework/FrameworkTests/MainWindowDelegateTests.cs +++ b/Src/Common/Framework/FrameworkTests/MainWindowDelegateTests.cs @@ -29,12 +29,6 @@ public void OnStylesRenamedOrDeleted() throw new NotImplementedException(); } - /// - public bool PopulateParaStyleListOverride() - { - throw new NotImplementedException(); - } - /// public LcmCache Cache { get; set; } @@ -107,27 +101,6 @@ public int HvoAppRootObject { throw new NotImplementedException(); } } - - /// - public int MaxStyleLevelToShow { - get { - throw new NotImplementedException(); - } - } - - /// - public bool ShowTEStylesComboInStylesDialog { - get { - throw new NotImplementedException(); - } - } - - /// - public bool CanSelectParagraphBackgroundColor { - get { - throw new NotImplementedException(); - } - } #endregion #region IWin32Window implementation diff --git a/Src/Common/Framework/FwEditingHelper.cs b/Src/Common/Framework/FwEditingHelper.cs index 82f5a73685..3f091efadb 100644 --- a/Src/Common/Framework/FwEditingHelper.cs +++ b/Src/Common/Framework/FwEditingHelper.cs @@ -439,9 +439,7 @@ public void InsertPicture(ICmPicture pict) /// ------------------------------------------------------------------------------------ /// - /// 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. /// /// The picture to insert an ORC for /// The initial value of the TsString into which the ORC is to be diff --git a/Src/Common/Framework/MainWindowDelegate.cs b/Src/Common/Framework/MainWindowDelegate.cs index 22ac64f4b3..f3f3be9025 100644 --- a/Src/Common/Framework/MainWindowDelegate.cs +++ b/Src/Common/Framework/MainWindowDelegate.cs @@ -104,10 +104,8 @@ bool ShowStylesDialog(string paraStyleName, string charStyleName, /// /// Name of the initially selected paragraph style. /// Name of the initially selected character style. - /// The maximum style level that will be shown in this - /// dialog. (apps that do not use style levels in their stylesheets can pass 0) /// ------------------------------------------------------------------------------------ - void ShowApplyStyleDialog(string paraStyleName, string charStyleName, int maxStyleLevel); + void ShowApplyStyleDialog(string paraStyleName, string charStyleName); /// ------------------------------------------------------------------------------------ /// @@ -178,33 +176,9 @@ public interface IMainWindowDelegateCallbacks : IWin32Window /// int HvoAppRootObject { get; } /// - /// Gets the maximum style level to show. Default value is max int to show all styles. - /// - int MaxStyleLevelToShow { get; } - /// /// Called when styles are renamed or deleted. /// void OnStylesRenamedOrDeleted(); - /// - /// Allows individual implementations to override the default behavior when populating - /// the paragraph style list. - /// - /// true if implementation overrides the default; false if the - /// default behavior is desired. - bool PopulateParaStyleListOverride(); - /// - /// 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). - /// - bool ShowTEStylesComboInStylesDialog { get; } - /// - /// 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. - /// - /// The default implementation always return true. - bool CanSelectParagraphBackgroundColor { get; } } #endregion @@ -300,16 +274,6 @@ private ComboBox WritingSystemSelector get { return m_callbacks.WritingSystemSelector; } } - /// ------------------------------------------------------------------------------------ - /// - /// Gets the setting for the maximum style level to show. - /// - /// ------------------------------------------------------------------------------------ - private int MaxStyleLevelToShow - { - get { return m_callbacks.MaxStyleLevelToShow; } - } - /// ------------------------------------------------------------------------------------ /// /// Gets the hvo of the main "root object" associated with the application to which this @@ -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) { @@ -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)); @@ -718,10 +678,8 @@ public static int ContextValuesToInt(ContextValues context) /// /// Name of the para style. /// Name of the char style. - /// The maximum style level that will be shown in this - /// dialog. (apps that do not use style levels in their stylesheets can pass 0) /// ------------------------------------------------------------------------------------ - public void ShowApplyStyleDialog(string paraStyleName, string charStyleName, int maxStyleLevel) + public void ShowApplyStyleDialog(string paraStyleName, string charStyleName) { SimpleRootSite rootsite = (ActiveView as SimpleRootSite); try @@ -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) @@ -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; diff --git a/Src/Common/Framework/PublicationInterfaces.cs b/Src/Common/Framework/PublicationInterfaces.cs deleted file mode 100644 index da2fb4e42b..0000000000 --- a/Src/Common/Framework/PublicationInterfaces.cs +++ /dev/null @@ -1,90 +0,0 @@ -// Copyright (c) 2007-2013 SIL International -// This software is licensed under the LGPL, version 2.1 or later -// (http://www.gnu.org/licenses/lgpl-2.1.html) -// -// File: IPublicationView.cs -// Responsibility: TE Team - -using System; -using System.Windows.Forms; -using System.Text; -using SIL.LCModel; -using SIL.FieldWorks.Common.RootSites; - -namespace SIL.FieldWorks.Common.Framework -{ - /// ---------------------------------------------------------------------------------------- - /// - /// Implement that any publication control that appears as a view in the client area of a - /// main window must implement. - /// - /// ---------------------------------------------------------------------------------------- - public interface IPublicationView : IRootSite - { - /// ------------------------------------------------------------------------------------ - /// - /// Applies the publication overrides on styles in the view. - /// - /// Base character size to use for normal in the stylesheet - /// in millipoints. - /// The line spacing to use for normal in the stylesheet - /// in millipoints. - /// ------------------------------------------------------------------------------------ - void ApplyPubOverrides(decimal pubCharSize, decimal pubLineSpacing); - - /// ------------------------------------------------------------------------------------ - /// - /// Handle Print command - /// - /// ------------------------------------------------------------------------------------ - bool OnFilePrint(); - - /// ------------------------------------------------------------------------------------ - /// - /// Gets the number of pages in the publication - /// - /// ------------------------------------------------------------------------------------ - int PageCount - { - get; - } - } - - /// ---------------------------------------------------------------------------------------- - /// - /// Interface that any page setup dialog must implement (and ours does!) - /// - /// ---------------------------------------------------------------------------------------- - public interface IPageSetupDialog : IDisposable - { - /// ------------------------------------------------------------------------------------ - /// - /// Gets the size of the base character in millipoints. - /// - /// ------------------------------------------------------------------------------------ - int BaseCharacterSize { get; } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets the base (normal) line spacing in millipoints. - /// - /// ------------------------------------------------------------------------------------ - int BaseLineSpacing { get; } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets the text associated with this control. - /// - /// ------------------------------------------------------------------------------------ - string Text { get; set; } - - /// ------------------------------------------------------------------------------------ - /// - /// Runs the page setup dialog box with a default owner. - /// - /// if the user clicks OK in the dialog box; - /// otherwise, . - /// ------------------------------------------------------------------------------------ - DialogResult ShowDialog(); - } -} diff --git a/Src/Common/Framework/StylesXmlAccessor.cs b/Src/Common/Framework/StylesXmlAccessor.cs index 0c0c3de24b..7a2c60d43c 100644 --- a/Src/Common/Framework/StylesXmlAccessor.cs +++ b/Src/Common/Framework/StylesXmlAccessor.cs @@ -302,8 +302,6 @@ protected void CreateStyles() MoveStylesFromScriptureToLangProject(); // Populate hashtable with initial set of styles - // these are NOT from the *Styles.xml files or from TeStylesXmlAccessor.InitReservedStyles() - // They are from loading scripture styles in TE tests only. foreach (var sty in m_databaseStyles) m_htOrigStyles[sty.Name] = sty; @@ -358,28 +356,6 @@ protected void MoveStylesFromScriptureToLangProject() } } - /// ------------------------------------------------------------------------------------ - /// - /// Gets the application specific default font. This is usually the default font, but - /// in the case of TE it is the body font. - /// - /// The app default font. - /// ------------------------------------------------------------------------------------ - protected virtual string AppDefaultFont - { - get { return StyleServices.DefaultFont; } - } - - /// - /// Return true if this is the 'normal' style that all others inherit from. TE overrides. - /// - /// - /// - protected virtual bool IsNormalStyle(string styleName) - { - return styleName == "Normal"; - } - /// ------------------------------------------------------------------------------------ /// /// Define reserved styles. By default there is nothing to do. @@ -751,7 +727,6 @@ public StyleType GetType(XmlAttributeCollection attributes, string styleName, switch(sType) { case "paragraph": - ValidateParagraphContext(context, styleName); return StyleType.kstParagraph; case "character": return StyleType.kstCharacter; @@ -759,16 +734,6 @@ public StyleType GetType(XmlAttributeCollection attributes, string styleName, throw new ArgumentOutOfRangeException($"Unrecognized type attribute for style {styleName} in {ResourceFileName}: {sType}"); } } - - /// - /// Throw an exception if the specified context is not valid for the specified paragraph style. - /// TE overrides to forbid 'general' paragraph styles. This default does nothing. - /// - /// - /// - protected virtual void ValidateParagraphContext(ContextValues context, string styleName) - { - } #endregion #region Style upgrade stuff diff --git a/Src/Common/RootSite/RootSite.csproj b/Src/Common/RootSite/RootSite.csproj index 933d0ba23b..1dda986866 100644 --- a/Src/Common/RootSite/RootSite.csproj +++ b/Src/Common/RootSite/RootSite.csproj @@ -41,7 +41,6 @@ - diff --git a/Src/Common/RootSite/RootSiteEditingHelper.cs b/Src/Common/RootSite/RootSiteEditingHelper.cs index 782ef5a33c..8d3167cf17 100644 --- a/Src/Common/RootSite/RootSiteEditingHelper.cs +++ b/Src/Common/RootSite/RootSiteEditingHelper.cs @@ -15,7 +15,6 @@ using SIL.LCModel.Core.KernelInterfaces; using SIL.FieldWorks.Common.ViewsInterfaces; using SIL.FieldWorks.Common.FwUtils; -using SIL.FieldWorks.Common.UIAdapters; using SIL.LCModel; using SIL.LCModel.Application; using SIL.LCModel.DomainServices; @@ -37,24 +36,9 @@ public class RootSiteEditingHelper : EditingHelper internal static int kMaxSpellingSuggestionsInRootMenu = 7; #endregion - #region Enums - /// - public enum SpellCheckStatus - { - /// spell checking is enabled but word is in dictionary - WordInDictionary, - /// spell checking enabled with word not in dictionary, - /// whether or not suggestions exist - Enabled, - /// spell checking disabled - Disabled - } - #endregion - #region Member variables /// The FDO cache protected LcmCache m_cache; - private SpellCheckStatus m_spellCheckStatus = SpellCheckStatus.Disabled; private SpellCheckHelper m_spellCheckHelper = null; private int m_undoCountBeforeMerge; #endregion @@ -150,195 +134,6 @@ protected virtual SpellCheckHelper CreateSpellCheckHelper() return new SpellCheckHelper(Cache); } - /// ------------------------------------------------------------------------------------ - /// - /// Gets a value indicating what the status of the spell checking system is for the - /// sake of the the context menu that's being shown in the ShowContextMenu method. - /// This property is only valid when the context menu popped-up in that method is - /// in the process of being shown. This property is used for the SimpleRootSites who - /// need to handle the update messages for those spelling options. - /// - /// ------------------------------------------------------------------------------------ - public SpellCheckStatus SpellCheckingStatus - { - get { return m_spellCheckStatus; } - } - - /// ------------------------------------------------------------------------------------ - /// - /// Displays the specified context menu for the specified rootsite at the specified - /// mouse position. This will also determine whether or not to include the spelling - /// correction options. - /// - /// ------------------------------------------------------------------------------------ - public void ShowContextMenu(Point mousePos, ITMAdapter tmAdapter, - RootSite rootsite, string contextMenuName, string addToDictMenuName, - string insertBeforeMenuName, string changeMultipleMenuName, bool fShowSpellingOptions) - { - CheckDisposed(); - - m_spellCheckStatus = SpellCheckStatus.Disabled; - List menuItemNames = null; - - if (fShowSpellingOptions) - { - Debug.Assert(rootsite.RootBox == Callbacks.EditedRootBox); - menuItemNames = MakeSpellCheckMenuOptions(mousePos, rootsite, tmAdapter, - contextMenuName, addToDictMenuName, insertBeforeMenuName, - changeMultipleMenuName); - - m_spellCheckStatus = (menuItemNames == null ? - SpellCheckStatus.WordInDictionary : SpellCheckStatus.Enabled); - } - - Point pt = rootsite.PointToScreen(mousePos); - tmAdapter.PopupMenu(contextMenuName, pt.X, pt.Y, menuItemNames); - } - - /// ------------------------------------------------------------------------------------ - /// - /// Make spell checking menu options using the DotNetBar adapter. - /// - /// ------------------------------------------------------------------------------------ - private List MakeSpellCheckMenuOptions(Point mousePos, RootSite rootsite, - ITMAdapter tmAdapter, string menuName, string addToDictMenuName, - string changeMultipleMenuName, string insertBeforeMenuName) - { - int hvoObj, tag, wsAlt, wsText; - string word; - ISpellEngine dict; - bool nonSpellingError; - ICollection suggestions = SpellCheckHelper.GetSuggestions(mousePos, rootsite, - out hvoObj, out tag, out wsAlt, out wsText, out word, out dict, out nonSpellingError); - - IVwRootBox rootb = rootsite.RootBox; - // These two menu items are disabled for non-spelling errors. In addition, for addToDict, we need - // to set the tag to an AddToDictMenuItem which can actually do the work. - UpdateItemProps(tmAdapter, addToDictMenuName, nonSpellingError, new AddToDictMenuItem(dict, word, rootb, - hvoObj, tag, wsAlt, wsText, RootSiteStrings.ksAddToDictionary, Cache)); - // any non-null value of tag will indicate the item should be enabled, tested in TeMainWnd.UpdateSpellingMenus. - UpdateItemProps(tmAdapter, changeMultipleMenuName, nonSpellingError, "ok to change"); - - if (suggestions == null) - return null; - - // Make the menu options. - List menuItemNames = new List(); - TMItemProperties itemProps; - if (suggestions.Count == 0) - { - itemProps = new TMItemProperties(); - itemProps.Name = "noSpellingSuggestion"; - itemProps.Text = RootSiteStrings.ksNoSuggestions; - itemProps.Enabled = false; - menuItemNames.Add(itemProps.Name); - tmAdapter.AddContextMenuItem(itemProps, menuName, insertBeforeMenuName); - } - - int cSuggestions = 0; - string additionalSuggestionsMenuName = "additionalSpellSuggestion"; - - foreach (SpellCorrectMenuItem scmi in suggestions) - { - itemProps = new TMItemProperties(); - itemProps.Name = "spellSuggestion" + scmi.Text; - itemProps.Text = scmi.Text; - itemProps.Message = "SpellingSuggestionChosen"; - itemProps.CommandId = "CmdSpellingSuggestionChosen"; - itemProps.Tag = scmi; - itemProps.Font = (wsText == 0) ? null : GetFontForNormalStyle(wsText, - rootb.Stylesheet, rootb.DataAccess.WritingSystemFactory); - - if (cSuggestions++ == kMaxSpellingSuggestionsInRootMenu) - { - TMItemProperties tmpItemProps = new TMItemProperties(); - tmpItemProps.Name = additionalSuggestionsMenuName; - tmpItemProps.Text = RootSiteStrings.ksAdditionalSuggestions; - menuItemNames.Add(tmpItemProps.Name); - tmAdapter.AddContextMenuItem(tmpItemProps, menuName, insertBeforeMenuName); - insertBeforeMenuName = null; - } - - if (insertBeforeMenuName != null) - { - menuItemNames.Add(itemProps.Name); - tmAdapter.AddContextMenuItem(itemProps, menuName, insertBeforeMenuName); - } - else - { - tmAdapter.AddContextMenuItem(itemProps, menuName, - additionalSuggestionsMenuName, null); - } - } - - return menuItemNames; - } - - void UpdateItemProps(ITMAdapter tmAdapter, string menuName, bool nonSpellingError, object tag) - { - TMItemProperties itemProps = tmAdapter.GetItemProperties(menuName); - if (itemProps != null) - { - if (nonSpellingError) - { - itemProps.Tag = null; // disable - } - else - { - itemProps.Tag = tag; - } - itemProps.Update = true; - tmAdapter.SetItemProperties(menuName, itemProps); - } - } - - // This is part of an alternate strategy for spell checking that allows spell checking options to be added - // to an xCore-managed menu. It was developed to the point of a submenu, but not enhanced to allow the - // top seven suggestions to be at the top level. If we want to do that, I think we'll need to enhance the - // colleague with specific methods to enable and change the text of seven distinct menu items (which will - // need to be defined in the XML), like CmdFirstSpellSuggestion, CmdSecondSpellSuggestion, etc. - // For example, something like this in main.xml, at the start of mnuObjectChoices, works with the current code - // (see e.g., call to MakeSpellCheckColleague commented out in SandboxBase). - // - // - // The enhaned version might look more like this: - // - // - // - // - // Also need to define the commands, e.g., - // - // - ///// ----------------------------------------------------------------------------------- - ///// - ///// If the mousePos is part of a word that is not properly spelled, make a colleague - ///// which can handle the menu options for correcting it or adding it to the dictionary. - ///// Otherwise, answer null. - ///// - ///// The location of the mouse - ///// The rootbox - ///// - ///// - ///// ----------------------------------------------------------------------------------- - //public IxCoreColleague MakeSpellCheckColleague(Point mousePos, IVwRootBox rootb, - // Rectangle rcSrcRoot, Rectangle rcDstRoot) - //{ - // CheckDisposed(); - // int ichMin, ichLim, hvoObj, tag, wsAlt, wsText; - // string word; - // Dictionary dict; - // ICollection suggestions = GetSuggestions(mousePos, rootb, rcSrcRoot, rcDstRoot, - // out hvoObj, out tag, out wsAlt, out wsText, out ichMin, out ichLim, out word, out dict); - // if (suggestions == null) - // return null; - // return new SpellCorrectColleague(rootb, suggestions, hvoObj, tag, wsAlt, wsText, ichMin, ichLim, word, dict, this); - // - - void itemAdd_Click(object sender, EventArgs e) - { - (sender as AddToDictMenuItem).AddWordToDictionary(); - } - /// ------------------------------------------------------------------------------------ /// /// Return the dictionary which should be used for the specified writing system. diff --git a/Src/Common/RootSite/SpellCheckHelper.cs b/Src/Common/RootSite/SpellCheckHelper.cs index f06e4fedaa..b96198af92 100644 --- a/Src/Common/RootSite/SpellCheckHelper.cs +++ b/Src/Common/RootSite/SpellCheckHelper.cs @@ -617,26 +617,6 @@ public void AddWordToDictionary() m_rootb.DataAccess.EndUndoTask(); } - /// ------------------------------------------------------------------------------------ - /// - /// This information is useful for an override of MakeSpellCheckMenuOptions in TeEditingHelper. - /// - /// ------------------------------------------------------------------------------------ - public string Word - { - get { return m_word; } - } - - /// ------------------------------------------------------------------------------------ - /// - /// The writing system of the actual mis-spelled word. - /// - /// ------------------------------------------------------------------------------------ - public int WritingSystem - { - get { return m_wsText; } - } - /// ------------------------------------------------------------------------------------ /// /// Add the word to the spelling dictionary. diff --git a/Src/Common/SimpleRootSite/EditingHelper.cs b/Src/Common/SimpleRootSite/EditingHelper.cs index b688ab2730..aa3ba6970c 100644 --- a/Src/Common/SimpleRootSite/EditingHelper.cs +++ b/Src/Common/SimpleRootSite/EditingHelper.cs @@ -1592,20 +1592,6 @@ private Cursor GetCursor(bool fInObject, bool fInPicture, FwObjDataTypes objData return (Control is SimpleRootSite) ? ((SimpleRootSite)Control).IBeamCursor : Cursors.IBeam; } - - /// ------------------------------------------------------------------------------------ - /// - /// Convert this instance to type T. - /// - /// Desired type to cast to. - /// Editing helper cast as T. - /// We added this method so that we can retrieve the TeEditingHelper from the - /// PublicationEditingHelper (which internally contains an TeEditingHelper). - /// ------------------------------------------------------------------------------------ - public virtual T CastAs() where T : EditingHelper - { - return this as T; - } #endregion #region Style related methods diff --git a/Src/Common/UIAdapterInterfaces/AssemblyInfo.cs b/Src/Common/UIAdapterInterfaces/AssemblyInfo.cs deleted file mode 100644 index 0040a05418..0000000000 --- a/Src/Common/UIAdapterInterfaces/AssemblyInfo.cs +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) 2002-2013 SIL International -// This software is licensed under the LGPL, version 2.1 or later -// (http://www.gnu.org/licenses/lgpl-2.1.html) -// -------------------------------------------------------------------------------------------- -using System.Reflection; -using System.Runtime.CompilerServices; - -// [assembly: AssemblyTitle("FieldWorks Interfaces for xCore adapters")] // Sanitized by convert_generate_assembly_info - -// [assembly: System.Runtime.InteropServices.ComVisible(false)] // Sanitized by convert_generate_assembly_info \ No newline at end of file diff --git a/Src/Common/UIAdapterInterfaces/HelperClasses.cs b/Src/Common/UIAdapterInterfaces/HelperClasses.cs deleted file mode 100644 index dafb28d0aa..0000000000 --- a/Src/Common/UIAdapterInterfaces/HelperClasses.cs +++ /dev/null @@ -1,652 +0,0 @@ -// Copyright (c) 2003-2022 SIL International -// This software is licensed under the LGPL, version 2.1 or later -// (http://www.gnu.org/licenses/lgpl-2.1.html) - -using System; -using System.Collections; -using System.Drawing; -using System.Windows.Forms; - -namespace SIL.FieldWorks.Common.UIAdapters -{ - /// Handler for allowing applications to initialize a toolbar. - public delegate void InitializeBarHandler(ref TMBarProperties barProps); - - /// Handler for allowing applications to initialize a toolbar item. - public delegate void InitializeItemHandler(ref TMItemProperties itemProps); - - /// Handler for allowing applications a chance to set the contents of a combobox item. - public delegate void InitializeComboItemHandler(string name, ComboBox cboItem); - - /// Handler for allowing applications to respond to a toolbar's request for a - /// control container control. - public delegate Control LoadControlContainerItemHandler(string name, string tooltip); - - /// Handler for requesting toolbar information from an application so a menu - /// adapter can provide menu items to toggle the visibility of toolbars. - public delegate TMItemProperties[] GetBarInfoForViewMenuHandler(); - - #region TMItemProperties Class - /// ---------------------------------------------------------------------------------------- - /// - /// This class is used to pass information back and forth between a ToolBarAdapter object - /// and toolbar item command handlers for click and update. - /// - /// ---------------------------------------------------------------------------------------- - public class TMItemProperties - { - private bool m_update = false; - private string m_name = string.Empty; - private string m_text = string.Empty; - private string m_category = string.Empty; - private string m_tooltip = string.Empty; - private string m_commandId = string.Empty; - private string m_message = string.Empty; - private string m_originalText = string.Empty; - //private string m_statusMsg = string.Empty; - //private string m_shortcut = "None"; - private bool m_enabled = true; - private bool m_checked = false; - private bool m_visible = true; - private bool m_beginGroup = false; - //private bool m_isImageAppSpecific = false; - //private int m_imageIndex = -1; - private Control m_ctrl = null; - private Image m_image = null; - private ArrayList m_list = null; - private Form m_parentForm = null; - private bool m_isDisplayed = false; - private object m_tag = null; - private Font m_font = null; - - /// ------------------------------------------------------------------------------------ - /// - /// Creates a TMItemProperties object. - /// - /// ------------------------------------------------------------------------------------ - public TMItemProperties() - { - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets the name for a menu/toolbar item. Setting this value should not change - /// an item's name within the XML definition. It is only used to be able to pass - /// an item's name to instantiators of a toolbar adapter. - /// - /// ------------------------------------------------------------------------------------ - public string Name - { - get {return m_name;} - set {m_name = value;} - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets the text for a menu/toolbar item. - /// - /// ------------------------------------------------------------------------------------ - public string Text - { - get {return m_text;} - set {m_text = value;} - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets the value of the item's text as it came from the resources. Setting this - /// value in your appication has no effect. It is ignored. - /// - /// ------------------------------------------------------------------------------------ - public string OriginalText - { - get {return m_originalText;} - set {m_originalText = value;} - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets the font to be used in a button or menu. This value should only be set - /// when the item's font should be something other than the default. When the default - /// font is being used to display the text of this item, this value will be null. - /// - /// ------------------------------------------------------------------------------------ - public Font Font - { - get { return m_font; } - set { m_font = value; } - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets the category (e.g. "Bold" button's category would be "Format") for a - /// menu/toolbar item. - /// - /// ------------------------------------------------------------------------------------ - public string Category - { - get {return m_category;} - set {m_category = value;} - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets the tooltip for a menu/toolbar item. - /// - /// ------------------------------------------------------------------------------------ - public string Tooltip - { - get {return m_tooltip;} - set {m_tooltip = value;} - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets the command Id for a menu/toolbar item. - /// - /// ------------------------------------------------------------------------------------ - public string CommandId - { - get {return m_commandId;} - set {m_commandId = value;} - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets the command id for a menu/toolbar item. Setting this value in your - /// application has no effect. It is ignored. - /// - /// ------------------------------------------------------------------------------------ - public string Message - { - get {return m_message;} - set {m_message = value;} - } - -// /// ------------------------------------------------------------------------------------ -// /// -// /// Gets or sets the status message for a menu/toolbar item. -// /// -// /// ------------------------------------------------------------------------------------ -// public string StatusMessage -// { -// get {return m_statusMsg;} -// set {m_statusMsg = value;} -// } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets the enabled state for a menu/toolbar item. - /// - /// ------------------------------------------------------------------------------------ - public bool Enabled - { - get {return m_enabled;} - set {m_enabled = value;} - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets the checked state for a menu/toolbar item. - /// - /// ------------------------------------------------------------------------------------ - public bool Checked - { - get {return m_checked;} - set {m_checked = value;} - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets the visible state for a menu/toolbar item. - /// - /// ------------------------------------------------------------------------------------ - public bool Visible - { - get {return m_visible;} - set {m_visible = value;} - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets a value indicating whether this menu/toolbar item is currently - /// being displayed. - /// - /// ------------------------------------------------------------------------------------ - public bool IsDisplayed - { - get { return m_isDisplayed; } - set { m_isDisplayed = value; } - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets a value indicating whether or not the item begins a group (for menu - /// items, this would be a separator before this item. For toolbar items it would - /// be a dividing line.) - /// - /// ------------------------------------------------------------------------------------ - public bool BeginGroup - { - get {return m_beginGroup;} - set {m_beginGroup = value;} - } - -// /// ------------------------------------------------------------------------------------ -// /// -// /// Gets or sets the image index for a menu/toolbar item. -// /// -// /// ------------------------------------------------------------------------------------ -// public int ImageIndex -// { -// get {return m_imageIndex;} -// set {m_imageIndex = value;} -// } - -// /// ------------------------------------------------------------------------------------ -// /// -// /// Gets or sets a value indicating whether or not the menu/toolbar image is application -// /// specific or is defined in the FW framework. e.g. Undo, Redo, Cut, Copy, Paste, etc. -// /// are defined in the framework whereas the image for Insert verse number would be -// /// an application specific image. -// /// -// /// ------------------------------------------------------------------------------------ -// public bool IsImageAppSpecific -// { -// get {return m_isImageAppSpecific;} -// set {m_isImageAppSpecific = value;} -// } - -// /// ------------------------------------------------------------------------------------ -// /// -// /// Gets or sets the shortcut key for a menu/toolbar item. -// /// -// /// ------------------------------------------------------------------------------------ -// public string Shortcut -// { -// get {return m_shortcut;} -// set {m_shortcut = value;} -// } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets the image for a menu/toolbar item. - /// - /// ------------------------------------------------------------------------------------ - public Image Image - { - get {return m_image;} - set {m_image = value;} - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets the control hosted by toolbar items whose type is ComboBox or control container. - /// - /// ------------------------------------------------------------------------------------ - public Control Control - { - get {return m_ctrl;} - set {m_ctrl = value;} - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets a list of items associated with a toolbar item. For example, if the - /// toolbar item is a combobox, this list may contain all the item's in the combobox. - /// - /// ------------------------------------------------------------------------------------ - public ArrayList List - { - get {return m_list;} - set {m_list = value;} - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets the form on which the menu/toolbar item is located. Setting this - /// property does not set the parent form of an item. The setter is only for toolbar - /// adapters to use. - /// - /// ------------------------------------------------------------------------------------ - public Form ParentForm - { - get {return m_parentForm;} - set {m_parentForm = value;} - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets a value indicating whether or not the menu/toolbar item will be updated - /// with the properties specified in the after - /// control leaves the command handler and is returned to the toolbar adapter. - /// - /// ------------------------------------------------------------------------------------ - public bool Update - { - get {return m_update;} - set {m_update = value;} - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets any extra information needed to be passed between the application and - /// an adapter. - /// - /// ------------------------------------------------------------------------------------ - public object Tag - { - get {return m_tag;} - set {m_tag = value;} - } - } - - #endregion - - #region TMBarProperties Class - /// ---------------------------------------------------------------------------------------- - /// - /// This class is used to pass information back and forth between a ToolBarAdapter object - /// and an application. - /// - /// ---------------------------------------------------------------------------------------- - public class TMBarProperties - { - private bool m_update; - private string m_name; - private string m_text; - private bool m_enabled; - private bool m_visible; - private Form m_parentForm; - - /// ------------------------------------------------------------------------------------ - /// - /// Creates a TMBarProperties object. - /// - /// ------------------------------------------------------------------------------------ - public TMBarProperties() - { - } - - /// ------------------------------------------------------------------------------------ - /// - /// Creates a TMBarProperties object. - /// - /// - /// - /// - /// - /// The form on which the toolbar is located. - /// ------------------------------------------------------------------------------------ - public TMBarProperties(string name, string text, bool enabled, bool visible, Form parentForm) - { - m_name = name; - m_text = text; - m_enabled = enabled; - m_visible = visible; - m_parentForm = parentForm; - m_update = false; - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets the name for a toolbar. Setting this value should not change - /// a bar's name within the XML definition. It is only used to pass a bar's name to - /// instantiators of a toolbar adapter. - /// - /// ------------------------------------------------------------------------------------ - public string Name - { - get {return m_name;} - set {m_name = value;} - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets the display text for a toolbar. - /// - /// ------------------------------------------------------------------------------------ - public string Text - { - get {return m_text;} - set {m_text = value;} - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets the enabled state for a toolbar. - /// - /// ------------------------------------------------------------------------------------ - public bool Enabled - { - get {return m_enabled;} - set {m_enabled = value;} - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets the visible state for a toolbar. - /// - /// ------------------------------------------------------------------------------------ - public bool Visible - { - get {return m_visible;} - set {m_visible = value;} - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets the form on which the toolbar item is located. Setting this property - /// does not set the parent form of an item. The setter is only for toolbar adapters - /// to use. - /// - /// ------------------------------------------------------------------------------------ - public Form ParentForm - { - get {return m_parentForm;} - set {m_parentForm = value;} - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets a value indicating whether or not the toolbar will be updated - /// with the properties specified in the after - /// control leaves the command handler and is returned to the toolbar adapter. - /// - /// ------------------------------------------------------------------------------------ - public bool Update - { - get {return m_update;} - set {m_update = value;} - } - } - - #endregion - - #region WindowListInfo Class - /// ---------------------------------------------------------------------------------------- - /// - /// Class used to send information to the update command handler for the window list - /// item on a menu. - /// - /// ---------------------------------------------------------------------------------------- - public class WindowListInfo - { - /// The TMItemProperties of the first window list menu item. When the window - /// list item's update handler is called, the update handler should fill an - /// ArrayList of strings that will be used by the menu adapter to build each window - /// list menu item. The array list should contain the desired menu texts (without the - /// numbers, however). Once the ArrayList is built, it should be assigned to the List - /// property of WindowListItemProperties. - public TMItemProperties WindowListItemProperties; - /// Index of the item in the ArrayList that represents the active window. - /// This tells the menu adapter what item in the window list gets checked. - public int CheckedItemIndex; - } - - #endregion - - #region SBTabProperties Class - /// ---------------------------------------------------------------------------------------- - /// - /// - /// - /// ---------------------------------------------------------------------------------------- - public class SBTabProperties - { - /// Gets or sets the internal name for the tab. - public string Name; - /// Gets or sets the text displayed in the tab. - public string Text = string.Empty; - /// Gets or sets a value indicating whether or not the tab is enabled. - public bool Enabled = true; - /// - /// Gets or sets the message used by the message mediator to inform IxCoreColleagues - /// that the tab is becoming the current tab in the sidebar. - /// - public string Message; - /// Gets or sets the image index used for the tab. - public int ImageIndex = -1; - /// Gets the collection properties for each item on the tab. - public SBTabItemProperties[] Items; - /// Gets or sets whether or not the tab's items should appear as small icons. - public bool SmallIconMode = false; - /// - public object Tag; - /// Gets the name of the current item on the tab or null when there isn't one. - public string CurrentTabItem = null; - - /// - /// This string stores the format string used to build the tooltip (when the tab is - /// current) for a tab's information bar button. When the tab is current, the tooltip - /// will display the tab's text followed by the text of the tab's current item. When - /// the tab isn't current then this format string isn't used and the tooltip will - /// display the tab's text only. - /// - public string InfoBarButtonToolTipFormat; - /// - /// Gets or sets the message used by the message mediator to inform IxCoreColleagues - /// the user clicked on the tab's configure menu item shown on the sidebar tab's - /// context menu. - /// - public string ConfigureMessage; - /// - /// Gets or sets the tab's configure menu item text that appears on the sidebar's - /// context menu. - /// - public string ConfigureMenuText; - /// - /// This is only used so when an application handles the update message for the - /// configure menu, it can return whether or not the configure menu should be enabled. - /// - public bool ConfigureMenuEnabled = true; - /// - /// This is only used so when an application handles the update message for the - /// configure menu, it can return whether or not the configure menu should be visible. - /// - public bool ConfigureMenuVisible = true; - - /// ------------------------------------------------------------------------------------ - /// - /// - /// - /// ------------------------------------------------------------------------------------ - public SBTabProperties() - { - // Initialize the Id to a guid in case a more human comprehensible one isn't - // assigned later. - Name = Guid.NewGuid().ToString(); - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets the properties for a single tab item. - /// - /// Index of tab item whose properties are being requested. - /// - /// ------------------------------------------------------------------------------------ - public SBTabItemProperties GetTabItemProperties(int index) - { - if (index < 0 || Items == null || index >= Items.Length) - return null; - - return Items[index]; - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets the properties for a single tab item. - /// - /// Name of tab item whose properties are being requested. - /// - /// ------------------------------------------------------------------------------------ - public SBTabItemProperties GetTabItemProperties(string name) - { - foreach (SBTabItemProperties itemProps in Items) - { - if (itemProps.Name == name) - return itemProps; - } - - return null; - } - } - - #endregion - - #region SBTabItemProperties Class - /// ---------------------------------------------------------------------------------------- - /// - /// - /// - /// ---------------------------------------------------------------------------------------- - public class SBTabItemProperties - { - /// - /// The window that has the properties. This allows owhter windows to ignore properties - /// not meant for them. - /// - public System.Windows.Forms.Form ParentForm; - /// - public string Name; - /// - public string Text = string.Empty; - /// - public string Tooltip = string.Empty; - /// - public string Message; - /// - public int ImageIndex = -1; - /// - public string OwningTabName = null; - /// - public object Tag; - /// true indicates that event should always be fired, even if the button - /// was the last one clicked, false if button fires only once. - public bool ClickAlways = false; - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets a value indicating whether or not the menu/toolbar item will be updated - /// with the properties specified in the after - /// control leaves the command handler and is returned to the toolbar adapter. - /// - /// ------------------------------------------------------------------------------------ - public bool Update; - - /// ------------------------------------------------------------------------------------ - /// - /// Make one. - /// - /// ------------------------------------------------------------------------------------ - public SBTabItemProperties(System.Windows.Forms.Form parentForm) - { - ParentForm = parentForm; - // Initialize the Id to a guid in case a more human comprehensible one isn't - // assigned later. - Name = Guid.NewGuid().ToString(); - } - } - - #endregion -} diff --git a/Src/Common/UIAdapterInterfaces/SIBInterface.cs b/Src/Common/UIAdapterInterfaces/SIBInterface.cs deleted file mode 100644 index 51b82ec624..0000000000 --- a/Src/Common/UIAdapterInterfaces/SIBInterface.cs +++ /dev/null @@ -1,263 +0,0 @@ -// Copyright (c) 2015 SIL International -// This software is licensed under the LGPL, version 2.1 or later -// (http://www.gnu.org/licenses/lgpl-2.1.html) - -using System; -using System.Windows.Forms; -using XCore; - -namespace SIL.FieldWorks.Common.UIAdapters -{ - /// - /// Side Bar and Information Bar Interface. - /// - public interface ISIBInterface - { - /// ------------------------------------------------------------------------------------ - /// - /// - /// - /// Sidebar Container - /// Info. Bar Container - /// - /// ------------------------------------------------------------------------------------ - void Initialize(Control sbContainer, Control ibContainer, Mediator mediator); - - /// ------------------------------------------------------------------------------------ - /// - /// Add category tab to sidebar - /// - /// - /// ------------------------------------------------------------------------------------ - void AddTab(SBTabProperties tabProps); - - /// ------------------------------------------------------------------------------------ - /// - /// Add item to a category tab - /// - /// Name of the tab to which an item will be added. - /// Properties of the new tab item. - /// ------------------------------------------------------------------------------------ - void AddTabItem(string tabName, SBTabItemProperties itemProps); - - /// ------------------------------------------------------------------------------------ - /// - /// Add item to a category tab - /// - /// Index of the tab to which an item will be added. - /// Properties of the new tab item. - /// ------------------------------------------------------------------------------------ - void AddTabItem(int tabIndex, SBTabItemProperties itemProps); - - /// ------------------------------------------------------------------------------------ - /// - /// Sets the current sidebar tab. - /// - /// index of tab to make current. - /// true to cause events to be fired when setting - /// the current sidebar tab (like when the user clicks on an item). Otherwise, - /// false. - /// ------------------------------------------------------------------------------------ - void SetCurrentTab(int tabIndex, bool generateEvents); - - /// ------------------------------------------------------------------------------------ - /// - /// Sets the current sidebar tab. - /// - /// Name of the tab to make current. - /// true to cause events to be fired when setting - /// the current sidebar tab (like when the user clicks on an item). Otherwise, - /// false. - /// ------------------------------------------------------------------------------------ - void SetCurrentTab(string tabName, bool generateEvents); - - /// ------------------------------------------------------------------------------------ - /// - /// Sets the current sidebar tab item. - /// - /// index of tab containing the tab item to make current. - /// Name of tab item to make current. - /// true to cause events to be fired when setting - /// the current sidebar tab item (like when the user clicks on an item). Otherwise, - /// false. - /// ------------------------------------------------------------------------------------ - void SetCurrentTabItem(int tabIndex, string itemName, bool generateEvents); - - /// ------------------------------------------------------------------------------------ - /// - /// Sets the current sidebar tab item. - /// - /// Name of tab containing the tab item to make current. - /// Name of tab item to make current. - /// true to cause events to be fired when setting - /// the current sidebar tab item (like when the user clicks on an item). Otherwise, - /// false. - /// ------------------------------------------------------------------------------------ - void SetCurrentTabItem(string tabName, string itemName, bool generateEvents); - - /// ------------------------------------------------------------------------------------ - /// - /// Tells the side bar adapter to setup it's menus so they show up on the application's - /// view menu. This method should be called after all the tabs and tab items have been - /// created. - /// - /// ITMAdapter used by the application. - /// Name of the menu item before which the sidebar - /// menus will be added. - /// ------------------------------------------------------------------------------------ - void SetupViewMenuForSideBarTabs(ITMAdapter adapter, string insertBeforeItem); - - /// ------------------------------------------------------------------------------------ - /// - /// Returns the properties for the specified item on the specified tab. - /// - /// Tab containing the item. - /// Item whose properties are being requested. - /// - /// ------------------------------------------------------------------------------------ - SBTabItemProperties GetTabItemProperties(string tabName, string itemName); - - /// ------------------------------------------------------------------------------------ - /// - /// Tells the adapter to load it's settings from the specified keys. - /// - /// - /// ------------------------------------------------------------------------------------ - void LoadSettings(Microsoft.Win32.RegistryKey key); - - /// ------------------------------------------------------------------------------------ - /// - /// Tells the adapter to save it's settings to the specified keys. - /// - /// - /// ------------------------------------------------------------------------------------ - void SaveSettings(Microsoft.Win32.RegistryKey key); - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets the index of the image used for the context menu item that allows the - /// user to switch to large icons on the side bar. It is assumed the image for those - /// menu items is found in the same image list that's specified for the TabImageList - /// property. - /// - /// ------------------------------------------------------------------------------------ - int LargeIconModeImageIndex - { - get; - set; - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets the index of the image used for the context menu item that allows the - /// user to switch to small icons on the side bar. It is assumed the image for those - /// menu items is found in the same image list that's specified for the TabImageList - /// property. - /// - /// ------------------------------------------------------------------------------------ - int SmallIconModeImageIndex - { - get; - set; - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets the visible state of the sidebar. - /// - /// ------------------------------------------------------------------------------------ - bool SideBarVisible - { - get; - set; - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets the visible state of the info. bar. - /// - /// ------------------------------------------------------------------------------------ - bool InformationBarVisible - { - get; - set; - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets the array of tabs contained in the sidebar. - /// - /// ------------------------------------------------------------------------------------ - SBTabProperties[] Tabs - { - get; - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets the image list for small icon mode for the individual items on the - /// side bar. A single image list is used for the items on all tabs. - /// - /// ------------------------------------------------------------------------------------ - ImageList ItemImageListSmall - { - get; - set; - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets the image list for large icon mode for the individual items on the - /// side bar. A single image list is used for the items on all tabs. - /// - /// ------------------------------------------------------------------------------------ - ImageList ItemImageListLarge - { - get; - set; - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets the image list for the side bar tab icons that go on the tab button - /// (i.e. next to the tab's text) and the information bar buttons. - /// - /// ------------------------------------------------------------------------------------ - ImageList TabImageList - { - get; - set; - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets the current tab. - /// - /// ------------------------------------------------------------------------------------ - SBTabProperties CurrentTabProperties - { - get; - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets the current tab item. - /// - /// ------------------------------------------------------------------------------------ - SBTabItemProperties CurrentTabItemProperties - { - get; - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets the text on the information bar. - /// - /// ------------------------------------------------------------------------------------ - string InformationBarText - { - get; - set; - } - } -} diff --git a/Src/Common/UIAdapterInterfaces/TMInterface.cs b/Src/Common/UIAdapterInterfaces/TMInterface.cs deleted file mode 100644 index f9211b9672..0000000000 --- a/Src/Common/UIAdapterInterfaces/TMInterface.cs +++ /dev/null @@ -1,389 +0,0 @@ -// Copyright (c) 2003-2013 SIL International -// This software is licensed under the LGPL, version 2.1 or later -// (http://www.gnu.org/licenses/lgpl-2.1.html) -// -// File: MenuInterface.cs -// Responsibility: David Olson -// Last reviewed: -// -// -// - -using System; -using System.Collections; -using System.Windows.Forms; -using System.Drawing; -using XCore; -using System.Collections.Generic; - -namespace SIL.FieldWorks.Common.UIAdapters -{ - #region ITMAdapter Interface - /// ---------------------------------------------------------------------------------------- - /// - /// - /// - /// ---------------------------------------------------------------------------------------- - public interface ITMAdapter - { - /// ------------------------------------------------------------------------------------ - /// - /// Initializes a Toolbar/Menu adapter object. - /// - /// The form owning the toolbars. - /// An XCore message mediator used for message routing. - /// - /// XML strings defining all the menus/toolbars in an - /// application. - /// ------------------------------------------------------------------------------------ - void Initialize(Form parentForm, Mediator messageMediator, string[] definitions); - - /// ------------------------------------------------------------------------------------ - /// - /// Initializes a Toolbar/Menu adapter object. - /// - /// The form owning the toolbars. - /// An XCore message mediator used for message routing. - /// - /// The registry path where the application's settings - /// are stored. (e.g. "Software\SIL\FieldWorks") - /// XML strings defining all the menus/toolbars in an - /// application. - /// ------------------------------------------------------------------------------------ - void Initialize(Form parentForm, Mediator messageMediator, string appsRegKeyPath, - string[] definitions); - - /// ------------------------------------------------------------------------------------ - /// - /// Initializes a Toolbar/Menu adapter object. - /// - /// The form owning the toolbars. - /// The control on parentForm that contains all - /// the child controls of the form. The adapter will use that control (if it's not - /// null) to put inside a tool strip docking manager (e.g. ToolStripContainer - /// control). - /// An XCore message mediator used for message routing. - /// - /// XML strings defining all the menus/toolbars in an - /// application. - /// ------------------------------------------------------------------------------------ - void Initialize(Form parentForm, Control contentPanelContent, - Mediator messageMediator, string[] definitions); - - /// ------------------------------------------------------------------------------------ - /// - /// Initializes a Toolbar/Menu adapter object. - /// - /// The form owning the toolbars. - /// The control on parentForm that contains all - /// the child controls of the form. The adapter will use that control (if it's not - /// null) to put inside a tool strip docking manager (e.g. ToolStripContainer - /// control). - /// An XCore message mediator used for message routing. - /// - /// The registry path where the application's settings - /// are stored. (e.g. "Software\SIL\FieldWorks") - /// XML strings defining all the menus/toolbars in an - /// application. - /// ------------------------------------------------------------------------------------ - void Initialize(Form parentForm, Control contentPanelContent, - Mediator messageMediator, string appsRegKeyPath, string[] definitions); - - /// ------------------------------------------------------------------------------------ - /// - /// Releases unmanaged and - optionally - managed resources - /// - /// ------------------------------------------------------------------------------------ - void Dispose(); - - /// ------------------------------------------------------------------------------------ - /// - /// Gets the properties of a toolbar/menu item. - /// - /// Name of the toolbar/menu item whose properties are being - /// requested. - /// - /// The properties of the toolbar/menu item. - /// ------------------------------------------------------------------------------------ - TMItemProperties GetItemProperties(string name); - - /// ------------------------------------------------------------------------------------ - /// - /// Sets the properties of a toolbar/menu item to those stored in a TMItemProperties - /// object. - /// - /// Name of the toolbar/menu item to modify. - /// Properties used to modfy the toolbar/menu item. - /// ------------------------------------------------------------------------------------ - void SetItemProperties(string name, TMItemProperties itemProps); - - /// ------------------------------------------------------------------------------------ - /// - /// Adds a new submenu item to the menu specified by parentItemName and inserts it - /// before the item specified by insertBeforeItem. If insertBeforeItem is null, then - /// the new submenu item is added to the end of parentItemName's menu collection. - /// - /// Properties of the new menu item. - /// Name of the menu item that will be added to. - /// Name of the submenu item before which the new - /// menu item will be added. - /// ------------------------------------------------------------------------------------ - void AddMenuItem(TMItemProperties itemProps, string parentItemName, string insertBeforeItem); - - /// ------------------------------------------------------------------------------------ - /// - /// Adds a new menu item to a context menu specified by contextMenuName and inserts it - /// before the item specified by insertBeforeItem. If insertBeforeItem is null, then - /// the new menu item is added to the end of parentItemName's menu collection. - /// - /// Properties of the new menu item. - /// Name of the context menu to which the item is added. - /// - /// Name of the context menu item before which the new - /// menu item will be added. - /// ------------------------------------------------------------------------------------ - void AddContextMenuItem(TMItemProperties itemProps, string contextMenuName, string insertBeforeItem); - - /// ------------------------------------------------------------------------------------ - /// - /// Adds a new menu item to a context menu specified by contextMenuName and inserts it - /// before the item specified by insertBeforeItem. If insertBeforeItem is null, then - /// the new menu item is added to the end of parentItemName's menu collection. This - /// overload allows new menu items to be added as submenus to menus at the top level - /// of the context menu. The parentMenuName can be the name of a menu item at any - /// level within the hierarchy of the menus on the context menu. - /// - /// Properties of the new menu item. - /// Name of the context menu to which the item is added. - /// - /// Name of the menu item in the context menu under which - /// the new item is added. - /// Name of the context menu item before which the new - /// menu item will be added. - /// ------------------------------------------------------------------------------------ - void AddContextMenuItem(TMItemProperties itemProps, string contextMenuName, - string parentMenuName, string insertBeforeItem); - - /// ------------------------------------------------------------------------------------ - /// - /// Removes all the subitems of the specified menu. - /// - /// The name of the item whose subitems will be removed. - /// - /// ------------------------------------------------------------------------------------ - void RemoveMenuSubItems(string parentItemName); - - /// ------------------------------------------------------------------------------------ - /// - /// Removes the specified item from the specified parent menu. - /// - /// The name of the item whose subitem will be removed. - /// - /// subitem to remove from parent menu. - /// ------------------------------------------------------------------------------------ - void RemoveMenuItem(string parentItemName, string name); - - /// ------------------------------------------------------------------------------------ - /// - /// Pops-up a menu so it shows like a context menu. If the item doesn't have any - /// sub items, then this command is ignored. - /// - /// The name of the item to popup. The name could be the name of - /// a menu off the application's menu bar, or one of the context menu's added to the - /// menu adapter. - /// The X location (on the screen) where the menu is popped-up. - /// The Y location (on the screen) where the menu is popped-up. - /// ------------------------------------------------------------------------------------ - void PopupMenu(string name, int x, int y); - - /// ------------------------------------------------------------------------------------ - /// - /// Pops-up a menu so it shows like a context menu. If the item doesn't have any - /// sub items, then this command is ignored. - /// - /// The name of the item to popup. The name could be the name of - /// a menu off the application's menu bar, or one of the context menu's added to the - /// menu adapter. - /// The X location (on the screen) where the menu is popped-up. - /// The Y location (on the screen) where the menu is popped-up. - /// list of items to remove from the menu when - /// it closes - /// ------------------------------------------------------------------------------------ - void PopupMenu(string name, int x, int y, List subItemsToRemoveOnClose); - - /// ------------------------------------------------------------------------------------ - /// - /// Sets the context menu for a specified control. - /// - /// Control which is being assigned a context menu. - /// The name of the context menu to assign to the control. - /// ------------------------------------------------------------------------------------ - void SetContextMenuForControl(Control ctrl, string name); - - /// ------------------------------------------------------------------------------------ - /// - /// Allows an application to force the hiding of a toolbar item's popup control. - /// - /// Name of item whose popup should be hidden. - /// ------------------------------------------------------------------------------------ - void HideBarItemsPopup(string name); - - /// ------------------------------------------------------------------------------------ - /// - /// Allows an application to hide of a toolbar. - /// - /// Name of toolbar to hide. - /// ------------------------------------------------------------------------------------ - void HideToolBar(string name); - - /// ------------------------------------------------------------------------------------ - /// - /// Allows an application to show of a toolbar. - /// - /// Name of toolbar to show. - /// ------------------------------------------------------------------------------------ - void ShowToolBar(string name); - - /// ------------------------------------------------------------------------------------ - /// - /// Gets the properties of a toolbar. - /// - /// Name of the toolbar whose properties are being requested. - /// - /// The properties of the toolbar. - /// ------------------------------------------------------------------------------------ - TMBarProperties GetBarProperties(string name); - - /// ------------------------------------------------------------------------------------ - /// - /// Sets the properties of a toolbar/menu to those stored in a TMBarProperties - /// object. - /// - /// Name of the toolbar/menu to modify. - /// Properties used to modfy the toolbar/menu item. - /// ------------------------------------------------------------------------------------ - void SetBarProperties(string name, TMBarProperties barProps); - - /// ------------------------------------------------------------------------------------ - /// - /// Gets the control contained within a control container toolbar item. - /// - /// Name of the control container item. - /// - /// ------------------------------------------------------------------------------------ - Control GetBarItemControl(string name); - - /// ------------------------------------------------------------------------------------ - /// - /// Causes the adapter to save toolbar settings (e.g. user placement of toolbars). - /// - /// ------------------------------------------------------------------------------------ - void SaveBarSettings(); - - /// ------------------------------------------------------------------------------------ - /// - /// Causes the adapter to show it's dialog for customizing toolbars. - /// - /// ------------------------------------------------------------------------------------ - void ShowCustomizeDialog(); - - /// ------------------------------------------------------------------------------------ - /// - /// Sets the adapter's parent form. This will not cause docking sites to be added to - /// the form and DotNetBar manager. - /// - /// The new parent form. - /// The adapter's previous parent form. - /// ------------------------------------------------------------------------------------ - Form SetParentForm(Form newForm); - - /// ------------------------------------------------------------------------------------ - /// - /// Determines whether the specified Keys is a shortcut for a toolbar or menu item. - /// - /// The key. - /// true when the specified key is a shortcut key - /// and its associated toolbar or menu item is enabled. - /// - /// true if the specified key is a shortcut for a toolbar or menu item; - /// otherwise, false. - /// - /// ------------------------------------------------------------------------------------ - bool IsShortcutKey(Keys key, ref bool isItemEnabled); - - #region Events - /// ------------------------------------------------------------------------------------ - /// - /// Event fired when adding toolbar/menu items to a menu, menu bar or toolbar. This - /// allows delegates of this event to initialize properties of the menu item such as - /// its text, etc. - /// - /// ------------------------------------------------------------------------------------ - event InitializeItemHandler InitializeItem; - - /// ------------------------------------------------------------------------------------ - /// - /// Event fired when adding a toolbar to the toolbar container. This allows - /// delegates of this event to initialize properties of the toolbar such as its text. - /// - /// ------------------------------------------------------------------------------------ - event InitializeBarHandler InitializeBar; - - /// ------------------------------------------------------------------------------------ - /// - /// Event fired when adding a combobox toolbar item. This gives applications a chance - /// to initialize a combobox item. - /// - /// ------------------------------------------------------------------------------------ - event InitializeComboItemHandler InitializeComboItem; - - /// ------------------------------------------------------------------------------------ - /// - /// Event fired when a control container item requests the control to contain. - /// - /// ------------------------------------------------------------------------------------ - event LoadControlContainerItemHandler LoadControlContainerItem; - - #endregion - - #region Properties - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets the message mediator used by the menu adapter for message dispatch. - /// - /// ------------------------------------------------------------------------------------ - Mediator MessageMediator - { - get; - set; - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets a value indicating whether or not updates to toolbar/menu items should - /// take place during the application's idle cycles. - /// - /// ------------------------------------------------------------------------------------ - bool AllowUpdates - { - get; - set; - } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets an array of toolbar property objects an application can use to send to a - /// menu extender to use for display on a view menu allowing users to toggle the - /// visibility of each toolbar. - /// - /// ------------------------------------------------------------------------------------ - TMBarProperties[] BarInfoForViewMenu - { - get; - } - - #endregion - } - - #endregion -} diff --git a/Src/Common/UIAdapterInterfaces/UIAdapterInterfaces.csproj b/Src/Common/UIAdapterInterfaces/UIAdapterInterfaces.csproj deleted file mode 100644 index 88f2815eb3..0000000000 --- a/Src/Common/UIAdapterInterfaces/UIAdapterInterfaces.csproj +++ /dev/null @@ -1,40 +0,0 @@ - - - - UIAdapterInterfaces - SIL.FieldWorks.Common.UIAdapters - net48 - Library 168,169,219,414,649,1635,1702,1701 - false - false - - - DEBUG;TRACE - true - false - portable - - - TRACE - true - true - portable - - - - - - - - - - - - - - - - Properties\CommonAssemblyInfo.cs - - - \ No newline at end of file diff --git a/Src/Common/UIAdapterInterfaces/UIAdapterInterfacesStrings.Designer.cs b/Src/Common/UIAdapterInterfaces/UIAdapterInterfacesStrings.Designer.cs deleted file mode 100644 index ce8cd2d0e3..0000000000 --- a/Src/Common/UIAdapterInterfaces/UIAdapterInterfacesStrings.Designer.cs +++ /dev/null @@ -1,81 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.239 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace SIL.FieldWorks.Common.UIAdapters { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class UIAdapterInterfacesStrings { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal UIAdapterInterfacesStrings() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SIL.FieldWorks.Common.UIAdapters.UIAdapterInterfacesStrings", typeof(UIAdapterInterfacesStrings).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized string similar to Trying to load {0}. Your installation may be corrupt.. - /// - internal static string ksCannotLoadX { - get { - return ResourceManager.GetString("ksCannotLoadX", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Error. - /// - internal static string ksError { - get { - return ResourceManager.GetString("ksError", resourceCulture); - } - } - } -} diff --git a/Src/Common/UIAdapterInterfaces/UIAdapterInterfacesStrings.resx b/Src/Common/UIAdapterInterfaces/UIAdapterInterfacesStrings.resx deleted file mode 100644 index d990693242..0000000000 --- a/Src/Common/UIAdapterInterfaces/UIAdapterInterfacesStrings.resx +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Trying to load {0}. Your installation may be corrupt. - - - Error - - \ No newline at end of file diff --git a/Src/FwCoreDlgs/FwApplyStyleDlg.Designer.cs b/Src/FwCoreDlgs/FwApplyStyleDlg.Designer.cs index 3af830af51..8112cfccab 100644 --- a/Src/FwCoreDlgs/FwApplyStyleDlg.Designer.cs +++ b/Src/FwCoreDlgs/FwApplyStyleDlg.Designer.cs @@ -40,21 +40,16 @@ private void InitializeComponent() this.components = new System.ComponentModel.Container(); System.Windows.Forms.Label label1; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FwApplyStyleDlg)); - System.Windows.Forms.Label label2; this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.contextMenuStyles = new System.Windows.Forms.ContextMenuStrip(this.components); this.m_lstStyles = new SIL.FieldWorks.Common.Controls.CaseSensitiveListBox(); this.m_btnOk = new System.Windows.Forms.Button(); this.m_btnCancel = new System.Windows.Forms.Button(); this.m_btnHelp = new SIL.FieldWorks.Common.Controls.FwHelpButton(); - this.m_cboTypes = new System.Windows.Forms.ComboBox(); this.m_pnlMasterGrid = new System.Windows.Forms.TableLayoutPanel(); - this.m_pnlTypesCombo = new System.Windows.Forms.TableLayoutPanel(); label1 = new System.Windows.Forms.Label(); - label2 = new System.Windows.Forms.Label(); this.contextMenuStyles.SuspendLayout(); this.m_pnlMasterGrid.SuspendLayout(); - this.m_pnlTypesCombo.SuspendLayout(); this.SuspendLayout(); // // label1 @@ -62,11 +57,6 @@ private void InitializeComponent() resources.ApplyResources(label1, "label1"); label1.Name = "label1"; // - // label2 - // - resources.ApplyResources(label2, "label2"); - label2.Name = "label2"; - // // helpToolStripMenuItem // this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; @@ -113,33 +103,13 @@ private void InitializeComponent() this.m_btnHelp.ShowImage = false; this.m_btnHelp.Click += new System.EventHandler(this.m_btnHelp_Click); // - // m_cboTypes - // - resources.ApplyResources(this.m_cboTypes, "m_cboTypes"); - this.m_cboTypes.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.m_cboTypes.FormattingEnabled = true; - this.m_cboTypes.Items.AddRange(new object[] { - resources.GetString("m_cboTypes.Items"), - resources.GetString("m_cboTypes.Items1"), - resources.GetString("m_cboTypes.Items2")}); - this.m_cboTypes.Name = "m_cboTypes"; - this.m_cboTypes.SelectedIndexChanged += new System.EventHandler(this.m_cboTypes_SelectedIndexChanged); - // // m_pnlMasterGrid // resources.ApplyResources(this.m_pnlMasterGrid, "m_pnlMasterGrid"); - this.m_pnlMasterGrid.Controls.Add(this.m_pnlTypesCombo, 0, 2); this.m_pnlMasterGrid.Controls.Add(label1, 0, 0); this.m_pnlMasterGrid.Controls.Add(this.m_lstStyles, 0, 1); this.m_pnlMasterGrid.Name = "m_pnlMasterGrid"; // - // m_pnlTypesCombo - // - resources.ApplyResources(this.m_pnlTypesCombo, "m_pnlTypesCombo"); - this.m_pnlTypesCombo.Controls.Add(this.m_cboTypes, 1, 0); - this.m_pnlTypesCombo.Controls.Add(label2, 0, 0); - this.m_pnlTypesCombo.Name = "m_pnlTypesCombo"; - // // FwApplyStyleDlg // this.AcceptButton = this.m_btnOk; @@ -158,8 +128,6 @@ private void InitializeComponent() this.contextMenuStyles.ResumeLayout(false); this.m_pnlMasterGrid.ResumeLayout(false); this.m_pnlMasterGrid.PerformLayout(); - this.m_pnlTypesCombo.ResumeLayout(false); - this.m_pnlTypesCombo.PerformLayout(); this.ResumeLayout(false); } @@ -171,10 +139,8 @@ private void InitializeComponent() private System.Windows.Forms.Button m_btnOk; private System.Windows.Forms.Button m_btnCancel; private SIL.FieldWorks.Common.Controls.FwHelpButton m_btnHelp; - private System.Windows.Forms.ComboBox m_cboTypes; private System.Windows.Forms.ContextMenuStrip contextMenuStyles; private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem; private System.Windows.Forms.TableLayoutPanel m_pnlMasterGrid; - private System.Windows.Forms.TableLayoutPanel m_pnlTypesCombo; } } \ No newline at end of file diff --git a/Src/FwCoreDlgs/FwApplyStyleDlg.cs b/Src/FwCoreDlgs/FwApplyStyleDlg.cs index 9d42186089..fbab33dcee 100644 --- a/Src/FwCoreDlgs/FwApplyStyleDlg.cs +++ b/Src/FwCoreDlgs/FwApplyStyleDlg.cs @@ -32,7 +32,6 @@ public partial class FwApplyStyleDlg : Form private string m_charStyleName; private string m_chosenStyleName; - private int m_customUserLevel = 0; private bool m_fCanApplyCharacterStyle = true; private bool m_fCanApplyParagraphStyle = true; private List m_applicableStyleContexts; @@ -50,7 +49,6 @@ public partial class FwApplyStyleDlg : Form /// The hvo of the object which owns the style. /// The "flid" in which the styles are owned. /// Name of the normal style. - /// The custom user level. /// Name of the currently selected paragraph style. /// Name of the currently selected character style. /// The hvo of the root object in the current view. @@ -58,13 +56,12 @@ public partial class FwApplyStyleDlg : Form /// The help topic provider. /// ------------------------------------------------------------------------------------ public FwApplyStyleDlg(IVwRootSite rootSite, LcmCache cache, int hvoStylesOwner, - int stylesTag, string normalStyleName, int customUserLevel, string paraStyleName, + int stylesTag, string normalStyleName, string paraStyleName, string charStyleName, int hvoRootObject, IApp app, IHelpTopicProvider helpTopicProvider) { m_rootSite = rootSite; InitializeComponent(); - m_customUserLevel = customUserLevel; m_helpTopicProvider = helpTopicProvider; m_paraStyleName = paraStyleName; m_charStyleName = charStyleName; @@ -73,8 +70,6 @@ public FwApplyStyleDlg(IVwRootSite rootSite, LcmCache cache, int hvoStylesOwner, if (cache == null) return; - m_cboTypes.SelectedIndex = 1; // All Styles - // Load the style information m_styleTable = new StyleInfoTable(normalStyleName, cache.ServiceLocator.WritingSystemManager); @@ -157,32 +152,6 @@ public void CheckDisposed() } #region Event handlers - /// ------------------------------------------------------------------------------------ - /// - /// Handles the SelectedIndexChanged event of the m_cboTypes control. - /// - /// ------------------------------------------------------------------------------------ - private void m_cboTypes_SelectedIndexChanged(object sender, EventArgs e) - { - if (m_styleListHelper == null) - return; - switch (m_cboTypes.SelectedIndex) - { - case 0: // basic - m_styleListHelper.MaxStyleLevel = 0; - break; - - case 1: // all - m_styleListHelper.MaxStyleLevel = Int32.MaxValue; - break; - - case 2: // custom - m_styleListHelper.MaxStyleLevel = m_customUserLevel; - break; - } - m_styleListHelper.Refresh(); - } - /// ------------------------------------------------------------------------------------ /// /// Handles the Click event of the m_btnOk control. @@ -256,19 +225,6 @@ private void m_lstStyles_MouseUp(object sender, MouseEventArgs e) #endregion #region Properties - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets a value indicating whether or not to show the combo box where the user - /// can select the type of styles to show (all, basic, or custom styles). This combo - /// box is shown in TE but not in the other apps. - /// - /// ------------------------------------------------------------------------------------ - public bool AllowSelectStyleTypes - { - get { return m_pnlTypesCombo.Visible; } - set { m_pnlTypesCombo.Visible = value; } - } - /// ------------------------------------------------------------------------------------ /// /// Sets a value indicating whether character styles should be shown in the list of diff --git a/Src/FwCoreDlgs/FwApplyStyleDlg.resx b/Src/FwCoreDlgs/FwApplyStyleDlg.resx index e27e9313b6..fde9a568d3 100644 --- a/Src/FwCoreDlgs/FwApplyStyleDlg.resx +++ b/Src/FwCoreDlgs/FwApplyStyleDlg.resx @@ -154,49 +154,7 @@ m_pnlMasterGrid - 1 - - - False - - - True - - - Fill - - - NoControl - - - 0, 0 - - - 0, 0, 0, 0 - - - 26, 27 - - - 5 - - - &List: - - - MiddleLeft - - - label2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - m_pnlTypesCombo - - - 1 + 0 99, 22 @@ -238,7 +196,7 @@ m_pnlMasterGrid - 2 + 1 Bottom, Left @@ -327,86 +285,17 @@ 4 - - Fill - - - Basic Styles - - - All Styles - - - Custom Styles - - - 29, 3 - - - 200, 21 - - - 6 - - - m_cboTypes - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - m_pnlTypesCombo - - - 0 - Top, Bottom, Left, Right 1 - - 2 - - - Fill - - - 3, 314 - - - 1 - - - 232, 24 - - - 16 - - - False - - - m_pnlTypesCombo - - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - m_pnlMasterGrid - - - 0 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="m_cboTypes" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label2" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0" /></TableLayoutSettings> - 12, 9 - 3 + 2 236, 341 @@ -427,7 +316,7 @@ 1 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="m_pnlTypesCombo" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="m_lstStyles" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0" /><Rows Styles="AutoSize,0,Percent,100,AutoSize,0" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="m_lstStyles" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0" /><Rows Styles="AutoSize,0,Percent,100" /></TableLayoutSettings> True diff --git a/Src/FwCoreDlgs/FwCoreDlgControls/StyleLists/BaseStyleListHelper.cs b/Src/FwCoreDlgs/FwCoreDlgControls/StyleLists/BaseStyleListHelper.cs index affbb98906..5dbeaa70ee 100644 --- a/Src/FwCoreDlgs/FwCoreDlgControls/StyleLists/BaseStyleListHelper.cs +++ b/Src/FwCoreDlgs/FwCoreDlgControls/StyleLists/BaseStyleListHelper.cs @@ -96,8 +96,6 @@ public abstract class BaseStyleListHelper: IDisposable /// True to show internal styles, false otherwise protected bool m_showInternalStyles = false; - /// True to show only user-modified styles, false otherwise - protected bool m_showOnlyUserModifiedStyles = false; /// /// Stores only what style types will be shown in the list. When this value is @@ -563,17 +561,6 @@ public bool ShowUserDefinedStyles get { return m_showUserDefinedStyles; } set { m_showUserDefinedStyles = value; } } - - /// ------------------------------------------------------------------------------------ - /// - /// Indicates whether to show only user-defined styles - /// - /// ------------------------------------------------------------------------------------ - public bool ShowOnlyUserModifiedStyles - { - get { return m_showOnlyUserModifiedStyles; } - set { m_showOnlyUserModifiedStyles = value; } - } #endregion #region Control Delegate Methods @@ -924,9 +911,6 @@ protected bool OkToAddItem(StyleListItem item) if (item.UserLevel > MaxStyleLevel) return false; - if (m_showOnlyUserModifiedStyles && !item.IsUserModifiedStyle) - return false; - // If there's an excluded context list and the item's context is in it, // it's not OK to add. if (m_excludedContexts != null && m_excludedContexts.Count > 0 && diff --git a/Src/FwCoreDlgs/FwCoreDlgControls/StyleLists/StyleListItem.cs b/Src/FwCoreDlgs/FwCoreDlgControls/StyleLists/StyleListItem.cs index f9853e6517..9d736cdf3f 100644 --- a/Src/FwCoreDlgs/FwCoreDlgControls/StyleLists/StyleListItem.cs +++ b/Src/FwCoreDlgs/FwCoreDlgControls/StyleLists/StyleListItem.cs @@ -133,16 +133,6 @@ public bool IsDataPropertyStyle get {return m_itemType == StyleListItemType.DataProperty;} } - /// ------------------------------------------------------------------------------------ - /// - /// Gets a value indicating whether this instance is a user-modified style. - /// - /// ------------------------------------------------------------------------------------ - public bool IsUserModifiedStyle - { - get { return m_styleInfo.IsModified; } - } - /// ------------------------------------------------------------------------------------ /// /// Gets a value indicating the list item's style name. diff --git a/Src/FwCoreDlgs/FwCoreDlgsTests/FwStylesDlgTests.cs b/Src/FwCoreDlgs/FwCoreDlgsTests/FwStylesDlgTests.cs index deaf842931..a2d5abf89d 100644 --- a/Src/FwCoreDlgs/FwCoreDlgsTests/FwStylesDlgTests.cs +++ b/Src/FwCoreDlgs/FwCoreDlgsTests/FwStylesDlgTests.cs @@ -30,7 +30,7 @@ private class DummyFwStylesDlg : FwStylesDlg /// /// -------------------------------------------------------------------------------- public DummyFwStylesDlg() - : base(null, null, new LcmStyleSheet(), false, false, "TestDefault", 0, + : base(null, null, new LcmStyleSheet(), false, false, "TestDefault", MsrSysType.Cm, string.Empty, string.Empty, 0, null, null) { m_generalTab.RenamedStyles = m_renamedStyles; @@ -39,11 +39,11 @@ public DummyFwStylesDlg() /// public DummyFwStylesDlg(IVwRootSite rootSite, LcmCache cache, LcmStyleSheet styleSheet, bool defaultRightToLeft, bool showBiDiLabels, string normalStyleName, - int customUserLevel, MsrSysType userMeasurementType, string paraStyleName, + MsrSysType userMeasurementType, string paraStyleName, string charStyleName, int hvoRootObject, IApp app, IHelpTopicProvider helpTopicProvider) : base(rootSite, cache, styleSheet, defaultRightToLeft, showBiDiLabels, - normalStyleName, customUserLevel, userMeasurementType, paraStyleName, + normalStyleName, userMeasurementType, paraStyleName, charStyleName, hvoRootObject, app, helpTopicProvider) { } @@ -183,7 +183,7 @@ public void NoStyleSelected_AllTabsHidden(string selectedStyle, int visibleTabs) var stylesheet = new LcmStyleSheet(); stylesheet.Init(Cache, Cache.LangProject.Hvo, LangProjectTags.kflidStyles); - var sut = new DummyFwStylesDlg(null, Cache, stylesheet, false, false, "Normal", 0, MsrSysType.Cm, + var sut = new DummyFwStylesDlg(null, Cache, stylesheet, false, false, "Normal", MsrSysType.Cm, selectedStyle, string.Empty, 0, null, null); Assert.That(sut.TabControl.TabCount, Is.EqualTo(visibleTabs)); diff --git a/Src/FwCoreDlgs/FwStylesDlg.Designer.cs b/Src/FwCoreDlgs/FwStylesDlg.Designer.cs index a13da12204..24cda80dd8 100644 --- a/Src/FwCoreDlgs/FwStylesDlg.Designer.cs +++ b/Src/FwCoreDlgs/FwStylesDlg.Designer.cs @@ -154,8 +154,7 @@ private void InitializeComponent() resources.GetString("m_cboTypes.Items"), resources.GetString("m_cboTypes.Items1"), resources.GetString("m_cboTypes.Items2"), - resources.GetString("m_cboTypes.Items3"), - resources.GetString("m_cboTypes.Items4")}); + resources.GetString("m_cboTypes.Items3")}); resources.ApplyResources(this.m_cboTypes, "m_cboTypes"); this.m_cboTypes.Name = "m_cboTypes"; this.m_cboTypes.SelectedIndexChanged += new System.EventHandler(this.m_cboTypes_SelectedIndexChanged); diff --git a/Src/FwCoreDlgs/FwStylesDlg.cs b/Src/FwCoreDlgs/FwStylesDlg.cs index bc98dbc8db..c15701a574 100644 --- a/Src/FwCoreDlgs/FwStylesDlg.cs +++ b/Src/FwCoreDlgs/FwStylesDlg.cs @@ -69,15 +69,12 @@ public partial class FwStylesDlg : Form private StyleInfo m_normalStyleInfo; private int m_hvoRootObject; - private int m_customUserLevel = 0; private StyleChangeType m_changeType = StyleChangeType.None; private IVwRootSite m_rootSite; private IApp m_app; private MsrSysType m_userMeasurementType; private IHelpTopicProvider m_helpTopicProvider; - private bool m_fShowTEStyleTypes = false; - private object m_lastStyleTypeEntryForOtherApp; private bool m_fOkToSaveTabsToStyle = true; private static string m_oldStyle = "Dictionary-Normal"; #endregion @@ -92,9 +89,6 @@ public partial class FwStylesDlg : Form private FwStylesDlg() { InitializeComponent(); - Debug.Assert(m_cboTypes.Items.Count == 5); - m_lastStyleTypeEntryForOtherApp = m_cboTypes.Items[4]; - m_cboTypes.Items.RemoveAt(4); m_btnAdd.Image = ResourceHelper.ButtonMenuArrowIcon; } @@ -115,7 +109,6 @@ private FwStylesDlg() /// will automatically be BiDi enabled. If this value is false, then simple "Left" and /// "Right" labels will be used in the display, rather than "Leading" and "Trailing". /// Name of the normal style. Selected when the dialog starts if there is no paragraph style. - /// The custom user level. /// User's preferred measurement units. /// Name of the currently selected paragraph style. Selected when the dialog starts. /// Name of the currently selected character style. @@ -125,13 +118,12 @@ private FwStylesDlg() /// ------------------------------------------------------------------------------------ public FwStylesDlg(IVwRootSite rootSite, LcmCache cache, LcmStyleSheet styleSheet, bool defaultRightToLeft, bool showBiDiLabels, string normalStyleName, - int customUserLevel, MsrSysType userMeasurementType, string paraStyleName, + MsrSysType userMeasurementType, string paraStyleName, string charStyleName, int hvoRootObject, IApp app, IHelpTopicProvider helpTopicProvider) : this() { m_rootSite = rootSite; m_cache = cache; - m_customUserLevel = customUserLevel; m_hvoRootObject = hvoRootObject; m_app = app; showBiDiLabels |= defaultRightToLeft; @@ -200,7 +192,6 @@ public FwStylesDlg(IVwRootSite rootSite, LcmCache cache, LcmStyleSheet styleShee /// An action to run after the dialog closes /// style to select in the combo if none chosen in the dialog /// that the dialog will configure - /// optional constraint on which styles show /// root HVO for the application, e.g., Scripture for TE /// /// parent window @@ -208,7 +199,7 @@ public FwStylesDlg(IVwRootSite rootSite, LcmCache cache, LcmStyleSheet styleShee /// /// Method to be called if user requests to reset a style to factory settings. public static void RunStylesDialogForCombo(ComboBox combo, Action fixCombo, string defaultStyle, - LcmStyleSheet stylesheet, int nMaxStyleLevel, int hvoAppRoot, LcmCache cache, + LcmStyleSheet stylesheet, int hvoAppRoot, LcmCache cache, IWin32Window owner, IApp app, IHelpTopicProvider helpTopicProvider, Action setPropsToFactorySettings) { @@ -224,7 +215,6 @@ public static void RunStylesDialogForCombo(ComboBox combo, Action fixCombo, stri fRightToLeft, cache.ServiceLocator.WritingSystems.AllWritingSystems.Any(ws => ws.RightToLeftScript), stylesheet.GetDefaultBasedOnStyleName(), - nMaxStyleLevel, app.MeasurementSystem, dialogStartingSelectedStyle, comboStartingSelectedStyle, @@ -232,7 +222,6 @@ public static void RunStylesDialogForCombo(ComboBox combo, Action fixCombo, stri app, helpTopicProvider)) { - stylesDlg.ShowTEStyleTypes = false; stylesDlg.CanSelectParagraphBackgroundColor = false; stylesDlg.SetPropsToFactorySettings = setPropsToFactorySettings; if (stylesDlg.ShowDialog(owner) == DialogResult.OK && stylesDlg.ChangeType != StyleChangeType.None) @@ -335,8 +324,7 @@ public void CheckDisposed() /// ------------------------------------------------------------------------------------ /// /// Gets or sets a value indicating whether or not to show the combo box where the user - /// can select the type of styles to show (all, basic, or custom styles). This combo - /// box is shown in TE but not in the other apps. + /// can select the type of styles to show (basic, all, custom, or user-modified styles). /// /// ------------------------------------------------------------------------------------ public bool AllowSelectStyleTypes @@ -345,31 +333,6 @@ public bool AllowSelectStyleTypes set { m_pnlTypesCombo.Visible = value; } } - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets a value indicating whether to show the TE list of style types (all, - /// basic, or custom styles), or the FLEx list of style types (all, basic, dictionary, - /// or custom styles). - /// - /// ------------------------------------------------------------------------------------ - public bool ShowTEStyleTypes - { - get { return m_fShowTEStyleTypes; } - set - { - if (m_fShowTEStyleTypes == value) - return; - - // TE and FLEx need to show a different entry as the last style type in the - // list, so swap which one is there. - m_fShowTEStyleTypes = value; - object temp = m_lastStyleTypeEntryForOtherApp; - Debug.Assert(m_cboTypes.Items.Count == 4); - m_lastStyleTypeEntryForOtherApp = m_cboTypes.Items[3]; - m_cboTypes.Items[3] = temp; - } - } - /// ------------------------------------------------------------------------------------ /// /// Gets or sets a value indicating whether the user can select a paragraph background @@ -551,41 +514,16 @@ private void m_cboTypes_SelectedIndexChanged(object sender, EventArgs e) { if (m_styleListHelper == null) return; - if (m_fShowTEStyleTypes) + StyleListItem current = m_styleListHelper.SelectedStyle; + m_styleListHelper.MaxStyleLevel = Int32.MaxValue; + m_styleListHelper.ExplicitStylesToDisplay = null; + List stylesToExclude = GetExcludedFlexStyleNames(); + if (current != null && stylesToExclude.Contains(current.Name)) { - m_styleListHelper.ShowOnlyUserModifiedStyles = false; - switch (m_cboTypes.SelectedIndex) - { - case 0: // basic - m_styleListHelper.MaxStyleLevel = 0; - break; - - case 1: // all - m_styleListHelper.MaxStyleLevel = Int32.MaxValue; - break; - - case 2: // custom - m_styleListHelper.MaxStyleLevel = m_customUserLevel; - break; - case 3: // user-modified - m_styleListHelper.MaxStyleLevel = Int32.MaxValue; - m_styleListHelper.ShowOnlyUserModifiedStyles = true; - break; - } - } - else - { - StyleListItem current = m_styleListHelper.SelectedStyle; - m_styleListHelper.MaxStyleLevel = Int32.MaxValue; - m_styleListHelper.ExplicitStylesToDisplay = null; - List stylesToExclude = GetExcludedFlexStyleNames(); - if (current != null && stylesToExclude.Contains(current.Name)) - { - UpdateChanges((StyleInfo)current.StyleInfo); - stylesToExclude = GetExcludedFlexStyleNames(); // in case style name changed in interesting way. - } - m_styleListHelper.ExplicitStylesToExclude = stylesToExclude; + UpdateChanges((StyleInfo)current.StyleInfo); + stylesToExclude = GetExcludedFlexStyleNames(); // in case style name changed in interesting way. } + m_styleListHelper.ExplicitStylesToExclude = stylesToExclude; m_styleListHelper.Refresh(); if (m_lstStyles.SelectedValue == null) { @@ -624,11 +562,11 @@ private List GetExcludedFlexStyleNames() styles.Add(StyleUtils.DefaultParaCharsStyleName); break; - case 3: // dictionary -- use current table of styles to obtain names - foreach (var style in m_styleTable.Keys) + case 3: // user-modified -- styles changed from their factory settings + foreach (var style in m_styleTable) { - if (!style.StartsWith("Dictionary") && !style.StartsWith("Classified")) - styles.Add(style); + if (!style.Value.IsModified) + styles.Add(style.Key); } styles.Add(StyleUtils.DefaultParaCharsStyleName); break; diff --git a/Src/FwCoreDlgs/FwStylesDlg.resx b/Src/FwCoreDlgs/FwStylesDlg.resx index 6e045431fa..9a293dd021 100644 --- a/Src/FwCoreDlgs/FwStylesDlg.resx +++ b/Src/FwCoreDlgs/FwStylesDlg.resx @@ -903,7 +903,4 @@ User-modified Styles - - Dictionary - \ No newline at end of file diff --git a/Src/FwResources/FwStrings.Designer.cs b/Src/FwResources/FwStrings.Designer.cs index 55c8c2fd70..a039837060 100644 --- a/Src/FwResources/FwStrings.Designer.cs +++ b/Src/FwResources/FwStrings.Designer.cs @@ -1145,24 +1145,6 @@ internal static string kstidFileOpenToolTip { } } - /// - /// Looks up a localized string similar to Page Set&up.... - /// - internal static string kstidFilePageSetupMenuName { - get { - return ResourceManager.GetString("kstidFilePageSetupMenuName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Page Setup for Printing.. - /// - internal static string kstidFilePageSetupMsg { - get { - return ResourceManager.GetString("kstidFilePageSetupMsg", resourceCulture); - } - } - /// /// Looks up a localized string similar to &Print.... /// @@ -1962,15 +1944,6 @@ internal static string kstidOXESA { } } - /// - /// Looks up a localized string similar to Page Setup - {0}. - /// - internal static string kstidPageSetupWithViewName { - get { - return ResourceManager.GetString("kstidPageSetupWithViewName", resourceCulture); - } - } - /// /// Looks up a localized string similar to Page Width. /// @@ -2642,15 +2615,6 @@ internal static string kstidUndoMultipleActions { } } - /// - /// Looks up a localized string similar to Page Setup Changes. - /// - internal static string kstidUndoPageSetupChanges { - get { - return ResourceManager.GetString("kstidUndoPageSetupChanges", resourceCulture); - } - } - /// /// Looks up a localized string similar to Cancel. /// diff --git a/Src/FwResources/FwStrings.resx b/Src/FwResources/FwStrings.resx index c2e1a9af0e..bb1432c8fd 100644 --- a/Src/FwResources/FwStrings.resx +++ b/Src/FwResources/FwStrings.resx @@ -198,10 +198,6 @@ Please reapply your style change An error has occurred while creating a new project. Displayed in a dialog box when an error occurs while creating a new project. - - Page Setup - {0} - Title of the Page Setup dialog that also shows the name of the print layout view. - Open Project Tool tip for Open Project toolbar button @@ -561,10 +557,6 @@ only in multiple-paragraph fields like 'Description' Project &Management This is the text for the project managment option on the file menu. - - Page Set&up... - This is the text for the page setup option on the file menu. - &Print... This is the text for the print option on the file menu. @@ -697,10 +689,6 @@ only in multiple-paragraph fields like 'Description' Delete a FieldWorks project. This is the status bar message for the delete project menu option. - - Page Setup for Printing. - This is the status bar message for the page setup menu option. - Prints current view. This is the status bar message for the print menu option. @@ -1160,10 +1148,6 @@ FieldWorks ReadMe for help in this area. LIFT files Used in the list of file types in file save dialogs - - Page Setup Changes - for Undo - (Inherited from {0}) Text shown in the styles dialog font tab when a writing system has inherited font properties diff --git a/Src/FwResources/FwTMStrings.Designer.cs b/Src/FwResources/FwTMStrings.Designer.cs deleted file mode 100644 index d189d8901d..0000000000 --- a/Src/FwResources/FwTMStrings.Designer.cs +++ /dev/null @@ -1,1692 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.239 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace SIL.FieldWorks.Resources { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class FwTMStrings { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal FwTMStrings() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SIL.FieldWorks.Resources.FwTMStrings", typeof(FwTMStrings).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized string similar to Add to Spelling Dictionary. - /// - internal static string kstidAddToDict { - get { - return ResourceManager.GetString("kstidAddToDict", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Add Word to Spelling Dictionary. - /// - internal static string kstidAddToDictToolTip { - get { - return ResourceManager.GetString("kstidAddToDictToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Appl&y Style.... - /// - internal static string kstidApplyStyleItemName { - get { - return ResourceManager.GetString("kstidApplyStyleItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Apply Style. - /// - internal static string kstidApplyStyleToolTip { - get { - return ResourceManager.GetString("kstidApplyStyleToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Background Color. - /// - internal static string kstidBackgroundColorItemName { - get { - return ResourceManager.GetString("kstidBackgroundColorItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Background Color. - /// - internal static string kstidBackgroundColorToolTip { - get { - return ResourceManager.GetString("kstidBackgroundColorToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &Back up this Project.... - /// - internal static string kstidBackupItemName { - get { - return ResourceManager.GetString("kstidBackupItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Back up or restore a FieldWorks project.. - /// - internal static string kstidBackupRestoreMsg { - get { - return ResourceManager.GetString("kstidBackupRestoreMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Back up FieldWorks Project. - /// - internal static string kstidBackupToolTip { - get { - return ResourceManager.GetString("kstidBackupToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Bold. - /// - internal static string kstidBoldItemName { - get { - return ResourceManager.GetString("kstidBoldItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Bold. - /// - internal static string kstidBoldToolTip { - get { - return ResourceManager.GetString("kstidBoldToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Bottom Border. - /// - internal static string kstidBordersBottomItemName { - get { - return ResourceManager.GetString("kstidBordersBottomItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Bottom Border. - /// - internal static string kstidBordersBottomToolTip { - get { - return ResourceManager.GetString("kstidBordersBottomToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Borders. - /// - internal static string kstidBordersItemName { - get { - return ResourceManager.GetString("kstidBordersItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Left Border. - /// - internal static string kstidBordersLeftItemName { - get { - return ResourceManager.GetString("kstidBordersLeftItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Left Border. - /// - internal static string kstidBordersLeftToolTip { - get { - return ResourceManager.GetString("kstidBordersLeftToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to No Borders. - /// - internal static string kstidBordersNoneItemName { - get { - return ResourceManager.GetString("kstidBordersNoneItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to No Borders. - /// - internal static string kstidBordersNoneToolTip { - get { - return ResourceManager.GetString("kstidBordersNoneToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Right Border. - /// - internal static string kstidBordersRightItemName { - get { - return ResourceManager.GetString("kstidBordersRightItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Right Border. - /// - internal static string kstidBordersRightToolTip { - get { - return ResourceManager.GetString("kstidBordersRightToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Borders all Around. - /// - internal static string kstidBordersSurroundItemName { - get { - return ResourceManager.GetString("kstidBordersSurroundItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Borders all Around. - /// - internal static string kstidBordersSurroundToolTip { - get { - return ResourceManager.GetString("kstidBordersSurroundToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Borders. - /// - internal static string kstidBordersToolTip { - get { - return ResourceManager.GetString("kstidBordersToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Top Border. - /// - internal static string kstidBordersTopItemName { - get { - return ResourceManager.GetString("kstidBordersTopItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Top Border. - /// - internal static string kstidBordersTopToolTip { - get { - return ResourceManager.GetString("kstidBordersTopToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Bullets. - /// - internal static string kstidBulletedListItemItemName { - get { - return ResourceManager.GetString("kstidBulletedListItemItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Bullets. - /// - internal static string kstidBulletedListItemToolTip { - get { - return ResourceManager.GetString("kstidBulletedListItemToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &Cascade. - /// - internal static string kstidCascadeItemName { - get { - return ResourceManager.GetString("kstidCascadeItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Arranges open windows to be cascade from top left to bottom right.. - /// - internal static string kstidCascadeMsg { - get { - return ResourceManager.GetString("kstidCascadeMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Cascade Open Windows. - /// - internal static string kstidCascadeToolTip { - get { - return ResourceManager.GetString("kstidCascadeToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Center. - /// - internal static string kstidCenterItemName { - get { - return ResourceManager.GetString("kstidCenterItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Center. - /// - internal static string kstidCenterToolTip { - get { - return ResourceManager.GetString("kstidCenterToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Change Multiple Occurrences.... - /// - internal static string kstidChangeMultiOccurrences { - get { - return ResourceManager.GetString("kstidChangeMultiOccurrences", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Change Multiple Occurrences of Word. - /// - internal static string kstidChangeMultiOccurrencesToolTip { - get { - return ResourceManager.GetString("kstidChangeMultiOccurrencesToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Character Style. - /// - internal static string kstidCharStyleItemName { - get { - return ResourceManager.GetString("kstidCharStyleItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Character Style. - /// - internal static string kstidCharStyleToolTip { - get { - return ResourceManager.GetString("kstidCharStyleToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &Close. - /// - internal static string kstidCloseItemName { - get { - return ResourceManager.GetString("kstidCloseItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Close this window. - /// - internal static string kstidCloseMsg { - get { - return ResourceManager.GetString("kstidCloseMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Close Window. - /// - internal static string kstidCloseToolTip { - get { - return ResourceManager.GetString("kstidCloseToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &Copy. - /// - internal static string kstidCopyItemName { - get { - return ResourceManager.GetString("kstidCopyItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Copy text to the clipboard.. - /// - internal static string kstidCopyMsg { - get { - return ResourceManager.GetString("kstidCopyMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Copy. - /// - internal static string kstidCopyToolTip { - get { - return ResourceManager.GetString("kstidCopyToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &Create Shortcut on Desktop. - /// - internal static string kstidCreateShortcutItemName { - get { - return ResourceManager.GetString("kstidCreateShortcutItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Create shortcut on desktop for this project. - /// - internal static string kstidCreateShortcutToolTip { - get { - return ResourceManager.GetString("kstidCreateShortcutToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &Customize.... - /// - internal static string kstidCustomizeToolBarsItemName { - get { - return ResourceManager.GetString("kstidCustomizeToolBarsItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Cu&t. - /// - internal static string kstidCutItemName { - get { - return ResourceManager.GetString("kstidCutItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Cut text and put it on the clipboard.. - /// - internal static string kstidCutMsg { - get { - return ResourceManager.GetString("kstidCutMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Cut. - /// - internal static string kstidCutToolTip { - get { - return ResourceManager.GetString("kstidCutToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Decrease Indent. - /// - internal static string kstidDecreaseIndentItemName { - get { - return ResourceManager.GetString("kstidDecreaseIndentItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Decrease Indent. - /// - internal static string kstidDecreaseIndentToolTip { - get { - return ResourceManager.GetString("kstidDecreaseIndentToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to For help, press F1.. - /// - internal static string kstidDefaultStatusBarMsg { - get { - return ResourceManager.GetString("kstidDefaultStatusBarMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &Delete. - /// - internal static string kstidDeleteItemName { - get { - return ResourceManager.GetString("kstidDeleteItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Delete the selection.. - /// - internal static string kstidDeleteMsg { - get { - return ResourceManager.GetString("kstidDeleteMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &Delete FieldWorks Project.... - /// - internal static string kstidDeleteProjItemName { - get { - return ResourceManager.GetString("kstidDeleteProjItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Delete a FieldWorks project.. - /// - internal static string kstidDeleteProjMsg { - get { - return ResourceManager.GetString("kstidDeleteProjMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Delete FieldWorks Project. - /// - internal static string kstidDeleteProjToolTip { - get { - return ResourceManager.GetString("kstidDeleteProjToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Delete Selected Text. - /// - internal static string kstidDeleteToolTip { - get { - return ResourceManager.GetString("kstidDeleteToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Direct Formatting. - /// - internal static string kstidDirectFormattingToolBarText { - get { - return ResourceManager.GetString("kstidDirectFormattingToolBarText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Edit. - /// - internal static string kstidEditCategory { - get { - return ResourceManager.GetString("kstidEditCategory", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &Edit. - /// - internal static string kstidEditItemName { - get { - return ResourceManager.GetString("kstidEditItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to E&xit. - /// - internal static string kstidExitItemName { - get { - return ResourceManager.GetString("kstidExitItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Exits this application.. - /// - internal static string kstidExitMsg { - get { - return ResourceManager.GetString("kstidExitMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Exit Application. - /// - internal static string kstidExitToolTip { - get { - return ResourceManager.GetString("kstidExitToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to File. - /// - internal static string kstidFileCategory { - get { - return ResourceManager.GetString("kstidFileCategory", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &File. - /// - internal static string kstidFileItemName { - get { - return ResourceManager.GetString("kstidFileItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &Find.... - /// - internal static string kstidFindItemName { - get { - return ResourceManager.GetString("kstidFindItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Opens the Find dialog. - /// - internal static string kstidFindMsg { - get { - return ResourceManager.GetString("kstidFindMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Find Ne&xt. - /// - internal static string kstidFindNextItemName { - get { - return ResourceManager.GetString("kstidFindNextItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Find next.. - /// - internal static string kstidFindNextMsg { - get { - return ResourceManager.GetString("kstidFindNextMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Find Next Occurrence of Specified Text. - /// - internal static string kstidFindNextToolTip { - get { - return ResourceManager.GetString("kstidFindNextToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Find Pre&vious. - /// - internal static string kstidFindPrevItemName { - get { - return ResourceManager.GetString("kstidFindPrevItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Find previous.. - /// - internal static string kstidFindPrevMsg { - get { - return ResourceManager.GetString("kstidFindPrevMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Find Previous Occurrence of Specified Text. - /// - internal static string kstidFindPrevToolTip { - get { - return ResourceManager.GetString("kstidFindPrevToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Find Occurrence of Specified Text. - /// - internal static string kstidFindToolTip { - get { - return ResourceManager.GetString("kstidFindToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Font Color. - /// - internal static string kstidFontColorItemName { - get { - return ResourceManager.GetString("kstidFontColorItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Font Color. - /// - internal static string kstidFontColorToolTip { - get { - return ResourceManager.GetString("kstidFontColorToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Format. - /// - internal static string kstidFormatCategory { - get { - return ResourceManager.GetString("kstidFormatCategory", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to F&ormat. - /// - internal static string kstidFormatItemName { - get { - return ResourceManager.GetString("kstidFormatItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Formatting. - /// - internal static string kstidFormatToolBarText { - get { - return ResourceManager.GetString("kstidFormatToolBarText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Full &Window. - /// - internal static string kstidFullWindowItemName { - get { - return ResourceManager.GetString("kstidFullWindowItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Full Window. - /// - internal static string kstidFullWindowToolTip { - get { - return ResourceManager.GetString("kstidFullWindowToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Help. - /// - internal static string kstidHelpCategory { - get { - return ResourceManager.GetString("kstidHelpCategory", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &Help. - /// - internal static string kstidHelpItemName { - get { - return ResourceManager.GetString("kstidHelpItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &How Do I.... - /// - internal static string kstidHowDoIItemName { - get { - return ResourceManager.GetString("kstidHowDoIItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to How Do I?. - /// - internal static string kstidHowDoIToolTip { - get { - return ResourceManager.GetString("kstidHowDoIToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Increase Indent. - /// - internal static string kstidIncreaseIndentItemName { - get { - return ResourceManager.GetString("kstidIncreaseIndentItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Increase Indent. - /// - internal static string kstidIncreaseIndentToolTip { - get { - return ResourceManager.GetString("kstidIncreaseIndentToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Italic. - /// - internal static string kstidItalicItemName { - get { - return ResourceManager.GetString("kstidItalicItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Italic. - /// - internal static string kstidItalicToolTip { - get { - return ResourceManager.GetString("kstidItalicToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Align Left. - /// - internal static string kstidLeftAlignItemName { - get { - return ResourceManager.GetString("kstidLeftAlignItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Align Left. - /// - internal static string kstidLeftAlignToolTip { - get { - return ResourceManager.GetString("kstidLeftAlignToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &More Windows.... - /// - internal static string kstidMoreWindowsItemName { - get { - return ResourceManager.GetString("kstidMoreWindowsItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &New FieldWorks Project.... - /// - internal static string kstidNewItemName { - get { - return ResourceManager.GetString("kstidNewItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to New FieldWorks Project. - /// - internal static string kstidNewToolTip { - get { - return ResourceManager.GetString("kstidNewToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &New Window. - /// - internal static string kstidNewWindowItemName { - get { - return ResourceManager.GetString("kstidNewWindowItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Opens another identical second window containing the same data.. - /// - internal static string kstidNewWindowMsg { - get { - return ResourceManager.GetString("kstidNewWindowMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Open a New Window. - /// - internal static string kstidNewWindowToolTip { - get { - return ResourceManager.GetString("kstidNewWindowToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Numbering. - /// - internal static string kstidNumberedListItemItemName { - get { - return ResourceManager.GetString("kstidNumberedListItemItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Numbering. - /// - internal static string kstidNumberedListItemToolTip { - get { - return ResourceManager.GetString("kstidNumberedListItemToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &Open.... - /// - internal static string kstidOpenItemName { - get { - return ResourceManager.GetString("kstidOpenItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Open Project. - /// - internal static string kstidOpenToolTip { - get { - return ResourceManager.GetString("kstidOpenToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to P&age Setup.... - /// - internal static string kstidPageSetupItemName { - get { - return ResourceManager.GetString("kstidPageSetupItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Page Setup for Printing.. - /// - internal static string kstidPageSetupMsg { - get { - return ResourceManager.GetString("kstidPageSetupMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Page Setup. - /// - internal static string kstidPageSetupToolTip { - get { - return ResourceManager.GetString("kstidPageSetupToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Paragraph Style. - /// - internal static string kstidParaStyleItemName { - get { - return ResourceManager.GetString("kstidParaStyleItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Paragraph Style. - /// - internal static string kstidParaStyleToolTip { - get { - return ResourceManager.GetString("kstidParaStyleToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &Paste. - /// - internal static string kstidPasteItemName { - get { - return ResourceManager.GetString("kstidPasteItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Paste text from the clipboard.. - /// - internal static string kstidPasteMsg { - get { - return ResourceManager.GetString("kstidPasteMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Paste. - /// - internal static string kstidPasteToolTip { - get { - return ResourceManager.GetString("kstidPasteToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &Print.... - /// - internal static string kstidPrintItemName { - get { - return ResourceManager.GetString("kstidPrintItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Prints current view.. - /// - internal static string kstidPrintMsg { - get { - return ResourceManager.GetString("kstidPrintMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Print. - /// - internal static string kstidPrintToolTip { - get { - return ResourceManager.GetString("kstidPrintToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Modify properties of a FieldWorks project.. - /// - internal static string kstidProjectPropertiesMsg { - get { - return ResourceManager.GetString("kstidProjectPropertiesMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Project &Management. - /// - internal static string kstidProjManagementItemName { - get { - return ResourceManager.GetString("kstidProjManagementItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Project Management. - /// - internal static string kstidProjManagementToolTip { - get { - return ResourceManager.GetString("kstidProjManagementToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Field&Works Project Properties.... - /// - internal static string kstidProjPropertiesItemName { - get { - return ResourceManager.GetString("kstidProjPropertiesItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to FieldWorks Project Properties. - /// - internal static string kstidProjPropertiesToolTip { - get { - return ResourceManager.GetString("kstidProjPropertiesToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &Redo. - /// - internal static string kstidRedoItemName { - get { - return ResourceManager.GetString("kstidRedoItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Redo the most recent undone change.. - /// - internal static string kstidRedoMsg { - get { - return ResourceManager.GetString("kstidRedoMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Redo. - /// - internal static string kstidRedoToolTip { - get { - return ResourceManager.GetString("kstidRedoToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Remove &Character Style. - /// - internal static string kstidRemoveCharStyleItemName { - get { - return ResourceManager.GetString("kstidRemoveCharStyleItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Remove the character style formatting from the current selection.. - /// - internal static string kstidRemoveCharStyleMsg { - get { - return ResourceManager.GetString("kstidRemoveCharStyleMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Remove Character Style. - /// - internal static string kstidRemoveCharStyleToolTip { - get { - return ResourceManager.GetString("kstidRemoveCharStyleToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Reset the style of the current paragraph to the default paragraph style.. - /// - internal static string kstidRemoveParaStyleMsg { - get { - return ResourceManager.GetString("kstidRemoveParaStyleMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &Rename .... - /// - internal static string kstidRenameItemName { - get { - return ResourceManager.GetString("kstidRenameItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Rename a FieldWorks project.. - /// - internal static string kstidRenameMsg { - get { - return ResourceManager.GetString("kstidRenameMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Rename FieldWorks Project. - /// - internal static string kstidRenameToolTip { - get { - return ResourceManager.GetString("kstidRenameToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to R&eplace.... - /// - internal static string kstidReplaceItemName { - get { - return ResourceManager.GetString("kstidReplaceItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Opens the replace dialog.. - /// - internal static string kstidReplaceMsg { - get { - return ResourceManager.GetString("kstidReplaceMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Find and Replace Specified Text. - /// - internal static string kstidReplaceToolTip { - get { - return ResourceManager.GetString("kstidReplaceToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Reset P&aragraph Style. - /// - internal static string kstidResetParaStyleItemName { - get { - return ResourceManager.GetString("kstidResetParaStyleItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Reset Paragraph Style. - /// - internal static string kstidResetParaStyleToolTip { - get { - return ResourceManager.GetString("kstidResetParaStyleToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &Restore a Project.... - /// - internal static string kstidRestoreItemName { - get { - return ResourceManager.GetString("kstidRestoreItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Restore FieldWorks Project. - /// - internal static string kstidRestoreToolTip { - get { - return ResourceManager.GetString("kstidRestoreToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Align Right. - /// - internal static string kstidRightAlignItemName { - get { - return ResourceManager.GetString("kstidRightAlignItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Align Right. - /// - internal static string kstidRightAlignToolTip { - get { - return ResourceManager.GetString("kstidRightAlignToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &Save. - /// - internal static string kstidSaveItemName { - get { - return ResourceManager.GetString("kstidSaveItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Saves changes.. - /// - internal static string kstidSaveMsg { - get { - return ResourceManager.GetString("kstidSaveMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Save. - /// - internal static string kstidSaveToolTip { - get { - return ResourceManager.GetString("kstidSaveToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Select A&ll. - /// - internal static string kstidSelectAllItemName { - get { - return ResourceManager.GetString("kstidSelectAllItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Select all of the text.. - /// - internal static string kstidSelectAllMsg { - get { - return ResourceManager.GetString("kstidSelectAllMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Select All Text. - /// - internal static string kstidSelectAllToolTip { - get { - return ResourceManager.GetString("kstidSelectAllToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Project Locations and Sharing.... - /// - internal static string kstidSharingLocationItemName { - get { - return ResourceManager.GetString("kstidSharingLocationItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Brings up a dialog for controlling whether projects are shared and where they are stored.. - /// - internal static string kstidSharingLocationToolTip { - get { - return ResourceManager.GetString("kstidSharingLocationToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to S&ide Bar. - /// - internal static string kstidSideBarItemName { - get { - return ResourceManager.GetString("kstidSideBarItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Show or hide the Side bar.. - /// - internal static string kstidSideBarMsg { - get { - return ResourceManager.GetString("kstidSideBarMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Shows/Hide Side Bar. - /// - internal static string kstidSideBarToolTip { - get { - return ResourceManager.GetString("kstidSideBarToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Standard. - /// - internal static string kstidStandardToolBarText { - get { - return ResourceManager.GetString("kstidStandardToolBarText", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to St&atus Bar. - /// - internal static string kstidStatusBarItemName { - get { - return ResourceManager.GetString("kstidStatusBarItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Show or hide the Status bar.. - /// - internal static string kstidStatusBarMsg { - get { - return ResourceManager.GetString("kstidStatusBarMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Shows/Hide Status Bar. - /// - internal static string kstidStatusBarToolTip { - get { - return ResourceManager.GetString("kstidStatusBarToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &Styles.... - /// - internal static string kstidStyleItemName { - get { - return ResourceManager.GetString("kstidStyleItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Open a dialog to add, delete, or change styles.. - /// - internal static string kstidStyleMsg { - get { - return ResourceManager.GetString("kstidStyleMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Styles. - /// - internal static string kstidStyleToolTip { - get { - return ResourceManager.GetString("kstidStyleToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &Tile. - /// - internal static string kstidTileItemName { - get { - return ResourceManager.GetString("kstidTileItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Arranges open windows to be equal heights, displayed one on top of the other. - /// - internal static string kstidTileMsg { - get { - return ResourceManager.GetString("kstidTileMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Tile Side-&By-Side. - /// - internal static string kstidTileSideBySideItemName { - get { - return ResourceManager.GetString("kstidTileSideBySideItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Arranges open windows to be of equal widths, displayed side-by-side. - /// - internal static string kstidTileSideBySideMsg { - get { - return ResourceManager.GetString("kstidTileSideBySideMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Arrange Open Windows to be Side-By-Side. - /// - internal static string kstidTileSideBySideToolTip { - get { - return ResourceManager.GetString("kstidTileSideBySideToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Arrange Open Windows to be Stacked. - /// - internal static string kstidTileToolTip { - get { - return ResourceManager.GetString("kstidTileToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &Toolbars. - /// - internal static string kstidToolBarsItemName { - get { - return ResourceManager.GetString("kstidToolBarsItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Tools. - /// - internal static string kstidToolsCategory { - get { - return ResourceManager.GetString("kstidToolsCategory", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &Tools. - /// - internal static string kstidToolsItemName { - get { - return ResourceManager.GetString("kstidToolsItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &Training. - /// - internal static string kstidTrainingItemName { - get { - return ResourceManager.GetString("kstidTrainingItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Training. - /// - internal static string kstidTrainingToolTip { - get { - return ResourceManager.GetString("kstidTrainingToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Tutorials. - /// - internal static string kstidTutorialItemName { - get { - return ResourceManager.GetString("kstidTutorialItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &Undo. - /// - internal static string kstidUndoItemName { - get { - return ResourceManager.GetString("kstidUndoItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Undoes the most recent change.. - /// - internal static string kstidUndoMsg { - get { - return ResourceManager.GetString("kstidUndoMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Undo. - /// - internal static string kstidUndoToolTip { - get { - return ResourceManager.GetString("kstidUndoToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &User Properties.... - /// - internal static string kstidUserPropertiesItemName { - get { - return ResourceManager.GetString("kstidUserPropertiesItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Modify users and access levels.. - /// - internal static string kstidUserPropertiesMsg { - get { - return ResourceManager.GetString("kstidUserPropertiesMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to User Properties. - /// - internal static string kstidUserPropertiesToolTip { - get { - return ResourceManager.GetString("kstidUserPropertiesToolTip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to View. - /// - internal static string kstidViewCategory { - get { - return ResourceManager.GetString("kstidViewCategory", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &View. - /// - internal static string kstidViewItemName { - get { - return ResourceManager.GetString("kstidViewItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Window. - /// - internal static string kstidWindowCategory { - get { - return ResourceManager.GetString("kstidWindowCategory", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &Window. - /// - internal static string kstidWindowItemName { - get { - return ResourceManager.GetString("kstidWindowItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to {0} ({1}). - /// - internal static string kstidWindowListItemFormatter { - get { - return ResourceManager.GetString("kstidWindowListItemFormatter", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Writing System. - /// - internal static string kstidWritingSystemItemName { - get { - return ResourceManager.GetString("kstidWritingSystemItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Writing System. - /// - internal static string kstidWSTooltip { - get { - return ResourceManager.GetString("kstidWSTooltip", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Zoom. - /// - internal static string kstidZoomItemName { - get { - return ResourceManager.GetString("kstidZoomItemName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Zoom. - /// - internal static string kstidZoomToolTip { - get { - return ResourceManager.GetString("kstidZoomToolTip", resourceCulture); - } - } - } -} diff --git a/Src/FwResources/FwTMStrings.resx b/Src/FwResources/FwTMStrings.resx deleted file mode 100644 index c07eb6480b..0000000000 --- a/Src/FwResources/FwTMStrings.resx +++ /dev/null @@ -1,844 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - New FieldWorks Project - Tooltip for the New Project toolbar/menu item - - - Open Project - Tool tip for Open Project toolbar/menu item - - - Close Window - Tooltip for Close menu item - - - Save - Tool tip for Save toolbar button - - - Project Management - Tooltip for Project management toolbar/menu item - - - Page Setup - Tooltip for Page setup toolbar/menu item - - - Print - Tool tip for Print toolbar/menu item - - - Exit Application - Tool tip for exit toolbar/menu item - - - Cut - Tool tip for Cut toolbar/menu item - - - Copy - Tool tip for Copy toolbar button - - - Paste - Tool tip for Paste toolbar/menu item - - - Undo - Tool tip for Undo toolbar/menu item - - - Redo - Tool tip for Redo toolbar/menu item - - - Select All Text - Tool tip for select all menu item - - - Find Occurrence of Specified Text - Tool tip for find menu item - - - Find Next Occurrence of Specified Text - Tool tip for find next menu item - - - Find Previous Occurrence of Specified Text - Tool tip for find previous menu item - - - Find and Replace Specified Text - Tool tip for find/replace menu item - - - FieldWorks Project Properties - Tool tip for fieldworks project properties toolbar/menu item - - - Back up FieldWorks Project - Tool tip for backup/restore toolbar/menu item - - - Restore FieldWorks Project - Tool tip for backup/restore toolbar/menu item - - - Rename FieldWorks Project - Tool tip for rename toolbar/menu item - - - Delete FieldWorks Project - Tool tip for delete project toolbar/menu item - - - Create shortcut on desktop for this project - Tool tip for create shortcut on desktop toolbar/menu item - - - Paragraph Style - Tool tip for Paragraph Styles Combo on toolbar - - - Character Style - Tool tip for Character Styles Combo on toolbar - - - Delete Selected Text - Tool tip for Delete menu item - - - Shows/Hide Status Bar - Tool tip for Status Bar menu item - - - Shows/Hide Side Bar - Tool tip for Side Bar menu item - - - Zoom - Tool tip for Zoom Combo on toolbar - - - Full Window - Tool tip for full window menu item - - - Writing System - Tooltip text for the writing system selector combo box on the toolbar - - - Styles - Tool tip for Styles toolbar/menu item - - - Apply Style - Tool tip for Apply Style toolbar/menu item - - - Remove Character Style - Tool tip for Reset Character toolbar/menu item - - - Reset Paragraph Style - Tool tip for Reset Paragraph toolbar/menu item - - - Bold - Tool tip for Bold toolbar button - - - Italic - Tool tip for Italic toolbar button - - - Align Left - Tool tip for Left Align toolbar button - - - Align Right - Tool tip for Right Align toolbar button - - - Center - Tool tip for Center toolbar button - - - Numbering - Tool tip for Numbering toolbar button - - - Bullets - Tool tip for Bullets toolbar button - - - Decrease Indent - Tool tip for Decrease Indent toolbar button - - - Increase Indent - Tool tip for Increase Indent toolbar button - - - Borders - Tool tip for Borders toolbar button - - - Background Color - Tool tip for Background Color toolbar button - - - Font Color - Tool tip for Font Color toolbar button - - - Borders all Around - Tool tip for format/borders surrounding border tooltip - - - Top Border - Tool tip for format/borders top border tooltip - - - Bottom Border - Tool tip for format/borders bottom border tooltip - - - Left Border - Tool tip for format/borders left border tooltip - - - Right Border - Tool tip for format/borders right border tooltip - - - No Borders - Tool tip for format/borders right border tooltip - - - Open a New Window - Tool tip for new window toolbar button - - - &User Properties... - Text tip for user properties menu item - - - User Properties - Tool tip for user properties menu item - - - Cascade Open Windows - Tool tip for cascade toolbar/menu item - - - Arrange Open Windows to be Stacked - Tool tip for tile toolbar/menu item - - - Arrange Open Windows to be Side-By-Side - Tool tip for side-by-side toolbar/menu item - - - How Do I? - Tool tip for the how do I toolbar/menu item - - - Training - Tool tip for training toolbar/menu item - - - &File - This is the text for the File menu on the main menu bar. - - - &Edit - This is the text for the Edit menu on the main menu bar. - - - &View - This is the text for the View menu on the main menu bar. - - - F&ormat - This is the text for the Format menu on the main menu bar. - - - &Tools - This is the text for the Tools menu on the main menu bar. - - - &Window - This is the text for the Window menu on the main menu bar. - - - &Help - This is the text for the Help menu on the main menu bar. - - - &New FieldWorks Project... - Text for the new option on the file menu - - - &Open... - Text for Open Project menu item - - - &Close - Text for Close menu item - - - &Save - Text for Save toolbar button - - - Project &Management - Text for menu and toolbar item - - - P&age Setup... - Text for menu and toolbar item - - - &Print... - Text for Print toolbar button - - - E&xit - This is the text for the exit option on the file menu. - - - Field&Works Project Properties... - This is the text for the proj. properties option on the file/project management menu. - - - &Back up this Project... - This is the text for the backup option on the file/project management menu. - - - &Restore a Project... - This is the text for the restore option on the file/project management menu. - - - &Rename ... - This is the text for the rename project option on the file/project management menu. - - - &Delete FieldWorks Project... - This is the text for the delete project option on the file/project management menu. - - - &Create Shortcut on Desktop - This is the text for the create shortcut on desktop option on the file/project management menu. - - - &Undo - Text for Undo toolbar button - - - &Redo - Text for Redo toolbar button - - - Cu&t - Text for Cut toolbar button - - - &Copy - Text for Copy toolbar button - - - &Paste - Text for Paste toolbar button - - - Select A&ll - This is the text for the select all option on the edit menu. - - - &Find... - This is the text for the find option on the edit menu. - - - Find Ne&xt - This is the text for the next match option on the edit menu. - - - Find Pre&vious - This is the text for the prev match option on the edit menu. - - - R&eplace... - This is the text for the replace option on the edit menu. - - - &Delete - This is the text for the delete option on the edit menu. - - - Full &Window - This is the text for the full window item on the view menu. - - - St&atus Bar - This is the text for the status bar on the view menu. - - - S&ide Bar - This is the text for the side bar on the view menu. - - - &Toolbars - This is the text for the toolbar bar on the view menu. - - - &Customize... - This is the text for the customize item at the bottom of the toolbar bar menu item. - - - &Styles... - This is the text for the styles menu on the format menu. - - - Appl&y Style... - This is the text for the Apply Style menu on the format menu. - - - Remove &Character Style - This is the text for the remove character style menu on the format menu. - - - Reset P&aragraph Style - This is the text for the reset paragraphe style menu on the format menu. - - - Bold - Text for Bold toolbar button - - - Italic - Text for Italic toolbar button - - - Align Left - Text for Left Align toolbar button - - - Align Right - Text for Right Align toolbar button - - - Center - Text for Center toolbar button - - - Numbering - Text for Numbering toolbar button - - - Bullets - Text for Bullets toolbar button - - - Decrease Indent - Text for Decrease Indent toolbar button - - - Increase Indent - Text for Increase Indent toolbar button - - - Borders - Text for Borders toolbar button - - - Background Color - Text for Background Color toolbar button - - - Font Color - Text for Font Color toolbar button - - - Paragraph Style - Text for Paragraph Styles combobox on toolbar - - - Character Style - Text for Character Styles combobox on toolbar - - - Writing System - Item name for the writing system combobox control on the toolbar - - - Zoom - Text for Zoom Combo on toolbar - - - Borders all Around - Text for format/borders surrounding border tooltip - - - Top Border - Text for format/borders top border tooltip - - - Bottom Border - Text for format/borders bottom border tooltip - - - Left Border - Text for format/borders left border tooltip - - - Right Border - Text for format/borders right border tooltip - - - No Borders - Text for format/borders right border tooltip - - - &New Window - This is the text for the new window menu on the windows menu. - - - &Cascade - This is the text for the cascade menu on the windows menu. - - - &Tile - This is the text for the tile top to bottom (i.e. stacked) menu on the windows menu. - - - Tile Side-&By-Side - This is the text for the tile, side-by-side menu on the windows menu. - - - &How Do I... - Text for How Do I item on help menu - - - &Training - Text for Training item on help menu - - - Tutorials - Text for Tutorial item on help menu - - - &More Windows... - Text for the more windows menu item - - - Standard - This is the name of the standard toolbar as it shows up in the toolbar configuration feature - - - Formatting - This is the name of the format toolbar as it shows up in the toolbar configuration feature - - - Direct Formatting - This is the name of the direct formatting toolbar as it shows up in the toolbar configuration feature - - - File - This is the file category for toolbar/menu items. This string is used in the dialog that allows users to customize their toolbars. - - - Edit - This is the edit category for toolbar/menu items. This string is used in the dialog that allows users to customize their toolbars. - - - Format - This is the format category for toolbar/menu items. This string is used in the dialog that allows users to customize their toolbars. - - - View - This is the view category for toolbar/menu items. This string is used in the dialog that allows users to customize their toolbars. - - - Tools - This is the tools category for toolbar/menu items. This string is used in the dialog that allows users to customize their toolbars. - - - Window - This is the window category for toolbar/menu items. This string is used in the dialog that allows users to customize their toolbars. - - - Help - This is the help category for toolbar/menu items. This string is used in the dialog that allows users to customize their toolbars. - - - For help, press F1. - This is the message displayed in a main window's status bar when there is no other meaningful message to display. - - - Close this window - This is the status bar message for the close menu option. - - - Saves changes. - This is the status bar message for the save menu option. - - - Modify properties of a FieldWorks project. - This is the status bar message for the Fieldworks project properties menu option. - - - Back up or restore a FieldWorks project. - This is the status bar message for the backup and restore menu option. - - - Rename a FieldWorks project. - This is the status bar message for the rename project menu option. - - - Delete a FieldWorks project. - This is the status bar message for the delete project menu option. - - - Page Setup for Printing. - This is the status bar message for the page setup menu option. - - - Prints current view. - This is the status bar message for the print menu option. - - - Exits this application. - This is the status bar message for the exit menu option. - - - Undoes the most recent change. - This is the status bar message for the undo menu option. - - - Redo the most recent undone change. - This is the status bar message for the redo menu option. - - - Cut text and put it on the clipboard. - This is the status bar message for the cut menu option. - - - Copy text to the clipboard. - This is the status bar message for the copy menu option. - - - Paste text from the clipboard. - This is the status bar message for the paste menu option. - - - Select all of the text. - This is the status bar message for the select all menu option. - - - Opens the Find dialog - This is the status bar message for the find menu option. - - - Find next. - This is the status bar message for the find next menu option. - - - Find previous. - This is the status bar message for the find previous menu option. - - - Opens the replace dialog. - This is the status bar message for the find and replace menu option. - - - Delete the selection. - This is the status bar message for the delete selection menu option. - - - Show or hide the Status bar. - This is the status bar message for the view status bar menu option. - - - Show or hide the Side bar. - This is the status bar message for the view side bar menu option. - - - Open a dialog to add, delete, or change styles. - This is the status bar message for the styles menu option. - - - Remove the character style formatting from the current selection. - This is the status bar message for the remove character style formatting menu option. - - - Reset the style of the current paragraph to the default paragraph style. - This is the status bar message for the reset paragraph style formatting menu option. - - - Modify users and access levels. - This is the status bar message for the user properties menu option. - - - Opens another identical second window containing the same data. - This is the status bar message for the new window menu option. - - - Arranges open windows to be cascade from top left to bottom right. - This is the status bar message for the window cascade menu option. - - - Arranges open windows to be equal heights, displayed one on top of the other - This is the status bar message for the tile, stacked menu option. - - - Arranges open windows to be of equal widths, displayed side-by-side - This is the status bar message for the tile, side-by-side menu option. - - - {0} ({1}) - This is the format for the window list in the window menu {0} is info bar text and {1} is the project name. - - - Add to Spelling Dictionary - Text for adding word to dictionary on the context menu. - - - Add Word to Spelling Dictionary - Tool tip for adding word to dictionary. - - - Change Multiple Occurrences... - Text for changing multiple occurrences of a word on the context menu. - - - Change Multiple Occurrences of Word - Tool tip for changing multiple occurrences of a word. - - - Project Locations and Sharing... - Text for item in File menu - - - Brings up a dialog for controlling whether projects are shared and where they are stored. - Tool tip for item in file menu. - - \ No newline at end of file diff --git a/Src/LexText/LexTextControls/DataNotebook/ImportCharMappingDlg.cs b/Src/LexText/LexTextControls/DataNotebook/ImportCharMappingDlg.cs index 0e67743c45..901325bd37 100644 --- a/Src/LexText/LexTextControls/DataNotebook/ImportCharMappingDlg.cs +++ b/Src/LexText/LexTextControls/DataNotebook/ImportCharMappingDlg.cs @@ -124,14 +124,12 @@ private void m_btnStyles_Click(object sender, EventArgs e) fRTL, m_cache.ServiceLocator.WritingSystems.AllWritingSystems.Any(ws => ws.RightToLeftScript), m_stylesheet.GetDefaultBasedOnStyleName(), - 0, // customUserLevel m_app.MeasurementSystem, m_stylesheet.GetDefaultBasedOnStyleName(), String.Empty, 0, // hvoRootObject m_app, m_helpTopicProvider)) { - dlg.ShowTEStyleTypes = false; dlg.CanSelectParagraphBackgroundColor = false; if (dlg.ShowDialog(this) == DialogResult.OK && ((dlg.ChangeType & StyleChangeType.DefChanged) > 0 || diff --git a/Src/LexText/LexTextControls/LexImportWizardCharMarkerDlg.cs b/Src/LexText/LexTextControls/LexImportWizardCharMarkerDlg.cs index bcc590196e..7967965efc 100644 --- a/Src/LexText/LexTextControls/LexImportWizardCharMarkerDlg.cs +++ b/Src/LexText/LexTextControls/LexImportWizardCharMarkerDlg.cs @@ -549,7 +549,7 @@ private void btnStyles_Click(object sender, EventArgs e) return; } FwStylesDlg.RunStylesDialogForCombo(cbStyle, InitializeStylesComboBox, "", m_stylesheet as LcmStyleSheet, - 0, 0, m_cache, this, propertyTable.GetValue("App"), m_helpTopicProvider, null); + 0, m_cache, this, propertyTable.GetValue("App"), m_helpTopicProvider, null); } //private void tbElementName_TextChanged(object sender, EventArgs e) diff --git a/Src/xWorks/DictionaryDetailsController.cs b/Src/xWorks/DictionaryDetailsController.cs index 11ef9a0ee8..029d8b90db 100644 --- a/Src/xWorks/DictionaryDetailsController.cs +++ b/Src/xWorks/DictionaryDetailsController.cs @@ -896,7 +896,7 @@ private void HandleStylesBtn(ComboBox combo, string defaultStyle) { // If the combo is not enabled, don't allow the Styles dialog to change it (pass null instead). FixStyles will ensure a refresh. FwStylesDlg.RunStylesDialogForCombo(combo.Enabled ? combo : null, FixStyles(combo.Enabled), - defaultStyle, m_styleSheet, 0, 0, m_cache, View.TopLevelControl, m_propertyTable.GetValue("App"), + defaultStyle, m_styleSheet, 0, m_cache, View.TopLevelControl, m_propertyTable.GetValue("App"), m_propertyTable.GetValue("HelpTopicProvider"), new FlexStylesXmlAccessor(m_cache.LanguageProject.LexDbOA).SetPropsToFactorySettings); } diff --git a/Src/xWorks/FwXWindow.cs b/Src/xWorks/FwXWindow.cs index 5b12a37a58..9d63531f2f 100644 --- a/Src/xWorks/FwXWindow.cs +++ b/Src/xWorks/FwXWindow.cs @@ -10,7 +10,6 @@ using SIL.FieldWorks.Common.FwAvalonia; using SIL.FieldWorks.Common.FwUtils; using SIL.FieldWorks.Common.RootSites; -using SIL.FieldWorks.Common.UIAdapters; using SIL.FieldWorks.Common.ViewsInterfaces; using SIL.FieldWorks.FwCoreDlgControls; using SIL.FieldWorks.FwCoreDlgs; @@ -233,21 +232,6 @@ public virtual int HvoAppRootObject } } - /// ------------------------------------------------------------------------------------ - /// - /// Gets the setting for style levels to show. If custom lists or sub-lists of styles - /// are displayed in the application, this setting should be overridden. - /// - /// ------------------------------------------------------------------------------------ - public virtual int MaxStyleLevelToShow - { - get - { - CheckDisposed(); - return Int32.MaxValue; - } - } - /// ------------------------------------------------------------------------------------ /// /// Called when styles are renamed or deleted. @@ -263,20 +247,6 @@ public virtual void OnStylesRenamedOrDeleted() //FinishRefresh(); Refresh(); } - - /// ------------------------------------------------------------------------------------ - /// - /// Allows individual implementations to override the default behavior when populating - /// the paragraph style list. - /// - /// false by default, but overridden versions may return true if - /// to prevent the default behavior. - /// - /// ------------------------------------------------------------------------------------ - public virtual bool PopulateParaStyleListOverride() - { - return false; - } #endregion /// ------------------------------------------------------------------------------------ @@ -1130,25 +1100,6 @@ public bool OnArchiveWithRamp(object command) return ramp.ArchiveNow(this, MainMenuStrip.Font, Icon, filesToArchive, m_propertyTable, m_app, Cache); } - /// ------------------------------------------------------------------------------------ - /// - /// Update Archive With RAMP menu item - /// - /// the toolbar/menu item properties - /// true if handled - /// ------------------------------------------------------------------------------------ - public bool OnUpdateArchiveWithRamp(object args) - { - TMItemProperties itemProps = args as TMItemProperties; - if (itemProps != null) - { - itemProps.Visible = !(Platform.IsMono); - itemProps.Update = true; - return true; - } - return false; - } - /// ------------------------------------------------------------------------------------ /// /// Handle whether to enable Archive With RAMP menu item (enabled iff properly installed) @@ -1881,7 +1832,7 @@ protected bool OnFormatApplyStyle(object args) return false; ShowApplyStyleDialog( ParaStyleListHelper != null ? ParaStyleListHelper.SelectedStyle.Name : null, - CharStyleListHelper != null ? CharStyleListHelper.SelectedStyle.Name : null, 0); + CharStyleListHelper != null ? CharStyleListHelper.SelectedStyle.Name : null); return true; } @@ -1891,12 +1842,10 @@ protected bool OnFormatApplyStyle(object args) /// /// The currently-selected Paragraph style name /// The currently-selected Character style name - /// The maximum style level that will be shown in this - /// dialog. (apps that do not use style levels in their stylesheets can pass 0) /// ------------------------------------------------------------------------------------ - public void ShowApplyStyleDialog(string paraStyleName, string charStyleName, int maxStyleLevel) + public void ShowApplyStyleDialog(string paraStyleName, string charStyleName) { - m_delegate.ShowApplyStyleDialog(paraStyleName, charStyleName, maxStyleLevel); + m_delegate.ShowApplyStyleDialog(paraStyleName, charStyleName); } /// ------------------------------------------------------------------------------------ @@ -2534,32 +2483,6 @@ private void ResyncStylesheet() if (m_rebarAdapter is IUIAdapterForceRegenerate) ((IUIAdapterForceRegenerate)m_rebarAdapter).ForceFullRegenerate(); } - - /// ------------------------------------------------------------------------------------ - /// - /// Gets or sets a value indicating whether or not to show the 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). - /// - /// The default implementation always returns false - /// ------------------------------------------------------------------------------------ - public virtual bool ShowTEStylesComboInStylesDialog - { - get { return false; } - } - - /// ------------------------------------------------------------------------------------ - /// - /// 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. - /// - /// The default implementation always return true. - /// ------------------------------------------------------------------------------------ - public virtual bool CanSelectParagraphBackgroundColor - { - get { return true; } - } #endregion implementation of (some of) IMainWindowDelegateCallbacks /// diff --git a/Src/xWorks/XmlDocConfigureDlg.cs b/Src/xWorks/XmlDocConfigureDlg.cs index 12d3055ed2..bf98608934 100644 --- a/Src/xWorks/XmlDocConfigureDlg.cs +++ b/Src/xWorks/XmlDocConfigureDlg.cs @@ -1249,7 +1249,6 @@ private void HandleStylesBtn(ComboBox combo, Action fixCombo, string defaultStyl fixCombo(); }, defaultStyle, m_styleSheet, - m_callbacks != null ? m_callbacks.MaxStyleLevelToShow : 0, m_callbacks != null ? m_callbacks.HvoAppRootObject : 0, m_cache, this, m_propertyTable.GetValue("App"), m_propertyTable.GetValue("HelpTopicProvider"), diff --git a/Src/xWorks/xWorks.csproj b/Src/xWorks/xWorks.csproj index da51515ffd..261422fa73 100644 --- a/Src/xWorks/xWorks.csproj +++ b/Src/xWorks/xWorks.csproj @@ -88,7 +88,6 @@ -