litvinovg/w2phtml
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 21 Packages Wiki Activity Actions

W2X relative image size

Browse source 
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@100 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2011-03-21 10:40:02 +00:00
parent 4ecd5ede1e
commit 4a63a1ce8c
18 changed files with 306 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

13
source/java/org/openoffice/da/comp/writer2xhtml/EpubOptionsDialog.java
View file

@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
* Version 1.2 (2011-03-04)
* Version 1.2 (2011-03-21)
*
*/
@ -82,7 +82,7 @@ public class EpubOptionsDialog extends OptionsDialogBase {
loadCheckBoxOption(xProps, "UseDefaultFont");
loadComboBoxOption(xProps, "DefaultFontName");
loadCheckBoxOption(xProps, "ConvertToPx");
loadCheckBoxOption(xProps, "OriginalImageSize");
loadListBoxOption(xProps, "ImageSize");
// Fill the font name list with all installed fonts
setListBoxStringItemList("DefaultFontName",
@ -132,7 +132,12 @@ public class EpubOptionsDialog extends OptionsDialogBase {
saveCheckBoxOption(xProps, helper, "UseDefaultFont", "use_default_font");
saveTextFieldOption(xProps, helper, "DefaultFontName", "default_font_name");
saveCheckBoxOption(xProps, helper, "ConvertToPx", "convert_to_px");
saveCheckBoxOption(xProps, helper, "OriginalImageSize", "original_image_size");
saveListBoxOption(xProps, "ImageSize");
switch (getListBoxSelectedItem("ImageSize")) {
case 0: helper.put("image_size", "absolute"); break;
case 1: helper.put("image_size", "relative"); break;
case 2: helper.put("image_size", "none");
}
// AutoCorrect
saveCheckBoxOption(xProps, helper, "IgnoreHardLineBreaks", "ignore_hard_line_breaks");
@ -240,7 +245,7 @@ public class EpubOptionsDialog extends OptionsDialogBase {
setControlEnabled("DefaultFontName",!isLocked("default_font_name") && bUseDefaultFont);
setControlEnabled("ConvertToPx",!isLocked("convert_to_px"));
setControlEnabled("OriginalImageSize",!isLocked("original_image_size"));
setControlEnabled("ImageSize",!isLocked("image_size"));
// AutoCorrect
setControlEnabled("IgnoreHardLineBreaks",!isLocked("ignore_hard_line_breaks"));

10
source/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright: 2002-2010 by Henrik Just
* Copyright: 2002-2011 by Henrik Just
*
* All Rights Reserved.
*
* Version 1.2 (2010-04-12)
* Version 1.2 (2011-03-21)
*
*/
@ -120,7 +120,9 @@ public class XhtmlOptionsDialog extends OptionsDialogBase {
saveCheckBoxOption(xProps, helper, "ConvertToPx", "convert_to_px");
saveNumericOptionAsPercentage(xProps, helper, "Scaling", "scaling");
saveNumericOptionAsPercentage(xProps, helper, "ColumnScaling", "column_scaling");
saveCheckBoxOption(xProps, helper, "OriginalImageSize", "original_image_size");
saveCheckBoxOption(xProps, "OriginalImageSize");
// TODO: Support "relative"
helper.put("image_size", getCheckBoxStateAsBoolean("OriginalImageSize") ? "none" : "absolute");
// Special content
saveCheckBoxOption(xProps, helper, "Notes", "notes");
@ -175,7 +177,7 @@ public class XhtmlOptionsDialog extends OptionsDialogBase {
setControlEnabled("ColumnScalingLabel",!isLocked("column_scaling"));
setControlEnabled("ColumnScaling",!isLocked("column_scaling"));
setControlEnabled("ConvertToPx",!isLocked("convert_to_px"));
setControlEnabled("OriginalImageSize",!isLocked("original_image_size"));
setControlEnabled("OriginalImageSize",!isLocked("image_size") && !isLocked("original_image_size"));
// Special content
setControlEnabled("Notes",!isLocked("notes"));

10
source/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialogCalc.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright: 2002-2009 by Henrik Just
* Copyright: 2002-2011 by Henrik Just
*
* All Rights Reserved.
*
* Version 1.0 (2009-02-18)
* Version 1.2 (2011-03-21)
*
*/
@ -108,7 +108,9 @@ public class XhtmlOptionsDialogCalc extends OptionsDialogBase {
saveCheckBoxOption(xProps, helper, "ConvertToPx", "convert_to_px");
saveNumericOptionAsPercentage(xProps, helper, "Scaling", "scaling");
saveNumericOptionAsPercentage(xProps, helper, "ColumnScaling", "column_scaling");
saveCheckBoxOption(xProps, helper, "OriginalImageSize", "original_image_size");
saveCheckBoxOption(xProps, "OriginalImageSize");
// TODO: Support "relative"
helper.put("image_size", getCheckBoxStateAsBoolean("OriginalImageSize") ? "none" : "absolute");
// Special content
saveCheckBoxOption(xProps, helper, "Notes", "notes");
@ -149,7 +151,7 @@ public class XhtmlOptionsDialogCalc extends OptionsDialogBase {
setControlEnabled("Scaling",!isLocked("scaling"));
setControlEnabled("ColumnScalingLabel",!isLocked("column_scaling"));
setControlEnabled("ColumnScaling",!isLocked("column_scaling"));
setControlEnabled("OriginalImageSize",!isLocked("original_image_size"));
setControlEnabled("OriginalImageSize",!isLocked("image_size") && !isLocked("original_image_size"));
// Special content
setControlEnabled("Notes",!isLocked("notes"));