You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2019/09/06 16:12:52 UTC

[openoffice] branch trunk updated: Updated graphics for PagePropertyPanel (sidebar), fixed filename, cleaned up resource file

This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/trunk by this push:
     new f24d71b  Updated graphics for PagePropertyPanel (sidebar), fixed filename, cleaned up resource file
f24d71b is described below

commit f24d71bc698fb45278f65ac731b8ed8c264c9776
Author: mseidel <ms...@apache.org>
AuthorDate: Fri Sep 6 18:12:20 2019 +0200

    Updated graphics for PagePropertyPanel (sidebar), fixed filename, cleaned up resource file
---
 .../sidebar/pageproppanel/Landscapecopy_24x24.png  | Bin 4806 -> 541 bytes
 .../sw/res/sidebar/pageproppanel/column1_24x24.png | Bin 2978 -> 2847 bytes
 .../sw/res/sidebar/pageproppanel/column2_24x24.png | Bin 3018 -> 2851 bytes
 .../sw/res/sidebar/pageproppanel/column3_24x24.png | Bin 3017 -> 2857 bytes
 .../res/sidebar/pageproppanel/column_L_1_24x24.png | Bin 2902 -> 2851 bytes
 .../res/sidebar/pageproppanel/column_L_2_24x24.png | Bin 2904 -> 2855 bytes
 .../res/sidebar/pageproppanel/column_L_3_24x24.png | Bin 2921 -> 2865 bytes
 .../sidebar/pageproppanel/column_L_copy_24x24.png  | Bin 2878 -> 2852 bytes
 .../sidebar/pageproppanel/column_L_left_24x24.png  | Bin 2907 -> 2857 bytes
 .../sidebar/pageproppanel/column_L_right_24x24.png | Bin 2909 -> 2860 bytes
 .../res/sidebar/pageproppanel/columncopy_24x24.png | Bin 2912 -> 2844 bytes
 .../res/sidebar/pageproppanel/columnleft_24x24.png | Bin 3010 -> 2855 bytes
 .../sidebar/pageproppanel/columnright_24x24.png    | Bin 3013 -> 2855 bytes
 .../sidebar/pageproppanel/documentsizeA3_24x24.png | Bin 1161 -> 3105 bytes
 .../sidebar/pageproppanel/documentsizeA4_24x24.png | Bin 1143 -> 3058 bytes
 .../sidebar/pageproppanel/documentsizeA5_24x24.png | Bin 1156 -> 3097 bytes
 .../sidebar/pageproppanel/documentsizeB4_24x24.png | Bin 1148 -> 3018 bytes
 .../sidebar/pageproppanel/documentsizeB5_24x24.png | Bin 1157 -> 3073 bytes
 .../sidebar/pageproppanel/documentsizeC5_24x24.png | Bin 1175 -> 3106 bytes
 .../pageproppanel/documentsize_L_A3_24x24.png      | Bin 1187 -> 3117 bytes
 .../pageproppanel/documentsize_L_A4_24x24.png      | Bin 1172 -> 3072 bytes
 .../pageproppanel/documentsize_L_A5_24x24.png      | Bin 1189 -> 3109 bytes
 .../pageproppanel/documentsize_L_B4_24x24.png      | Bin 1186 -> 3032 bytes
 .../pageproppanel/documentsize_L_B5_24x24.png      | Bin 1194 -> 3081 bytes
 .../pageproppanel/documentsize_L_C5_24x24.png      | Bin 1207 -> 3119 bytes
 .../pageproppanel/documentsize_L_copy_24x24.png    | Bin 1097 -> 2852 bytes
 .../pageproppanel/documentsizecopy_24x24.png       | Bin 1071 -> 2844 bytes
 .../sidebar/pageproppanel/format_L_copy_24x24.png  | Bin 2878 -> 2852 bytes
 .../pageproppanel/format_L_mirror_24x24.png        | Bin 2906 -> 2882 bytes
 .../pageproppanel/format_L_narrow_24x24.png        | Bin 2914 -> 2876 bytes
 .../sidebar/pageproppanel/format_L_nomal_24x24.png | Bin 2913 -> 0 bytes
 ..._L_copy_24x24.png => format_L_normal_24x24.png} | Bin 2878 -> 2875 bytes
 .../sidebar/pageproppanel/format_L_wide_24x24.png  | Bin 2915 -> 2878 bytes
 .../res/sidebar/pageproppanel/formatcopy_24x24.png | Bin 2912 -> 2844 bytes
 .../sidebar/pageproppanel/formatmirror_24x24.png   | Bin 2905 -> 2904 bytes
 .../sidebar/pageproppanel/formatnarrow_24x24.png   | Bin 2970 -> 2866 bytes
 .../sidebar/pageproppanel/formatnormal_24x24.png   | Bin 2954 -> 2868 bytes
 .../res/sidebar/pageproppanel/formatwide_24x24.png | Bin 2975 -> 2867 bytes
 .../sidebar/pageproppanel/portraitcopy_24x24.png   | Bin 5118 -> 550 bytes
 main/sw/source/ui/sidebar/PagePropertyPanel.src    | 546 +++++++++++----------
 40 files changed, 275 insertions(+), 271 deletions(-)

