summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2003-03-16 21:13:17 (UTC)
committer llornkcor <llornkcor>2003-03-16 21:13:17 (UTC)
commita637dff6d55b28cba58b8116b457c5bf46daab57 (patch) (side-by-side diff)
tree8698751b7d4c4817f83844898a697d5921d35ae5
parent75ebe1838923e121cb093310f7f7c1b021abdcc1 (diff)
downloadopie-a637dff6d55b28cba58b8116b457c5bf46daab57.zip
opie-a637dff6d55b28cba58b8116b457c5bf46daab57.tar.gz
opie-a637dff6d55b28cba58b8116b457c5bf46daab57.tar.bz2
fix open .desktop file
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/apps/textedit/textedit.cpp23
1 files changed, 15 insertions, 8 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 5edf102..59a605a 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -383,7 +383,6 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
defaultFont = QFont ( family, size, weight, italic );
editor-> setFont ( defaultFont );
-
// updateCaption();
cfg.setGroup ( "View" );
@@ -699,27 +698,36 @@ void TextEdit::openFile( const QString &f ) {
QString filer;
QFileInfo fi( f);
// bFromDocView = true;
- if(f.find(".desktop",0,true) != -1 && !openDesktop ) {
+ 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:
+ tr(".desktop File"),tr("Linked Document"),0,1,1) )
+ {
+ case 0: //desktop
filer = f;
break;
- case 1:
+ case 1: //linked
DocLnk sf(f);
filer = sf.file();
break;
+ };
}
- } else if(fi.baseName().left(1) == "") {
+ else if(fi.baseName().left(1) == "")
+ {
+ qDebug("opening dotfile");
currentFileName=f;
openDotFile(currentFileName);
- } else {
+ return;
+ }
+ else
+ {
DocLnk sf(f);
filer = sf.file();
if(filer.right(1) == "/")
filer = f;
+ }
DocLnk nf;
nf.setType("text/plain");
@@ -731,7 +739,6 @@ file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?"),
qDebug("openFile string "+currentFileName);
- }
showEditTools();
// Show filename in caption
QString name = filer;