Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup - more reformatting

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2006-01-23 04:11:46 +00:00
parent 8ff12d3d92
commit 7c2e5dec5a
1 changed files with 74 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/unix/mimetype.cpp
View File

@@ -27,18 +27,7 @@
// will be preserved during unassociate // will be preserved during unassociate
// 9) KDE does not yet handle multiple actions; Netscape mode never will // 9) KDE does not yet handle multiple actions; Netscape mode never will
/* // TODO: this file is a mess, we need to split it and review everything (VZ)
TODO: this file is a mess, we need to split it and reformet/review
everything (VZ)
*/
// ============================================================================
// declarations
// ============================================================================
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
// for compilers that support precompilation, includes "wx.h". // for compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h" #include "wx/wxprec.h"
@@ -55,8 +44,7 @@
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/string.h" #include "wx/string.h"
#endif //WX_PRECOMP #endif
#include "wx/log.h" #include "wx/log.h"
#include "wx/file.h" #include "wx/file.h"
@@ -180,6 +168,7 @@ public:
sLine.MakeLower(); sLine.MakeLower();
if (sLine.Contains(sTest)) if (sLine.Contains(sTest))
nResult = (int) i; nResult = (int) i;
i++; i++;
} }
} }
@@ -208,6 +197,7 @@ public:
return false; return false;
if (nIndex >= (int)GetLineCount() ) if (nIndex >= (int)GetLineCount() )
return false; return false;
GetLine(nIndex) = GetLine(nIndex).Prepend(wxT("#")); GetLine(nIndex) = GetLine(nIndex).Prepend(wxT("#"));
return true; return true;
} }
@@ -381,6 +371,7 @@ bool wxMimeTypesManagerImpl::CheckGnomeDirsExist ()
return false; return false;
} }
} }
sTmp = sTmp + wxT("/mime-info"); sTmp = sTmp + wxT("/mime-info");
if (! wxDir::Exists( sTmp ) ) if (! wxDir::Exists( sTmp ) )
{ {
@@ -434,6 +425,7 @@ bool wxMimeTypesManagerImpl::WriteGnomeKeyFile(int index, bool delete_index)
sTmp = wxT( "\t") + sTmp; sTmp = wxT( "\t") + sTmp;
outfile.AddLine( sTmp ); outfile.AddLine( sTmp );
} }
//for international use do something like this //for international use do something like this
//outfile.AddLine( wxString( "\t[en_US]icon-filename=") + cmd ); //outfile.AddLine( wxString( "\t[en_US]icon-filename=") + cmd );
outfile.AddLine( wxT( "\ticon-filename=") + m_aIcons[index] ); outfile.AddLine( wxT( "\ticon-filename=") + m_aIcons[index] );
@@ -446,7 +438,7 @@ bool wxMimeTypesManagerImpl::WriteGnomeKeyFile(int index, bool delete_index)
wxMimeTypeCommands sOld; wxMimeTypeCommands sOld;
size_t nOld = nIndex + 1; size_t nOld = nIndex + 1;
bool oldEntryEnd = false; bool oldEntryEnd = false;
while ( (nOld < outfile.GetLineCount() )&& (!oldEntryEnd)) while ( (nOld < outfile.GetLineCount() ) && !oldEntryEnd)
{ {
sTmp = outfile.GetLine(nOld); sTmp = outfile.GetLine(nOld);
if ( (sTmp[0u] == wxT('\t')) || (sTmp[0u] == wxT('#')) ) if ( (sTmp[0u] == wxT('\t')) || (sTmp[0u] == wxT('#')) )
@@ -495,7 +487,6 @@ bool wxMimeTypesManagerImpl::WriteGnomeKeyFile(int index, bool delete_index)
return bTmp; return bTmp;
} }
bool wxMimeTypesManagerImpl::WriteGnomeMimeFile(int index, bool delete_index) bool wxMimeTypesManagerImpl::WriteGnomeMimeFile(int index, bool delete_index)
{ {
wxString gnomedir; wxString gnomedir;
@@ -659,8 +650,6 @@ void wxMimeTypesManagerImpl::LoadGnomeDataFromKeyFile(const wxString& filename,
AddToMimeData( curMimeType, curIconFile, entry, strExtensions, strDesc); AddToMimeData( curMimeType, curIconFile, entry, strExtensions, strDesc);
} }
void wxMimeTypesManagerImpl::LoadGnomeMimeTypesFromMimeFile(const wxString& filename) void wxMimeTypesManagerImpl::LoadGnomeMimeTypesFromMimeFile(const wxString& filename)
{ {
wxTextFile textfile(filename); wxTextFile textfile(filename);
@@ -707,7 +696,7 @@ void wxMimeTypesManagerImpl::LoadGnomeMimeTypesFromMimeFile(const wxString& file
if ( !pc ) if ( !pc )
{ {
// the end - this can only happen if nLine == nLineCount // the end: this can only happen if nLine == nLineCount
break; break;
} }
@@ -789,7 +778,7 @@ void wxMimeTypesManagerImpl::LoadGnomeMimeFilesFromDir(
cont = dir.GetNext(&filename); cont = dir.GetNext(&filename);
} }
// Hack alert: We scan all icons and deduce the // FIXME: Hack alert: We scan all icons and deduce the
// mime-type from the file name. // mime-type from the file name.
dirname = dirbase; dirname = dirbase;
dirname << wxT("/pixmaps/document-icons"); dirname << wxT("/pixmaps/document-icons");
@@ -800,7 +789,7 @@ void wxMimeTypesManagerImpl::LoadGnomeMimeFilesFromDir(
if ( !wxDir::Exists(dirname) ) if ( !wxDir::Exists(dirname) )
{ {
// Jst test for default GPE dir also // Just test for default GPE dir also
dirname = wxT("/usr/share/gpe/pixmaps/default/filemanager/document-icons"); dirname = wxT("/usr/share/gpe/pixmaps/default/filemanager/document-icons");
if ( !wxDir::Exists(dirname) ) if ( !wxDir::Exists(dirname) )
@@ -1038,6 +1027,7 @@ void wxMimeTypesManagerImpl::LoadKDELinksForMimeSubtype(const wxString& dirbase,
nIndex = wxNOT_FOUND; nIndex = wxNOT_FOUND;
wxString comment; wxString comment;
#if wxUSE_INTL #if wxUSE_INTL
wxLocale *locale = wxGetLocale(); wxLocale *locale = wxGetLocale();
if ( locale ) if ( locale )
@@ -1046,7 +1036,7 @@ void wxMimeTypesManagerImpl::LoadKDELinksForMimeSubtype(const wxString& dirbase,
comment << wxT("Comment[") + locale->GetName() + wxT("]="); comment << wxT("Comment[") + locale->GetName() + wxT("]=");
nIndex = file.pIndexOf(comment); nIndex = file.pIndexOf(comment);
} }
#endif // wxUSE_INTL #endif
if ( nIndex == wxNOT_FOUND ) if ( nIndex == wxNOT_FOUND )
{ {
@@ -1070,8 +1060,10 @@ void wxMimeTypesManagerImpl::LoadKDELinksForMimeSubtype(const wxString& dirbase,
while ( tokenizer.HasMoreTokens() ) while ( tokenizer.HasMoreTokens() )
{ {
wxString e = tokenizer.GetNextToken(); wxString e = tokenizer.GetNextToken();
// don't support too difficult patterns
if ( e.Left(2) != wxT("*.") ) if ( e.Left(2) != wxT("*.") )
continue; // don't support too difficult patterns continue;
if ( !mime_extension.empty() ) if ( !mime_extension.empty() )
{ {
@@ -1091,9 +1083,10 @@ void wxMimeTypesManagerImpl::LoadKDELinksForMimeSubtype(const wxString& dirbase,
if ( nIndex != wxNOT_FOUND ) if ( nIndex != wxNOT_FOUND )
{ {
strIcon = file.GetCmd(nIndex); 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
wxLogTrace(TRACE_MIME, wxT(" icon %s"), strIcon.c_str());
// it could be the real path, but more often a short name
if (!wxFileExists(strIcon)) if (!wxFileExists(strIcon))
{ {
// icon is just the short name // icon is just the short name
@@ -1131,8 +1124,8 @@ void wxMimeTypesManagerImpl::LoadKDELinksForMimeSubtype(const wxString& dirbase,
if ( nIndex != wxNOT_FOUND ) if ( nIndex != wxNOT_FOUND )
{ {
wxString sTmp = file.GetCmd(nIndex);
// we expect %f; others including %F and %U and %u are possible // 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") )) if (0 == sTmp.Replace( wxT("%f"), wxT("%s") ))
sTmp = sTmp + wxT(" %s"); sTmp = sTmp + wxT(" %s");
entry->AddOrReplaceVerb(wxString(wxT("open")), sTmp ); entry->AddOrReplaceVerb(wxString(wxT("open")), sTmp );
@@ -1396,7 +1389,7 @@ size_t wxFileTypeImpl::GetAllCommands(wxArrayString *verbs,
for ( i = 0; i < sPairs->GetCount(); i++ ) for ( i = 0; i < sPairs->GetCount(); i++ )
{ {
vrb = sPairs->GetVerb(i); vrb = sPairs->GetVerb(i);
// some gnome entries have . inside // some gnome entries have "." inside
vrb = vrb.AfterLast(wxT('.')); vrb = vrb.AfterLast(wxT('.'));
cmd = sPairs->GetCmd(i); cmd = sPairs->GetCmd(i);
if (! cmd.empty() ) if (! cmd.empty() )
@@ -1436,8 +1429,8 @@ bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions)
extensions.Add(strExt); extensions.Add(strExt);
strExt.Empty(); strExt.Empty();
} }
//else: repeated spaces (shouldn't happen, but it's not that //else: repeated spaces
// important if it does happen) // (shouldn't happen, but it's not that important if it does happen)
if ( *p == wxT('\0') ) if ( *p == wxT('\0') )
break; break;
@@ -1460,7 +1453,7 @@ bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions)
return true; return true;
} }
// set an arbitrary command, // set an arbitrary command:
// could adjust the code to ask confirmation if it already exists and // could adjust the code to ask confirmation if it already exists and
// overwriteprompt is true, but this is currently ignored as *Associate* has // overwriteprompt is true, but this is currently ignored as *Associate* has
// no overwrite prompt // no overwrite prompt
@@ -1522,7 +1515,6 @@ bool wxFileTypeImpl::SetDefaultIcon(const wxString& strIcon, int WXUNUSED(index)
// wxMimeTypesManagerImpl (Unix) // wxMimeTypesManagerImpl (Unix)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxMimeTypesManagerImpl::wxMimeTypesManagerImpl() wxMimeTypesManagerImpl::wxMimeTypesManagerImpl()
{ {
m_initialized = false; m_initialized = false;
@@ -1800,7 +1792,7 @@ bool wxMimeTypesManagerImpl::WriteToMailCap(int index, bool delete_index)
( m_mailcapStylesInited & wxMAILCAP_STANDARD) ) ) ( m_mailcapStylesInited & wxMAILCAP_STANDARD) ) )
return false; return false;
bool bTemp; bool bTemp = false;
wxString strHome = wxGetenv(wxT("HOME")); wxString strHome = wxGetenv(wxT("HOME"));
// and now the users mailcap // and now the users mailcap
@@ -1830,6 +1822,7 @@ bool wxMimeTypesManagerImpl::WriteToMailCap(int index, bool delete_index)
sTmp = m_aTypes[index]; sTmp = m_aTypes[index];
wxString sOld; wxString sOld;
int nIndex = file.pIndexOf(sTmp); int nIndex = file.pIndexOf(sTmp);
// get rid of all the unwanted entries... // get rid of all the unwanted entries...
if (nIndex == wxNOT_FOUND) if (nIndex == wxNOT_FOUND)
{ {
@@ -1846,6 +1839,7 @@ bool wxMimeTypesManagerImpl::WriteToMailCap(int index, bool delete_index)
if (nIndex < (int) file.GetLineCount()) if (nIndex < (int) file.GetLineCount())
sOld = sOld + file[nIndex]; sOld = sOld + file[nIndex];
} }
if (nIndex < (int) if (nIndex < (int)
file.GetLineCount()) file.CommentLine(nIndex); file.GetLineCount()) file.CommentLine(nIndex);
} }
@@ -2167,8 +2161,7 @@ wxFileType * wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& ex
return NULL; return NULL;
} }
wxFileType * wxFileType * wxMimeTypesManagerImpl::GetFileTypeFromMimeType(const wxString& mimeType)
wxMimeTypesManagerImpl::GetFileTypeFromMimeType(const wxString& mimeType)
{ {
InitIfNeeded(); InitIfNeeded();
@@ -2214,7 +2207,6 @@ wxMimeTypesManagerImpl::GetFileTypeFromMimeType(const wxString& mimeType)
return fileType; return fileType;
} }
wxString wxMimeTypesManagerImpl::GetCommand(const wxString & verb, size_t nIndex) const wxString wxMimeTypesManagerImpl::GetCommand(const wxString & verb, size_t nIndex) const
{ {
wxString command, testcmd, sV, sTmp; wxString command, testcmd, sV, sTmp;
@@ -2778,8 +2770,7 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName,
continue; continue;
} }
// if the test command failed, it's as if the entry were not there at // if the test command failed, it's as if the entry were not there at all
// all
if ( data.testfailed ) if ( data.testfailed )
{ {
continue; continue;