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 2388ab6..11c0dc2 100644 --- a/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java +++ b/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java @@ -75,7 +75,7 @@ public class XhtmlOptionsDialog extends OptionsDialogBase { loadCheckBoxOption(xProps, "OriginalImageSize"); loadTextFieldOption(xProps, "MinLetterSpacing"); - + loadTextFieldOption(xProps, "MaxWidth"); loadTextFieldOption(xProps, "PageBreakStyle"); loadCheckBoxOption(xProps, "InlineCSS"); @@ -130,7 +130,7 @@ public class XhtmlOptionsDialog extends OptionsDialogBase { } saveTextFieldOption(xProps, helper, "MinLetterSpacing", "min_letter_spacing"); - + saveTextFieldOption(xProps, helper, "MaxWidth", "max_width"); saveTextFieldOption(xProps, helper, "PageBreakStyle", "page_break_style"); saveCheckBoxOption(xProps, helper, "ConvertToPx", "convert_to_px"); @@ -197,7 +197,7 @@ public class XhtmlOptionsDialog extends OptionsDialogBase { setControlEnabled("Scaling",!isLocked("scaling")); setControlEnabled("MinLetterSpacing",!isLocked("min_letter_spacing")); - + setControlEnabled("MaxWidth",!isLocked("max_width")); setControlEnabled("PageBreakStyle",!isLocked("page_break_style")); diff --git a/src/main/java/w2phtml/project.properties b/src/main/java/w2phtml/project.properties index 3e1a711..2f1b9c2 100644 --- a/src/main/java/w2phtml/project.properties +++ b/src/main/java/w2phtml/project.properties @@ -1,3 +1,3 @@ -#Wed Mar 11 08:32:43 CET 2020 +#Wed Mar 11 10:55:21 CET 2020 releaseVersion=0.5.5 -releaseDate=08\:32\:43 11-03-2020 +releaseDate=10\:55\:21 11-03-2020 diff --git a/src/main/oxt/.gradle/buildOutputCleanup/built.bin b/src/main/oxt/.gradle/buildOutputCleanup/built.bin new file mode 100644 index 0000000..e69de29 diff --git a/src/main/oxt/.gradle/buildOutputCleanup/cache.properties b/src/main/oxt/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 0000000..d9fbeef --- /dev/null +++ b/src/main/oxt/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Wed Mar 11 09:39:54 CET 2020 +gradle.version=4.0.1 diff --git a/src/main/oxt/.gradle/buildOutputCleanup/cache.properties.lock b/src/main/oxt/.gradle/buildOutputCleanup/cache.properties.lock new file mode 100644 index 0000000..40fdece --- /dev/null +++ b/src/main/oxt/.gradle/buildOutputCleanup/cache.properties.lock @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/main/oxt/Options.xcs b/src/main/oxt/Options.xcs index c2cd2c6..dce4f81 100644 --- a/src/main/oxt/Options.xcs +++ b/src/main/oxt/Options.xcs @@ -37,6 +37,7 @@ + diff --git a/src/main/oxt/Options.xcu b/src/main/oxt/Options.xcu index 49e4037..609dab7 100644 --- a/src/main/oxt/Options.xcu +++ b/src/main/oxt/Options.xcu @@ -20,6 +20,9 @@ 0.15 + + 1000px + height:3em;margin-top:1em;margin-bottom:1em;background-color:#f6f6f6; diff --git a/src/main/oxt/w2phtml/DialogStrings_en_US.properties b/src/main/oxt/w2phtml/DialogStrings_en_US.properties index cc445b7..ffd7853 100644 --- a/src/main/oxt/w2phtml/DialogStrings_en_US.properties +++ b/src/main/oxt/w2phtml/DialogStrings_en_US.properties @@ -84,3 +84,4 @@ 160.XhtmlOptions.EmbedImg.Label=Embed images 161.XhtmlOptions.AlignSplitsToPages.Label=Align splits to pages 162.XhtmlOptions.Greenstone.Label=Add Greenstone3 markup +166.XhtmlOptions.MaxWidth.Label=Max width diff --git a/src/main/oxt/w2phtml/DialogStrings_ru_RU.properties b/src/main/oxt/w2phtml/DialogStrings_ru_RU.properties index 0238c82..c1463b2 100644 --- a/src/main/oxt/w2phtml/DialogStrings_ru_RU.properties +++ b/src/main/oxt/w2phtml/DialogStrings_ru_RU.properties @@ -84,3 +84,5 @@ 160.XhtmlOptions.EmbedImg.Label=\u0412\u0441\u0442\u0440\u043E\u0438\u0442\u044C images 161.XhtmlOptions.AlignSplitsToPages.Label=\u0420\u0430\u0437\u0434\u0435\u043b\u044f\u0442\u044c \u043f\u043e \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430\u043c 162.XhtmlOptions.Greenstone.Label=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0440\u0430\u0437\u043c\u0435\u0442\u043a\u0443 \u0434\u043b\u044f Greenstone3 +166.XhtmlOptions.MaxWidth.Label=\u041c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u0430\u044f \u0448\u0438\u0440\u0438\u043d\u0430 + diff --git a/src/main/oxt/w2phtml/XhtmlOptions.xdl b/src/main/oxt/w2phtml/XhtmlOptions.xdl index d112d56..e2e4e22 100644 --- a/src/main/oxt/w2phtml/XhtmlOptions.xdl +++ b/src/main/oxt/w2phtml/XhtmlOptions.xdl @@ -70,7 +70,7 @@ - - + + - \ No newline at end of file +