#include "wx/dynarray.h"
#include "wx/string.h"
#include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/utils.h"
#endif
-#include "wx/log.h"
#include "wx/file.h"
#include "wx/confbase.h"
#include "wx/ffile.h"
#include "wx/textfile.h"
#include "wx/dir.h"
-#include "wx/utils.h"
#include "wx/tokenzr.h"
#include "wx/iconloc.h"
#include "wx/filename.h"
+#include "wx/app.h"
+#include "wx/apptrait.h"
#if wxUSE_LIBGNOMEVFS
// Not GUI dependent
int pIndexOf(const wxString & sSearch, bool bIncludeComments = false, int iStart = 0)
{
- size_t i = iStart;
- int nResult = wxNOT_FOUND;
- if (i >= GetLineCount())
- return wxNOT_FOUND;
-
wxString sTest = sSearch;
sTest.MakeLower();
- wxString sLine;
-
- if (bIncludeComments)
- {
- while ( i < GetLineCount() )
- {
- sLine = GetLine(i);
- sLine.MakeLower();
- if (sLine.Contains(sTest))
- nResult = (int) i;
-
- i++;
- }
- }
- else
+ for(size_t i = iStart; i < GetLineCount(); i++)
{
- while ( (i < GetLineCount()) )
+ wxString sLine = GetLine(i).Trim(false);
+ if(bIncludeComments || ! sLine.StartsWith(wxT("#")))
{
- sLine = GetLine(i);
sLine.MakeLower();
- if ( ! sLine.StartsWith(wxT("#")))
- {
- if (sLine.Contains(sTest))
- nResult = (int) i;
- }
-
- i++;
+ if(sLine.StartsWith(sTest))
+ return (int)i;
}
}
-
- return nResult;
+ return wxNOT_FOUND;
}
bool CommentLine(int nIndex)
{
wxTextFile textfile(filename);
#if defined(__WXGTK20__) && wxUSE_UNICODE
- if ( !textfile.Open(wxConvUTF8) )
+ if ( !textfile.Open(wxMBConvUTF8(wxMBConvUTF8::MAP_INVALID_UTF8_TO_OCTAL)) )
#else
if ( !textfile.Open() )
#endif
// calls to FileExist() required)
if (nDir != 0)
{
- wxString tmp = search_dirs[nDir];
+ const wxString &tmp = search_dirs[nDir];
search_dirs.RemoveAt( nDir );
search_dirs.Insert( tmp, 0 );
}
{
// holds an extension; need to change it to *.ext;
wxString e = wxT("*.") + tokenizer.GetNextToken() + wxT(";");
- sTmp = sTmp + e;
+ sTmp += e;
}
if (!delete_index)
const wxString& filename,
const wxArrayString& icondirs)
{
+ wxFileName fullname(dirbase, filename);
wxMimeTextFile file;
- if ( !file.Open(dirbase + filename) )
- return;
+ {
+ wxLogNull logNull;
+ if ( !file.Open(fullname.GetFullPath()) )
+ if ( !file.Open(fullname.GetFullPath(), wxConvISO8859_1) )
+ return;
+ }
wxLogTrace(TRACE_MIME, wxT("loading KDE file %s"),
- (dirbase + filename).c_str());
+ fullname.GetFullPath().c_str());
wxMimeTypeCommands * entry = new wxMimeTypeCommands;
wxArrayString sExts;
// we expect %f; others including %F and %U and %u are possible
wxString sTmp = file.GetCmd(nIndex);
if (0 == sTmp.Replace( wxT("%f"), wxT("%s") ))
- sTmp = sTmp + wxT(" %s");
+ sTmp += wxT(" %s");
entry->AddOrReplaceVerb(wxString(wxT("open")), sTmp );
}
const wxString& subdir,
const wxArrayString& icondirs)
{
- wxString dirname = dirbase;
- dirname += subdir;
- wxDir dir(dirname);
- if ( !dir.IsOpened() )
+ wxFileName dirname(dirbase, wxEmptyString);
+ dirname.AppendDir(subdir);
+ wxDir dir(dirname.GetPath());
+ if(! dir.IsOpened())
return;
wxLogTrace(TRACE_MIME, wxT("--- Loading from KDE directory %s ---"),
- dirname.c_str());
-
- dirname += wxT('/');
+ dirname.GetPath().c_str());
wxString filename;
bool cont = dir.GetFirst(&filename, wxT("*.kdelnk"), wxDIR_FILES);
- while ( cont )
- {
- LoadKDELinksForMimeSubtype(dirname, subdir, filename, icondirs);
-
+ while(cont) {
+ LoadKDELinksForMimeSubtype(dirname.GetPath(), subdir,
+ filename, icondirs);
cont = dir.GetNext(&filename);
}
// new standard for Gnome and KDE
cont = dir.GetFirst(&filename, wxT("*.desktop"), wxDIR_FILES);
- while ( cont )
- {
- LoadKDELinksForMimeSubtype(dirname, subdir, filename, icondirs);
-
+ while(cont) {
+ LoadKDELinksForMimeSubtype(dirname.GetPath(), subdir,
+ filename, icondirs);
cont = dir.GetNext(&filename);
}
}
-void wxMimeTypesManagerImpl::LoadKDELinkFilesFromDir(const wxString& dirbase,
+void wxMimeTypesManagerImpl::LoadKDELinkFilesFromDir(const wxString& dirname,
const wxArrayString& icondirs)
{
- wxASSERT_MSG( !dirbase.empty() && !wxEndsWithPathSeparator(dirbase),
- wxT("base directory shouldn't end with a slash") );
-
- wxString dirname = dirbase;
- dirname << wxT("/mimelnk");
-
- if ( !wxDir::Exists(dirname) )
+ if(! wxDir::Exists(dirname))
return;
wxDir dir(dirname);
if ( !dir.IsOpened() )
return;
- // we will concatenate it with dir name to get the full path below
- dirname += wxT('/');
-
wxString subdir;
bool cont = dir.GetFirst(&subdir, wxEmptyString, wxDIR_DIRS);
while ( cont )
}
}
-void wxMimeTypesManagerImpl::GetKDEMimeInfo(const wxString& sExtraDir)
+// Read a KDE .desktop file of type 'Application'
+void wxMimeTypesManagerImpl::LoadKDEApp(const wxString& filename)
{
- wxArrayString dirs;
- wxArrayString icondirs;
+ wxMimeTextFile file;
- // 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;
- }
+ {
+ wxLogNull logNull;
+ if ( !file.Open(filename) )
+ if ( !file.Open(filename, wxConvISO8859_1) )
+ return;
+ }
- configFile.AppendDir(theme);
- }
- else
- {
- // $(KDEDIR)/share/config -> $(KDEDIR)/share
- configFile.RemoveDir( configFile.GetDirCount() - 1 );
+ wxLogTrace(TRACE_MIME, wxT("loading KDE file %s"), filename.c_str());
- // $(KDEDIR)/share/ -> $(KDEDIR)/share/icons
- configFile.AppendDir( wxT("icons") );
+ // Here, only type 'Application' should be considered.
+ int nIndex = file.pIndexOf( wxT("Type=") );
+ if (nIndex != wxNOT_FOUND &&
+ file.GetCmd(nIndex).Lower() != wxT("application"))
+ return;
+
+ // The hidden entry specifies a file to be ignored.
+ nIndex = file.pIndexOf( wxT("Hidden=") );
+ if (nIndex != wxNOT_FOUND && file.GetCmd(nIndex).Lower() == wxT("true"))
+ return;
+
+ // Semicolon separated list of mime types handled by the application.
+ nIndex = file.pIndexOf( wxT("MimeType=") );
+ if (nIndex == wxNOT_FOUND)
+ return;
+ wxString mimetypes = file.GetCmd (nIndex);
- // $(KDEDIR)/share/icons -> $(KDEDIR)/share/icons/default.kde
- configFile.AppendDir( wxT("default.kde") );
+ // Name of the application
+ wxString nameapp;
+ nIndex = wxNOT_FOUND;
+#if wxUSE_INTL // try "Name[locale name]" first
+ wxLocale *locale = wxGetLocale();
+ if ( locale )
+ nIndex = file.pIndexOf(_T("Name[")+locale->GetName()+_T("]="));
+#endif // wxUSE_INTL
+ if(nIndex == wxNOT_FOUND)
+ nIndex = file.pIndexOf( wxT("Name=") );
+ if(nIndex != wxNOT_FOUND)
+ nameapp = file.GetCmd(nIndex);
+
+ // Icon of the application.
+ wxString nameicon, namemini;
+ nIndex = wxNOT_FOUND;
+#if wxUSE_INTL // try "Icon[locale name]" first
+ if ( locale )
+ nIndex = file.pIndexOf(_T("Icon[")+locale->GetName()+_T("]="));
+#endif // wxUSE_INTL
+ if(nIndex == wxNOT_FOUND)
+ nIndex = file.pIndexOf( wxT("Icon=") );
+ if(nIndex != wxNOT_FOUND) {
+ nameicon = wxString(wxT("--icon ")) + file.GetCmd(nIndex);
+ namemini = wxString(wxT("--miniicon ")) + file.GetCmd(nIndex);
+ }
+
+ // Replace some of the field code in the 'Exec' entry.
+ // TODO: deal with %d, %D, %n, %N, %k and %v (but last one is deprecated)
+ nIndex = file.pIndexOf( wxT("Exec=") );
+ if (nIndex == wxNOT_FOUND)
+ return;
+ wxString sCmd = file.GetCmd(nIndex);
+ // we expect %f; others including %F and %U and %u are possible
+ sCmd.Replace(wxT("%F"), wxT("%f"));
+ sCmd.Replace(wxT("%U"), wxT("%f"));
+ sCmd.Replace(wxT("%u"), wxT("%f"));
+ if (0 == sCmd.Replace ( wxT("%f"), wxT("%s") ))
+ sCmd = sCmd + wxT(" %s");
+ sCmd.Replace(wxT("%c"), nameapp);
+ sCmd.Replace(wxT("%i"), nameicon);
+ sCmd.Replace(wxT("%m"), namemini);
+
+ wxStringTokenizer tokenizer(mimetypes, _T(";"));
+ while(tokenizer.HasMoreTokens()) {
+ wxString mimetype = tokenizer.GetNextToken().Lower();
+ int nIndex = m_aTypes.Index(mimetype);
+ if(nIndex != wxNOT_FOUND) { // is this a known MIME type?
+ wxMimeTypeCommands* entry = m_aEntries[nIndex];
+ entry->AddOrReplaceVerb(wxT("open"), sCmd);
}
+ }
+}
- configFile.SetName( wxEmptyString );
- configFile.AppendDir( wxT("32x32") );
- configFile.AppendDir( wxT("mimetypes") );
+void wxMimeTypesManagerImpl::LoadKDEAppsFilesFromDir(const wxString& dirname)
+{
+ if(! wxDir::Exists(dirname))
+ return;
+ wxDir dir(dirname);
+ if ( !dir.IsOpened() )
+ return;
- // Just try a few likely icons theme names
+ wxString filename;
+ // Look into .desktop files
+ bool cont = dir.GetFirst(&filename, _T("*.desktop"), wxDIR_FILES);
+ while(cont) {
+ wxFileName p(dirname, filename);
+ LoadKDEApp( p.GetFullPath() );
+ cont = dir.GetNext(&filename);
+ }
+ // Look recursively into subdirs
+ cont = dir.GetFirst(&filename, wxEmptyString, wxDIR_DIRS);
+ while(cont) {
+ wxFileName p(dirname, wxEmptyString);
+ p.AppendDir(filename);
+ LoadKDEAppsFilesFromDir( p.GetPath() );
+ cont = dir.GetNext(&filename);
+ }
+}
- int pos = configFile.GetDirCount() - 3;
+// Return base KDE directories.
+// 1) Environment variable $KDEHOME, or "~/.kde" if not set.
+// 2) List of directories in colon separated environment variable $KDEDIRS.
+// 3) Environment variable $KDEDIR in case $KDEDIRS is not set.
+// Notice at least the local kde directory is added to the list. If it is the
+// only one, use later the application 'kde-config' to get additional paths.
+static void GetKDEBaseDirs(wxArrayString& basedirs)
+{
+ wxString env = wxGetenv( wxT("KDEHOME") );
+ if(env.IsEmpty())
+ env = wxGetHomeDir() + wxT("/.kde");
+ basedirs.Add(env);
+
+ env = wxGetenv( wxT("KDEDIRS") );
+ if(env.IsEmpty()) {
+ env = wxGetenv( wxT("KDEDIR") );
+ if(! env.IsEmpty())
+ basedirs.Add(env);
+ } else {
+ wxStringTokenizer tokenizer(env, wxT(":"));
+ while(tokenizer.HasMoreTokens())
+ basedirs.Add( tokenizer.GetNextToken() );
+ }
+}
- if (!wxDir::Exists(configFile.GetPath()))
- {
- configFile.RemoveDir( pos );
- configFile.InsertDir( pos, wxT("default.kde") );
- }
+static wxString ReadPathFromKDEConfig(const wxString& request)
+{
+ wxString str;
+ wxArrayString output;
+ if(wxExecute(wxT("kde-config --path ")+request, output) == 0 &&
+ output.Count() > 0)
+ str = output.Item(0);
+ return str;
+}
- if (!wxDir::Exists(configFile.GetPath()))
- {
- configFile.RemoveDir( pos );
- configFile.InsertDir( pos, wxT("default") );
- }
+// Try to find the "Theme" entry in the configuration file, provided it exists.
+static wxString GetKDEThemeInFile(const wxFileName& filename)
+{
+ wxString theme;
+ wxTextFile config;
+ if(filename.FileExists() && config.Open( filename.GetFullPath() )) {
+ size_t cnt = config.GetLineCount();
+ for(size_t i = 0; i < cnt; i++)
+ if(config[i].StartsWith(wxT("Theme="), &theme))
+ break;
+ }
+ return theme;
+}
- if (!wxDir::Exists(configFile.GetPath()))
- {
- configFile.RemoveDir( pos );
- configFile.InsertDir( pos, wxT("crystalsvg") );
- }
+// Try to find a file "kdeglobals" in one of the directories and read the
+// "Theme" entry there.
+static wxString GetKDETheme(const wxArrayString& basedirs)
+{
+ wxString theme;
+ for(size_t i = 0; i < basedirs.Count(); i++) {
+ wxFileName filename(basedirs.Item(i), wxEmptyString);
+ filename.AppendDir( wxT("share") );
+ filename.AppendDir( wxT("config") );
+ filename.SetName( wxT("kdeglobals") );
+ theme = GetKDEThemeInFile(filename);
+ if(! theme.IsEmpty())
+ return theme;
+ }
+ // If $KDEDIRS and $KDEDIR were set, we try nothing more. Otherwise, we
+ // try to get the configuration file with 'kde-config'.
+ if(basedirs.Count() > 1)
+ return theme;
+ wxString paths = ReadPathFromKDEConfig(wxT("config"));
+ if(! paths.IsEmpty()) {
+ wxStringTokenizer tokenizer(paths, wxT(":"));
+ while( tokenizer.HasMoreTokens() ) {
+ wxFileName filename(tokenizer.GetNextToken(), wxT("kdeglobals"));
+ theme = GetKDEThemeInFile(filename);
+ if(! theme.IsEmpty())
+ return theme;
+ }
+ }
+ return theme;
+}
- if (!wxDir::Exists(configFile.GetPath()))
- {
- configFile.RemoveDir( pos );
- configFile.InsertDir( pos, wxT("crystal") );
+// Get list of directories of icons.
+static void GetKDEIconDirs(const wxArrayString& basedirs,
+ wxArrayString& icondirs)
+{
+ wxString theme = GetKDETheme(basedirs);
+ if(theme.IsEmpty())
+ theme = wxT("default.kde");
+
+ for(size_t i = 0; i < basedirs.Count(); i++) {
+ wxFileName dirname(basedirs.Item(i), wxEmptyString);
+ dirname.AppendDir( wxT("share") );
+ dirname.AppendDir( wxT("icons") );
+ dirname.AppendDir(theme);
+ dirname.AppendDir( wxT("32x32") );
+ dirname.AppendDir( wxT("mimetypes") );
+ if( wxDir::Exists( dirname.GetPath() ) )
+ icondirs.Add( dirname.GetPath() );
+ }
+
+ // If $KDEDIRS and $KDEDIR were not set, use 'kde-config'
+ if(basedirs.Count() > 1)
+ return;
+ wxString paths = ReadPathFromKDEConfig(wxT("icon"));
+ if(! paths.IsEmpty()) {
+ wxStringTokenizer tokenizer(paths, wxT(":"));
+ while( tokenizer.HasMoreTokens() ) {
+ wxFileName dirname(tokenizer.GetNextToken(), wxEmptyString);
+ dirname.AppendDir(theme);
+ dirname.AppendDir( wxT("32x32") );
+ dirname.AppendDir( wxT("mimetypes") );
+ if(icondirs.Index(dirname.GetPath()) == wxNOT_FOUND &&
+ wxDir::Exists( dirname.GetPath() ) )
+ icondirs.Add( dirname.GetPath() );
}
+ }
+}
- if (wxDir::Exists(configFile.GetPath()))
- icondirs.Add( configFile.GetFullPath() );
+// Get list of directories of mime types.
+static void GetKDEMimeDirs(const wxArrayString& basedirs,
+ wxArrayString& mimedirs)
+{
+ for(size_t i = 0; i < basedirs.Count(); i++) {
+ wxFileName dirname(basedirs.Item(i), wxEmptyString);
+ dirname.AppendDir( wxT("share") );
+ dirname.AppendDir( wxT("mimelnk") );
+ if( wxDir::Exists( dirname.GetPath() ) )
+ mimedirs.Add( dirname.GetPath() );
}
- // settings in ~/.kde have maximal priority
- dirs.Add(wxGetHomeDir() + wxT("/.kde/share"));
- icondirs.Add(wxGetHomeDir() + wxT("/.kde/share/icons/"));
+ // If $KDEDIRS and $KDEDIR were not set, use 'kde-config'
+ if(basedirs.Count() > 1)
+ return;
+ wxString paths = ReadPathFromKDEConfig(wxT("mime"));
+ if(! paths.IsEmpty()) {
+ wxStringTokenizer tokenizer(paths, wxT(":"));
+ while( tokenizer.HasMoreTokens() ) {
+ wxFileName p(tokenizer.GetNextToken(), wxEmptyString);
+ wxString dirname = p.GetPath(); // To remove possible trailing '/'
+ if(mimedirs.Index(dirname) == wxNOT_FOUND &&
+ wxDir::Exists(dirname) )
+ mimedirs.Add(dirname);
+ }
+ }
+}
- if (kdedir)
- {
- dirs.Add( wxString(kdedir) + wxT("/share") );
- icondirs.Add( wxString(kdedir) + wxT("/share/icons/") );
+// Get list of directories of application desktop files.
+static void GetKDEAppsDirs(const wxArrayString& basedirs,
+ wxArrayString& appsdirs)
+{
+ for(size_t i = 0; i < basedirs.Count(); i++) {
+ wxFileName dirname(basedirs.Item(i), wxEmptyString);
+ dirname.AppendDir( wxT("share") );
+ dirname.AppendDir( wxT("applnk") );
+ if( wxDir::Exists( dirname.GetPath() ) )
+ appsdirs.Add( dirname.GetPath() );
}
- else
- {
- // try to guess KDEDIR
- dirs.Add(wxT("/usr/share"));
- dirs.Add(wxT("/opt/kde/share"));
- icondirs.Add(wxT("/usr/share/icons/"));
- icondirs.Add(wxT("/usr/X11R6/share/icons/")); // Debian/Corel linux
- icondirs.Add(wxT("/opt/kde/share/icons/"));
+
+ // If $KDEDIRS and $KDEDIR were not set, use 'kde-config'
+ if(basedirs.Count() > 1)
+ return;
+ wxString paths = ReadPathFromKDEConfig(wxT("apps"));
+ if(! paths.IsEmpty()) {
+ wxStringTokenizer tokenizer(paths, wxT(":"));
+ while( tokenizer.HasMoreTokens() ) {
+ wxFileName p(tokenizer.GetNextToken(), wxEmptyString);
+ wxString dirname = p.GetPath(); // To remove possible trailing '/'
+ if(appsdirs.Index(dirname) == wxNOT_FOUND &&
+ wxDir::Exists(dirname) )
+ appsdirs.Add(dirname);
+ }
+ }
+ paths = ReadPathFromKDEConfig(wxT("xdgdata-apps"));
+ if(! paths.IsEmpty()) {
+ wxStringTokenizer tokenizer(paths, wxT(":"));
+ while( tokenizer.HasMoreTokens() ) {
+ wxFileName p(tokenizer.GetNextToken(), wxEmptyString);
+ wxString dirname = p.GetPath(); // To remove possible trailing '/'
+ if(appsdirs.Index(dirname) == wxNOT_FOUND &&
+ wxDir::Exists(dirname) )
+ appsdirs.Add(dirname);
+ }
}
+}
- if (!sExtraDir.empty())
- dirs.Add(sExtraDir);
- icondirs.Add(sExtraDir + wxT("/icons"));
+// Fill database with all mime types.
+void wxMimeTypesManagerImpl::GetKDEMimeInfo(const wxString& sExtraDir)
+{
+ wxArrayString basedirs;
+ GetKDEBaseDirs(basedirs);
- size_t nDirs = dirs.GetCount();
- for ( size_t nDir = 0; nDir < nDirs; nDir++ )
- {
- LoadKDELinkFilesFromDir(dirs[nDir], icondirs);
- }
+ wxArrayString icondirs;
+ GetKDEIconDirs(basedirs, icondirs);
+ wxArrayString mimedirs;
+ GetKDEMimeDirs(basedirs, mimedirs);
+ wxArrayString appsdirs;
+ GetKDEAppsDirs(basedirs, appsdirs);
+
+ if(! sExtraDir.IsEmpty()) {
+ icondirs.Add(sExtraDir + wxT("/icons"));
+ mimedirs.Add(sExtraDir + wxT("/mimelnk"));
+ appsdirs.Add(sExtraDir + wxT("/applnk"));
+ }
+
+ // Load mime types
+ size_t nDirs = mimedirs.GetCount(), nDir;
+ for(nDir = 0; nDir < nDirs; nDir++)
+ LoadKDELinkFilesFromDir(mimedirs[nDir], icondirs);
+
+ // Load application files and associate them to corresponding mime types.
+ nDirs = appsdirs.GetCount();
+ for(nDir = 0; nDir < nDirs; nDir++)
+ LoadKDEAppsFilesFromDir(appsdirs[nDir]);
}
// ----------------------------------------------------------------------------
bool wxFileTypeImpl::GetMimeTypes(wxArrayString& mimeTypes) const
{
mimeTypes.Clear();
- for (size_t i = 0; i < m_index.GetCount(); i++)
+ size_t nCount = m_index.GetCount();
+ for (size_t i = 0; i < nCount; i++)
mimeTypes.Add(m_manager->m_aTypes[m_index[i]]);
return true;
entry->Add(verb + wxT("=") + cmd + wxT(" %s "));
bool ok = true;
- for ( size_t i = 0; i < strTypes.GetCount(); i++ )
+ size_t nCount = strTypes.GetCount();
+ for ( size_t i = 0; i < nCount; i++ )
{
if (!m_manager->DoAssociation(strTypes[i], strIcon, entry, strExtensions, strDesc))
ok = false;
return ok;
}
-// ignore index on the grouds that we only have one icon in a Unix file
+// ignore index on the grounds that we only have one icon in a Unix file
bool wxFileTypeImpl::SetDefaultIcon(const wxString& strIcon, int WXUNUSED(index))
{
if (strIcon.empty())
wxMimeTypeCommands *entry = new wxMimeTypeCommands();
bool ok = true;
- for ( size_t i = 0; i < strTypes.GetCount(); i++ )
+ size_t nCount = strTypes.GetCount();
+ for ( size_t i = 0; i < nCount; i++ )
{
if ( !m_manager->DoAssociation
(
{
// set the flag first to prevent recursion
m_initialized = true;
-
- wxString wm = wxGetenv( wxT("WINDOWMANAGER") );
-
- if (wm.Find( wxT("kde") ) != wxNOT_FOUND)
- Initialize( wxMAILCAP_KDE );
- else if (wm.Find( wxT("gnome") ) != wxNOT_FOUND)
- Initialize( wxMAILCAP_GNOME );
- else
- Initialize();
+
+ wxString wm = wxTheApp->GetTraits()->GetDesktopEnvironment();
+
+ if (wm == wxT("KDE"))
+ Initialize( wxMAILCAP_KDE );
+ else if (wm == wxT("GNOME"))
+ Initialize( wxMAILCAP_GNOME );
+ else
+ Initialize();
}
}
if (!sExtraDir.empty())
dirs.Add( sExtraDir + wxT("/") );
+ wxString file;
size_t nDirs = dirs.GetCount();
for ( size_t nDir = 0; nDir < nDirs; nDir++ )
{
- wxString file = dirs[nDir] + wxT("mailcap");
+ file = dirs[nDir];
+ file += wxT("mailcap");
if ( wxFile::Exists(file) )
{
ReadMailcap(file);
}
- file = dirs[nDir] + wxT("mime.types");
+ file = dirs[nDir];
+ file += wxT("mime.types");
if ( wxFile::Exists(file) )
- {
ReadMimeTypes(file);
- }
}
}
nIndex = file.pIndexOf(wxT("#--Netscape"));
if (nIndex != wxNOT_FOUND)
{
- wxASSERT_MSG(false,wxT("Error in .mime.types \nTrying to mix Netscape and Metamail formats\nFile not modiifed"));
+ wxFAIL_MSG(wxT("Error in .mime.types\nTrying to mix Netscape and Metamail formats\nFile not modified"));
return false;
}
{
// add the new entries in
wxString sTmp = strType.Append( wxT(' '), 40 - strType.Len() );
- sTmp = sTmp + m_aExtensions[index];
+ sTmp += m_aExtensions[index];
file.AddLine(sTmp);
}
// metamail entreies
if (file.GetLineCount() > 0)
{
- wxASSERT_MSG(false, wxT(".mime.types File not in Netscape format\nNo entries written to\n.mime.types or to .mailcap"));
+ wxFAIL_MSG(wxT(".mime.types File not in Netscape format\nNo entries written to\n.mime.types or to .mailcap"));
return false;
}
file.GetLineCount()) file.CommentLine(nIndex);
}
- sTmp = sTmp + wxT(";") + sCmd; //includes wxT(" %s ");
+ sTmp += wxT(";") + sCmd; //includes wxT(" %s ");
// write it in the format that Netscape uses (default)
if (! ( m_mailcapStylesInited & wxMAILCAP_STANDARD ) )
bKnownToken = true;
size_t i;
- for (i=0; i < entries->GetCount(); i++)
+ size_t nCount = entries->GetCount();
+ for (i=0; i < nCount; i++)
{
if (s.Contains(entries->GetVerb(i)))
bKnownToken = true;
if (!bKnownToken)
{
- sTmp = sTmp + wxT("; \\");
+ sTmp += wxT("; \\");
file.InsertLine(sTmp, nIndex);
sTmp = s;
}
if (! m_aDescriptions[index].empty() )
{
- sTmp = sTmp + wxT("; \\");
+ sTmp += wxT("; \\");
file.InsertLine(sTmp, nIndex);
nIndex++;
sTmp = wxT(" description=\"") + m_aDescriptions[index] + wxT("\"");
if (! m_aIcons[index].empty() )
{
- sTmp = sTmp + wxT("; \\");
+ sTmp += wxT("; \\");
file.InsertLine(sTmp, nIndex);
nIndex++;
sTmp = wxT(" x11-bitmap=\"") + m_aIcons[index] + wxT("\"");
for (i=0; i < entries->GetCount(); i++)
if ( i != iOpen )
{
- sTmp = sTmp + wxT("; \\");
+ sTmp += wxT("; \\");
file.InsertLine(sTmp, nIndex);
nIndex++;
sTmp = wxT(" ") + entries->GetVerbCmd(i);
wxArrayString sA_Exts = ftInfo.GetExtensions();
wxString sExt, sExtStore;
size_t i, nIndex;
- for (i=0; i < sA_Exts.GetCount(); i++)
+ size_t nExtCount = sA_Exts.GetCount();
+ for (i=0; i < nExtCount; i++)
{
sExt = sA_Exts.Item(i);
// clean up to just a space before and after
sExt.Trim().Trim(false);
sExt = wxT(' ') + sExt + wxT(' ');
- for (nIndex = 0; nIndex < m_aExtensions.GetCount(); nIndex++)
+ size_t nCount = m_aExtensions.GetCount();
+ for (nIndex = 0; nIndex < nCount; nIndex++)
{
sExtStore = m_aExtensions.Item(nIndex);
if (sExtStore.Replace(sExt, wxT(" ") ) > 0)
wxString& exts = m_aExtensions[nIndex];
// add all extensions we don't have yet
+ wxString ext;
size_t count = strExtensions.GetCount();
for ( size_t i = 0; i < count; i++ )
{
- wxString ext = strExtensions[i] + wxT(' ');
+ ext = strExtensions[i];
+ ext += wxT(' ');
if ( exts.Find(ext) == wxNOT_FOUND )
{
wxMimeTypeCommands * sPairs = m_aEntries [nIndex];
size_t i;
- for ( i = 0; i < sPairs->GetCount (); i++ )
+ size_t nCount = sPairs->GetCount();
+ for ( i = 0; i < nCount; i++ )
{
sTmp = sPairs->GetVerbCmd (i);
if ( sTmp.Contains(sV) )
wxString curField;
curField.reserve(1024);
+ const wxChar *pPagerEnv = wxGetenv(wxT("PAGER"));
+
+ const wxArrayString empty_extensions_list;
+
size_t nLineCount = file.GetLineCount();
for ( size_t nLine = 0; nLine < nLineCount; nLine++ )
{
// is a bad idea (FIXME)
if ( data.copiousoutput )
{
- const wxChar *p = wxGetenv(wxT("PAGER"));
- data.cmdOpen << wxT(" | ") << (p ? p : wxT("more"));
+ data.cmdOpen << wxT(" | ") << (pPagerEnv ? pPagerEnv : wxT("more"));
}
if ( data.needsterminal )
{
- data.cmdOpen = wxString::Format(wxT("xterm -e sh -c '%s'"),
+ data.cmdOpen.Printf(wxT("xterm -e sh -c '%s'"),
data.cmdOpen.c_str());
}
data.type,
data.icon,
new wxMimeTypeCommands(data.verbs, data.commands),
- wxArrayString() /* extensions */,
+ empty_extensions_list,
data.desc,
overwrite
);
mimetypes.Empty();
- wxString type;
size_t count = m_aTypes.GetCount();
for ( size_t n = 0; n < count; n++ )
{
// don't return template types from here (i.e. anything containg '*')
- type = m_aTypes[n];
+ const wxString &type = m_aTypes[n];
if ( type.Find(wxT('*')) == wxNOT_FOUND )
{
mimetypes.Add(type);
bool wxMimeTypesManagerImpl::Unassociate(wxFileType *ft)
{
+ InitIfNeeded();
+
wxArrayString sMimeTypes;
ft->GetMimeTypes(sMimeTypes);
- wxString sMime;
size_t i;
- for (i = 0; i < sMimeTypes.GetCount(); i ++)
+ size_t nCount = sMimeTypes.GetCount();
+ for (i = 0; i < nCount; i ++)
{
- sMime = sMimeTypes.Item(i);
+ const wxString &sMime = sMimeTypes.Item(i);
int nIndex = m_aTypes.Index(sMime);
if ( nIndex == wxNOT_FOUND)
{
static bool IsKnownUnimportantField(const wxString& fieldAll)
{
- static const wxChar *knownFields[] =
+ static const wxChar * const knownFields[] =
{
wxT("x-mozilla-flags"),
wxT("nametemplate"),
projects / wxWidgets.git / blobdiff