2 files changed, 28 insertions, 12 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
@@ -234,25 +234,26 @@ void QpeEditor::find ( const QString &txt, bool caseSensitive,
 
 #endif
 
 
 static const int nfontsizes = 6;
 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 )
 {
     doc = 0;
     edited=false;
-    edited1=false;
+    fromSetDocument=false;
+
     setToolBarsMovable( false );
     connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
 
     channel = new QCopChannel( "QPE/Application/textedit", this );
     connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
         this, SLOT(receive(const QCString&, const QByteArray&)) );
 
     setIcon( Resource::loadPixmap( "TextEditor" ) );
 
     QPEToolBar *bar = new QPEToolBar( this );
     bar->setHorizontalStretchable( true );
     menu = bar;
@@ -260,35 +261,36 @@ 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;
 
     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() ) );
     a->addTo( bar );
     a->addTo( file );
 
     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() ) );
     a->addTo( file );
 
     a = new QAction( tr( "Cut" ), Resource::loadPixmap( "cut" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( editCut() ) );
     a->addTo( editBar );
     a->addTo( edit );
 
     a = new QAction( tr( "Copy" ), Resource::loadPixmap( "copy" ), QString::null, 0, this, 0 );
@@ -330,24 +332,25 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     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"), 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);
     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->addTo( advancedMenu);
 
     filePermAction = new QAction( tr("File Permissions"), QString::null, 0, this, 0 );
@@ -427,43 +430,46 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     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 );
     wa-> setOn ( wrap );
     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");
 }
 
 void TextEdit::closeEvent(QCloseEvent *) {
 //    qDebug("closing here");
       if( edited1 && promptExit)
           saveAs();
      qApp->quit();
 }
@@ -817,24 +823,26 @@ bool TextEdit::save() {
 
 
             chmod( file.latin1(), mode);
         }
         return true;
     }
     return false;
 }
 
 /*!
   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)
 //         qDebug("no doc");
 //         return true;
 //     }
 //     if ( !editor->edited() ) {
 //         delete doc;
 //         doc = 0;
 //         return true;
 //     }
@@ -965,84 +973,91 @@ 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;
-
+               //   fromSetDocument=false;
 //    doSearchBar();
         }
     }
     updateCaption( currentFileName);
 }
 
 void TextEdit::changeFont() {
   QDialog *d = new QDialog ( this, "FontDialog", true );
   d-> setCaption ( tr( "Choose font" ));
   QBoxLayout *lay = new QVBoxLayout ( d );
   OFontSelector *ofs = new OFontSelector ( true, d );
   lay-> addWidget ( ofs );
   ofs-> setSelectedFont ( editor-> font ( ));
 
   d-> showMaximized ( );
     if ( d-> exec ( ) == QDialog::Accepted )
       editor-> setFont ( ofs-> selectedFont ( ));
     delete d;
 
 }
 
 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();
               setCaption( tr("Text Editor") );
           }
           break;
       case 1: 
             // exit
           break;
     };
 }
 
 void TextEdit::changeStartConfig( bool b ) {
     startWithNew=b;
     Config cfg("TextEdit");
     cfg.setGroup("View");
     cfg.writeEntry("startNew",b);
     update();
 }
 
 void TextEdit::editorChanged() { 
-    if(editor->edited() && edited && !edited1) {
+//    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>"
                          "and is licensed under the GPL"));
 }
 
 void TextEdit::doPrompt(bool b) {
     promptExit=b;
     Config cfg("TextEdit");
     cfg.setGroup ( "View" );
     cfg.writeEntry ( "PromptExit", b); 
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
@@ -107,24 +107,25 @@ private slots:
     void setWordWrap(bool y);
     void setSearchBar(bool);
 
 private:
     void openDotFile(const QString &);
     void colorChanged( const QColor &c );
     void clear();
     void updateCaption( const QString &name=QString::null );
     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;
     DocLnk *doc;
     bool fileIs, useAdvancedFeatures, promptExit, openDesktop, filePerms, useSearchBar, startWithNew;
     bool bFromDocView;
    int  viewSelection;
     QAction *zin, *zout;
     QString currentFileName;
 };