diff --git a/main/default_images/sw/res/sidebar/pageproppanel/Landscapecopy_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/Landscapecopy_24x24.png
index ce13721..3fc83bd 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/Landscapecopy_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/Landscapecopy_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/column1_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/column1_24x24.png
index 48f4a8b..7b53514 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/column1_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/column1_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/column2_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/column2_24x24.png
index d8a2de4..14a1ab2 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/column2_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/column2_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/column3_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/column3_24x24.png
index 5869559..55cbc66 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/column3_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/column3_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/column_L_1_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/column_L_1_24x24.png
index bac5e3f..c5a5ad2 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/column_L_1_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/column_L_1_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/column_L_2_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/column_L_2_24x24.png
index 146b666..7a1a4a6 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/column_L_2_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/column_L_2_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/column_L_3_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/column_L_3_24x24.png
index 11ee375..f10ac88 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/column_L_3_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/column_L_3_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/column_L_copy_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/column_L_copy_24x24.png
index 747ac4d..419b7fe 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/column_L_copy_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/column_L_copy_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/column_L_left_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/column_L_left_24x24.png
index c6a9f0c..d4750ed 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/column_L_left_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/column_L_left_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/column_L_right_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/column_L_right_24x24.png
index ccdecfe..bdfc3ae 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/column_L_right_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/column_L_right_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/columncopy_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/columncopy_24x24.png
index 983da8b..cbac5cd 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/columncopy_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/columncopy_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/columnleft_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/columnleft_24x24.png
index c61c76a..74e7625 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/columnleft_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/columnleft_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/columnright_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/columnright_24x24.png
index 9421fab..3d5cda8 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/columnright_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/columnright_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/documentsizeA3_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/documentsizeA3_24x24.png
index e950728..e8b1e76 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/documentsizeA3_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/documentsizeA3_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/documentsizeA4_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/documentsizeA4_24x24.png
index 3039746..6bf3ea5 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/documentsizeA4_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/documentsizeA4_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/documentsizeA5_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/documentsizeA5_24x24.png
index 2e73f5d..bbb263c 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/documentsizeA5_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/documentsizeA5_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/documentsizeB4_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/documentsizeB4_24x24.png
index 8456ef4..79df171 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/documentsizeB4_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/documentsizeB4_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/documentsizeB5_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/documentsizeB5_24x24.png
index 21b3746..c9e90a0 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/documentsizeB5_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/documentsizeB5_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/documentsizeC5_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/documentsizeC5_24x24.png
index 91501da..4615c05 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/documentsizeC5_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/documentsizeC5_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A3_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A3_24x24.png
index a32119d..93b8712 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A3_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A3_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A4_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A4_24x24.png
index 5cd5f8e..6fa2f59 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A4_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A4_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A5_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A5_24x24.png
index cc4d2cb..f75434b 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A5_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A5_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_B4_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_B4_24x24.png
index e1d1bcf..1796337 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_B4_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_B4_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_B5_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_B5_24x24.png
index 0e76272..eb2179d 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_B5_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_B5_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_C5_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_C5_24x24.png
index 2c880f8..e660a77 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_C5_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_C5_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_copy_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_copy_24x24.png
index 608d5a5..c2bb906 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_copy_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_copy_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/documentsizecopy_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/documentsizecopy_24x24.png
index ce13c36..d55bcdf 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/documentsizecopy_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/documentsizecopy_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/format_L_copy_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/format_L_copy_24x24.png
index 747ac4d..84725aa 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/format_L_copy_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/format_L_copy_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/format_L_mirror_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/format_L_mirror_24x24.png
index aa93fbc..94bf4a3 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/format_L_mirror_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/format_L_mirror_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/format_L_narrow_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/format_L_narrow_24x24.png
index e6d2579..aaa664c 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/format_L_narrow_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/format_L_narrow_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/format_L_nomal_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/format_L_nomal_24x24.png
deleted file mode 100644
index 840ca80..0000000
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/format_L_nomal_24x24.png and /dev/null differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/column_L_copy_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/format_L_normal_24x24.png
similarity index 91%
copy from main/default_images/sw/res/sidebar/pageproppanel/column_L_copy_24x24.png
copy to main/default_images/sw/res/sidebar/pageproppanel/format_L_normal_24x24.png
index 747ac4d..2dc34ae 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/column_L_copy_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/format_L_normal_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/format_L_wide_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/format_L_wide_24x24.png
index a47c1ca..3157232 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/format_L_wide_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/format_L_wide_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/formatcopy_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/formatcopy_24x24.png
index 983da8b..060fb03 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/formatcopy_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/formatcopy_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/formatmirror_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/formatmirror_24x24.png
index 696ca11..354629d 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/formatmirror_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/formatmirror_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/formatnarrow_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/formatnarrow_24x24.png
index 2f4b0e4..8a3c8b4 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/formatnarrow_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/formatnarrow_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/formatnormal_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/formatnormal_24x24.png
index 83fea86..0c287d1 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/formatnormal_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/formatnormal_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/formatwide_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/formatwide_24x24.png
index b260b07..9bf315f 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/formatwide_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/formatwide_24x24.png differ
diff --git a/main/default_images/sw/res/sidebar/pageproppanel/portraitcopy_24x24.png b/main/default_images/sw/res/sidebar/pageproppanel/portraitcopy_24x24.png
index e39324a..bf46134 100644
Binary files a/main/default_images/sw/res/sidebar/pageproppanel/portraitcopy_24x24.png and b/main/default_images/sw/res/sidebar/pageproppanel/portraitcopy_24x24.png differ
diff --git a/main/sw/source/ui/sidebar/PagePropertyPanel.src b/main/sw/source/ui/sidebar/PagePropertyPanel.src
index 93561e8..eab8f72 100644
--- a/main/sw/source/ui/sidebar/PagePropertyPanel.src
+++ b/main/sw/source/ui/sidebar/PagePropertyPanel.src
@@ -1,5 +1,5 @@
 /**************************************************************
-* 
+*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
@@ -7,18 +7,20 @@
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License.  You may obtain a copy of the License at
-* 
+*
 *   http://www.apache.org/licenses/LICENSE-2.0
-* 
+*
 * Unless required by applicable law or agreed to in writing,
 * software distributed under the License is distributed on an
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 * KIND, either express or implied.  See the License for the
 * specific language governing permissions and limitations
 * under the License.
-* 
+*
 *************************************************************/
 
+
+
 #include <sfx2/sidebar/ResourceDefinitions.hrc>
 #include "PropertyPanel.hrc"
 #include "PagePropertyPanel.hrc"
