2 files changed, 42 insertions, 26 deletions

diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index e978fa4..b199c81 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -245,3 +245,4 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     edited=false;
-    edited1=false;
+    fromSetDocument=false;
+
     setToolBarsMovable( false );
@@ -271,3 +272,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) );
-    a->addTo( bar );
+//    a->addTo( bar );
     a->addTo( file );
@@ -282,2 +283,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     file->insertSeparator();
+    a->addTo( bar );
     a->addTo( file );
@@ -341,2 +343,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     nStart->addTo( advancedMenu );
+    nStart->setEnabled(false);
 
@@ -438,3 +441,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
         currentFileName=qApp->argv()[1];
-//         qDebug("<<<<<<<<<<<<<<<<<<<<<<<< "+currentFileName+" %d",qApp->argc());
+        
         QFileInfo fi(currentFileName);
@@ -447,9 +450,11 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     } else {
-//        qDebug("Do other thing");
-        if(startWithNew) {
+    edited1=false;
+        
+//        if(startWithNew ) {
             openDotFile("");
 //            fileNew();
-        } else {
-            fileOpen();
-        }
+//        }
+//        else {
+//             fileOpen();
+//         }
     }
@@ -457,2 +462,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     viewSelection = cfg.readNumEntry( "FileView", 0 );
+//    setCaption(tr("Text Editor"));
 }
@@ -697,3 +703,3 @@ void TextEdit::openFile( const QString &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"),
@@ -828,2 +834,4 @@ bool TextEdit::save() {
 bool TextEdit::saveAs() {
+    if(caption() == tr("Text Editor"))
+        return false;
     qDebug("saveAsFile " + currentFileName);
@@ -965,15 +973,15 @@ void TextEdit::setDocument(const QString& fileref) {
         qDebug("setDocument");
-        QFileInfo fi(currentFileName);
-        qDebug("basename:"+fi.baseName()+": current filenmame "+currentFileName);
-        if(fi.baseName().left(1) == "") {
-//        openDotFile(currentFileName);
-        } else {
-            qDebug("setDoc open");
-            bFromDocView = true;
-            openFile(fileref);
-            editor->setEdited(true);
-            edited1=false;
-            edited=true;
-
-//    doSearchBar();
+         QFileInfo fi(currentFileName);
+         qDebug("basename:"+fi.baseName()+": current filenmame "+currentFileName);
+         if(fi.baseName().left(1) == "") {
+ //        openDotFile(currentFileName);
+         } else {
+             qDebug("setDoc open");
+             bFromDocView = true;
+             openFile(fileref);
+             editor->setEdited(true);
+             edited1=false;
+             edited=true;
+               //   fromSetDocument=false;
+ //    doSearchBar();
         }
@@ -999,3 +1007,7 @@ void TextEdit::changeFont() {
 void TextEdit::editDelete() {
-    switch ( QMessageBox::warning(this,tr("Text Editor"),tr("Do you really want<BR>to <B>delete</B> the current file\nfrom the disk?<BR>This is <B>irreversable!!</B>"),tr("Yes"),tr("No"),0,0,1) ) {
+    switch ( QMessageBox::warning(this,tr("Text Editor"),
+                                  tr("Do you really want<BR>to <B>delete</B> "
+                                     "the current file\nfrom the disk?<BR>This is "
+                                     "<B>irreversable!!</B>"),
+                                  tr("Yes"),tr("No"),0,0,1) ) {
       case 0:
@@ -1021,4 +1033,5 @@ void TextEdit::changeStartConfig( bool b ) {
 
-void TextEdit::editorChanged() { 
-    if(editor->edited() && edited && !edited1) {
+void TextEdit::editorChanged() {
+//    qDebug("editor changed");
+    if( /*editor->edited() &&*/ /*edited && */!edited1) {
         setCaption( "*"+caption());
@@ -1029,3 +1042,3 @@ void TextEdit::editorChanged() {
 
-void TextEdit::receive(const QCString&msg, const QByteArray&) {
+void TextEdit::receive(const QCString&msg, const QByteArray &data) {
     qDebug("QCop "+msg);
@@ -1033,2 +1046,3 @@ void TextEdit::receive(const QCString&msg, const QByteArray&) {
       qDebug("bugger all");
+          
   }
@@ -1036,2 +1050,3 @@ void TextEdit::receive(const QCString&msg, const QByteArray&) {
 }
+
 void TextEdit::doAbout() {
diff --git a/core/apps/textedit/textedit.h b/core/apps/textedit/textedit.h
index bb7d693..9f16ebf 100644
--- a/core/apps/textedit/textedit.h
+++ b/core/apps/textedit/textedit.h
@@ -118,2 +118,3 @@ private:
 //    fileBrowser *browseForFiles;
+    bool fromSetDocument;
     QpeEditor* editor;