| -rw-r--r-- | core/apps/textedit/textedit.cpp | 215 | ||||
| -rw-r--r-- | core/apps/textedit/textedit.h | 4 |
2 files changed, 104 insertions, 115 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index 464671a..1c3b393 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp @@ -191,37 +191,37 @@ private: }; void QpeEditor::find ( const QString &txt, bool caseSensitive, bool backwards ) { - static bool wrap = FALSE; + static bool wrap = false; int line, col; if ( wrap ) { if ( !backwards ) line = col = 0; - wrap = FALSE; + wrap = false; // emit searchWrapped(); } else { getCursorPosition( &line, &col ); } //ignore backwards for now.... if ( !backwards ) { for ( ; ; ) { if ( line >= numLines() ) { - wrap = TRUE; + wrap = true; //emit notFound(); break; } int findCol = getString( line )->find( txt, col, caseSensitive ); if ( findCol >= 0 ) { - setCursorPosition( line, findCol, FALSE ); + setCursorPosition( line, findCol, false ); col = findCol + txt.length(); - setCursorPosition( line, col, TRUE ); + setCursorPosition( line, col, true ); - //found = TRUE; + //found = true; break; } line++; col = 0; } } @@ -236,28 +236,28 @@ void QpeEditor::find ( const QString &txt, bool caseSensitive, 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 ) + : QMainWindow( parent, name, f ), bFromDocView( false ) { doc = 0; - edited=FALSE; - edited1=FALSE; - setToolBarsMovable( FALSE ); + edited=false; + edited1=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 ); + bar->setHorizontalStretchable( true ); menu = bar; QPEMenuBar *mb = new QPEMenuBar( bar ); QPopupMenu *file = new QPopupMenu( this ); QPopupMenu *edit = new QPopupMenu( this ); QPopupMenu *advancedMenu = new QPopupMenu(this); @@ -329,53 +329,53 @@ 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->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->setToggleAction(true); nStart->addTo( advancedMenu ); 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->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->setToggleAction(true); desktopAction->addTo( advancedMenu); filePermAction = new QAction( tr("File Permissions"), QString::null, 0, this, 0 ); connect( filePermAction, SIGNAL( toggled(bool) ), this, SLOT( doFilePerms(bool) ) ); - filePermAction->setToggleAction(TRUE); + filePermAction->setToggleAction(true); filePermAction->addTo( advancedMenu); searchBarAction = new QAction( tr("Search Bar Open"), QString::null, 0, this, 0 ); connect( searchBarAction, SIGNAL( toggled(bool) ), this, SLOT( setSearchBar(bool) ) ); - searchBarAction->setToggleAction(TRUE); + searchBarAction->setToggleAction(true); searchBarAction->addTo( advancedMenu); font->insertSeparator(); font->insertItem(tr("About"), this, SLOT( doAbout()) ); mb->insertItem( tr( "File" ), file ); mb->insertItem( tr( "Edit" ), edit ); mb->insertItem( tr( "View" ), font ); searchBar = new QPEToolBar(this); - addToolBar( searchBar, "Search", QMainWindow::Top, TRUE ); + addToolBar( searchBar, "Search", QMainWindow::Top, true ); - searchBar->setHorizontalStretchable( TRUE ); + searchBar->setHorizontalStretchable( true ); searchEdit = new QLineEdit( searchBar, "searchEdit" ); searchBar->setStretchableWidget( searchEdit ); connect( searchEdit, SIGNAL( textChanged( const QString & ) ), this, SLOT( search() ) ); @@ -419,57 +419,60 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) cfg.setGroup ( "View" ); promptExit = cfg.readBoolEntry ( "PromptExit", false ); openDesktop = cfg.readBoolEntry ( "OpenDesktop", true ); filePerms = cfg.readBoolEntry ( "FilePermissions", false ); useSearchBar = cfg.readBoolEntry ( "SearchBar", false ); + startWithNew = cfg.readBoolEntry ( "startNew", true); - if(useSearchBar) { - searchBarAction->setOn(true); - } else{ - } + 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() > 0) { + if( qApp->argc() > 1) { currentFileName=qApp->argv()[1]; -// qDebug("<<<<<<<<<<<<<<<<<<<<<<<< "+currentFileName); +// qDebug("<<<<<<<<<<<<<<<<<<<<<<<< "+currentFileName+" %d",qApp->argc()); QFileInfo fi(currentFileName); if(fi.baseName().left(1) == "") { openDotFile(currentFileName); } else { - - nStart->setOn(TRUE); openFile(currentFileName); } - } else - if(cfg.readEntry("startNew","TRUE") == "TRUE") { - - nStart->setOn(TRUE); - fileNew(); } else { - +// qDebug("Do other thing"); + if(startWithNew) { + openDotFile(""); +// fileNew(); + } else { fileOpen(); } + } viewSelection = cfg.readNumEntry( "FileView", 0 ); } TextEdit::~TextEdit() { - if( edited1 & promptExit ) +// qDebug("destr"); +} + +void TextEdit::closeEvent(QCloseEvent *) { +// qDebug("closing here"); + if( edited1 && promptExit) saveAs(); + qApp->quit(); } void TextEdit::cleanUp() { - qDebug("cleanUp");// save(); +// qDebug("cleanUp");// save(); Config cfg ( "TextEdit" ); cfg. setGroup ( "Font" ); QFont f = editor->font(); cfg.writeEntry ( "Family", f. family ( )); cfg.writeEntry ( "Size", f. pointSize ( )); @@ -481,27 +484,30 @@ void TextEdit::cleanUp() { cfg.writeEntry ( "FileView", viewSelection ); cfg.writeEntry ( "PromptExit", promptExit ); cfg.writeEntry ( "OpenDesktop", openDesktop ); cfg.writeEntry ( "FilePermissions", filePerms ); cfg.writeEntry ( "SearchBar", useSearchBar ); + cfg.writeEntry ( "startNew", startWithNew ); + } void TextEdit::accept() { +// qDebug("accept"); if( edited1) saveAs(); - exit(0); + qApp->quit(); } void TextEdit::zoomIn() { - setFontSize(editor->font().pointSize()+1,FALSE); + setFontSize(editor->font().pointSize()+1,false); } void TextEdit::zoomOut() { - setFontSize(editor->font().pointSize()-1,TRUE); + setFontSize(editor->font().pointSize()-1,true); } void TextEdit::setFontSize(int sz, bool round_down_not_up) { int s=10; for (int i=0; i<nfontsizes; i++) { @@ -563,27 +569,26 @@ void TextEdit::fileNew() { // saveAs(); // } newFile(DocLnk()); } void TextEdit::fileOpen() { - Config cfg("TextEdit"); - cfg.setGroup("View"); - // bool b=FALSE; - QMap<QString, QStringList> map; map.insert(tr("All"), QStringList() ); QStringList text; text << "text/*"; map.insert(tr("Text"), text ); text << "*"; map.insert(tr("All"), text ); - QString str = OFileDialog::getOpenFileName( 2, QPEApplication::documentDir(), QString::null, map); + QString str = OFileDialog::getOpenFileName( 2, + QPEApplication::documentDir(), + QString::null, map); if(!str.isEmpty() ) openFile( str ); - + else + updateCaption(); } void TextEdit::doSearchBar() { if(!useSearchBar) searchBar->hide(); else @@ -631,49 +636,39 @@ void TextEdit::editPaste() { editor->paste(); #endif } void TextEdit::editFind() { searchBar->show(); - searchVisible = TRUE; searchEdit->setFocus(); -// Config cfg("TextEdit"); -// cfg.setGroup("View"); -// cfg.writeEntry("SearchBar","Opened"); - } void TextEdit::findNext() { - editor->find( searchEdit->text(), FALSE, FALSE ); + editor->find( searchEdit->text(), false, false ); } void TextEdit::findClose() { - searchVisible = FALSE; searchBar->hide(); -// Config cfg("TextEdit"); -// cfg.setGroup("View"); -// cfg.writeEntry("SearchBar","Closed"); -// cfg.write(); } void TextEdit::search() { - editor->find( searchEdit->text(), FALSE, FALSE ); + editor->find( searchEdit->text(), false, false ); } void TextEdit::newFile( const DocLnk &f ) { DocLnk nf = f; nf.setType("text/plain"); clear(); setWState (WState_Reserved1 ); editor->setFocus(); doc = new DocLnk(nf); currentFileName = "Unnamed"; qDebug("newFile "+currentFileName); updateCaption( currentFileName); -// editor->setEdited( FALSE); +// editor->setEdited( false); } void TextEdit::openDotFile( const QString &f ) { if(!currentFileName.isEmpty()) { currentFileName=f; @@ -683,27 +678,27 @@ void TextEdit::openDotFile( const QString &f ) { file.open(IO_ReadWrite); QTextStream t(&file); while ( !t.atEnd()) { txt+=t.readLine(); } editor->setText(txt); - editor->setEdited( FALSE); - edited1=FALSE; - edited=FALSE; + editor->setEdited( false); + edited1=false; + edited=false; } updateCaption( currentFileName); } 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) { +// bFromDocView = true; + 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) ) { case 0: filer = f; @@ -741,13 +736,13 @@ file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?"), name = name.mid( sep+1 ); updateCaption( name ); } void TextEdit::openFile( const DocLnk &f ) { // clear(); -// bFromDocView = TRUE; +// bFromDocView = true; FileManager fm; QString txt; currentFileName=f.file(); qDebug("openFile doclnk " + currentFileName); if ( !fm.loadFile( f, txt ) ) { // ####### could be a new file @@ -755,29 +750,27 @@ void TextEdit::openFile( const DocLnk &f ) { } // fileNew(); if ( doc ) delete doc; doc = new DocLnk(f); editor->setText(txt); - editor->setEdited( FALSE); - edited1=FALSE; - edited=FALSE; + editor->setEdited( false); + edited1=false; + edited=false; doc->setName(currentFileName); updateCaption(); } void TextEdit::showEditTools() { -// if ( !doc ) -// close(); -// clear(); menu->show(); editBar->show(); - if ( searchVisible ) + if(!useSearchBar) + searchBar->hide(); + else searchBar->show(); -// updateCaption(); setWState (WState_Reserved1 ); } /*! unprompted save */ bool TextEdit::save() { @@ -813,15 +806,15 @@ bool TextEdit::save() { } else { QMessageBox::message(tr("Text Edit"),tr("Write Failed")); return false; } } - editor->setEdited( FALSE); - edited1=FALSE; - edited=FALSE; + editor->setEdited( false); + edited1=false; + edited=false; if(caption().left(1)=="*") setCaption(caption().right(caption().length()-1)); chmod( file.latin1(), mode); } @@ -832,31 +825,31 @@ bool TextEdit::save() { /*! prompted save */ bool TextEdit::saveAs() { qDebug("saveAsFile " + currentFileName); // case of nothing to save... - if ( !doc ) { -//|| !bFromDocView) - qDebug("no doc"); - return true; - } - if ( !editor->edited() ) { - delete doc; - doc = 0; - return true; - } +// if ( !doc && !currentFileName.isEmpty()) { +// //|| !bFromDocView) +// qDebug("no doc"); +// return true; +// } +// if ( !editor->edited() ) { +// delete doc; +// doc = 0; +// return true; +// } QString rt = editor->text(); qDebug(currentFileName); if( currentFileName.isEmpty() || currentFileName == tr("Unnamed") || currentFileName == tr("Text Editor")) { -// qDebug("do silly TT filename thing"); - if ( doc->name().isEmpty() ) { + qDebug("do silly TT filename thing"); +// if ( doc && doc->name().isEmpty() ) { QString pt = rt.simplifyWhiteSpace(); int i = pt.find( ' ' ); QString docname = pt; if ( i > 0 ) docname = pt.left( i ); // remove "." at the beginning @@ -866,45 +859,53 @@ bool TextEdit::saveAs() { // cut the length. filenames longer than that //don't make sense and something goes wrong when they get too long. if ( docname.length() > 40 ) docname = docname.left(40); if ( docname.isEmpty() ) docname = tr("Unnamed"); - doc->setName(docname); + if(doc) doc->setName(docname); currentFileName=docname; +// } +// else +// qDebug("hmmmmmm"); } - } + QMap<QString, QStringList> map; map.insert(tr("All"), QStringList() ); QStringList text; text << "text/*"; map.insert(tr("Text"), text ); text << "*"; map.insert(tr("All"), text ); -// if(currentFileName + + QFileInfo cuFi( currentFileName); + QString filee = cuFi.fileName(); + QString dire = cuFi.dirPath(); + if(dire==".") + dire = QPEApplication::documentDir(); QString str = OFileDialog::getSaveFileName( 2, - QPEApplication::documentDir(), - currentFileName, map); + dire, + filee, map); if(!str.isEmpty() ) { QString fileNm=str; qDebug("saving filename "+fileNm); QFileInfo fi(fileNm); currentFileName=fi.fileName(); - if(doc) { + if(doc) // QString file = doc->file(); // doc->removeFiles(); delete doc; DocLnk nf; nf.setType("text/plain"); nf.setFile( fileNm); doc = new DocLnk(nf); // editor->setText(rt); -// qDebug("openFile doclnk "+currentFileName); + qDebug("Saving file as "+currentFileName); doc->setName( currentFileName); updateCaption( currentFileName); FileManager fm; if ( !fm.saveFile( *doc, rt ) ) { return false; @@ -918,13 +919,13 @@ bool TextEdit::saveAs() { filePerm->showMaximized(); filePerm->exec(); if( filePerm) delete filePerm; } - } +// } editor->setEdited( false); edited1 = false; edited = false; if(caption().left(1)=="*") setCaption(caption().right(caption().length()-1)); @@ -965,29 +966,24 @@ void TextEdit::setDocument(const QString& fileref) { QFileInfo fi(currentFileName); qDebug("basename:"+fi.baseName()+": current filenmame "+currentFileName); if(fi.baseName().left(1) == "") { // openDotFile(currentFileName); } else { qDebug("setDoc open"); - bFromDocView = TRUE; + bFromDocView = true; openFile(fileref); - editor->setEdited(TRUE); - edited1=FALSE; - edited=TRUE; + editor->setEdited(true); + edited1=false; + edited=true; // doSearchBar(); } } updateCaption( currentFileName); } -void TextEdit::closeEvent( QCloseEvent *e ) { - bFromDocView = FALSE; - e->accept(); -} - 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 ); @@ -1013,30 +1009,25 @@ void TextEdit::editDelete() { // exit break; }; } void TextEdit::changeStartConfig( bool b ) { - + startWithNew=b; Config cfg("TextEdit"); cfg.setGroup("View"); - if(b) { - qDebug("bool"); - cfg.writeEntry("startNew","TRUE"); - } else { - cfg.writeEntry("startNew","FALSE"); - } + cfg.writeEntry("startNew",b); update(); } void TextEdit::editorChanged() { if(editor->edited() && edited && !edited1) { setCaption( "*"+caption()); - edited1=TRUE; + edited1=true; } - edited=TRUE; + 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 a95e742..bb7d693 100644 --- a/core/apps/textedit/textedit.h +++ b/core/apps/textedit/textedit.h @@ -62,13 +62,12 @@ public: void openFile( const QString & ); QCopChannel * channel; public slots: void editorChanged(); void receive(const QCString&, const QByteArray&); protected: - bool fileIs, useAdvancedFeatures, promptExit, openDesktop, filePerms, useSearchBar; void closeEvent( QCloseEvent *e ); void doSearchBar(); private slots: void editPasteTimeDate(); void doPrompt(bool); void doDesktop(bool); @@ -111,22 +110,21 @@ private slots: 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; QpeEditor* editor; QToolBar *menu, *editBar, *searchBar; QPopupMenu *advancedMenu; QLineEdit *searchEdit; DocLnk *doc; - bool searchVisible; + bool fileIs, useAdvancedFeatures, promptExit, openDesktop, filePerms, useSearchBar, startWithNew; bool bFromDocView; int viewSelection; QAction *zin, *zout; QString currentFileName; }; |