@@ -27,22 +29,22 @@
 // page property panel control
 Control RID_PROPERTYPANEL_SWPAGE
 {
-	OutputSize = TRUE;
-	DialogControl = TRUE;
-	Border = FALSE;
-	Size = MAP_APPFONT( PROPERTYPAGE_WIDTH, PAGE_HEIGHT );
+	OutputSize = TRUE ;
+	DialogControl = TRUE ;
+	Border = FALSE ;
+	Size = MAP_APPFONT ( PROPERTYPAGE_WIDTH, PAGE_HEIGHT ) ;
 	HelpID = HID_PROPERTYPANEL_SWPAGE_SECTION;
-	Text = "Page";
-	
+	Text = "Page" ;
+
 	FixedText FT_ORIENTATION
 	{
-	    Pos = MAP_APPFONT ( FT_ORIENTATION_X, FT_ORIENTATION_Y );
-        Size = MAP_APPFONT ( MBOX_WIDTH, TEXT_HEIGHT) ;
-		Text [ en-US ] = "~Orientation:";
+		Pos = MAP_APPFONT ( FT_ORIENTATION_X, FT_ORIENTATION_Y ) ;
+		Size = MAP_APPFONT ( MBOX_WIDTH, TEXT_HEIGHT ) ;
+		Text [ en-US ] = "~Orientation:" ;
 	};
 	ToolBox TB_ORIENTATION
 	{
-		Pos = MAP_APPFONT (TBX_ORIENTATION_X, TBX_ORIENTATION_Y) ;
+		Pos = MAP_APPFONT ( TBX_ORIENTATION_X, TBX_ORIENTATION_Y ) ;
 		HelpID = HID_SWPAGE_ORIENTATION;
 		SVLook = TRUE ;
 		TabStop = TRUE ;
@@ -51,7 +53,7 @@ Control RID_PROPERTYPANEL_SWPAGE
 		{
 			ToolBoxItem
 			{
-				HelpID = HID_SWPAGE_TBI_ORIENTATION;
+				HelpID = HID_SWPAGE_TBI_ORIENTATION ;
 				Identifier = TBI_ORIENTATION ;
 				Text [ en-US ] = "Orientation" ;
 				DropDown = TRUE ;
@@ -60,27 +62,27 @@ Control RID_PROPERTYPANEL_SWPAGE
 	};
 	String STR_QHELP_TB_ORIENTATION
 	{
-		Text [ en-US ] = "Select the paper orientation - vertically (portrait) or horizontally (landscape) - for the current page style.";
+		Text [ en-US ] = "Select the paper orientation - vertically (portrait) or horizontally (landscape) - for the current page style." ;
 	};
 
 	FixedText FT_MARGIN
 	{
-	    Pos = MAP_APPFONT ( FT_MARGIN_X, FT_MARGIN_Y );
-        Size = MAP_APPFONT ( MBOX_WIDTH + 50, TEXT_HEIGHT) ;
-		Text [ en-US ] = "~Margin:";
+		Pos = MAP_APPFONT ( FT_MARGIN_X, FT_MARGIN_Y ) ;
+		Size = MAP_APPFONT ( MBOX_WIDTH + 50, TEXT_HEIGHT ) ;
+		Text [ en-US ] = "~Margin:" ;
 	};
 	ToolBox TB_MARGIN
 	{
 		SVLook = TRUE ;
-		Pos = MAP_APPFONT (TBX_MARGIN_X, TBX_MARGIN_Y) ;
-		HelpID = HID_SWPAGE_MARGIN;
+		Pos = MAP_APPFONT ( TBX_MARGIN_X, TBX_MARGIN_Y ) ;
+		HelpID = HID_SWPAGE_MARGIN ;
 		TabStop = TRUE ;
 		Text = "Margin" ;
 		ItemList =
 		{
 			ToolBoxItem
 			{
-				HelpID = HID_SWPAGE_TBI_MARGIN;
+				HelpID = HID_SWPAGE_TBI_MARGIN ;
 				Identifier = TBI_MARGIN ;
 				Text [ en-US ] = "Margin" ;
 				DropDown = TRUE ;
@@ -89,27 +91,27 @@ Control RID_PROPERTYPANEL_SWPAGE
 	};
 	String STR_QHELP_TB_MARGIN
 	{
-		Text [ en-US ] = "Select the margin values for the current page style.";
+		Text [ en-US ] = "Select the margin values for the current page style." ;
 	};
 
 	FixedText FT_SIZE
 	{
-	    Pos = MAP_APPFONT ( FT_SIZE_X, FT_SIZE_Y );
-        Size = MAP_APPFONT ( MBOX_WIDTH, TEXT_HEIGHT) ;
-		Text [ en-US ] = "~Size:";
+		Pos = MAP_APPFONT ( FT_SIZE_X, FT_SIZE_Y ) ;
+		Size = MAP_APPFONT ( MBOX_WIDTH, TEXT_HEIGHT ) ;
+		Text [ en-US ] = "~Size:" ;
 	};
 	ToolBox TB_SIZE
-	{        
-        SVLook = TRUE ;
-		Pos = MAP_APPFONT ( TBX_SIZE_X , TBX_SIZE_Y ) ;
-		HelpID = HID_SWPAGE_SIZE;
+	{
+		SVLook = TRUE ;
+		Pos = MAP_APPFONT ( TBX_SIZE_X, TBX_SIZE_Y ) ;
+		HelpID = HID_SWPAGE_SIZE ;
 		TabStop = TRUE ;
 		Text = "Size" ;
 		ItemList =
 		{
 			ToolBoxItem
 			{
-				HelpID = HID_SWPAGE_TBI_SIZE;
+				HelpID = HID_SWPAGE_TBI_SIZE ;
 				Identifier = TBI_SIZE ;
 				Text [ en-US ] = "Size" ;
 				DropDown = TRUE ;
@@ -118,28 +120,28 @@ Control RID_PROPERTYPANEL_SWPAGE
 	};
 	String STR_QHELP_TB_SIZE
 	{
-		Text [ en-US ] = "Select a predefined paper size for the current page style.";
+		Text [ en-US ] = "Select a predefined paper size for the current page style." ;
 	};
 
 	FixedText FT_COLUMN
 	{
-	    Pos = MAP_APPFONT ( FT_COLUMN_X, FT_COLUMN_Y );
-        Size = MAP_APPFONT ( MBOX_WIDTH + 50, TEXT_HEIGHT) ;
-		Text [ en-US ] = "~Column:";
+		Pos = MAP_APPFONT ( FT_COLUMN_X, FT_COLUMN_Y );
+		Size = MAP_APPFONT ( MBOX_WIDTH + 50, TEXT_HEIGHT ) ;
+		Text [ en-US ] = "~Column:" ;
 	};
 	ToolBox TB_COLUMN
-	{        
-        SVLook = TRUE ;
-		Pos = MAP_APPFONT ( TBX_COLUMN_X , TBX_COLUMN_Y ) ;
-		HelpID = HID_SWPAGE_COLUMN;
+	{
+		SVLook = TRUE ;
+		Pos = MAP_APPFONT ( TBX_COLUMN_X, TBX_COLUMN_Y ) ;
+		HelpID = HID_SWPAGE_COLUMN ;
 		TabStop = TRUE ;
 		Text = "Column" ;
 		ItemList =
 		{
 			ToolBoxItem
 			{
-				HelpID = HID_SWPAGE_TBI_COLUMN;
-				Identifier = TBI_COLUMN;
+				HelpID = HID_SWPAGE_TBI_COLUMN ;
+				Identifier = TBI_COLUMN ;
 				Text [ en-US ] = "Column" ;
 				DropDown = TRUE ;
 			};
@@ -147,552 +149,554 @@ Control RID_PROPERTYPANEL_SWPAGE
 	};
 	String STR_QHELP_TB_COLUMN
 	{
-		Text [ en-US ] = "Select the layout and the number of columns for the current page style.";
+		Text [ en-US ] = "Select the layout and the number of columns for the current page style." ;
 	};
 
 	Image IMG_PAGE_PORTRAIT
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/portraitcopy_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/portraitcopy_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_LANDSCAPE
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/Landscapecopy_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/Landscapecopy_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_NARROW
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/format_L_narrow_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/format_L_narrow_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_NORMAL
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/format_L_nomal_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/format_L_normal_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_WIDE
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/format_L_wide_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/format_L_wide_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_MIRRORED
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/format_L_mirror_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/format_L_mirror_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_MARGIN_CUSTOM
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/format_L_copy_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/format_L_copy_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_NARROW_L
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/formatnarrow_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/formatnarrow_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_NORMAL_L
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/formatnormal_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/formatnormal_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_WIDE_L
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/formatwide_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/formatwide_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_MIRRORED_L
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/formatmirror_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/formatmirror_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_MARGIN_CUSTOM_L
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/formatcopy_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/formatcopy_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_A3
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/documentsize_L_A3_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/documentsize_L_A3_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_A4
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/documentsize_L_A4_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/documentsize_L_A4_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_A5
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/documentsize_L_A5_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/documentsize_L_A5_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_B4
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/documentsize_L_B4_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/documentsize_L_B4_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_B5
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/documentsize_L_B5_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/documentsize_L_B5_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_C5
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/documentsize_L_C5_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/documentsize_L_C5_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_LETTER
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/documentsize_L_copy_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/documentsize_L_copy_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_LEGAL
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/documentsize_L_copy_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/documentsize_L_copy_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_SIZE_NONE
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/documentsize_L_copy_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/documentsize_L_copy_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_A3_L
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/documentsizeA3_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/documentsizeA3_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_A4_L
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/documentsizeA4_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/documentsizeA4_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_A5_L
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/documentsizeA5_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/documentsizeA5_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_B4_L
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/documentsizeB4_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/documentsizeB4_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_B5_L
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/documentsizeB5_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/documentsizeB5_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_C5_L
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/documentsizeC5_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/documentsizeC5_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_LETTER_L
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/documentsizecopy_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/documentsizecopy_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_LEGAL_L
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/documentsizecopy_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/documentsizecopy_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_SIZE_NONE_L
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/documentsizecopy_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/documentsizecopy_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_COLUMN_1
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/column_L_1_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/column_L_1_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_COLUMN_2
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/column_L_2_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/column_L_2_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_COLUMN_3
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/column_L_3_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/column_L_3_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_COLUMN_LEFT
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/column_L_left_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/column_L_left_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_COLUMN_RIGHT
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/column_L_right_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/column_L_right_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_COLUMN_NONE
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/column_L_copy_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/column_L_copy_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_COLUMN_1_L
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/column1_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/column1_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_COLUMN_2_L
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/column2_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/column2_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_COLUMN_3_L
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/column3_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/column3_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_COLUMN_LEFT_L
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/columnleft_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/columnleft_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_COLUMN_RIGHT_L
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/columnright_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/columnright_24x24.png" ;} ;
 	};
 	Image IMG_PAGE_COLUMN_NONE_L
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/columncopy_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/columncopy_24x24.png" ;} ;
 	};
 };
 
 // popup for page orientation attribute
 Control RID_POPUP_SWPAGE_ORIENTATION
 {
-	OutputSize = TRUE;
-	DialogControl = TRUE;
-	Border = FALSE;
-	Size = MAP_APPFONT( POPUPPANEL_MARGIN_SMALL * 2 + POPUP_BORDER_WIDTH + VS_WIDTH, ITEM_HEIGHT*2 + POPUPPANEL_MARGIN_SMALL*2 );
-	
+	OutputSize = TRUE ;
+	DialogControl = TRUE ;
+	Border = FALSE ;
+	Size = MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL * 2 + POPUP_BORDER_WIDTH + VS_WIDTH, ITEM_HEIGHT * 2 + POPUPPANEL_MARGIN_SMALL * 2 ) ;
+
 	Control VS_ORIENTATION
 	{
-        Pos = MAP_APPFONT(  POPUPPANEL_MARGIN_SMALL + OFFSET_X, POPUPPANEL_MARGIN_SMALL + OFFSET_Y); 
-        Size = MAP_APPFONT ( VS_WIDTH  , ITEM_HEIGHT*2);
-        HelpID = HID_SWPAGE_VS_ORIENTATION;
+		Pos = MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL + OFFSET_X, POPUPPANEL_MARGIN_SMALL + OFFSET_Y ) ;
+		Size = MAP_APPFONT ( VS_WIDTH, ITEM_HEIGHT * 2 ) ;
+		HelpID = HID_SWPAGE_VS_ORIENTATION ;
 		TabStop = TRUE ;
-		Text = "Orientation";
+		Text = "Orientation" ;
 	};
 	Image IMG_PORTRAIT
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/portraitcopy_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/portraitcopy_24x24.png" ;} ;
 	};
 	Image IMG_LANDSCAPE
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/Landscapecopy_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/Landscapecopy_24x24.png" ;} ;
 	};
 	String STR_PORTRAIT
 	{
-		Text [ en-US ] = "Portrait";
+		Text [ en-US ] = "Portrait" ;
 	};
 	String STR_LANDSCAPE
 	{
-		Text [ en-US ] = "Landscape";
+		Text [ en-US ] = "Landscape" ;
 	};
 };
 
 // popup for page style's margin attributes
 Control RID_POPUP_SWPAGE_MARGIN
 {
-	OutputSize = TRUE;
-	DialogControl = TRUE;
-	Border = FALSE;
-	Size = MAP_APPFONT( POPUPPANEL_MARGIN_SMALL * 2 + POPUP_BORDER_WIDTH + VS_WIDTH, MARGIN_PANEL_HEIGHT );
-	
+	OutputSize = TRUE ;
+	DialogControl = TRUE ;
+	Border = FALSE ;
+	Size = MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL * 2 + POPUP_BORDER_WIDTH + VS_WIDTH, MARGIN_PANEL_HEIGHT ) ;
+
 	Control VS_MARGIN
 	{
-        Pos = MAP_APPFONT(  POPUPPANEL_MARGIN_SMALL + OFFSET_X, POPUPPANEL_MARGIN_SMALL + OFFSET_Y ); 
-        Size = MAP_APPFONT ( VS_WIDTH  , ITEM_HEIGHT*5);
-        HelpID = HID_SWPAGE_VS_MARGIN;
+		Pos = MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL + OFFSET_X, POPUPPANEL_MARGIN_SMALL + OFFSET_Y ) ;
+		Size = MAP_APPFONT ( VS_WIDTH, ITEM_HEIGHT * 5 ) ;
+		HelpID = HID_SWPAGE_VS_MARGIN ;
 		TabStop = TRUE ;
-		Text = "Margin";
+		Text = "Margin" ;
 	};
 	FixedText FT_CUSTOM
 	{
-	    Pos = MAP_APPFONT ( FT_CUSTOM_X, FT_CUSTOM_Y );
-        Size = MAP_APPFONT ( MBOX_WIDTH + 30, TEXT_HEIGHT) ;
-		Text [ en-US ] = "Custom:";
+		Pos = MAP_APPFONT ( FT_CUSTOM_X, FT_CUSTOM_Y ) ;
+		Size = MAP_APPFONT ( MBOX_WIDTH + 30, TEXT_HEIGHT ) ;
+		Text [ en-US ] = "Custom:" ;
 	};
 	FixedText FT_LEFT
 	{
-	    Pos = MAP_APPFONT ( FT_X, FT_LEFT_Y );
-        Size = MAP_APPFONT ( 25, TEXT_HEIGHT) ;
-		Text [ en-US ] = "~Left:";
+		Pos = MAP_APPFONT ( FT_X, FT_LEFT_Y ) ;
+		Size = MAP_APPFONT ( 25, TEXT_HEIGHT ) ;
+		Text [ en-US ] = "~Left:" ;
 	};
 	FixedText FT_INNER
 	{
-	    Pos = MAP_APPFONT ( FT_X, FT_LEFT_Y );
-        Size = MAP_APPFONT ( 25, TEXT_HEIGHT) ;
-		Text [ en-US ] = "I~nner:";
+		Pos = MAP_APPFONT ( FT_X, FT_LEFT_Y ) ;
+		Size = MAP_APPFONT ( 25, TEXT_HEIGHT ) ;
+		Text [ en-US ] = "I~nner:" ;
 	};
 	MetricField MF_SWLEFT_MARGIN
 	{
-		Border = TRUE;
-		Pos = MAP_APPFONT ( MF_X , LEFT_MF_Y );
-		Size = MAP_APPFONT ( MBOX_WIDTH - 12, MBOX_HEIGHT );
-		HelpID = HID_SWPAGE_LEFT_MARGIN;
-		Left = TRUE;
-		Repeat = TRUE;
-		Spin = TRUE;
-		Maximum = 9999;
-		DecimalDigits = 2;
-		Unit = FUNIT_CM;
-		Last = 9999;
-		SpinSize = 10;
+		Border = TRUE ;
+		Pos = MAP_APPFONT ( MF_X, LEFT_MF_Y ) ;
+		Size = MAP_APPFONT ( MBOX_WIDTH - 12, MBOX_HEIGHT ) ;
+		HelpID = HID_SWPAGE_LEFT_MARGIN ;
+		Left = TRUE ;
+		Repeat = TRUE ;
+		Spin = TRUE ;
+		Maximum = 9999 ;
+		DecimalDigits = 2 ;
+		Unit = FUNIT_CM ;
+		Last = 9999 ;
+		SpinSize = 10 ;
 	};
 	FixedText FT_RIGHT
 	{
-	    Pos = MAP_APPFONT ( FT_X, FT_RIGHT_Y );
-        Size = MAP_APPFONT ( 25, TEXT_HEIGHT) ;
-		Text [ en-US ] = "~Right:";
+		Pos = MAP_APPFONT ( FT_X, FT_RIGHT_Y ) ;
+		Size = MAP_APPFONT ( 25, TEXT_HEIGHT ) ;
+		Text [ en-US ] = "~Right:" ;
 	};
 	FixedText FT_OUTER
 	{
-	    Pos = MAP_APPFONT ( FT_X, FT_RIGHT_Y );
-        Size = MAP_APPFONT ( 25, TEXT_HEIGHT) ;
-		Text [ en-US ] = "O~uter:";
+		Pos = MAP_APPFONT ( FT_X, FT_RIGHT_Y ) ;
+		Size = MAP_APPFONT ( 25, TEXT_HEIGHT ) ;
+		Text [ en-US ] = "O~uter:" ;
 	};
 	MetricField MF_SWRIGHT_MARGIN
 	{
-		Border = TRUE;
-		Pos = MAP_APPFONT ( MF_X , RIGHT_MF_Y );
+		Border = TRUE ;
+		Pos = MAP_APPFONT ( MF_X, RIGHT_MF_Y );
 		Size = MAP_APPFONT ( MBOX_WIDTH - 12, MBOX_HEIGHT );
-		HelpID = HID_SWPAGE_RIGHT_MARGIN;
-		Left = TRUE;
-		Repeat = TRUE;
-		Spin = TRUE;
-		Maximum = 9999;
-		DecimalDigits = 2;
-		Unit = FUNIT_CM;
-		Last = 9999;
-		SpinSize = 10;
+		HelpID = HID_SWPAGE_RIGHT_MARGIN ;
+		Left = TRUE ;
+		Repeat = TRUE ;
+		Spin = TRUE ;
+		Maximum = 9999 ;
+		DecimalDigits = 2 ;
+		Unit = FUNIT_CM ;
+		Last = 9999 ;
+		SpinSize = 10 ;
 	};
 	FixedText FT_TOP
 	{
-	    Pos = MAP_APPFONT ( FT_X, FT_TOP_Y );
-        Size = MAP_APPFONT ( 25, TEXT_HEIGHT) ;
-		Text [ en-US ] = "~Top:";
+		Pos = MAP_APPFONT ( FT_X, FT_TOP_Y ) ;
+		Size = MAP_APPFONT ( 25, TEXT_HEIGHT ) ;
+		Text [ en-US ] = "~Top:" ;
 	};
 	MetricField MF_SWTOP_MARGIN
 	{
-		Border = TRUE;
-		Pos = MAP_APPFONT ( MF_X , TOP_MF_Y );
-		Size = MAP_APPFONT ( MBOX_WIDTH - 12, MBOX_HEIGHT );
-		HelpID = HID_SWPAGE_TOP_MARGIN;
-		Left = TRUE;
-		Repeat = TRUE;
-		Spin = TRUE;
-		Maximum = 9999;
-		DecimalDigits = 2;
-		Unit = FUNIT_CM;
-		Last = 9999;
-		SpinSize = 10;
+		Border = TRUE ;
+		Pos = MAP_APPFONT ( MF_X, TOP_MF_Y ) ;
+		Size = MAP_APPFONT ( MBOX_WIDTH - 12, MBOX_HEIGHT ) ;
+		HelpID = HID_SWPAGE_TOP_MARGIN ;
+		Left = TRUE ;
+		Repeat = TRUE ;
+		Spin = TRUE ;
+		Maximum = 9999 ;
+		DecimalDigits = 2 ;
+		Unit = FUNIT_CM ;
+		Last = 9999 ;
+		SpinSize = 10 ;
 	};
 	FixedText FT_BOTTOM
 	{
-	    Pos = MAP_APPFONT ( FT_X, FT_BOTTOM_Y );
-        Size = MAP_APPFONT ( 25, TEXT_HEIGHT) ;
-		Text [ en-US ] = "~Bottom:";
+		Pos = MAP_APPFONT ( FT_X, FT_BOTTOM_Y ) ;
+		Size = MAP_APPFONT ( 25, TEXT_HEIGHT ) ;
+		Text [ en-US ] = "~Bottom:" ;
 	};
 	MetricField MF_SWBOTTOM_MARGIN
 	{
-		Border = TRUE;
-		Pos = MAP_APPFONT ( MF_X , BOTTOM_MF_Y );
+		Border = TRUE ;
+		Pos = MAP_APPFONT ( MF_X, BOTTOM_MF_Y ) ;
 		Size = MAP_APPFONT ( MBOX_WIDTH - 12, MBOX_HEIGHT );
-		HelpID = HID_SWPAGE_BOTTOM_MARGIN;
-		Left = TRUE;
-		Repeat = TRUE;
-		Spin = TRUE;
-		Maximum = 9999;
-		DecimalDigits = 2;
-		Unit = FUNIT_CM;
-		Last = 9999;
-		SpinSize = 10;
+		HelpID = HID_SWPAGE_BOTTOM_MARGIN ;
+		Left = TRUE ;
+		Repeat = TRUE ;
+		Spin = TRUE ;
+		Maximum = 9999 ;
+		DecimalDigits = 2 ;
+		Unit = FUNIT_CM ;
+		Last = 9999 ;
+		SpinSize = 10 ;
 	};
 	MetricField FLD_WIDTH_HEIGHT
 	{
-		Border = TRUE;
-		Left = TRUE;
-		Repeat = TRUE;
-		Spin = TRUE;
-		Maximum = 9999;
-		DecimalDigits = 2;
-		Unit = FUNIT_CM;
-		Last = 9999;
-		SpinSize = 10;
-	};
-	
+		Border = TRUE ;
+		Left = TRUE ;
+		Repeat = TRUE ;
+		Spin = TRUE ;
+		Maximum = 9999 ;
+		DecimalDigits = 2 ;
+		Unit = FUNIT_CM ;
+		Last = 9999 ;
+		SpinSize = 10 ;
+	};
+
 	Image IMG_NARROW
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/format_L_narrow_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/format_L_narrow_24x24.png" ;} ;
 	};
 	Image IMG_NORMAL
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/format_L_nomal_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/format_L_normal_24x24.png" ;} ;
 	};
 	Image IMG_WIDE
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/format_L_wide_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/format_L_wide_24x24.png" ;} ;
 	};
 	Image IMG_MIRRORED
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/format_L_mirror_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/format_L_mirror_24x24.png" ;} ;
 	};
 	Image IMG_NARROW_L
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/formatnarrow_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/formatnarrow_24x24.png" ;} ;
 	};
 	Image IMG_NORMAL_L
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/formatnormal_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/formatnormal_24x24.png" ;} ;
 	};
 	Image IMG_WIDE_L
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/formatwide_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/formatwide_24x24.png" ;} ;
 	};
 	Image IMG_MIRRORED_L
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/formatmirror_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/formatmirror_24x24.png" ;} ;
 	};
 	Image IMG_CUSTOM
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/last_custom_common.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/last_custom_common.png" ;} ;
 	};
 	Image IMG_CUSTOM_DIS
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/last_custom_common_grey.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/last_custom_common_grey.png" ;} ;
 	};
 	String STR_LCVALUE
 	{
-		Text [ en-US ] = "Last Custom Values";
+		Text [ en-US ] = "Last Custom Values" ;
 	};
 	String STR_NARROW
 	{
-		Text [ en-US ] = "Narrow";
+		Text [ en-US ] = "Narrow" ;
 	};
 	String STR_NORMAL
 	{
-		Text [ en-US ] = "Normal";
+		Text [ en-US ] = "Normal" ;
 	};
 	String STR_WIDE
 	{
-		Text [ en-US ] = "Wide";
+		Text [ en-US ] = "Wide" ;
 	};
 	String STR_MIRRORED
 	{
-		Text [ en-US ] = "Mirrored";
+		Text [ en-US ] = "Mirrored" ;
 	};
 	String STR_MARGIN_TOOLTIP_LEFT
 	{
-		Text [ en-US ] = "Left: ";
+		Text [ en-US ] = "Left: " ;
 	};
 	String STR_MARGIN_TOOLTIP_RIGHT
 	{
-		Text [ en-US ] = ". Right: ";
+		Text [ en-US ] = ". Right: " ;
 	};
 	String STR_MARGIN_TOOLTIP_INNER
 	{
-		Text [ en-US ] = "Inner: ";
+		Text [ en-US ] = "Inner: " ;
 	};
 	String STR_MARGIN_TOOLTIP_OUTER
 	{
-		Text [ en-US ] = ". Outer: ";
+		Text [ en-US ] = ". Outer: " ;
 	};
 	String STR_MARGIN_TOOLTIP_TOP
 	{
-		Text [ en-US ] = ". Top: ";
+		Text [ en-US ] = ". Top: " ;
 	};
 	String STR_MARGIN_TOOLTIP_BOT
 	{
-		Text [ en-US ] = ". Bottom: ";
+		Text [ en-US ] = ". Bottom: " ;
 	};
 };
 
 // popup for page style's page size
 Control RID_POPUP_SWPAGE_SIZE
 {
-	OutputSize = TRUE;
-	DialogControl = TRUE;
-	Border = FALSE;
-	Size = MAP_APPFONT( POPUPPANEL_MARGIN_SMALL * 2 + POPUP_BORDER_WIDTH + VS_WIDTH + 22, ITEM_HEIGHT2*8 + POPUPPANEL_MARGIN_SMALL*2 + CONTROL_SPACING_VERTICAL + 15 );
-	
+	OutputSize = TRUE ;
+	DialogControl = TRUE ;
+	Border = FALSE ;
+	Size = MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL * 2 + POPUP_BORDER_WIDTH + VS_WIDTH + 22, ITEM_HEIGHT2 * 8 + POPUPPANEL_MARGIN_SMALL*2 + CONTROL_SPACING_VERTICAL + 15 ) ;
+
 	Control VS_SIZE
 	{
-        Pos = MAP_APPFONT(  POPUPPANEL_MARGIN_SMALL + OFFSET_X, POPUPPANEL_MARGIN_SMALL + OFFSET_Y); 
-        Size = MAP_APPFONT ( VS_WIDTH + 22 , ITEM_HEIGHT2*8);
-        HelpID = HID_SWPAGE_VS_SIZE;
+		Pos = MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL + OFFSET_X, POPUPPANEL_MARGIN_SMALL + OFFSET_Y ) ;
+		Size = MAP_APPFONT ( VS_WIDTH + 22, ITEM_HEIGHT2 * 8 ) ;
+		HelpID = HID_SWPAGE_VS_SIZE ;
 		TabStop = TRUE ;
