#include "wx/tokenzr.h"
#include "wx/iconloc.h"
#include "wx/filename.h"
-#include "wx/fileconf.h"
#include "wx/unix/mimetype.h"
wxString strDesc;
if ( !wxDir::Exists(dirname) )
- return;
+ {
+ // 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 );
size_t nDir, nDirs = icondirs.GetCount();
for ( nDir = 0; nDir < nDirs; nDir++ )
{
- wxFileName fname( icondirs[nDir], strIcon );
+ wxFileName fnameIcon( strIcon );
+ wxFileName fname( icondirs[nDir], fnameIcon.GetName() );
fname.SetExt( wxT("png") );
if (fname.FileExists())
{
{
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") );
configFile.AppendDir( wxT("config") );
configFile.SetName( wxT("kdeglobals") );
- if (configFile.FileExists())
+ wxTextFile config;
+ if (configFile.FileExists() && config.Open(configFile.GetFullPath()))
{
- wxFileConfig config( wxEmptyString, wxEmptyString, configFile.GetFullPath() );
// $(KDEDIR)/share/config -> $(KDEDIR)/share
configFile.RemoveDir( configFile.GetDirCount()-1 );
// $(KDEDIR)/share/ -> $(KDEDIR)/share/icons
configFile.AppendDir( wxT("icons") );
// Check for entry
- config.SetPath( wxT("Icons") );
- wxString theme;
- if (config.Read( wxT("Theme"), &theme ))
- configFile.AppendDir( theme );
- else
- configFile.AppendDir( wxT("default.kde") );
+ 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
{
}
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( configFile.GetDirCount()-1 );
- configFile.AppendDir( wxT("default.kde") );
+ configFile.RemoveDir( pos );
+ configFile.InsertDir( pos, wxT("default.kde") );
}
if (!wxDir::Exists(configFile.GetPath()))
{
- configFile.RemoveDir( configFile.GetDirCount()-1 );
- configFile.AppendDir( wxT("default") );
+ configFile.RemoveDir( pos );
+ configFile.InsertDir( pos, wxT("default") );
}
if (!wxDir::Exists(configFile.GetPath()))
{
- configFile.RemoveDir( configFile.GetDirCount()-1 );
- configFile.AppendDir( wxT("crystalsvg") );
+ configFile.RemoveDir( pos );
+ configFile.InsertDir( pos, wxT("crystalsvg") );
}
if (!wxDir::Exists(configFile.GetPath()))
{
- configFile.RemoveDir( configFile.GetDirCount()-1 );
- configFile.AppendDir( wxT("crystal") );
+ configFile.RemoveDir( pos );
+ configFile.InsertDir( pos, wxT("crystal") );
}
if (wxDir::Exists(configFile.GetPath()))
- {
- configFile.AppendDir( wxT("32x32") );
- configFile.AppendDir( wxT("mimetypes") );
icondirs.Add( configFile.GetFullPath() );
- }
}
// settings in ~/.kde have maximal priority
// 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);
}
}
// something is wrong, bail out
cont = FALSE;
- wxLogDebug(wxT("Mailcap file %s, line %lu: "
- "'\\' 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(),
(unsigned long)nLine + 1);
}
// this might be useful for the programmer
wxLogDebug
(
- wxT("Mailcap file %s, line %lu: "
- "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(),
(unsigned long)nLine + 1,
curField.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;
// 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