INTEGRATION: CWS cjksp1_DEV300 (1.22.756); FILE MERGED

2007/05/11 08:16:35 pflin 1.22.756.3: Issue number: i#76247
Submitted by:  Fong Lin, Remove the assertions in non-product build and rescover the old tab page
Reviewed by:   Fong Lin
2007/05/08 10:23:38 pflin 1.22.756.2: RESYNC: (1.22-1.23); FILE MERGED
2007/04/23 08:01:39 pflin 1.22.756.1: Text grid enhancement: grid layout refactor

1 files changed, 53 insertions, 22 deletions

diff --git a/sw/source/ui/misc/pggrid.src b/sw/source/ui/misc/pggrid.src
index ed24a38c9a24..e73c2e930d8d 100644
--- a/sw/source/ui/misc/pggrid.src
+++ b/sw/source/ui/misc/pggrid.src
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: pggrid.src,v $
  *
- *  $Revision: 1.23 $
+ *  $Revision: 1.24 $
  *
- *  last change: $Author: ihi $ $Date: 2007-04-19 13:21:44 $
+ *  last change: $Author: kz $ $Date: 2008-03-07 16:34:30 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -65,6 +65,13 @@ TabPage TP_TEXTGRID_PAGE
         Size = MAP_APPFONT ( 158 , 10 ) ;
         Text [ en-US ] = "Grid (lines and characters)" ;
     };
+    CheckBox        CB_SNAPTOCHARS
+    {
+        Pos = MAP_APPFONT ( 14 , 53 ) ;
+        Size = MAP_APPFONT ( 158 , 10 ) ;
+        Text [ en-US ] = "~Snap to characters" ;
+        Text [ zh-CN ] = "文字对齐字符网格" ;
+    };
     Window          WN_EXAMPLE
     {
         Pos = MAP_APPFONT ( 176 , 6 ) ;
@@ -72,19 +79,19 @@ TabPage TP_TEXTGRID_PAGE
     };
     FixedLine       FL_LAYOUT
     {
-        Pos = MAP_APPFONT ( 6 , 56 ) ;
+        Pos = MAP_APPFONT ( 6 , 69 ) ;
         Size = MAP_APPFONT ( 248 , 8 ) ;
         Text [ en-US ] = "Grid layout" ;
     };
     FixedText       FT_LINESPERPAGE
     {
-        Pos = MAP_APPFONT ( 12 , 69 ) ;
+        Pos = MAP_APPFONT ( 12 , 82 ) ;
         Size = MAP_APPFONT ( 59 , 8 ) ;
         Text [ en-US ] = "Lines per page" ;
     };
     NumericField    NF_LINESPERPAGE
     {
-        Pos = MAP_APPFONT ( 74 , 67 ) ;
+        Pos = MAP_APPFONT ( 74 , 80 ) ;
         Size = MAP_APPFONT ( 25 , 12 ) ;
         Border = TRUE ;
         TabStop = TRUE ;
@@ -100,13 +107,13 @@ TabPage TP_TEXTGRID_PAGE
     };
     FixedText       FT_TEXTSIZE
     {
-        Pos = MAP_APPFONT ( 133 , 69 ) ;
+        Pos = MAP_APPFONT ( 133 , 82 ) ;
         Size = MAP_APPFONT ( 80 , 8 ) ;
         Text [ en-US ] = "Max. base text size" ;
     };
     MetricField     MF_TEXTSIZE
     {
-        Pos = MAP_APPFONT ( 216 , 67 ) ;
+        Pos = MAP_APPFONT ( 216 , 80 ) ;
         Size = MAP_APPFONT ( 35 , 12 ) ;
         Border = TRUE ;
         TabStop = TRUE ;
@@ -115,7 +122,7 @@ TabPage TP_TEXTGRID_PAGE
         Spin = TRUE ;
         Minimum = 1 ;
         Maximum = 5600 ;
-        DecimalDigits = 1 ;
+        DecimalDigits = 2 ;
         Unit = FUNIT_POINT ;
         First = 10 ;
         Last = 5600 ;
@@ -123,13 +130,13 @@ TabPage TP_TEXTGRID_PAGE
     };
     FixedText       FT_CHARSPERLINE
     {
-        Pos = MAP_APPFONT ( 12 , 85 ) ;
+        Pos = MAP_APPFONT ( 12 , 98 ) ;
         Size = MAP_APPFONT ( 59 , 8 ) ;
         Text [ en-US ] = "Characters per line" ;
     };
     NumericField    NF_CHARSPERLINE
     {
-        Pos = MAP_APPFONT ( 74 , 83 ) ;
+        Pos = MAP_APPFONT ( 74 , 96 ) ;
         Size = MAP_APPFONT ( 25 , 12 ) ;
         Border = TRUE ;
         TabStop = TRUE ;
@@ -143,62 +150,86 @@ TabPage TP_TEXTGRID_PAGE
         Last = 233 ;
         SpinSize = 1 ;
     };