-		Text = "Size";
+		Text = "Size" ;
 	};
 	PushButton CB_SIZE_MORE
 	{
 		Pos = MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL + 2*OFFSET_X, POPUPPANEL_MARGIN_SMALL + 2*OFFSET_Y + ITEM_HEIGHT2*8 ) ;
 		Size = MAP_APPFONT ( VS_WIDTH - 2 + 22, 15 ) ;
-		HelpID = HID_SWPAGE_SIZE_MORE;
+		HelpID = HID_SWPAGE_SIZE_MORE ;
 		TabStop = TRUE ;
-		Text [ en-US ] = "~More Options";
-		QuickHelpText [ en-US ] = "More Options" ;		
-	};	
+		Text [ en-US ] = "~More Options" ;
+		QuickHelpText [ en-US ] = "More Options" ;
+	};
 	MetricField FLD_WIDTH_HEIGHT
 	{
-		Border = TRUE;
-		Left = TRUE;
-		Repeat = TRUE;
-		Spin = TRUE;
-		Maximum = 9999;
-		DecimalDigits = 2;
-		Unit = FUNIT_CM;
-		Last = 9999;
-		SpinSize = 10;
+		Border = TRUE ;
+		Left = TRUE ;
+		Repeat = TRUE ;
+		Spin = TRUE ;
+		Maximum = 9999 ;
+		DecimalDigits = 2 ;
+		Unit = FUNIT_CM ;
+		Last = 9999 ;
+		SpinSize = 10 ;
 	};
 };
 
 // popup for page style's column attribute
 Control RID_POPUP_SWPAGE_COLUMN
 {
-	OutputSize = TRUE;
-	DialogControl = TRUE;
-	Border = FALSE;
-	Size = MAP_APPFONT( POPUPPANEL_MARGIN_SMALL * 2 + POPUP_BORDER_WIDTH + VS_WIDTH - 15, ITEM_HEIGHT*5 + POPUPPANEL_MARGIN_SMALL*2 + CONTROL_SPACING_VERTICAL + 15 );
-	
+	OutputSize = TRUE ;
+	DialogControl = TRUE ;
+	Border = FALSE ;
+	Size = MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL * 2 + POPUP_BORDER_WIDTH + VS_WIDTH - 15, ITEM_HEIGHT*5 + POPUPPANEL_MARGIN_SMALL*2 + CONTROL_SPACING_VERTICAL + 15 ) ;
+
 	Control VS_COLUMN
 	{
-        Pos = MAP_APPFONT(  POPUPPANEL_MARGIN_SMALL + OFFSET_X, POPUPPANEL_MARGIN_SMALL + OFFSET_Y); 
-        Size = MAP_APPFONT ( VS_WIDTH -15 , ITEM_HEIGHT*5);
-        HelpID = HID_SWPAGE_VS_COLUMN;
+		Pos = MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL + OFFSET_X, POPUPPANEL_MARGIN_SMALL + OFFSET_Y ) ;
+		Size = MAP_APPFONT ( VS_WIDTH - 15, ITEM_HEIGHT * 5 ) ;
+		HelpID = HID_SWPAGE_VS_COLUMN ;
 		TabStop = TRUE ;
