From f95a208d0827da18bd4523723ed270a5cac18047 Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Mon, 10 Feb 2020 16:54:35 +0100 Subject: [PATCH] Added align splits to pages option for libreoffice extension --- .../da/comp/writer2xhtml/XhtmlOptionsDialog.java | 5 ++++- src/main/oxt/writer2xhtml/Options.xcs | 1 + src/main/oxt/writer2xhtml/Options.xcu | 3 +++ .../DialogStrings_en_US.properties | 1 + .../DialogStrings_ru_RU.properties | 5 +++-- .../writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl | 9 +++++---- src/main/oxt/writer2xhtml/description.xml | 2 +- 7 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java b/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java index 2d4fe74..c48c748 100644 --- a/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java +++ b/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java @@ -96,6 +96,7 @@ public class XhtmlOptionsDialog extends OptionsDialogBase { loadCheckBoxOption(xProps, "IgnoreDoubleSpaces"); // Files + loadCheckBoxOption(xProps, "AlignSplitsToPages"); loadCheckBoxOption(xProps, "Split"); loadListBoxOption(xProps, "SplitLevel"); loadListBoxOption(xProps, "RepeatLevels"); @@ -145,6 +146,7 @@ public class XhtmlOptionsDialog extends OptionsDialogBase { saveCheckBoxOption(xProps, helper, "InlineCSS", "css_inline"); saveCheckBoxOption(xProps, helper, "EmbedImg", "embed_svg"); saveCheckBoxOption(xProps, helper, "EmbedSVG", "embed_img"); + saveCheckBoxOption(xProps, helper, "AlignSplitsToPages","align_splits_to_pages"); saveCheckBoxOption(xProps, helper, "Notes", "notes"); saveCheckBoxOption(xProps, helper, "UseDublinCore", "use_dublin_core"); @@ -153,7 +155,6 @@ public class XhtmlOptionsDialog extends OptionsDialogBase { saveCheckBoxOption(xProps, helper, "IgnoreHardLineBreaks", "ignore_hard_line_breaks"); saveCheckBoxOption(xProps, helper, "IgnoreEmptyParagraphs", "ignore_empty_paragraphs"); saveCheckBoxOption(xProps, helper, "IgnoreDoubleSpaces", "ignore_double_spaces"); - // Files boolean bSplit = saveCheckBoxOption(xProps, "Split"); short nSplitLevel = saveListBoxOption(xProps, "SplitLevel"); @@ -210,6 +211,8 @@ public class XhtmlOptionsDialog extends OptionsDialogBase { setControlEnabled("InlineCSS",!isLocked("css_inline")); setControlEnabled("EmbedImg",!isLocked("embed_img")); setControlEnabled("EmbedSVG",!isLocked("embed_svg")); + setControlEnabled("AlignSplitsToPages",!isLocked("align_splits_to_pages")); + setControlEnabled("Notes",!isLocked("notes")); setControlEnabled("UseDublinCore",!isLocked("use_dublin_core")); diff --git a/src/main/oxt/writer2xhtml/Options.xcs b/src/main/oxt/writer2xhtml/Options.xcs index d0e5314..35b7bbd 100644 --- a/src/main/oxt/writer2xhtml/Options.xcs +++ b/src/main/oxt/writer2xhtml/Options.xcs @@ -47,6 +47,7 @@ + diff --git a/src/main/oxt/writer2xhtml/Options.xcu b/src/main/oxt/writer2xhtml/Options.xcu index 5fa9dce..93a9b17 100644 --- a/src/main/oxt/writer2xhtml/Options.xcu +++ b/src/main/oxt/writer2xhtml/Options.xcu @@ -47,6 +47,9 @@ false + + true + 1 diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_en_US.properties b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_en_US.properties index 6e49a12..bc3c889 100644 --- a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_en_US.properties +++ b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_en_US.properties @@ -82,3 +82,4 @@ 152.XhtmlOptions.InlineCSS.Label=Inline CSS 156.XhtmlOptions.EmbedSVG.Label=Embed SVG 160.XhtmlOptions.EmbedImg.Label=Embed images +161.XhtmlOptions.AlignSplitsToPages.Label=Align splits to pages diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_ru_RU.properties b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_ru_RU.properties index 08e1e06..187364a 100644 --- a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_ru_RU.properties +++ b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_ru_RU.properties @@ -80,5 +80,6 @@ 147.XhtmlOptions.MinimumLetterSpacing.HelpText=\u041C\u0438\u043D\u0438\u043C\u0430\u043B\u044C\u043D\u043E\u0435 \u043C\u0435\u0436\u0441\u0438\u043C\u0432\u043E\u043B\u044C\u043D\u043E\u0435 \u0440\u0430\u0441\u0441\u0442\u043E\u044F\u043D\u0438\u0435 148.XhtmlOptions.MinLetterSpacing.HelpText=\u041C\u0438\u043D\u0438\u043C\u0430\u043B\u044C\u043D\u043E\u0435 \u043C\u0435\u0436\u0441\u0438\u043C\u0432\u043E\u043B\u044C\u043D\u043E\u0435 \u0440\u0430\u0441\u0441\u0442\u043E\u044F\u043D\u0438\u0435 152.XhtmlOptions.InlineCSS.Label=Inline CSS -156.XhtmlOptions.EmbedSVG.Label=Embed SVG -160.XhtmlOptions.EmbedImg.Label=Embed images +156.XhtmlOptions.EmbedSVG.Label=\u0412\u0441\u0442\u0440\u043E\u0438\u0442\u044C SVG +160.XhtmlOptions.EmbedImg.Label=\u0412\u0441\u0442\u0440\u043E\u0438\u0442\u044C images +161.XhtmlOptions.AlignSplitsToPages.Label=\u0412\u044B\u0440\u043E\u0432\u043D\u044F\u0442\u044C\20\u0440\u0430\u0437\u0434\u0435\u043B\u0435\u043D\u0438\u0435\20\u043F\u043E\20\u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430\u043C diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl index bb613fd..33b3403 100644 --- a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl +++ b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl @@ -68,8 +68,9 @@ - - - + + + + - \ No newline at end of file + diff --git a/src/main/oxt/writer2xhtml/description.xml b/src/main/oxt/writer2xhtml/description.xml index 80afa62..2d512ab 100644 --- a/src/main/oxt/writer2xhtml/description.xml +++ b/src/main/oxt/writer2xhtml/description.xml @@ -5,7 +5,7 @@ - +