various fixes.. saveAs and quit stuff

2 files changed, 137 insertions, 148 deletions

diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 464671a..1c3b393 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -195,10 +195,10 @@ void QpeEditor::find ( const QString &txt, bool caseSensitive,
            bool backwards )
 {
-    static bool wrap = FALSE;
+    static bool wrap = false;
     int line, col;
     if ( wrap ) {
         if ( !backwards )
             line = col = 0;
-        wrap = FALSE;
+        wrap = false;
           //  emit searchWrapped();
     } else {
@@ -209,5 +209,5 @@ void QpeEditor::find ( const QString &txt, bool caseSensitive,
         for ( ; ; ) {
             if ( line >= numLines() ) {
-                wrap = TRUE;
+                wrap = true;
                   //emit notFound();
                 break;
@@ -215,9 +215,9 @@ void QpeEditor::find ( const QString &txt, bool caseSensitive,
             int findCol = getString( line )->find( txt, col, caseSensitive );
             if ( findCol >= 0 ) {
-                setCursorPosition( line, findCol, FALSE );
+                setCursorPosition( line, findCol, false );
                 col = findCol + txt.length();
-                setCursorPosition( line, col, TRUE );
+                setCursorPosition( line, col, true );
 
-                  //found = TRUE;
+                  //found = true;
                 break;
             }
@@ -240,10 +240,10 @@ static const int fontsize[nfontsizes] = {8,10,12,14,18,24};
 
 TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
-    : QMainWindow( parent, name, f ), bFromDocView( FALSE )
+    : QMainWindow( parent, name, f ), bFromDocView( false )
 {
     doc = 0;
-    edited=FALSE;
-    edited1=FALSE;
-    setToolBarsMovable( FALSE );
+    edited=false;
+    edited1=false;
+    setToolBarsMovable( false );
     connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
 
@@ -255,5 +255,5 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
 
     QPEToolBar *bar = new QPEToolBar( this );
-    bar->setHorizontalStretchable( TRUE );
+    bar->setHorizontalStretchable( true );
     menu = bar;
 
@@ -333,30 +333,30 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     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->setToggleAction(true);
     wa->addTo( advancedMenu);
 
     nStart = new QAction( tr("Start with new file"), QString::null, 0, this, 0 );
     connect( nStart, SIGNAL( toggled(bool) ), this, SLOT( changeStartConfig(bool) ) );
-    nStart->setToggleAction(TRUE);
+    nStart->setToggleAction(true);
     nStart->addTo( advancedMenu );
 
     nAdvanced = new QAction( tr("Prompt on Exit"), QString::null, 0, this, 0 );
     connect( nAdvanced, SIGNAL( toggled(bool) ), this, SLOT( doPrompt(bool) ) );
-    nAdvanced->setToggleAction(TRUE);
+    nAdvanced->setToggleAction(true);
     nAdvanced->addTo( advancedMenu );
 
     desktopAction = new QAction( tr("Always open linked file"), QString::null, 0, this, 0 );
     connect( desktopAction, SIGNAL( toggled(bool) ), this, SLOT( doDesktop(bool) ) );
-    desktopAction->setToggleAction(TRUE);
+    desktopAction->setToggleAction(true);
     desktopAction->addTo( advancedMenu);
 
     filePermAction = new QAction( tr("File Permissions"), QString::null, 0, this, 0 );
     connect( filePermAction, SIGNAL( toggled(bool) ), this, SLOT( doFilePerms(bool) ) );
-    filePermAction->setToggleAction(TRUE);
+    filePermAction->setToggleAction(true);
     filePermAction->addTo( advancedMenu);
 
     searchBarAction = new QAction( tr("Search Bar Open"), QString::null, 0, this, 0 );
     connect( searchBarAction, SIGNAL( toggled(bool) ), this, SLOT( setSearchBar(bool) ) );
-    searchBarAction->setToggleAction(TRUE);
+    searchBarAction->setToggleAction(true);
     searchBarAction->addTo( advancedMenu);
 
@@ -371,7 +371,7 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
 
     searchBar = new QPEToolBar(this);
-    addToolBar( searchBar,  "Search", QMainWindow::Top, TRUE );
+    addToolBar( searchBar,  "Search", QMainWindow::Top, true );
 
-    searchBar->setHorizontalStretchable( TRUE );
+    searchBar->setHorizontalStretchable( true );
 
     searchEdit = new QLineEdit( searchBar, "searchEdit" );
@@ -423,12 +423,11 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     filePerms = cfg.readBoolEntry ( "FilePermissions", false );
     useSearchBar = cfg.readBoolEntry ( "SearchBar", false );
-
-    if(useSearchBar) {
-        searchBarAction->setOn(true);
-    } else{
-    }
-    if(promptExit )  nAdvanced->setOn ( true );
-    if(openDesktop) desktopAction->setOn ( true );
-    if(filePerms) filePermAction->setOn ( true );
+    startWithNew =  cfg.readBoolEntry ( "startNew", true);
+    
+    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 );
       
     bool wrap = cfg. readBoolEntry ( "Wrap", true );
@@ -436,24 +435,22 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     setWordWrap ( wrap );
 
-     if( qApp->argc() > 0) {
-         currentFileName=qApp->argv()[1];
-//         qDebug("<<<<<<<<<<<<<<<<<<<<<<<< "+currentFileName);
-         QFileInfo fi(currentFileName);
-
-         if(fi.baseName().left(1) == "") {
-             openDotFile(currentFileName);
-         } else {
-
-             nStart->setOn(TRUE);
-             openFile(currentFileName);
-         }
-     } else
-        if(cfg.readEntry("startNew","TRUE") == "TRUE") {
+    if( qApp->argc() > 1) {
+        currentFileName=qApp->argv()[1];
+//         qDebug("<<<<<<<<<<<<<<<<<<<<<<<< "+currentFileName+" %d",qApp->argc());
+        QFileInfo fi(currentFileName);
 
-        nStart->setOn(TRUE);
-        fileNew();
+        if(fi.baseName().left(1) == "") {
+            openDotFile(currentFileName);
+        } else {
+            openFile(currentFileName);
+        }
     } else {
-
-        fileOpen();
+//        qDebug("Do other thing");
+        if(startWithNew) {
+            openDotFile("");
+//            fileNew();
+        } else {
+            fileOpen();
+        }
     }
 
@@ -462,10 +459,16 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
 
 TextEdit::~TextEdit() {
-    if( edited1 & promptExit )
-        saveAs();
+//    qDebug("destr");
+}
+
+void TextEdit::closeEvent(QCloseEvent *) {
+//    qDebug("closing here");
+      if( edited1 && promptExit)
+          saveAs();
+     qApp->quit();
 }
 
 void TextEdit::cleanUp() {
-  qDebug("cleanUp");//    save();
+//  qDebug("cleanUp");//    save();
   
     Config cfg ( "TextEdit" );
@@ -478,5 +481,5 @@ void TextEdit::cleanUp() {
     
     cfg.setGroup ( "View" );
-    cfg.writeEntry ( "Wrap",     editor-> wordWrap ( ) == QMultiLineEdit::WidgetWidth );
+    cfg.writeEntry ( "Wrap", editor->wordWrap() == QMultiLineEdit::WidgetWidth );
     cfg.writeEntry ( "FileView", viewSelection );
 
@@ -485,19 +488,22 @@ void TextEdit::cleanUp() {
     cfg.writeEntry ( "FilePermissions", filePerms );
     cfg.writeEntry ( "SearchBar", useSearchBar );
+    cfg.writeEntry ( "startNew", startWithNew );
+
 }
 
 
 void TextEdit::accept() {
-    if( edited1)
-        saveAs();
-    exit(0);
+//    qDebug("accept");
+        if( edited1)
+            saveAs();
+     qApp->quit();
 }
 
 void TextEdit::zoomIn() {
-    setFontSize(editor->font().pointSize()+1,FALSE);
+    setFontSize(editor->font().pointSize()+1,false);
 }
 
 void TextEdit::zoomOut() {
-    setFontSize(editor->font().pointSize()-1,TRUE);
+    setFontSize(editor->font().pointSize()-1,true);
 }
 
@@ -567,8 +573,4 @@ void TextEdit::fileNew() {
 
 void TextEdit::fileOpen() {
-    Config cfg("TextEdit");
-    cfg.setGroup("View");
-    //    bool b=FALSE;
-
     QMap<QString, QStringList> map;
     map.insert(tr("All"), QStringList() );
@@ -578,8 +580,11 @@ void TextEdit::fileOpen() {
     text << "*";
     map.insert(tr("All"), text );
-    QString str = OFileDialog::getOpenFileName( 2, QPEApplication::documentDir(), QString::null, map);
+    QString str = OFileDialog::getOpenFileName( 2,
+                                                QPEApplication::documentDir(),
+                                                QString::null, map);
     if(!str.isEmpty() )
         openFile( str );
-    
+    else
+        updateCaption();
 }
 
@@ -635,28 +640,18 @@ void TextEdit::editPaste() {
 void TextEdit::editFind() {
     searchBar->show();
-    searchVisible = TRUE;
     searchEdit->setFocus();
-//     Config cfg("TextEdit");
-//     cfg.setGroup("View");
-//     cfg.writeEntry("SearchBar","Opened");
-    
 }
 
 void TextEdit::findNext() {
-    editor->find( searchEdit->text(), FALSE, FALSE );
+    editor->find( searchEdit->text(), false, false );
 
 }
 
 void TextEdit::findClose() {
-    searchVisible = FALSE;
     searchBar->hide();
-//     Config cfg("TextEdit");
-//     cfg.setGroup("View");
-//     cfg.writeEntry("SearchBar","Closed");
-//     cfg.write();
 }
 
 void TextEdit::search() {
-    editor->find( searchEdit->text(), FALSE, FALSE );
+    editor->find( searchEdit->text(), false, false );
 }
 
@@ -671,5 +666,5 @@ void TextEdit::newFile( const DocLnk &f ) {
     qDebug("newFile "+currentFileName);
     updateCaption( currentFileName);
-//    editor->setEdited( FALSE);
+//    editor->setEdited( false);
 }
 
@@ -687,7 +682,7 @@ void TextEdit::openDotFile( const QString &f ) {
     }
     editor->setText(txt);
-    editor->setEdited( FALSE);
-    edited1=FALSE;
-    edited=FALSE;
+    editor->setEdited( false);
+    edited1=false;
+    edited=false;
 
 
@@ -700,6 +695,6 @@ void TextEdit::openFile( const QString &f ) {
     QString filer;
     QFileInfo fi( f);
-//    bFromDocView = TRUE;
-    if(f.find(".desktop",0,TRUE) != -1 && !openDesktop) {
+//    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>
@@ -745,5 +740,5 @@ file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?"),
 void TextEdit::openFile( const DocLnk &f ) {
 //    clear();
-//    bFromDocView = TRUE;
+//    bFromDocView = true;
     FileManager fm;
     QString txt;
@@ -759,7 +754,7 @@ void TextEdit::openFile( const DocLnk &f ) {
     doc = new DocLnk(f);
     editor->setText(txt);
-    editor->setEdited( FALSE);
-    edited1=FALSE;
-    edited=FALSE;
+    editor->setEdited( false);
+    edited1=false;
+    edited=false;
 
     doc->setName(currentFileName);
@@ -768,12 +763,10 @@ void TextEdit::openFile( const DocLnk &f ) {
 
 void TextEdit::showEditTools() {
-//        if ( !doc )
-//      close();
-//    clear();
     menu->show();
     editBar->show();
-    if ( searchVisible )
+    if(!useSearchBar)
+        searchBar->hide();
+    else
         searchBar->show();
-//    updateCaption();
     setWState (WState_Reserved1 );
 }
@@ -817,7 +810,7 @@ bool TextEdit::save() {
                      
             }
-            editor->setEdited( FALSE);
-            edited1=FALSE;
-            edited=FALSE;
+            editor->setEdited( false);
+            edited1=false;
+            edited=false;
             if(caption().left(1)=="*")
             setCaption(caption().right(caption().length()-1));
@@ -836,14 +829,14 @@ bool TextEdit::saveAs() {
     qDebug("saveAsFile " + currentFileName);
       // case of nothing to save... 
-    if ( !doc ) {
-//|| !bFromDocView)
-        qDebug("no doc");
-        return true;
-    }
-    if ( !editor->edited() ) {
-        delete doc;
-        doc = 0;
-        return true;
-    }
+//     if ( !doc && !currentFileName.isEmpty()) {
+// //|| !bFromDocView)
+//         qDebug("no doc");
+//         return true;
+//     }
+//     if ( !editor->edited() ) {
+//         delete doc;
+//         doc = 0;
+//         return true;
+//     }
 
     QString rt = editor->text();
@@ -853,26 +846,29 @@ bool TextEdit::saveAs() {
         || currentFileName == tr("Unnamed")
         || currentFileName == tr("Text Editor")) {
-//        qDebug("do silly TT filename thing");
-        if ( doc->name().isEmpty() ) {
-            QString pt = rt.simplifyWhiteSpace();
-            int i = pt.find( ' ' );
-            QString docname = pt;
-            if ( i > 0 )
-                docname = pt.left( i );
-              // remove "." at the beginning
-            while( docname.startsWith( "." ) )
-                docname = docname.mid( 1 );
-            docname.replace( QRegExp("/"), "_" );
-              // cut the length. filenames longer than that
-              //don't make sense and something goes wrong when they get too long.
-            if ( docname.length() > 40 )
-                docname = docname.left(40);
-            if ( docname.isEmpty() )
-                docname = tr("Unnamed");
-            doc->setName(docname);
-            currentFileName=docname;
-        }
+        qDebug("do silly TT filename thing");
+//        if ( doc && doc->name().isEmpty() ) {
+        QString pt = rt.simplifyWhiteSpace();
+        int i = pt.find( ' ' );
+        QString docname = pt;
+        if ( i > 0 )
+            docname = pt.left( i );
+          // remove "." at the beginning
+        while( docname.startsWith( "." ) )
+            docname = docname.mid( 1 );
+        docname.replace( QRegExp("/"), "_" );
+          // cut the length. filenames longer than that
+          //don't make sense and something goes wrong when they get too long.
+        if ( docname.length() > 40 )
+            docname = docname.left(40);
+        if ( docname.isEmpty() )
+            docname = tr("Unnamed");
+        if(doc) doc->setName(docname);
+        currentFileName=docname;
+//         }
+//         else
+//             qDebug("hmmmmmm");
     }
 
+
     QMap<QString, QStringList> map;
     map.insert(tr("All"), QStringList() );
@@ -882,10 +878,15 @@ bool TextEdit::saveAs() {
     text << "*";
     map.insert(tr("All"), text );
-//    if(currentFileName
+
+    QFileInfo cuFi( currentFileName);
+    QString filee = cuFi.fileName();
+    QString dire = cuFi.dirPath();
+    if(dire==".")
+       dire = QPEApplication::documentDir();
     QString str = OFileDialog::getSaveFileName( 2,
-                  QPEApplication::documentDir(),
-                  currentFileName, map);
+                  dire,
+                  filee, map);
 
-    if(!str.isEmpty() ) {
+    if(!str.isEmpty()) {
         QString fileNm=str;
 
@@ -893,5 +894,5 @@ bool TextEdit::saveAs() {
         QFileInfo fi(fileNm);
         currentFileName=fi.fileName();
-        if(doc) {
+        if(doc) 
 //        QString file = doc->file();
 //        doc->removeFiles();
@@ -902,5 +903,5 @@ bool TextEdit::saveAs() {
             doc = new DocLnk(nf);
 //        editor->setText(rt);
-//            qDebug("openFile doclnk "+currentFileName);
+            qDebug("Saving file as "+currentFileName);
             doc->setName( currentFileName);
             updateCaption( currentFileName);
@@ -922,5 +923,5 @@ bool TextEdit::saveAs() {
                     delete  filePerm;
             }
-        }
+//        }
         editor->setEdited( false);
         edited1 = false;
@@ -969,9 +970,9 @@ void TextEdit::setDocument(const QString& fileref) {
         } else {
             qDebug("setDoc open");
-            bFromDocView = TRUE;
+            bFromDocView = true;
             openFile(fileref);
-            editor->setEdited(TRUE);
-            edited1=FALSE;
-            edited=TRUE;
+            editor->setEdited(true);
+            edited1=false;
+            edited=true;
 
 //    doSearchBar();
@@ -981,9 +982,4 @@ void TextEdit::setDocument(const QString& fileref) {
 }
 
-void TextEdit::closeEvent( QCloseEvent *e ) {
-    bFromDocView = FALSE;
-    e->accept();
-}
-
 void TextEdit::changeFont() {
   QDialog *d = new QDialog ( this, "FontDialog", true );
@@ -1017,13 +1013,8 @@ void TextEdit::editDelete() {
 
 void TextEdit::changeStartConfig( bool b ) {
-
+    startWithNew=b;
     Config cfg("TextEdit");
     cfg.setGroup("View");
-    if(b) {
-        qDebug("bool");
-        cfg.writeEntry("startNew","TRUE");
-    } else {
-        cfg.writeEntry("startNew","FALSE");
-    }
+    cfg.writeEntry("startNew",b);
     update();
 }
@@ -1032,7 +1023,7 @@ void TextEdit::editorChanged() {
     if(editor->edited() && edited && !edited1) {
         setCaption( "*"+caption());
-        edited1=TRUE;
+        edited1=true;
     }
-    edited=TRUE;
+    edited=true;
 }
 
diff --git a/core/apps/textedit/textedit.h b/core/apps/textedit/textedit.h
index a95e742..bb7d693 100644
--- a/core/apps/textedit/textedit.h
+++ b/core/apps/textedit/textedit.h
@@ -66,5 +66,4 @@ public slots:
 void  receive(const QCString&, const QByteArray&);
 protected:
-    bool fileIs, useAdvancedFeatures, promptExit, openDesktop, filePerms, useSearchBar;
     void closeEvent( QCloseEvent *e );
     void doSearchBar();
@@ -115,5 +114,4 @@ private:
     void updateCaption( const QString &name=QString::null );
     void setFontSize(int sz, bool round_down_not_up);
-
 private:
 //    fileSaver *fileSaveDlg;
@@ -124,5 +122,5 @@ private:
     QLineEdit *searchEdit;
     DocLnk *doc;
-    bool searchVisible;
+    bool fileIs, useAdvancedFeatures, promptExit, openDesktop, filePerms, useSearchBar, startWithNew;
     bool bFromDocView;
    int  viewSelection;