-		Text = "Column";
+		Text = "Column" ;
 	};
 	PushButton CB_COLUMN_MORE
 	{
-		Pos = MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL + 2*OFFSET_X, POPUPPANEL_MARGIN_SMALL + 2*OFFSET_Y + ITEM_HEIGHT*5 ) ;
+		Pos = MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL + 2 * OFFSET_X, POPUPPANEL_MARGIN_SMALL + 2 * OFFSET_Y + ITEM_HEIGHT * 5 ) ;
 		Size = MAP_APPFONT ( VS_WIDTH - 2 - 15, 15 ) ;
-		HelpID = HID_SWPAGE_COLUMN_MORE;
+		HelpID = HID_SWPAGE_COLUMN_MORE ;
 		TabStop = TRUE ;
-		Text [ en-US ] = "~More Options";
-		QuickHelpText [ en-US ] = "More Options" ;		
-	};	
-	Image  IMG_ONE
+		Text [ en-US ] = "~More Options" ;
+		QuickHelpText [ en-US ] = "More Options" ;
+	};
+	Image IMG_ONE
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/column_L_1_24x24.png";};
-	};			
-	Image  IMG_TWO
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/column_L_1_24x24.png" ;} ;
+	};
+	Image IMG_TWO
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/column_L_2_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/column_L_2_24x24.png" ;} ;
 	};
