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
@@ -242,9 +242,10 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     : QMainWindow( parent, name, f ), bFromDocView( false )
 {
     doc = 0;
     edited=false;
-    edited1=false;
+    fromSetDocument=false;
+
     setToolBarsMovable( false );
     connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
 
     channel = new QCopChannel( "QPE/Application/textedit", this );
@@ -268,9 +269,9 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     editBar = bar;
 
     QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) );
-    a->addTo( bar );
+//    a->addTo( bar );
     a->addTo( file );
 
     a = new QAction( tr( "Open" ), Resource::loadPixmap( "fileopen" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( fileOpen() ) );
@@ -279,8 +280,9 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
 
     a = new QAction( tr( "Save" ), QPixmap(( const char** ) filesave_xpm  ) , QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( save() ) );
     file->insertSeparator();
+    a->addTo( bar );
     a->addTo( file );
 
     a = new QAction( tr( "Save As" ), QPixmap(( const char** ) filesave_xpm  ) , QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( saveAs() ) );
@@ -338,8 +340,9 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     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->addTo( advancedMenu );
+    nStart->setEnabled(false);
 
     nAdvanced = new QAction( tr("Prompt on Exit"), QString::null, 0, this, 0 );
     connect( nAdvanced, SIGNAL( toggled(bool) ), this, SLOT( doPrompt(bool) ) );
     nAdvanced->setToggleAction(true);
@@ -435,27 +438,30 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     setWordWrap ( wrap );
 
     if( qApp->argc() > 1) {
         currentFileName=qApp->argv()[1];
-//         qDebug("<<<<<<<<<<<<<<<<<<<<<<<< "+currentFileName+" %d",qApp->argc());
+        
         QFileInfo fi(currentFileName);
 
         if(fi.baseName().left(1) == "") {
             openDotFile(currentFileName);
         } else {
             openFile(currentFileName);
         }
     } else {
-//        qDebug("Do other thing");
-        if(startWithNew) {
+    edited1=false;
+        
+//        if(startWithNew ) {
             openDotFile("");
 //            fileNew();
-        } else {
-            fileOpen();
-        }
+//        }
+//        else {
+//             fileOpen();
+//         }
     }
 
     viewSelection = cfg.readNumEntry( "FileView", 0 );
+//    setCaption(tr("Text Editor"));
 }
 
 TextEdit::~TextEdit() {
 //    qDebug("destr");
@@ -694,9 +700,9 @@ void TextEdit::openFile( const QString &f ) {
     qDebug("filename is "+ 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) ) {
@@ -825,8 +831,10 @@ bool TextEdit::save() {
 
 /*!
   prompted save */
 bool TextEdit::saveAs() {
+    if(caption() == tr("Text Editor"))
+        return false;
     qDebug("saveAsFile " + currentFileName);
       // case of nothing to save... 
 //     if ( !doc && !currentFileName.isEmpty()) {
 // //|| !bFromDocView)
@@ -962,21 +970,21 @@ void TextEdit::updateCaption( const QString &name ) {
 void TextEdit::setDocument(const QString& fileref) {
     if(fileref != "Unnamed") {
         currentFileName=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();
         }
     }
     updateCaption( currentFileName);
 }
@@ -996,9 +1004,13 @@ 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:
           if(doc) {
               doc->removeFiles();
               clear();
@@ -1018,23 +1030,26 @@ void TextEdit::changeStartConfig( bool b ) {
     cfg.writeEntry("startNew",b);
     update();
 }
 
-void TextEdit::editorChanged() { 
-    if(editor->edited() && edited && !edited1) {
+void TextEdit::editorChanged() {
+//    qDebug("editor changed");
+    if( /*editor->edited() &&*/ /*edited && */!edited1) {
         setCaption( "*"+caption());
         edited1=true;
     }
     edited=true;
 }
 
-void TextEdit::receive(const QCString&msg, const QByteArray&) {
+void TextEdit::receive(const QCString&msg, const QByteArray &data) {
     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>"
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
@@ -115,8 +115,9 @@ private:
     void setFontSize(int sz, bool round_down_not_up);
 private:
 //    fileSaver *fileSaveDlg;
 //    fileBrowser *browseForFiles;
+    bool fromSetDocument;
     QpeEditor* editor;
     QToolBar *menu, *editBar, *searchBar;
     QPopupMenu *advancedMenu;
     QLineEdit *searchEdit;