fix open .desktop file

1 files changed, 78 insertions, 71 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
@@ -191,9 +191,9 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     QPEMenuBar *mb = new QPEMenuBar( bar );
     QPopupMenu *file = new QPopupMenu( this );
     QPopupMenu *edit = new QPopupMenu( this );
     QPopupMenu *advancedMenu = new QPopupMenu(this);
-    
+
     font = new QPopupMenu( this );
 
     bar = new QPEToolBar( this );
     editBar = bar;
@@ -246,9 +246,9 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
                      QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( editPasteTimeDate() ) );
     a->addTo( edit );
 #endif
-    
+
        a = new QAction( tr( "Goto Line..." ), Resource::loadPixmap( "find" ),
                     QString::null, 0, this, 0 );
    connect( a, SIGNAL( activated() ), this, SLOT( gotoLine() ) );
     edit->insertSeparator();
@@ -273,9 +273,9 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     font->insertItem(tr("Font"), this, SLOT(changeFont()) );
 
     font->insertSeparator();
     font->insertItem(tr("Advanced Features"), advancedMenu);
-    
+
     QAction *wa = new QAction( tr("Wrap lines"),
                                QString::null, 0, this, 0 );
     connect( wa, SIGNAL( toggled(bool) ),
              this, SLOT( setWordWrap(bool) ) );
@@ -323,9 +323,9 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     connect( nAutoSave, SIGNAL( toggled(bool) ),
              this, SLOT( doTimer(bool) ) );
     nAutoSave->setToggleAction(true);
     nAutoSave->addTo( advancedMenu);
-     
+
 
     font->insertSeparator();
 
     font->insertItem(tr("About"), this, SLOT( doAbout()) );
@@ -382,9 +382,8 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     bool italic    = cfg. readBoolEntry ( "Italic", defaultFont. italic ( ));
 
     defaultFont = QFont ( family, size, weight, italic );
     editor-> setFont ( defaultFont );
-
 //    updateCaption();
 
     cfg.setGroup ( "View" );
 
@@ -393,9 +392,9 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     filePerms = cfg.readBoolEntry ( "FilePermissions", false );
     useSearchBar = cfg.readBoolEntry ( "SearchBar", false );
     startWithNew =  cfg.readBoolEntry ( "startNew", true);
     featureAutoSave = cfg.readBoolEntry( "autosave", false);
-    
+
     if(useSearchBar) searchBarAction->setOn(true);
     if(promptExit)  nAdvanced->setOn( true );
     if(openDesktop) desktopAction->setOn( true );
     if(filePerms) filePermAction->setOn( true );
@@ -404,17 +403,17 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
 
 //       {
 //           doTimer(true);
 //       }
-        
+
     bool wrap = cfg. readBoolEntry ( "Wrap", true );
     wa-> setOn ( wrap );
     setWordWrap ( wrap );
 
 /////////////////
     if( qApp->argc() > 1) {
         currentFileName=qApp->argv()[1];
-        
+
         QFileInfo fi(currentFileName);
 
         if(fi.baseName().left(1) == "") {
             openDotFile(currentFileName);
@@ -445,33 +444,33 @@ void TextEdit::closeEvent(QCloseEvent *) {
                   qApp->quit();
               }
               break;
 
-              case 2: 
+              case 2:
               {
                   qApp->quit();
               }
               break;
 
-              case -1: 
+              case -1:
                   break;
             };
       }
     else
         qApp->quit();