-	Image  IMG_THREE
+	Image IMG_THREE
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/column_L_3_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/column_L_3_24x24.png" ;} ;
 	};
-	Image  IMG_LEFT	
+	Image IMG_LEFT
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/column_L_left_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/column_L_left_24x24.png" ;} ;
 	};
-	Image  IMG_RIGHT
+	Image IMG_RIGHT
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/column_L_right_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/column_L_right_24x24.png" ;} ;
 	};
-	Image  IMG_ONE_L
+	Image IMG_ONE_L
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/column1_24x24.png";};
-	};			
-	Image  IMG_TWO_L
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/column1_24x24.png" ;} ;
+	};
+	Image IMG_TWO_L
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/column2_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/column2_24x24.png" ;} ;
 	};
-	Image  IMG_THREE_L
+	Image IMG_THREE_L
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/column3_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/column3_24x24.png" ;} ;
 	};
-	Image  IMG_LEFT_L
+	Image IMG_LEFT_L
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/columnleft_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/columnleft_24x24.png" ;} ;
 	};
-	Image  IMG_RIGHT_L
+	Image IMG_RIGHT_L
 	{
-		ImageBitmap = Bitmap{File = "sidebar/pageproppanel/columnright_24x24.png";};
+		ImageBitmap = Bitmap {File = "sidebar/pageproppanel/columnright_24x24.png" ;} ;
 	};
-	String STR_ONE			
+	String STR_ONE
 	{
-		Text [ en-US ] = "1 Column";
+		Text [ en-US ] = "1 Column" ;
 	};
-	String STR_TWO	
+	String STR_TWO
 	{
-		Text [ en-US ] = "2 Columns";
+		Text [ en-US ] = "2 Columns" ;
 	};
 	String STR_THREE
 	{
-		Text [ en-US ] = "3 Columns";
+		Text [ en-US ] = "3 Columns" ;
 	};
-	String STR_LEFT	
+	String STR_LEFT
 	{
-		Text [ en-US ] = "Left";
+		Text [ en-US ] = "Left" ;
 	};
 	String STR_RIGHT
 	{
-		Text [ en-US ] = "Right";
+		Text [ en-US ] = "Right" ;
 	};
 };
+
+// ******************************************************************* EOF