author | llornkcor <llornkcor> | 2002-04-10 19:08:30 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-04-10 19:08:30 (UTC) |
commit | 11d754ffa429875b526c49f125d8a844c5cda3d8 (patch) (side-by-side diff) | |
tree | 4b2fa1f980e62dad5a0ae465c95eb627df32cdd9 /core/apps/textedit | |
parent | 5504a71f3e65673a3eea23051d0043f2b483276b (diff) | |
download | opie-11d754ffa429875b526c49f125d8a844c5cda3d8.zip opie-11d754ffa429875b526c49f125d8a844c5cda3d8.tar.gz opie-11d754ffa429875b526c49f125d8a844c5cda3d8.tar.bz2 |
bug fix
-rw-r--r-- | core/apps/textedit/fileBrowser.cpp | 28 | ||||
-rw-r--r-- | core/apps/textedit/textedit.cpp | 99 | ||||
-rw-r--r-- | core/apps/textedit/textedit.h | 7 |
3 files changed, 73 insertions, 61 deletions
diff --git a/core/apps/textedit/fileBrowser.cpp b/core/apps/textedit/fileBrowser.cpp index bc99348..f322513 100644 --- a/core/apps/textedit/fileBrowser.cpp +++ b/core/apps/textedit/fileBrowser.cpp @@ -49,5 +49,5 @@ fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags { if ( !name ) - setName( tr("fileBrowser") ); + setName( "fileBrowser" ); setCaption(tr( name ) ); // mimeType = mimeFilter; @@ -121,5 +121,5 @@ fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags ListView->addColumn( tr( "Size" ) ); ListView->setColumnWidth(1,-1); - ListView->addColumn( tr("Date"),-1); + ListView->addColumn( "Date",-1); ListView->setColumnWidthMode(0,QListView::Manual); @@ -135,5 +135,5 @@ fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags FileStack->addWidget( ListView, get_unique_id() ); - +mimeType="text/plain"; fileSelector = new FileSelector( mimeType, FileStack, "fileselector" , FALSE, FALSE); //buggy // connect( fileSelector, SIGNAL( closeMe() ), this, SLOT( showEditTools() ) ); @@ -349,5 +349,5 @@ void fileBrowser::docButtonPushed() { void fileBrowser::selectionChanged( const QString &select ) { - if ( select == tr("Documents")) { + if ( select == "Documents") { FileStack->raiseWidget( fileSelector ); dirPathCombo->hide(); @@ -356,5 +356,5 @@ void fileBrowser::selectionChanged( const QString &select ) homeButton->hide(); } else { - if ( select == tr("All files") ) + if ( select == "All files" ) currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::All); else @@ -413,5 +413,5 @@ void fileBrowser::doCd() { void fileBrowser::makDir() { InputDialog *fileDlg; - fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0); + fileDlg = new InputDialog(this,"Make Directory",TRUE, 0); fileDlg->exec(); if( fileDlg->result() == 1 ) { @@ -426,5 +426,5 @@ void fileBrowser::localRename() { QString curFile = ListView->currentItem()->text(0); InputDialog *fileDlg; - fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0); + fileDlg = new InputDialog(this,"Rename",TRUE, 0); fileDlg->setTextEdit((const QString &) curFile); fileDlg->exec(); @@ -433,5 +433,5 @@ void fileBrowser::localRename() { QString newName = currentDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist"; if( rename(oldname.latin1(), newName.latin1())== -1) - QMessageBox::message(tr("Note"),tr("Could not rename")); + QMessageBox::message("Note","Could not rename"); } populateList(); @@ -441,6 +441,6 @@ void fileBrowser::localDelete() { QString f = ListView->currentItem()->text(0); if(QDir(f).exists() ) { - switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f+ - tr(" ?\nIt must be empty"),tr("Yes"),tr("No"),0,0,1) ) { + switch ( QMessageBox::warning(this,"Delete","Do you really want to delete\n"+f+ + " ?\nIt must be empty","Yes","No",0,0,1) ) { case 0: { f=currentDir.canonicalPath()+"/"+f; @@ -455,6 +455,6 @@ void fileBrowser::localDelete() { }; } else { - switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f - +" ?",tr("Yes"),tr("No"),0,0,1) ) { + switch ( QMessageBox::warning(this,"Delete","Do you really want to delete\n"+f + +" ?","Yes","No",0,0,1) ) { case 0: { f=currentDir.canonicalPath()+"/"+f; @@ -494,5 +494,5 @@ void fileBrowser::showType(const QString &t) { qDebug(t); - if(t.find(tr("All"),0,TRUE) != -1) { + if(t.find("All",0,TRUE) != -1) { filterStr = "*"; } else { @@ -606,5 +606,5 @@ InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags { if ( !name ) - setName( tr("InputDialog") ); + setName( "InputDialog" ); resize( 234, 50 ); setMaximumSize( QSize( 240, 50 ) ); 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 @@ -36,4 +36,5 @@ #include <qpe/qpemenubar.h> #include <qpe/qpetoolbar.h> +#include <qpe/qcopenvelope_qws.h> //#include <qpe/finddialog.h> @@ -239,4 +240,8 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) 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" ) ); @@ -398,11 +403,11 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) updateCaption(); - cfg.setGroup("View"); - if(cfg.readEntry("startNew","TRUE") == "TRUE") { - nStart->setOn(TRUE); - fileNew(); - } else { - fileOpen(); - } + cfg.setGroup("View"); + if(cfg.readEntry("startNew","TRUE") == "TRUE") { + nStart->setOn(TRUE); + fileNew(); + } else { + fileOpen(); + } viewSelection = cfg.readNumEntry( "FileView", 0 ); } @@ -486,7 +491,7 @@ void TextEdit::setWordWrap(bool y) void TextEdit::fileNew() { - if( !bFromDocView ) { - saveAs(); - } +// if( !bFromDocView ) { +// saveAs(); +// } newFile(DocLnk()); } @@ -494,7 +499,9 @@ void TextEdit::fileNew() void TextEdit::fileOpen() { - browseForFiles=new fileBrowser(this,tr("Open File"),TRUE,0, "text/*"); // + browseForFiles = new fileBrowser(this,tr("Open File"),TRUE,0, "text/*"); // browseForFiles->setFileView( viewSelection ); browseForFiles->showMaximized(); +// if( result != -1 ) + if( browseForFiles->exec() != -1 ) { QString selFile = browseForFiles->selectedFileName; @@ -619,6 +626,8 @@ void TextEdit::newFile( const DocLnk &f ) editor->setFocus(); doc = new DocLnk(nf); + currentFileName = "Unnamed"; qDebug("newFile "+currentFileName); - updateCaption(currentFileName); + updateCaption( currentFileName); +// editor->setEdited( FALSE); } @@ -626,5 +635,5 @@ void TextEdit::openFile( const QString &f ) { - bFromDocView = TRUE; +// bFromDocView = TRUE; DocLnk nf; nf.setType("text/plain"); @@ -637,9 +646,9 @@ void TextEdit::openFile( const QString &f ) openFile(nf); showEditTools(); - // Show filename in caption + // Show filename in caption QString name = f; int sep = name.findRev( '/' ); if ( sep > 0 ) - name = name.mid( sep+1 ); + name = name.mid( sep+1 ); updateCaption( name ); } @@ -648,5 +657,5 @@ void TextEdit::openFile( const DocLnk &f ) { // clear(); - bFromDocView = TRUE; +// bFromDocView = TRUE; FileManager fm; QString txt; @@ -654,13 +663,10 @@ void TextEdit::openFile( const DocLnk &f ) qDebug("openFile doclnk " + currentFileName); if ( !fm.loadFile( f, txt ) ) { - // ####### could be a new file + // ####### could be a new file qDebug( "Cannot open file" ); - - //return; } - - fileNew(); +// fileNew(); if ( doc ) - delete doc; + delete doc; doc = new DocLnk(f); editor->setText(txt); @@ -669,5 +675,4 @@ void TextEdit::openFile( const DocLnk &f ) edited=FALSE; - qDebug("openFile doclnk "+currentFileName); doc->setName(currentFileName); updateCaption(); @@ -692,7 +697,7 @@ 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(); if( !rt.isEmpty() ) { @@ -732,11 +737,10 @@ 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() ) { delete doc; @@ -748,5 +752,5 @@ bool TextEdit::saveAs() qDebug(currentFileName); - if( currentFileName.isEmpty() || currentFileName == tr("Unnamed")) { + if( currentFileName.isEmpty() || currentFileName == tr("Unnamed") || currentFileName == tr("Text Editor")) { qDebug("do silly TT filename thing"); if ( doc->name().isEmpty() ) { @@ -815,5 +819,5 @@ bool TextEdit::saveAs() delete fileSaveDlg; return true; -} +} //end saveAs void TextEdit::clear() @@ -836,5 +840,6 @@ void TextEdit::updateCaption( const QString &name ) currentFileName=s; } - + if(s.left(1) == "/") + s = s.right(s.length()-1); setCaption( s + " - " + tr("Text Editor") ); } @@ -844,10 +849,9 @@ void TextEdit::setDocument(const QString& fileref) { bFromDocView = TRUE; - qDebug("setDocument "+fileref); - bFromDocView = TRUE; if(fileref.find(".desktop",0,TRUE) == -1) { - openFile(fileref); + openFile(fileref); } else { - openFile(DocLnk(fileref)); + qDebug("is desktop file"); + openFile(DocLnk(fileref)); } editor->setEdited(TRUE); @@ -865,10 +869,7 @@ void TextEdit::closeEvent( QCloseEvent *e ) 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); @@ -935,2 +936,10 @@ void TextEdit::editorChanged() { edited=TRUE; } + +void TextEdit::receive(const QCString&msg, const QByteArray&) { + qDebug("QCop "+msg); + if ( msg == "setDocument(QString)" ) { + qDebug("bugger all"); + } + +} diff --git a/core/apps/textedit/textedit.h b/core/apps/textedit/textedit.h index af69518..61fa2a0 100644 --- a/core/apps/textedit/textedit.h +++ b/core/apps/textedit/textedit.h @@ -29,4 +29,7 @@ #include <qpe/filemanager.h> +#include <qpe/qcopenvelope_qws.h> + +#include <opie/ofileselector.h> #include <qmainwindow.h> @@ -58,7 +61,8 @@ public: bool edited, edited1; void openFile( const QString & ); + QCopChannel * channel; public slots: void editorChanged(); - +void receive(const QCString&, const QByteArray&); protected: void closeEvent( QCloseEvent *e ); @@ -107,5 +111,4 @@ private: fileSaver *fileSaveDlg; fileBrowser *browseForFiles; - QpeEditor* editor; QToolBar *menu, *editBar, *searchBar; |