// Created: 23.09.98
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence: wxWindows license (part of wxExtra library)
+// Licence: wxWindows licence (part of wxExtra library)
/////////////////////////////////////////////////////////////////////////////
// known bugs; there may be others!! chris elliott, biol75@york.ac.uk 27 Mar 01
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "mimetype.h"
#endif
#ifndef WX_PRECOMP
#include "wx/string.h"
- #if wxUSE_GUI
- #include "wx/icon.h"
-
- #endif
#endif //WX_PRECOMP
#include "wx/dir.h"
#include "wx/utils.h"
#include "wx/tokenzr.h"
+#include "wx/iconloc.h"
+#include "wx/filename.h"
#include "wx/unix/mimetype.h"
wxString gnomedir;
wxGetHomeDir( &gnomedir );
wxString sTmp = gnomedir;
- sTmp = sTmp + "/.gnome";
+ sTmp = sTmp + wxT("/.gnome");
if (! wxDir::Exists ( sTmp ) )
{
if (!wxMkdir ( sTmp ))
{
- wxFAIL_MSG (wxString ("Failed to create directory\n.gnome in \nCheckGnomeDirsExist") + sTmp );
+ wxLogError(_("Failed to create directory %s/.gnome."), sTmp.c_str());
return FALSE;
}
}
- sTmp = sTmp + "/mime-info";
+ sTmp = sTmp + wxT("/mime-info");
if (! wxDir::Exists ( sTmp ) )
{
if (!wxMkdir ( sTmp ))
{
- wxFAIL_MSG (wxString ("Failed to create directory\nmime-info in \nCheckGnomeDirsExist") + sTmp );
+ wxLogError(_("Failed to create directory %s/mime-info."), sTmp.c_str());
return FALSE;
}
}
wxString gnomedir;
wxGetHomeDir( &gnomedir );
- wxMimeTextFile outfile ( gnomedir + "/.gnome/mime-info/user.keys");
+ wxMimeTextFile outfile ( gnomedir + wxT("/.gnome/mime-info/user.keys"));
// if this fails probably Gnome is not installed ??
// create it anyway as a private mime store
+#if defined(__WXGTK20__) && wxUSE_UNICODE
+ if (! outfile.Open ( wxConvUTF8) )
+#else
if (! outfile.Open () )
+#endif
{
if (delete_index) return FALSE;
if (!CheckGnomeDirsExist() ) return FALSE;
}
//sOld should also contain the icon
if ( !m_aIcons[index].empty() )
- sOld.AddOrReplaceVerb ( wxT( "icon-filename"), m_aIcons[index] );
+ sOld.AddOrReplaceVerb ( wxT("icon-filename"), m_aIcons[index] );
for (i=0; i < sOld.GetCount(); i++)
{
sTmp = sOld.GetVerbCmd(i);
sTmp.Replace( wxT("%s"), wxT("%f") );
- sTmp = wxT ( "\t") + sTmp;
+ sTmp = wxT("\t") + sTmp;
nIndex ++;
outfile.InsertLine ( sTmp, nIndex );
}
wxString gnomedir;
wxGetHomeDir( &gnomedir );
- wxMimeTextFile outfile ( gnomedir + "/.gnome/mime-info/user.mime");
+ wxMimeTextFile outfile ( gnomedir + wxT("/.gnome/mime-info/user.mime"));
// if this fails probably Gnome is not installed ??
// create it anyway as a private mime store
if (! outfile.Open () )
if ( nIndex == wxNOT_FOUND )
{
outfile.AddLine ( strType );
- outfile.AddLine ( wxT( "\text:") + m_aExtensions.Item(index) );
+ outfile.AddLine ( wxT("\text:") + m_aExtensions.Item(index) );
}
else
{
else
{// check for next line being the right one to replace ??
wxString sOld = outfile.GetLine(nIndex+1);
- if (sOld.Contains(wxT("\text: ")))
+ if (sOld.Contains( wxT("\text: ")))
{
- outfile.GetLine(nIndex+1) = wxT( "\text: ") + m_aExtensions.Item(index);
+ outfile.GetLine(nIndex+1) = wxT("\text: ") + m_aExtensions.Item(index);
}
else
{
- outfile.InsertLine(wxT( "\text: ") + m_aExtensions.Item(index), nIndex + 1 );
+ outfile.InsertLine( wxT("\text: ") + m_aExtensions.Item(index), nIndex + 1 );
}
}
}
}
-void wxMimeTypesManagerImpl::LoadGnomeDataFromKeyFile(const wxString& filename)
+void wxMimeTypesManagerImpl::LoadGnomeDataFromKeyFile(const wxString& filename,
+ const wxArrayString& dirs)
{
wxTextFile textfile(filename);
+#if defined(__WXGTK20__) && wxUSE_UNICODE
+ if ( !textfile.Open( wxConvUTF8) )
+#else
if ( !textfile.Open() )
+#endif
return;
wxLogTrace(TRACE_MIME, wxT("--- Opened Gnome file %s ---"),
filename.c_str());
wxString sTmp(pc);
if (sTmp.Contains(wxT("=")) )
{
+ // GNOME 1:
if (sTmp.Contains( wxT("icon-filename=") ) )
{
curIconFile = sTmp.AfterFirst(wxT('='));
}
+ // GNOME 2:
+ else if (sTmp.Contains( wxT("icon_filename=") ) )
+ {
+ curIconFile = sTmp.AfterFirst(wxT('='));
+
+ if (!wxFileExists(curIconFile))
+ {
+ size_t nDirs = dirs.GetCount();
+ for (size_t nDir = 0; nDir < nDirs; nDir++)
+ {
+ wxFileName newFile( curIconFile );
+ newFile.SetPath( dirs[nDir] );
+ newFile.AppendDir( wxT("pixmaps") );
+ newFile.AppendDir( wxT("document-icons") );
+ newFile.SetExt( wxT("png") );
+ if (newFile.FileExists())
+ curIconFile = newFile.GetFullPath();
+ }
+ }
+ }
else //: some other field,
{
//may contain lines like this (RH7)
// ignore blank lines
nLine ++;
} // end of while, save any data
+
if (! curMimeType.empty())
- {
AddToMimeData ( curMimeType, curIconFile, entry, strExtensions, strDesc);
- }
-
}
wxTextFile textfile(filename);
if ( !textfile.Open() )
return;
- wxLogTrace(TRACE_MIME, wxT("--- Opened Gnome file %s ---"),
- filename.c_str());
+
+ wxLogTrace(TRACE_MIME,
+ wxT("--- Opened Gnome file %s ---"),
+ filename.c_str());
// values for the entry being parsed
wxString curMimeType, curExtList;
if ( nLine < nLineCount )
{
pc = textfile[nLine].c_str();
- if ( *pc == _T('#') )
+ if ( *pc == wxT('#') )
{
// skip comments
continue;
// end of the entry
if ( !!curMimeType && !!curExtList )
{
- wxLogTrace(TRACE_MIME, wxT("--- At end of Gnome file finding mimetype %s ---"),
- curMimeType.c_str());
-
+ wxLogTrace(TRACE_MIME,
+ wxT("--- At end of Gnome file finding mimetype %s ---"),
+ curMimeType.c_str());
+
AddMimeTypeInfo(curMimeType, curExtList, wxEmptyString);
}
}
// what do we have here?
- if ( *pc == _T('\t') )
+ if ( *pc == wxT('\t') )
{
// this is a field=value ling
pc++; // skip leading TAB
- static const int lenField = 4; // strlen("ext:")
- if ( wxStrncmp(pc, _T("ext:"), lenField) == 0 )
+ static const int lenField = 5; // strlen("ext: ")
+ if ( wxStrncmp(pc, wxT("ext: "), lenField) == 0 )
{
- // skip ' ' which follows and take everything left until the end
- // of line
- curExtList = pc + lenField + 1;
+ // skip it and take everything left until the end of line
+ curExtList = pc + lenField;
}
//else: some other field, we don't care
}
else
{
// this is the start of the new section
- wxLogTrace(TRACE_MIME, wxT("--- In Gnome file finding mimetype %s ---"),
- curMimeType.c_str());
+ wxLogTrace(TRACE_MIME,
+ wxT("--- In Gnome file finding mimetype %s ---"),
+ curMimeType.c_str());
if (! curMimeType.empty())
AddMimeTypeInfo(curMimeType, curExtList, wxEmptyString);
curMimeType.Empty();
- while ( *pc != _T(':') && *pc != _T('\0') )
+ while ( *pc != wxT(':') && *pc != wxT('\0') )
{
curMimeType += *pc++;
}
}
-void wxMimeTypesManagerImpl::LoadGnomeMimeFilesFromDir(const wxString& dirbase)
+void wxMimeTypesManagerImpl::LoadGnomeMimeFilesFromDir(
+ const wxString& dirbase, const wxArrayString& dirs)
{
wxASSERT_MSG( !!dirbase && !wxEndsWithPathSeparator(dirbase),
_T("base directory shouldn't end with a slash") );
wxString dirname = dirbase;
- dirname << _T("/mime-info");
-
+ dirname << wxT("/mime-info");
+
if ( !wxDir::Exists(dirname) )
return;
return;
// we will concatenate it with filename to get the full path below
- dirname += _T('/');
+ dirname += wxT('/');
wxString filename;
- bool cont = dir.GetFirst(&filename, _T("*.mime"), wxDIR_FILES);
+ bool cont;
+ cont = dir.GetFirst(&filename, _T("*.mime"), wxDIR_FILES);
while ( cont )
{
LoadGnomeMimeTypesFromMimeFile(dirname + filename);
cont = dir.GetFirst(&filename, _T("*.keys"), wxDIR_FILES);
while ( cont )
{
- LoadGnomeDataFromKeyFile(dirname + filename);
+ LoadGnomeDataFromKeyFile(dirname + filename, dirs);
cont = dir.GetNext(&filename);
}
-}
+ // Hack alert: We scan all icons and deduce the
+ // mime-type from the file name.
+ dirname = dirbase;
+ dirname << wxT("/pixmaps/document-icons");
+
+ // these are always empty in this file
+ wxArrayString strExtensions;
+ wxString strDesc;
+
+ if ( !wxDir::Exists(dirname) )
+ {
+ // Jst test for default GPE dir also
+ dirname = wxT("/usr/share/gpe/pixmaps/default/filemanager/document-icons");
+
+ if ( !wxDir::Exists(dirname) )
+ return;
+ }
+ wxDir dir2( dirname );
+ cont = dir2.GetFirst(&filename, wxT("gnome-*.png"), wxDIR_FILES);
+ while ( cont )
+ {
+ wxString mimeType = filename;
+ mimeType.Remove( 0, 6 ); // remove "gnome-"
+ mimeType.Remove( mimeType.Len()-4, 4 ); // remove ".png"
+ int pos = mimeType.Find( wxT("-") );
+ if (pos != wxNOT_FOUND)
+ {
+ mimeType.SetChar( pos, wxT('/') );
+ wxString iconFile = dirname;
+ iconFile << wxT("/");
+ iconFile << filename;
+ AddToMimeData ( mimeType, iconFile, NULL, strExtensions, strDesc, TRUE );
+ }
+
+ cont = dir2.GetNext(&filename);
+ }
+}
void wxMimeTypesManagerImpl::GetGnomeMimeInfo(const wxString& sExtraDir)
{
-
wxArrayString dirs;
- dirs.Add(_T("/usr/share"));
- dirs.Add(_T("/usr/local/share"));
+
+ wxString gnomedir = wxGetenv( wxT("GNOMEDIR") );;
+ if (!gnomedir.empty())
+ {
+ gnomedir << wxT("/share");
+ dirs.Add( gnomedir );
+ }
- wxString gnomedir;
- wxGetHomeDir( &gnomedir );
- gnomedir += _T("/.gnome");
+ dirs.Add(wxT("/usr/share"));
+ dirs.Add(wxT("/usr/local/share"));
+
+ gnomedir = wxGetHomeDir();
+ gnomedir << wxT("/.gnome");
dirs.Add( gnomedir );
+
if (!sExtraDir.empty()) dirs.Add( sExtraDir );
size_t nDirs = dirs.GetCount();
for ( size_t nDir = 0; nDir < nDirs; nDir++ )
{
- LoadGnomeMimeFilesFromDir(dirs[nDir]);
+ LoadGnomeMimeFilesFromDir(dirs[nDir], dirs);
}
}
// kde writing; see http://webcvs.kde.org/cgi-bin/cvsweb.cgi/~checkout~/kdelibs/kio/DESKTOP_ENTRY_STANDARD
// for now write to .kdelnk but should eventually do .desktop instead (in preference??)
-bool wxMimeTypesManagerImpl::CheckKDEDirsExist ( const wxString & sOK, const wxString & sTest )
-
- {
+bool wxMimeTypesManagerImpl::CheckKDEDirsExist ( const wxString &sOK, const wxString &sTest )
+{
if (sTest.empty())
- {
- if (wxDir::Exists(sOK)) return TRUE;
- else return FALSE;
- }
+ {
+ if (wxDir::Exists(sOK))
+ return TRUE;
+ else
+ return FALSE;
+ }
else
- {
- wxString sStart = sOK + wxT("/") + sTest.BeforeFirst(wxT('/'));
- if (!wxDir::Exists(sStart)) wxMkdir(sStart);
- wxString sEnd = sTest.AfterFirst(wxT('/'));
- return CheckKDEDirsExist(sStart, sEnd);
+ {
+ wxString sStart = sOK + wxT("/") + sTest.BeforeFirst(wxT('/'));
+ if (!wxDir::Exists(sStart)) wxMkdir(sStart);
+ wxString sEnd = sTest.AfterFirst(wxT('/'));
+ return CheckKDEDirsExist(sStart, sEnd);
}
}
appoutfile.Close ();
return bTemp;
-
-
}
void wxMimeTypesManagerImpl::LoadKDELinksForMimeSubtype(const wxString& dirbase,
wxMimeTextFile file;
if ( !file.Open(dirbase + filename) ) return;
+ wxLogTrace(TRACE_MIME, wxT("loading KDE file %s"),
+ (dirbase+filename).c_str());
+
wxMimeTypeCommands * entry = new wxMimeTypeCommands;
wxArrayString sExts;
wxString mimetype, mime_desc, strIcon;
- int nIndex = file.pIndexOf ("MimeType=");
+ int nIndex = file.pIndexOf( wxT("MimeType=") );
if (nIndex == wxNOT_FOUND)
{
// construct mimetype from the directory name and the basename of the
// file (it always has .kdelnk extension)
- mimetype << subdir << _T('/') << filename.BeforeLast(_T('.'));
+ mimetype << subdir << wxT('/') << filename.BeforeLast( wxT('.') );
}
else mimetype = file.GetCmd (nIndex);
}
sExts.Add(mime_extension);
-
// ok, now we can take care of icon:
nIndex = file.pIndexOf(_T("Icon="));
if ( nIndex != wxNOT_FOUND )
{
strIcon = file.GetCmd(nIndex);
+ wxLogTrace(TRACE_MIME, wxT(" icon %s"), strIcon.c_str());
//it could be the real path, but more often a short name
+
+
if (!wxFileExists(strIcon))
{
// icon is just the short name
// in many locations, at least ~/.kde and $KDEDIR
size_t nDir, nDirs = icondirs.GetCount();
for ( nDir = 0; nDir < nDirs; nDir++ )
- if (wxFileExists(icondirs[nDir] + strIcon))
+ {
+ wxFileName fnameIcon( strIcon );
+ wxFileName fname( icondirs[nDir], fnameIcon.GetName() );
+ fname.SetExt( wxT("png") );
+ if (fname.FileExists())
{
- strIcon.Prepend(icondirs[nDir]);
+ strIcon = fname.GetFullPath();
+ wxLogTrace(TRACE_MIME, wxT(" iconfile %s"), strIcon.c_str());
break;
}
+ }
}
}
}
if ( !dir.IsOpened() )
return;
+ wxLogTrace(TRACE_MIME, wxT("--- Loading from KDE directory %s ---"),
+ dirname.c_str());
+
dirname += _T('/');
wxString filename;
wxArrayString dirs;
wxArrayString icondirs;
+ // FIXME: This code is heavily broken. There are three bugs in it:
+ // 1) it uses only KDEDIR, which is deprecated, instead of using
+ // list of paths from KDEDIRS and using KDEDIR only if KDEDIRS
+ // is not set
+ // 2) it doesn't look into ~/.kde/share/config/kdeglobals where
+ // user's settings are stored and thus *ignores* user's settings
+ // instead of respecting them
+ // 3) it "tries to guess KDEDIR" and "tries a few likely theme
+ // names", both of which is completely arbitrary; instead, the
+ // code should give up if KDEDIR(S) is not set and/or the icon
+ // theme cannot be determined, because it means that the user is
+ // not using KDE (and thus is not interested in KDE icons anyway)
+
+ // the variable $KDEDIR is set when KDE is running
+ wxString kdedir = wxGetenv( wxT("KDEDIR") );
+
+ if (!kdedir.empty())
+ {
+ // $(KDEDIR)/share/config/kdeglobals holds info
+ // the current icons theme
+ wxFileName configFile( kdedir, wxEmptyString );
+ configFile.AppendDir( wxT("share") );
+ configFile.AppendDir( wxT("config") );
+ configFile.SetName( wxT("kdeglobals") );
+
+ wxTextFile config;
+ if (configFile.FileExists() && config.Open(configFile.GetFullPath()))
+ {
+ // $(KDEDIR)/share/config -> $(KDEDIR)/share
+ configFile.RemoveDir( configFile.GetDirCount()-1 );
+ // $(KDEDIR)/share/ -> $(KDEDIR)/share/icons
+ configFile.AppendDir( wxT("icons") );
+
+ // Check for entry
+ wxString theme(wxT("default.kde"));
+ size_t cnt = config.GetLineCount();
+ for (size_t i = 0; i < cnt; i++)
+ {
+ if (config[i].StartsWith(wxT("Theme="), &theme/*rest*/))
+ break;
+ }
+ configFile.AppendDir(theme);
+ }
+ else
+ {
+ // $(KDEDIR)/share/config -> $(KDEDIR)/share
+ configFile.RemoveDir( configFile.GetDirCount()-1 );
+ // $(KDEDIR)/share/ -> $(KDEDIR)/share/icons
+ configFile.AppendDir( wxT("icons") );
+ // $(KDEDIR)/share/icons -> $(KDEDIR)/share/icons/default.kde
+ configFile.AppendDir( wxT("default.kde") );
+ }
+
+ configFile.SetName( wxEmptyString );
+ configFile.AppendDir( wxT("32x32") );
+ configFile.AppendDir( wxT("mimetypes") );
+
+ // Just try a few likely icons theme names
+
+ int pos = configFile.GetDirCount()-3;
+
+ if (!wxDir::Exists(configFile.GetPath()))
+ {
+ configFile.RemoveDir( pos );
+ configFile.InsertDir( pos, wxT("default.kde") );
+ }
+
+ if (!wxDir::Exists(configFile.GetPath()))
+ {
+ configFile.RemoveDir( pos );
+ configFile.InsertDir( pos, wxT("default") );
+ }
+
+ if (!wxDir::Exists(configFile.GetPath()))
+ {
+ configFile.RemoveDir( pos );
+ configFile.InsertDir( pos, wxT("crystalsvg") );
+ }
+
+ if (!wxDir::Exists(configFile.GetPath()))
+ {
+ configFile.RemoveDir( pos );
+ configFile.InsertDir( pos, wxT("crystal") );
+ }
+
+ if (wxDir::Exists(configFile.GetPath()))
+ icondirs.Add( configFile.GetFullPath() );
+ }
+
// settings in ~/.kde have maximal priority
- dirs.Add(wxGetHomeDir() + _T("/.kde/share"));
- icondirs.Add(wxGetHomeDir() + _T("/.kde/share/icons/"));
+ dirs.Add(wxGetHomeDir() + wxT("/.kde/share"));
+ icondirs.Add(wxGetHomeDir() + wxT("/.kde/share/icons/"));
- // the variable KDEDIR is set when KDE is running
- const char *kdedir = getenv("KDEDIR");
- if ( kdedir )
+ if (kdedir)
{
- dirs.Add(wxString(kdedir) + _T("/share"));
- icondirs.Add(wxString(kdedir) + _T("/share/icons/"));
+ dirs.Add( wxString(kdedir) + wxT("/share") );
+ icondirs.Add( wxString(kdedir) + wxT("/share/icons/") );
}
else
{
return wxFileType::ExpandCommand(sTmp, params);
}
-bool wxFileTypeImpl::GetIcon(wxIcon *icon,
- wxString *iconFile /*= NULL */,
- int *iconIndex /*= NULL*/) const
+bool wxFileTypeImpl::GetIcon(wxIconLocation *iconLoc) const
{
-#if wxUSE_GUI
wxString sTmp;
size_t i = 0;
while ( (i < m_index.GetCount() ) && sTmp.empty() )
sTmp = m_manager->m_aIcons[m_index[i]];
i ++;
}
- if ( sTmp.empty () ) return FALSE;
-
- wxIcon icn;
-
- if (sTmp.Right(4).MakeUpper() == _T(".XPM"))
- icn = wxIcon(sTmp);
- else
- icn = wxIcon(sTmp, wxBITMAP_TYPE_ANY);
+ if ( sTmp.empty () )
+ return FALSE;
- if ( icn.Ok() )
+ if ( iconLoc )
{
- *icon = icn;
- if (iconFile) *iconFile = sTmp;
- if (iconIndex) *iconIndex = 0;
- return TRUE;
+ iconLoc->SetFileName(sTmp);
}
-#endif // wxUSE_GUI
- return FALSE;
+ return TRUE;
}
m_mailcapStylesInited = 0;
}
+void wxMimeTypesManagerImpl::InitIfNeeded()
+{
+ if ( !m_initialized )
+ {
+ // set the flag first to prevent recursion
+ m_initialized = TRUE;
+
+#if 0
+ wxString wm = wxGetenv( wxT("WINDOWMANAGER") );
+
+ if (wm.Find( wxT("kde") ) != wxNOT_FOUND)
+ Initialize( wxMAILCAP_KDE|wxMAILCAP_STANDARD );
+ else if (wm.Find( wxT("gnome") ) != wxNOT_FOUND)
+ Initialize( wxMAILCAP_GNOME|wxMAILCAP_STANDARD );
+ else
+#endif
+ Initialize();
+ }
+}
+
// read system and user mailcaps and other files
void wxMimeTypesManagerImpl::Initialize(int mailcapStyles,
const wxString& sExtraDir)
GetMimeInfo(sExtraDir);
// read GNOME tables
- if ( mailcapStyles & wxMAILCAP_GNOME)
+ if (mailcapStyles & wxMAILCAP_GNOME)
GetGnomeMimeInfo(sExtraDir);
// read KDE tables
- if ( mailcapStyles & wxMAILCAP_KDE)
+ if (mailcapStyles & wxMAILCAP_KDE)
GetKDEMimeInfo(sExtraDir);
m_mailcapStylesInited |= mailcapStyles;
m_aExtensions.Clear ();
m_aDescriptions.Clear ();
+ WX_CLEAR_ARRAY(m_aEntries);
m_aEntries.Empty();
m_mailcapStylesInited = 0;
wxMimeTypesManagerImpl::~wxMimeTypesManagerImpl()
{
ClearData();
-
- WX_CLEAR_ARRAY(m_aEntries);
}
m_aEntries.Add(entry ? entry : new wxMimeTypeCommands);
// change nIndex so we can use it below to add the extensions
- nIndex = m_aExtensions.Add(wxEmptyString);
+ m_aExtensions.Add(wxEmptyString);
+ nIndex = m_aExtensions.size() - 1;
m_aDescriptions.Add(strDesc);
}
entryOld->AddOrReplaceVerb(verb, entry->GetCmd(i));
}
}
+
+ // as we don't store it anywhere, it won't be deleted later as
+ // usual -- do it immediately instead
+ delete entry;
}
}
}
strFileName.c_str());
wxTextFile file(strFileName);
+#if defined(__WXGTK20__) && wxUSE_UNICODE
+ if ( !file.Open( wxConvUTF8) )
+#else
if ( !file.Open() )
+#endif
return FALSE;
// the information we extract
size_t nLineCount = file.GetLineCount();
const wxChar *pc = NULL;
- for ( size_t nLine = 0; nLine < nLineCount; nLine++ ) {
+ for ( size_t nLine = 0; nLine < nLineCount; nLine++ )
+ {
if ( pc == NULL ) {
// now we're at the start of the line
pc = file[nLine].c_str();
// the string is quoted and ends at the matching quote
pEnd = wxStrchr(++pc, wxT('"'));
if ( pEnd == NULL ) {
- wxLogWarning(_("Mime.types file %s, line %d: unterminated "
- "quoted string."),
+ wxLogWarning(_("Mime.types file %s, line %d: unterminated quoted string."),
strFileName.c_str(), nLine + 1);
}
}
else if ( strLHS == wxT("exts") ) {
strExtensions = strRHS;
}
- else {
+ else if ( strLHS == _T("icon") )
+ {
// this one is simply ignored: it usually refers to Netscape
// built in icons which are useless for us anyhow
- if ( strLHS != _T("icon") )
- {
- wxLogWarning(_("Unknown field in file %s, line %d: '%s'."),
- strFileName.c_str(), nLine + 1, strLHS.c_str());
- }
+ }
+ else if ( !strLHS.StartsWith(_T("x-")) )
+ {
+ // we suppose that all fields starting with "X-" are
+ // unregistered extensions according to the standard practice,
+ // but it may be worth telling the user about other junk in
+ // his mime.types file
+ wxLogWarning(_("Unknown field in file %s, line %d: '%s'."),
+ strFileName.c_str(), nLine + 1, strLHS.c_str());
}
if ( !entryEnded ) {
strFileName.c_str());
wxTextFile file(strFileName);
+#if defined(__WXGTK20__) && wxUSE_UNICODE
+ if ( !file.Open( wxConvUTF8) )
+#else
if ( !file.Open() )
+#endif
return FALSE;
// indices of MIME types (in m_aTypes) we already found in this file
// something is wrong, bail out
cont = FALSE;
- wxLogDebug(wxT("Mailcap file %s, line %d: "
- "'\\' on the end of the last line "
- "ignored."),
+ wxLogDebug(wxT("Mailcap file %s, line %lu: '\\' on the end of the last line ignored."),
strFileName.c_str(),
- nLine + 1);
+ (unsigned long)nLine + 1);
}
else
{
// this might be useful for the programmer
wxLogDebug
(
- wxT("Mailcap file %s, line %d: "
- "unknown field '%s' for the "
- "MIME type '%s' ignored."),
+ wxT("Mailcap file %s, line %lu: unknown field '%s' for the MIME type '%s' ignored."),
strFileName.c_str(),
- nLine + 1,
+ (unsigned long)nLine + 1,
curField.c_str(),
data.type.c_str()
);
// check that we really read something reasonable
if ( currentToken < Field_Other )
{
- wxLogWarning(_("Mailcap file %s, line %d: incomplete entry "
- "ignored."),
+ wxLogWarning(_("Mailcap file %s, line %d: incomplete entry ignored."),
strFileName.c_str(), nLine + 1);
continue;
if ( data.needsterminal )
{
- data.cmdOpen.Printf(_T("xterm -e sh -c '%s'"), data.cmdOpen.c_str());
+ data.cmdOpen = wxString::Format(_T("xterm -e sh -c '%s'"),
+ data.cmdOpen.c_str());
}
if ( !data.cmdOpen.empty() )
// have we seen this one before?
int nIndex = m_aTypes.Index(data.type);
- // and if we have, was it in this file?
+ // and if we have, was it in this file? if not, we should
+ // overwrite the previously seen one
overwrite = nIndex == wxNOT_FOUND ||
- aIndicesSeenHere.Index(nIndex) != wxNOT_FOUND;
+ aIndicesSeenHere.Index(nIndex) == wxNOT_FOUND;
}
wxLogTrace(TRACE_MIME, _T("mailcap %s: %s [%s]"),
projects / wxWidgets.git / blobdiff