Diffstat (limited to 'core/apps/textedit/textedit.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/apps/textedit/textedit.cpp | 69 |
1 files changed, 39 insertions, 30 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index 6804918..943fecd 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp @@ -37,2 +37,3 @@ #include <qpe/qpetoolbar.h> +#include <qpe/qcopenvelope_qws.h> //#include <qpe/finddialog.h> @@ -240,2 +241,6 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) + 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" ) ); @@ -487,5 +492,5 @@ void TextEdit::fileNew() { - if( !bFromDocView ) { - saveAs(); - } +// if( !bFromDocView ) { +// saveAs(); +// } newFile(DocLnk()); @@ -498,2 +503,4 @@ void TextEdit::fileOpen() browseForFiles->showMaximized(); +// if( result != -1 ) + if( browseForFiles->exec() != -1 ) { @@ -620,4 +627,6 @@ void TextEdit::newFile( const DocLnk &f ) doc = new DocLnk(nf); + currentFileName = "Unnamed"; qDebug("newFile "+currentFileName); updateCaption(currentFileName); +// editor->setEdited( FALSE); } @@ -627,3 +636,3 @@ void TextEdit::openFile( const QString &f ) - bFromDocView = TRUE; +// bFromDocView = TRUE; DocLnk nf; @@ -649,3 +658,3 @@ void TextEdit::openFile( const DocLnk &f ) // clear(); - bFromDocView = TRUE; +// bFromDocView = TRUE; FileManager fm; @@ -657,7 +666,4 @@ void TextEdit::openFile( const DocLnk &f ) qDebug( "Cannot open file" ); - - //return; } - - fileNew(); +// fileNew(); if ( doc ) @@ -670,3 +676,2 @@ void TextEdit::openFile( const DocLnk &f ) - qDebug("openFile doclnk "+currentFileName); doc->setName(currentFileName); @@ -693,5 +698,5 @@ bool TextEdit::save() QString file = doc->file(); - qDebug(file); + qDebug("saver file "+file); QString name= doc->name(); - qDebug(name); + qDebug("File named "+name); QString rt = editor->text(); @@ -733,9 +738,8 @@ bool TextEdit::saveAs() // qDebug("saveAsFile "+currentFileName); - - // case of nothing to save... /// there's always something to save -// if ( !doc )//|| !bFromDocView) -// { -// qDebug("no doc"); -// return true; -// } + // case of nothing to save... + if ( !doc )//|| !bFromDocView) + { + qDebug("no doc"); + return true; + } if ( !editor->edited() ) { @@ -749,3 +753,3 @@ bool TextEdit::saveAs() - if( currentFileName.isEmpty() || currentFileName == tr("Unnamed")) { + if( currentFileName.isEmpty() || currentFileName == tr("Unnamed") || currentFileName == tr("Text Editor")) { qDebug("do silly TT filename thing"); @@ -816,3 +820,3 @@ bool TextEdit::saveAs() return true; -} +} //end saveAs @@ -837,3 +841,4 @@ void TextEdit::updateCaption( const QString &name ) } - + if(s.left(1) == "/") + s = s.right(s.length()-1); setCaption( s + " - " + tr("Text Editor") ); @@ -845,4 +850,2 @@ void TextEdit::setDocument(const QString& fileref) bFromDocView = TRUE; - qDebug("setDocument "+fileref); - bFromDocView = TRUE; if(fileref.find(".desktop",0,TRUE) == -1) { @@ -850,2 +853,3 @@ void TextEdit::setDocument(const QString& fileref) } else { + qDebug("is desktop file"); openFile(DocLnk(fileref)); @@ -866,8 +870,5 @@ void TextEdit::accept() { - QString file = doc->file(); - if (file.find("_.txt",0,TRUE) ==-1) - save(); - else { - QFile(file).remove(); - } + //if(caption() !="Unnamed") + if(edited1) + saveAs(); exit(0); @@ -936 +937,9 @@ void TextEdit::editorChanged() { } + +void TextEdit::receive(const QCString&msg, const QByteArray&) { + qDebug("QCop "+msg); + if ( msg == "setDocument(QString)" ) { + qDebug("bugger all"); + } + +} |