#pragma hdrstop
#endif
+#if wxUSE_FONTMAP
+
#ifndef WX_PRECOMP
#include "wx/app.h"
#include "wx/log.h"
#endif
#if wxUSE_GUI
+ #include "wx/fontutil.h"
#include "wx/msgdlg.h"
#include "wx/fontdlg.h"
#include "wx/choicdlg.h"
// ----------------------------------------------------------------------------
// the config paths we use
+#if wxUSE_CONFIG
static const wxChar* FONTMAPPER_ROOT_PATH = wxT("/wxWindows/FontMapper");
static const wxChar* FONTMAPPER_CHARSET_PATH = wxT("Charsets");
static const wxChar* FONTMAPPER_CHARSET_ALIAS_PATH = wxT("Aliases");
+
+// we only ask questions in GUI mode
#if wxUSE_GUI
static const wxChar* FONTMAPPER_FONT_FROM_ENCODING_PATH = wxT("Encodings");
+ static const wxChar* FONTMAPPER_FONT_DONT_ASK = wxT("none");
#endif // wxUSE_GUI
+#endif // wxUSE_CONFIG
// encodings supported by GetEncodingDescription
static wxFontEncoding gs_encodings[] =
wxTRANSLATE( "Unicode 8 bit (UTF-8)" ),
};
-// and the internal names
+// and the internal names (these are not translated on purpose!)
static const wxChar* gs_encodingNames[] =
{
- wxT( "iso8859-1" ),
- wxT( "iso8859-2" ),
- wxT( "iso8859-3" ),
- wxT( "iso8859-4" ),
- wxT( "iso8859-5" ),
- wxT( "iso8859-6" ),
- wxT( "iso8859-7" ),
- wxT( "iso8859-8" ),
- wxT( "iso8859-9" ),
- wxT( "iso8859-10" ),
- wxT( "iso8859-11" ),
- wxT( "iso8859-12" ),
- wxT( "iso8859-13" ),
- wxT( "iso8859-14" ),
- wxT( "iso8859-15" ),
+ wxT( "iso-8859-1" ),
+ wxT( "iso-8859-2" ),
+ wxT( "iso-8859-3" ),
+ wxT( "iso-8859-4" ),
+ wxT( "iso-8859-5" ),
+ wxT( "iso-8859-6" ),
+ wxT( "iso-8859-7" ),
+ wxT( "iso-8859-8" ),
+ wxT( "iso-8859-9" ),
+ wxT( "iso-8859-10" ),
+ wxT( "iso-8859-11" ),
+ wxT( "iso-8859-12" ),
+ wxT( "iso-8859-13" ),
+ wxT( "iso-8859-14" ),
+ wxT( "iso-8859-15" ),
wxT( "koi8-r" ),
wxT( "windows-1250" ),
wxT( "windows-1251" ),
wxT( "windows-1256" ),
wxT( "windows-1257" ),
wxT( "windows-437" ),
- wxT( "utf7" ),
- wxT( "utf8" ),
+ wxT( "utf-7" ),
+ wxT( "utf-8" ),
};
// ----------------------------------------------------------------------------
{
#if wxUSE_CONFIG
m_config = NULL;
+ m_configIsDummy = FALSE;
#endif // wxUSE_CONFIG
#if wxUSE_GUI
// but will allow us to remember the results of the questions at
// least during this run
m_config = new wxMemoryConfig;
- wxConfig::Set(m_config);
+ m_configIsDummy = TRUE;
+ // VS: we can't call wxConfig::Set(m_config) here because that would
+ // disable automatic wxConfig instance creation if this code was
+ // called before wxApp::OnInit (this happens in wxGTK -- it sets
+ // default wxFont encoding in wxApp::Initialize())
}
}
+ if ( m_configIsDummy && wxConfig::Get(FALSE) != NULL )
+ {
+ // VS: in case we created dummy m_config (see above), we want to switch back
+ // to the real one as soon as one becomes available.
+ m_config = wxConfig::Get(FALSE);
+ m_configIsDummy = FALSE;
+ // FIXME: ideally, we should add keys from dummy config to the real one now,
+ // but it is a low-priority task because typical wxWin application
+ // either doesn't use wxConfig at all or creates wxConfig object in
+ // wxApp::OnInit(), before any real interaction with the user takes
+ // place...
+ }
+
return m_config;
}
{
if ( gs_encodings[i] == encoding )
{
- return wxGetTranslation(gs_encodingNames[i]);
+ return gs_encodingNames[i];
}
}
wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset,
bool interactive)
{
+ // a special pseudo encoding which means "don't ask me about this charset
+ // any more" - we need it to avoid driving the user crazy with asking him
+ // time after time about the same charset which he [presumably] doesn't
+ // have the fonts fot
+ static const int wxFONTENCODING_UNKNOWN = -2;
+
wxFontEncoding encoding = wxFONTENCODING_SYSTEM;
// we're going to modify it, make a copy
long value = config->Read(charset, -1l);
if ( value != -1 )
{
+ if ( value == wxFONTENCODING_UNKNOWN )
+ {
+ // don't try to find it, in particular don't ask the user
+ return wxFONTENCODING_SYSTEM;
+ }
+
if ( value >= 0 && value <= wxFONTENCODING_MAX )
{
encoding = (wxFontEncoding)value;
RestorePath(pathOld);
}
-#endif
+#endif // wxUSE_CONFIG
// if didn't find it there, try to recognize it ourselves
if ( encoding == wxFONTENCODING_SYSTEM )
unsigned int value;
if ( wxSscanf(p, wxT("8859-%u"), &value) == 1 )
{
- if ( value < wxFONTENCODING_ISO8859_MAX -
- wxFONTENCODING_ISO8859_1 )
+ // make it 0 based and check that it is strictly positive in
+ // the process (no such thing as iso8859-0 encoding)
+ if ( (value-- > 0) &&
+ (value < wxFONTENCODING_ISO8859_MAX -
+ wxFONTENCODING_ISO8859_1) )
{
// it's a valid ISO8859 encoding
- value += wxFONTENCODING_ISO8859_1 - 1;
+ value += wxFONTENCODING_ISO8859_1;
encoding = (wxFontEncoding)value;
}
}
if ( n != -1 )
{
encoding = gs_encodings[n];
+ }
#if wxUSE_CONFIG
// save the result in the config now
- if ( ChangePath(FONTMAPPER_CHARSET_PATH, &pathOld) )
- {
- wxConfigBase *config = GetConfig();
-
- // remember the alt encoding for this charset
- if ( !config->Write(charset, (long)encoding) )
- {
- wxLogError(_("Failed to remember the encoding for the charset '%s'."), charset.c_str());
- }
+ if ( ChangePath(FONTMAPPER_CHARSET_PATH, &pathOld) )
+ {
+ wxConfigBase *config = GetConfig();
- RestorePath(pathOld);
+ // remember the alt encoding for this charset - or remember that
+ // we don't know it
+ long value = n == -1 ? wxFONTENCODING_UNKNOWN : (long)encoding;
+ if ( !config->Write(charset, value) )
+ {
+ wxLogError(_("Failed to remember the encoding for the charset '%s'."), charset.c_str());
}
-#endif // wxUSE_CONFIG
+
+ RestorePath(pathOld);
}
- //else: cancelled
+#endif // wxUSE_CONFIG
}
#endif // wxUSE_GUI
// wxFatalError doesn't return
}
- wxString configEntry, encName = GetEncodingName(encoding);
+ wxString configEntry,
+ encName = GetEncodingName(encoding);
if ( !!facename )
{
configEntry = facename + _T("_");
RestorePath(pathOld);
- if ( !!fontinfo && !!facename )
+ // this special value means that we don't know of fonts for this
+ // encoding but, moreover, have already asked the user as well and he
+ // didn't specify any font neither
+ if ( fontinfo == FONTMAPPER_FONT_DONT_ASK )
{
- // we tried to find a match with facename - now try without it
- fontinfo = config->Read(encName);
+ interactive = FALSE;
}
-
- if ( !!fontinfo )
+ else // use the info entered the last time
{
- if ( info->FromString(fontinfo) )
+ if ( !!fontinfo && !!facename )
{
- if ( wxTestFontEncoding(*info) )
- {
- // ok, got something
- return TRUE;
- }
- //else: no such fonts, look for something else
+ // we tried to find a match with facename - now try without it
+ fontinfo = config->Read(encName);
}
- else
+
+ if ( !!fontinfo )
{
- wxLogDebug(wxT("corrupted config data: string '%s' is not a valid font encoding info"), fontinfo.c_str());
+ if ( info->FromString(fontinfo) )
+ {
+ if ( wxTestFontEncoding(*info) )
+ {
+ // ok, got something
+ return TRUE;
+ }
+ //else: no such fonts, look for something else
+ // (should we erase the outdated value?)
+ }
+ else
+ {
+ wxLogDebug(wxT("corrupted config data: string '%s' is not a valid font encoding info"),
+ fontinfo.c_str());
+ }
}
+ //else: there is no information in config about this encoding
}
- //else: there is no information in config about this encoding
}
#endif // wxUSE_CONFIG
// ask the user
+#if wxUSE_FONTDLG
if ( interactive )
{
wxString title(m_titleDialog);
// the message
wxString msg;
- msg.Printf(_("The encoding '%s' is unknown.\nWould you like to select a font to be used for this encoding\n(otherwise the text in this encoding will not be shown correctly)?"),
+ msg.Printf(_("No font for displaying text in encoding '%s' found.\nWould you like to select a font to be used for this encoding\n(otherwise the text in this encoding will not be shown correctly)?"),
GetEncodingDescription(encoding).c_str());
wxWindow *parent = m_windowParent;
info -> encoding = retData.GetEncoding();
#if wxUSE_CONFIG
- // remember this in the config
+ // remember this in the config
if ( ChangePath(FONTMAPPER_FONT_FROM_ENCODING_PATH, &pathOld) )
{
GetConfig()->Write(configEntry, info->ToString());
}
//else: the user canceled the font selection dialog
}
- //else: the user doesn't want to select a font
+ else
+ {
+ // the user doesn't want to select a font for this encoding,
+ // remember it to avoid asking the same question again later
+#if wxUSE_CONFIG
+ if ( ChangePath(FONTMAPPER_FONT_FROM_ENCODING_PATH, &pathOld) )
+ {
+ GetConfig()->Write(configEntry, FONTMAPPER_FONT_DONT_ASK);
+
+ RestorePath(pathOld);
+ }
+#endif // wxUSE_CONFIG
+ }
}
//else: we're in non-interactive mode
+#endif // wxUSE_FONTDLG
// now try the default mappings:
wxFontEncodingArray equiv = wxEncodingConverter::GetAllEquivalents(encoding);
}
#endif // wxUSE_GUI
+
+#endif // wxUSE_FONTMAP
projects / wxWidgets.git / blobdiff