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
@@ -187,17 +187,17 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     QPEToolBar *bar = new QPEToolBar( this );
     bar->setHorizontalStretchable( true );
     menu = bar;
 
     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;
 
     QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ),
                               QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) );
@@ -242,17 +242,17 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
 
 
 #ifndef QT_NO_CLIPBOARD
     a = new QAction( tr( "Insert Time and Date" ), Resource::loadPixmap( "paste" ),
                      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();
    a->addTo( edit );
 
     a = new QAction( tr( "Find..." ), Resource::loadPixmap( "find" ),
                      QString::null, 0, this, 0 );
@@ -269,17 +269,17 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     zout->addTo( font );
 
     font->insertSeparator();
 
     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) ) );
     wa->setToggleAction(true);
     wa->addTo( advancedMenu);
 
     nStart = new QAction( tr("Start with new file"),
@@ -319,17 +319,17 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     searchBarAction->addTo( advancedMenu);
 
     nAutoSave = new QAction( tr("Auto Save 5 min."),
                                    QString::null, 0, this, 0 );
     connect( nAutoSave, SIGNAL( toggled(bool) ),
              this, SLOT( doTimer(bool) ) );
     nAutoSave->setToggleAction(true);
     nAutoSave->addTo( advancedMenu);
-     
+
 
     font->insertSeparator();
 
     font->insertItem(tr("About"), this, SLOT( doAbout()) );
 
     mb->insertItem( tr( "File" ), file );
     mb->insertItem( tr( "Edit" ), edit );
     mb->insertItem( tr( "View" ), font );
@@ -378,47 +378,46 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
 
     QString family = cfg. readEntry     ( "Family", defaultFont. family ( ));
     int size       = cfg. readNumEntry  ( "Size",   defaultFont. pointSize ( ));
     int weight     = cfg. readNumEntry  ( "Weight", defaultFont. weight ( ));
     bool italic    = cfg. readBoolEntry ( "Italic", defaultFont. italic ( ));
 
     defaultFont = QFont ( family, size, weight, italic );
     editor-> setFont ( defaultFont );
-
 //    updateCaption();
 
     cfg.setGroup ( "View" );
 
     promptExit = cfg.readBoolEntry ( "PromptExit", false );
     openDesktop = cfg.readBoolEntry ( "OpenDesktop", true );
     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 );
     if(startWithNew) nStart->setOn( true );
     if(featureAutoSave) nAutoSave->setOn(true);
 
 //       {
 //           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);
         } else {
             openFile(currentFileName);
         }
     } else {
@@ -441,41 +440,41 @@ void TextEdit::closeEvent(QCloseEvent *) {
             {
               case 1:
               {
                   saveAs();
                   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 );
 
     cfg.writeEntry ( "PromptExit", promptExit );
     cfg.writeEntry ( "OpenDesktop", openDesktop );
     cfg.writeEntry ( "FilePermissions", filePerms );
     cfg.writeEntry ( "SearchBar", useSearchBar );
@@ -554,17 +553,17 @@ void TextEdit::setSearchBar(bool b) {
     Config cfg("TextEdit");
     cfg.setGroup("View");
     cfg.writeEntry ( "SearchBar", b );
     searchBarAction->setOn(b);
     if(b)
         searchBar->show();
     else
         searchBar->hide();
-    editor->setFocus();            
+    editor->setFocus();
 }
 
 void TextEdit::fileNew() {
 //     if( !bFromDocView  ) {
 //         saveAs();
 //     }
     newFile(DocLnk());
 }
@@ -670,17 +669,17 @@ void TextEdit::newFile( const DocLnk &f ) {
     qDebug("newFile "+currentFileName);
     updateCaption( currentFileName);
 //    editor->setEdited( false);
 }
 
 void TextEdit::openDotFile( const QString &f ) {
     if(!currentFileName.isEmpty()) {
     currentFileName=f;
-    
+
     qDebug("openFile dotfile " + currentFileName);
     QString txt;
     QFile file(f);
     file.open(IO_ReadWrite);
     QTextStream t(&file);
     while ( !t.atEnd()) {
         txt+=t.readLine()+"\n";
     }
@@ -690,60 +689,68 @@ 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);
+        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();
 //    bFromDocView = true;
     FileManager fm;
     QString txt;
     currentFileName=f.file();
@@ -813,17 +820,17 @@ bool TextEdit::save() {
                 QFile f(file);
                  if( f.open(IO_WriteOnly)) {
                      QCString crt = rt.utf8();
                      f.writeBlock(crt,crt.length());
                  } else {
                      QMessageBox::message(tr("Text Edit"),tr("Write Failed"));
                  return false;
                  }
-                     
+
             }
             editor->setEdited( false);
             edited1=false;
             edited=false;
             if(caption().left(1)=="*")
             setCaption(caption().right(caption().length()-1));
 
 
@@ -836,31 +843,31 @@ bool TextEdit::save() {
 
 /*!
   prompted save */
 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;
 //     }
 //     if ( !editor->edited() ) {
 //         delete doc;
 //         doc = 0;
 //         return true;
 //     }
 
     QString rt = editor->text();
     qDebug(currentFileName);
-    
+
     if( currentFileName.isEmpty()
         || currentFileName == tr("Unnamed")
         || currentFileName == tr("Text Editor")) {
         qDebug("do silly TT filename thing");
 //        if ( doc && doc->name().isEmpty() ) {
         QString pt = rt.simplifyWhiteSpace();
         int i = pt.find( ' ' );
         QString docname = pt;
@@ -907,17 +914,17 @@ bool TextEdit::saveAs() {
     else
         str=currentFileName;
     if(!str.isEmpty()) {
         QString fileNm=str;
 
         qDebug("saving filename "+fileNm);
         QFileInfo fi(fileNm);
         currentFileName=fi.fileName();
-        if(doc) 
+        if(doc)
 //        QString file = doc->file();
 //        doc->removeFiles();
             delete doc;
             DocLnk nf;
             nf.setType("text/plain");
             nf.setFile( fileNm);
             doc = new DocLnk(nf);
 //        editor->setText(rt);
@@ -942,31 +949,31 @@ bool TextEdit::saveAs() {
                     delete  filePerm;
             }
 //        }
         editor->setEdited( false);
         edited1 = false;
         edited = false;
         if(caption().left(1)=="*")
             setCaption(caption().right(caption().length()-1));
-        
+
         return true;
     }
     qDebug("returning false");
     return false;
 } //end saveAs
 
 void TextEdit::clear() {
     delete doc;
     doc = 0;
     editor->clear();
 }
 
 void TextEdit::updateCaption( const QString &name ) {
-    
+
     if ( name.isEmpty() )
         setCaption( tr("Text Editor") );
     else {
         QString s = name;
         if ( s.isNull() )
             s = doc->name();
         if ( s.isEmpty()  ) {
             s = tr( "Unnamed" );
@@ -1024,17 +1031,17 @@ void TextEdit::editDelete() {
                                   tr("Yes"),tr("No"),0,0,1) ) {
       case 0:
           if(doc) {
               doc->removeFiles();
               clear();
               setCaption( tr("Text Editor") );
           }
           break;
-      case 1: 
+      case 1:
             // exit
           break;
     };
 }
 
 void TextEdit::changeStartConfig( bool b ) {
     startWithNew=b;
     Config cfg("TextEdit");
@@ -1051,47 +1058,47 @@ void TextEdit::editorChanged() {
     }
     edited=true;
 }
 
 void TextEdit::receive(const QCString&msg, const QByteArray &) {
     qDebug("QCop "+msg);
   if ( msg == "setDocument(QString)" ) {
       qDebug("bugger all");
-          
+
   }
 
 }
 
 void TextEdit::doAbout() {
     QMessageBox::about(0,tr("Text Edit"),tr("Text Edit is copyright<BR>"
                          "2000 Trolltech AS, and<BR>"
                          "2002 by <B>L. J. Potter <BR>llornkcor@handhelds.org</B><BR>"
                          "and is licensed under the GPL"));
 }
 
 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
   QClipboard *cb = QApplication::clipboard();
   QDateTime dt = QDateTime::currentDateTime();
   cb->setText( dt.toString());
   editor->paste();
@@ -1107,17 +1114,17 @@ int TextEdit::savePrompt()
                                       (tr("Save")), (tr("Don't Save")), (tr("&Cancel")), 2, 2 ) )
       {
         case 0:
         {
             return 1;
         }
         break;
 
-        case 1: 
+        case 1:
         {
             return 2;
         }
         break;
 
         case 2:
         {
             return -1;
@@ -1145,23 +1152,23 @@ void TextEdit::timerCrank()
           setTimer();
       }
 }
 
 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");
 }
 
 void TextEdit::setTimer()
 {
 if(featureAutoSave)
@@ -1173,32 +1180,32 @@ if(featureAutoSave)
     }
 }
 
 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()));
 }
 
 void TextEdit::doGoto() {
    QString number = gotoEdit->text();
    gotoEdit->hide();
 
    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"));
    else
    {
       editor->setCursorPosition(lineNumber, 0, false);
    }