+    FixedText       FT_CHARWIDTH
+    {
+        Pos = MAP_APPFONT ( 133 , 98 ) ;
+        Size = MAP_APPFONT ( 80 , 8 ) ;
+        Text [ en-US ] = "Character ~width" ;
+        Text [ zh-CN ] = "字符跨度" ;
+    };
+    MetricField     MF_CHARWIDTH
+    {
+        Pos = MAP_APPFONT ( 216 , 96 ) ;
+        Size = MAP_APPFONT ( 35 , 12 ) ;
+        Border = TRUE ;
+        TabStop = TRUE ;
+        Left = TRUE ;
+        Repeat = TRUE ;
+        Spin = TRUE ;
+        Minimum = 0 ;
+        Maximum = 5600 ;
+        DecimalDigits = 2 ;
+        Unit = FUNIT_POINT;
+        First = 0 ;
+        Last = 5600 ;
+        SpinSize = 5 ;
+    };
     FixedText       FT_RUBYSIZE
     {
-        Pos = MAP_APPFONT ( 133 , 85 ) ;
+        Pos = MAP_APPFONT ( 133 , 98 ) ;
         Size = MAP_APPFONT ( 80 , 8 ) ;
         Text [ en-US ] = "Max. Ruby text size" ;
     };
     MetricField     MF_RUBYSIZE
     {
-        Pos = MAP_APPFONT ( 216 , 83 ) ;
+        Pos = MAP_APPFONT ( 216 , 96 ) ;
         Size = MAP_APPFONT ( 35 , 12 ) ;
         Border = TRUE ;
         TabStop = TRUE ;
         Left = TRUE ;
         Repeat = TRUE ;
         Spin = TRUE ;
-        Minimum = 1 ;
+        Minimum = 0 ;
         Maximum = 5600 ;
-        DecimalDigits = 1 ;
+        DecimalDigits = 2 ;
         Unit = FUNIT_POINT;
-        First = 10 ;
+        First = 0 ;
         Last = 5600 ;
         SpinSize = 5 ;
     };
     CheckBox        CB_RUBYBELOW
     {
-        Pos = MAP_APPFONT ( 14 , 99 ) ;
-        Size = MAP_APPFONT ( 242 , 10 ) ;
+        Pos = MAP_APPFONT ( 14 , 112 ) ;
+        Size = MAP_APPFONT ( 110 , 10 ) ;
         Text [ en-US ] = "Ruby text below/left from base text" ;
     };
     FixedLine       FL_DISPLAY
     {
-        Pos = MAP_APPFONT ( 6 , 115 ) ;
+        Pos = MAP_APPFONT ( 6 , 128 ) ;
         Size = MAP_APPFONT ( 248 , 8 ) ;
         Text [ en-US ] = "Grid display" ;
     };
     CheckBox        CB_DISPLAY
     {
-        Pos = MAP_APPFONT ( 12 , 126 ) ;
+        Pos = MAP_APPFONT ( 12 , 139 ) ;
         Size = MAP_APPFONT ( 112 , 10 ) ;
         Text [ en-US ] = "Display grid" ;
     };
     CheckBox        CB_PRINT
     {
-        Pos = MAP_APPFONT ( 18 , 141 ) ;
+        Pos = MAP_APPFONT ( 18 , 154 ) ;
         Size = MAP_APPFONT ( 106 , 10 ) ;
         Text [ en-US ] = "Print grid" ;
     };
     FixedText       FT_COLOR
     {
-        Pos = MAP_APPFONT ( 133 , 126 ) ;
+        Pos = MAP_APPFONT ( 133 , 139 ) ;
         Size = MAP_APPFONT ( 55 , 8 ) ;
         Text [ en-US ] = "Grid color" ;
     };
     ListBox         LB_COLOR
     {
-        Pos = MAP_APPFONT ( 191 , 124 ) ;
+        Pos = MAP_APPFONT ( 191 , 137 ) ;
         Size = MAP_APPFONT ( 60 , 50 ) ;
         TabStop = TRUE;
         Border = TRUE;