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 e06b5c0..68a2c76 100644 --- a/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java +++ b/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java @@ -78,6 +78,8 @@ public class XhtmlOptionsDialog extends OptionsDialogBase { } loadCheckBoxOption(xProps, "OriginalImageSize"); + loadTextFieldOption(xProps, "MinLetterSpacing"); + // Special content loadCheckBoxOption(xProps, "Notes"); loadCheckBoxOption(xProps, "UseDublinCore"); @@ -121,7 +123,9 @@ public class XhtmlOptionsDialog extends OptionsDialogBase { helper.put("TemplateURL", "$(user)/writer2xhtml-template.xhtml"); helper.put("StyleSheetURL", "$(user)/writer2xhtml-styles.css"); } - + + saveTextFieldOption(xProps, "MinLetterSpacing"); + saveCheckBoxOption(xProps, helper, "ConvertToPx", "convert_to_px"); saveNumericOptionAsPercentage(xProps, helper, "Scaling", "scaling"); saveNumericOptionAsPercentage(xProps, helper, "ColumnScaling", "column_scaling"); @@ -181,6 +185,9 @@ public class XhtmlOptionsDialog extends OptionsDialogBase { setControlEnabled("Scaling",!isLocked("scaling")); setControlEnabled("ColumnScalingLabel",!isLocked("column_scaling")); setControlEnabled("ColumnScaling",!isLocked("column_scaling")); + + // setControlEnabled("MinLetterSpacingValue",!isLocked("min_letter_spacing")); + setControlEnabled("ConvertToPx",!isLocked("convert_to_px")); setControlEnabled("OriginalImageSize",!isLocked("image_size") && !isLocked("original_image_size")); diff --git a/src/main/oxt/writer2xhtml/Options.xcs b/src/main/oxt/writer2xhtml/Options.xcs index e03342f..f5008cd 100644 --- a/src/main/oxt/writer2xhtml/Options.xcs +++ b/src/main/oxt/writer2xhtml/Options.xcs @@ -33,6 +33,7 @@ + @@ -112,4 +113,4 @@ - \ No newline at end of file + diff --git a/src/main/oxt/writer2xhtml/Options.xcu b/src/main/oxt/writer2xhtml/Options.xcu index 0ec51a0..ae20f16 100644 --- a/src/main/oxt/writer2xhtml/Options.xcu +++ b/src/main/oxt/writer2xhtml/Options.xcu @@ -12,11 +12,14 @@ - true + false 100 + + 0.15 + 100 diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_en_US.properties b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_en_US.properties index 638c588..f11bdf2 100644 --- a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_en_US.properties +++ b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_en_US.properties @@ -127,3 +127,5 @@ 141.Config.StringItemList=Custom 144.XhtmlOptions.UseMathjax.HelpText= 145.XhtmlOptions.UseMathjax.Label=Use MathJax +148.XhtmlOptions.MinimumLetterSpacing.Label=Minimum Letter Spacing +149.XhtmlOptions.MinimumLetterSpacing.HelpText=Minimum Letter Spacing diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl index b2648f8..d4bbe4f 100644 --- a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl +++ b/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl @@ -1,6 +1,6 @@ - + @@ -20,26 +20,26 @@ - + - + - - - - - - - - - - - + + + + + + + + + + + - - + + @@ -49,8 +49,8 @@ - - + + @@ -60,10 +60,12 @@ - - - - - + + + + + + + - \ No newline at end of file +