summaryrefslogtreecommitdiff
authorzecke <zecke>2003-12-06 11:48:47 (UTC)
committer zecke <zecke>2003-12-06 11:48:47 (UTC)
commit72336536db05459e3802b3be5032e55607985d0c (patch) (side-by-side diff)
tree6920e4d51efa0b5dd6977e536575c45c1bf785b4
parentfaaeb2cd28b47d79e9644e770622d141d315c195 (diff)
downloadopie-72336536db05459e3802b3be5032e55607985d0c.zip
opie-72336536db05459e3802b3be5032e55607985d0c.tar.gz
opie-72336536db05459e3802b3be5032e55607985d0c.tar.bz2
quirk for opening renamed desktop files...
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/textedit.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 1c95a97..b875228 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -685,71 +685,78 @@ void TextEdit::openDotFile( const QString &f ) {
edited=false;
}
updateCaption( currentFileName);
}
void TextEdit::openFile( const QString &f ) {
qDebug("filename is "+ f);
QString filer;
QFileInfo fi( f);
// bFromDocView = true;
if(f.find(".desktop",0,true) != -1 && !openDesktop )
{
switch ( QMessageBox::warning(this,tr("Text Editor"),tr("Text Editor has detected<BR>you selected a <B>.desktop</B>file.<BR>Open<B>.desktop</B> file or <B>linked</B> file?"),tr(".desktop File"),tr("Linked Document"),0,1,1) )
{
case 0: //desktop
filer = f;
break;
case 1: //linked
DocLnk sf(f);
filer = sf.file();
break;
};
}
else if(fi.baseName().left(1) == "")
{
qDebug("opening dotfile");
currentFileName=f;
openDotFile(currentFileName);
return;
}
- else
+ /*
+ * The problem is a file where Config(f).isValid() and it does not
+ * end with .desktop will be treated as desktop file
+ */
+ else if (f.find(".desktop",0,true) != -1 )
{
DocLnk sf(f);
filer = sf.file();
if(filer.right(1) == "/")
- filer = f;
+ filer = f;
+
}
+ else
+ filer = f;
DocLnk nf;
nf.setType("text/plain");
nf.setFile(filer);
currentFileName=filer;
nf.setName(fi.baseName());
openFile(nf);
qDebug("openFile string "+currentFileName);
showEditTools();
// Show filename in caption
QString name = filer;
int sep = name.findRev( '/' );
if ( sep > 0 )
name = name.mid( sep+1 );
updateCaption( name );
}
void TextEdit::openFile( const DocLnk &f ) {
// clear();
// bFromDocView = true;
FileManager fm;
QString txt;
currentFileName=f.file();
qDebug("openFile doclnk " + currentFileName);
if ( !fm.loadFile( f, txt ) ) {
// ####### could be a new file
qDebug( "Cannot open file" );
}
// fileNew();