| -rw-r--r-- | core/apps/textedit/textedit.cpp | 39 | ||||
| -rw-r--r-- | core/apps/textedit/textedit.h | 1 |
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 @@ -240,13 +240,14 @@ 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&)) ); @@ -266,23 +267,24 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) 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 ); @@ -336,12 +338,13 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) 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 ); @@ -433,31 +436,34 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) 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"); } @@ -823,12 +829,14 @@ bool TextEdit::save() { 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; @@ -971,13 +979,13 @@ void TextEdit::setDocument(const QString& fileref) { qDebug("setDoc open"); bFromDocView = true; openFile(fileref); editor->setEdited(true); edited1=false; edited=true; - + // fromSetDocument=false; // doSearchBar(); } } updateCaption( currentFileName); } @@ -994,13 +1002,17 @@ void TextEdit::changeFont() { 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") ); } @@ -1017,26 +1029,29 @@ void TextEdit::changeStartConfig( bool b ) { 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")); } 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 @@ -113,12 +113,13 @@ private: 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; |