-        
+
 }
 
 void TextEdit::cleanUp() {
-  
+
     Config cfg ( "TextEdit" );
     cfg. setGroup ( "Font" );
     QFont f = editor->font();
     cfg.writeEntry ( "Family", f. family ( ));
     cfg.writeEntry ( "Size",   f. pointSize ( ));
     cfg.writeEntry ( "Weight", f. weight ( ));
     cfg.writeEntry ( "Italic", f. italic ( ));
-    
+
     cfg.setGroup ( "View" );
     cfg.writeEntry ( "Wrap", editor->wordWrap() == QMultiLineEdit::WidgetWidth );
     cfg.writeEntry ( "FileView", viewSelection );
 
@@ -558,9 +557,9 @@ void TextEdit::setSearchBar(bool b) {
     if(b)
         searchBar->show();
     else
         searchBar->hide();
-    editor->setFocus();            
+    editor->setFocus();
 }
 
 void TextEdit::fileNew() {
 //     if( !bFromDocView  ) {
@@ -674,9 +673,9 @@ void TextEdit::newFile( const DocLnk &f ) {
 
 void TextEdit::openDotFile( const QString &f ) {
     if(!currentFileName.isEmpty()) {
     currentFileName=f;
-    
+
     qDebug("openFile dotfile " + currentFileName);
     QString txt;
     QFile file(f);
     file.open(IO_ReadWrite);
@@ -694,52 +693,60 @@ void TextEdit::openDotFile( const QString &f ) {
     updateCaption( currentFileName);
 }
 
 void TextEdit::openFile( const QString &f ) {
-    qDebug("filename is "+ f);
-    QString filer;
-    QFileInfo fi( 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>
+        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:
-              filer = f;
-              break;
-          case 1:
-              DocLnk sf(f);
-              filer = sf.file();
-              break;
-        }
-    } else if(fi.baseName().left(1) == "") {
-        currentFileName=f;
-        openDotFile(currentFileName);
-    } else {
-        DocLnk sf(f);
-        filer = sf.file();
-        if(filer.right(1) == "/")
-            filer = f;
-        
-    DocLnk nf;
-    nf.setType("text/plain");
-    nf.setFile(filer);
-    currentFileName=filer;
+                                                                                                                                                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
+                {
+                        DocLnk sf(f);
+                        filer = sf.file();
+                        if(filer.right(1) == "/")
+                                filer = f;
+    }
 
-        nf.setName(fi.baseName());
-        openFile(nf);
+                        DocLnk nf;
+                        nf.setType("text/plain");
+                        nf.setFile(filer);
+                        currentFileName=filer;
 
-        qDebug("openFile string "+currentFileName);
+                        nf.setName(fi.baseName());
+                        openFile(nf);
 
-    }
-    showEditTools();
-      // Show filename in caption
-    QString name = filer;
-    int sep = name.findRev( '/' );
-    if ( sep > 0 )
-        name = name.mid( sep+1 );
-    updateCaption( name );
+                        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();
@@ -817,9 +824,9 @@ bool TextEdit::save() {
                  } else {
                      QMessageBox::message(tr("Text Edit"),tr("Write Failed"));
                  return false;
                  }
-                     
+
             }
             editor->setEdited( false);
             edited1=false;
             edited=false;
@@ -840,9 +847,9 @@ bool TextEdit::saveAs() {
 
     if(caption() == tr("Text Editor"))
         return false;
     qDebug("saveAsFile " + currentFileName);
-      // case of nothing to save... 
+      // case of nothing to save...
 //     if ( !doc && !currentFileName.isEmpty()) {
 // //|| !bFromDocView)
 //         qDebug("no doc");
 //         return true;
@@ -854,9 +861,9 @@ bool TextEdit::saveAs() {
 //     }
 
     QString rt = editor->text();
     qDebug(currentFileName);
-    
+
     if( currentFileName.isEmpty()
         || currentFileName == tr("Unnamed")
         || currentFileName == tr("Text Editor")) {
         qDebug("do silly TT filename thing");
@@ -911,9 +918,9 @@ bool TextEdit::saveAs() {
 
         qDebug("saving filename "+fileNm);
         QFileInfo fi(fileNm);
         currentFileName=fi.fileName();
-        if(doc) 
+        if(doc)
 //        QString file = doc->file();
 //        doc->removeFiles();
             delete doc;
             DocLnk nf;
@@ -946,9 +953,9 @@ bool TextEdit::saveAs() {
         edited1 = false;
         edited = false;
         if(caption().left(1)=="*")
             setCaption(caption().right(caption().length()-1));
-        
+
         return true;
     }
     qDebug("returning false");
     return false;
@@ -960,9 +967,9 @@ void TextEdit::clear() {
     editor->clear();
 }
 
 void TextEdit::updateCaption( const QString &name ) {
-    
+
     if ( name.isEmpty() )
         setCaption( tr("Text Editor") );
     else {
         QString s = name;
@@ -1028,9 +1035,9 @@ void TextEdit::editDelete() {
               clear();
               setCaption( tr("Text Editor") );
           }
           break;
-      case 1: 
+      case 1:
             // exit
           break;
     };
 }
@@ -1055,9 +1062,9 @@ void TextEdit::editorChanged() {
 void TextEdit::receive(const QCString&msg, const QByteArray &) {
     qDebug("QCop "+msg);
   if ( msg == "setDocument(QString)" ) {
       qDebug("bugger all");
-          
+
   }
 
 }
 
@@ -1071,23 +1078,23 @@ void TextEdit::doAbout() {
 void TextEdit::doPrompt(bool b) {
     promptExit=b;
     Config cfg("TextEdit");
     cfg.setGroup ( "View" );
-    cfg.writeEntry ( "PromptExit", b); 
+    cfg.writeEntry ( "PromptExit", b);
 }
 
 void TextEdit::doDesktop(bool b) {
     openDesktop=b;
     Config cfg("TextEdit");
     cfg.setGroup ( "View" );
-    cfg.writeEntry ( "OpenDesktop", b); 
+    cfg.writeEntry ( "OpenDesktop", b);
 }
 
 void TextEdit::doFilePerms(bool b) {
     filePerms=b;
     Config cfg("TextEdit");
     cfg.setGroup ( "View" );
-    cfg.writeEntry ( "FilePermissions", b); 
+    cfg.writeEntry ( "FilePermissions", b);
 }
 
 void TextEdit::editPasteTimeDate() {
 #ifndef QT_NO_CLIPBOARD
@@ -1111,9 +1118,9 @@ int TextEdit::savePrompt()
             return 1;
         }
         break;
 
-        case 1: 
+        case 1:
         {
             return 2;
         }
         break;
@@ -1149,15 +1156,15 @@ void TextEdit::timerCrank()
 void TextEdit::doTimer(bool b)
 {
     Config cfg("TextEdit");
     cfg.setGroup ( "View" );
-    cfg.writeEntry ( "autosave", b); 
-    featureAutoSave = b; 
+    cfg.writeEntry ( "autosave", b);
+    featureAutoSave = b;
     nAutoSave->setOn(b);
     if(b)
       {
 //          qDebug("doTimer true");
-          setTimer();      
+          setTimer();
       }
 //     else
 //         qDebug("doTimer false");
 }
@@ -1177,9 +1184,9 @@ void TextEdit::gotoLine() {
     if( editor->length() < 1)
        return;
    QWidget *d = QApplication::desktop();
    gotoEdit = new QLineEdit( 0, "Goto line");
-   
+
    gotoEdit->move( (d->width()/2) - ( gotoEdit->width()/2) , (d->height()/2) - (gotoEdit->height()/2));
    gotoEdit->setFrame(true);
    gotoEdit->show();
    connect (gotoEdit,SIGNAL(returnPressed()), this, SLOT(doGoto()));
@@ -1192,9 +1199,9 @@ void TextEdit::doGoto() {
    if(gotoEdit) {
       delete gotoEdit;
       gotoEdit = 0;
    }
-   
+
    bool ok;
    int lineNumber = number.toInt(&ok, 10);
    if( editor->numLines() < lineNumber)
       QMessageBox::message(tr("Text Edit"),tr("Not enough lines"));