[Libreoffice-commits] .: cui/source

[Caolán McNamara]

 cui/source/tabpages/chardlg.cxx |   24 ++++++++++++++++++++++++
 cui/source/tabpages/chardlg.hrc |    4 ++++
 cui/source/tabpages/chardlg.src |   24 ++++++++++++++++--------
 3 files changed, 44 insertions(+), 8 deletions(-)

New commits:
commit 6f4e1dbf06ab27afedb6aa03a34c6335ee2d45f6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 11 09:36:19 2011 +0000

    Describe fonts the same way as the default font dialogs on each platform do
    
    i.e.
    Windows: Font, Style, Size
    http://msdn.microsoft.com/en-us/library/ms646958%28v=vs.85%29.aspx
    
    MacOsX: Family, Typeface, Size
    http://sketchup.google.com/crimages/layout-set-ShowFonts-mac-en.jpg
    
    GNOME: Family, Style, Size
    http://live.gnome.org/Design/GTKFontDialog/UsabilityEvaluations

diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index c3ad3dc..44d2cce 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -621,6 +621,30 @@ SvxCharNamePage::SvxCharNamePage( Window* pParent, const SfxItemSet& rInSet ) :
         m_pColorLB  = new ColorListBox( this, CUI_RES( LB_COLOR2 ) );
     }
 
+    //In MacOSX the standard dialogs name font-name, font-style as
+    //Family, Typeface
+    //In GNOME the standard dialogs name font-name, font-style as
+    //Family, Style
+    //In Windows the standard dialogs name font-name, font-style as
+    //Font, Style
+#ifdef WNT
+    String sFontFamilyString(CUI_RES(STR_CHARNAME_FONT));
+#else
+    String sFontFamilyString(CUI_RES(STR_CHARNAME_FAMILY));
+#endif
+    m_pWestFontNameFT->SetText(sFontFamilyString);
+    m_pEastFontNameFT->SetText(sFontFamilyString);
+    m_pCTLFontNameFT->SetText(sFontFamilyString);
+
+#ifdef MACOSX
+    String sFontStyleString(CUI_RES(STR_CHARNAME_TYPEFACE));
+#else
+    String sFontStyleString(CUI_RES(STR_CHARNAME_STYLE));
+#endif
+    m_pWestFontStyleFT->SetText(sFontStyleString);
+    m_pEastFontStyleFT->SetText(sFontStyleString);
+    m_pCTLFontStyleFT->SetText(sFontStyleString);
+
     m_pWestLine             ->Show( bCJK );
     m_pColorFL              ->Show( bCJK );
 
diff --git a/cui/source/tabpages/chardlg.hrc b/cui/source/tabpages/chardlg.hrc
index fa33c07..259611d 100644
--- a/cui/source/tabpages/chardlg.hrc
+++ b/cui/source/tabpages/chardlg.hrc
@@ -70,6 +70,10 @@
 
 #define STR_CHARNAME_NOSTYLE		150
 #define STR_CHARNAME_TRANSPARENT	151
+#define STR_CHARNAME_FAMILY			152
+#define STR_CHARNAME_FONT			153
+#define STR_CHARNAME_STYLE			154
+#define STR_CHARNAME_TYPEFACE		155
 
 // EffectsPage --------------------------------------------------------------
 
diff --git a/cui/source/tabpages/chardlg.src b/cui/source/tabpages/chardlg.src
index 532a1bf..ec646ef 100644
--- a/cui/source/tabpages/chardlg.src
+++ b/cui/source/tabpages/chardlg.src
@@ -48,13 +48,11 @@ TabPage RID_SVXPAGE_CHAR_NAME
     {
         Pos = MAP_APPFONT ( 12 , 14 );
         Size = MAP_APPFONT ( 80 , 8 );
-        Text [ en-US ] = "Font";
     };
     FixedText FT_WEST_NAME_NOCJK
     {
         Pos = MAP_APPFONT ( 12 , 6 );
         Size = MAP_APPFONT ( 112 , 8 );
-        Text [ en-US ] = "~Font";
     };
     ComboBox LB_WEST_NAME
     {
@@ -76,13 +74,11 @@ TabPage RID_SVXPAGE_CHAR_NAME
     {
         Pos = MAP_APPFONT ( 96 , 14 );
         Size = MAP_APPFONT ( 40 , 8 );
-        Text [ en-US ] = "~Typeface";
     };
     FixedText FT_WEST_STYLE_NOCJK
     {
         Pos = MAP_APPFONT ( 130 , 6 );
         Size = MAP_APPFONT ( 72 , 8 );
-        Text [ en-US ] = "~Typeface";
     };
     ComboBox LB_WEST_STYLE
     {
@@ -182,7 +178,6 @@ TabPage RID_SVXPAGE_CHAR_NAME
     {
         Pos = MAP_APPFONT ( 12 , 54 );
         Size = MAP_APPFONT ( 80 , 8 );
-        Text [ en-US ] = "Font";
     };
     ComboBox LB_EAST_NAME
     {
@@ -196,7 +191,6 @@ TabPage RID_SVXPAGE_CHAR_NAME
     {
         Pos = MAP_APPFONT ( 96 , 54 );
         Size = MAP_APPFONT ( 40 , 8 );
-        Text [ en-US ] = "T~ypeface";
     };
     ComboBox LB_EAST_STYLE
     {
@@ -252,7 +246,6 @@ TabPage RID_SVXPAGE_CHAR_NAME
     {
         Pos = MAP_APPFONT ( 12 , 94 );
         Size = MAP_APPFONT ( 80 , 8 );
-        Text [ en-US ] = "Font";
     };
     ComboBox LB_CTL_NAME
     {
@@ -266,7 +259,6 @@ TabPage RID_SVXPAGE_CHAR_NAME
     {
         Pos = MAP_APPFONT ( 96 , 94 );
         Size = MAP_APPFONT ( 40 , 8 );
-        Text [ en-US ] = "Ty~peface";
     };
     ComboBox LB_CTL_STYLE
     {
@@ -353,6 +345,22 @@ TabPage RID_SVXPAGE_CHAR_NAME
     {
         Text [ en-US ] = "Transparent";
     };
+    String STR_CHARNAME_FAMILY
+    {
+        Text [ en-US ] = "Family";
+    };
+    String STR_CHARNAME_FONT
+    {
+        Text [ en-US ] = "Font";
+    };
+    String STR_CHARNAME_STYLE
+    {
+        Text [ en-US ] = "Style";
+    };
+    String STR_CHARNAME_TYPEFACE
+    {
+        Text [ en-US ] = "Typeface";
+    };
 };
 
 // RID_SVXPAGE_CHAR_EFFECTS ---------------------------------------------------