Diffstat (limited to 'core/apps/textedit/textedit.cpp') (more/less context) (show whitespace changes)
| -rw-r--r-- | core/apps/textedit/textedit.cpp | 120 |
1 files changed, 100 insertions, 20 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index e3b8361..464671a 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp @@ -43,6 +43,7 @@ #include <qpe/qpetoolbar.h> #include <qpe/qcopenvelope_qws.h> +#include <qtextstream.h> #include <qdatetime.h> #include <qclipboard.h> #include <qstringlist.h> @@ -59,7 +60,7 @@ #include <qcheckbox.h> #include <qcombo.h> #include <qlayout.h> - +#include <qapplication.h> #include <unistd.h> #include <sys/stat.h> #include <stdlib.h> //getenv @@ -171,8 +172,7 @@ class QpeEditor : public QMultiLineEdit // Q_OBJECT public: QpeEditor( QWidget *parent, const char * name = 0 ) - : QMultiLineEdit( parent, name ) - { + : QMultiLineEdit( parent, name ) { clearTableFlags(); setTableFlags( Tbl_vScrollBar | Tbl_autoHScrollBar ); } @@ -224,9 +224,7 @@ void QpeEditor::find ( const QString &txt, bool caseSensitive, line++; col = 0; } - } - } @@ -357,6 +355,12 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) 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->addTo( advancedMenu); + + font->insertSeparator(); font->insertItem(tr("About"), this, SLOT( doAbout()) ); @@ -410,14 +414,19 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) defaultFont = QFont ( family, size, weight, italic ); editor-> setFont ( defaultFont ); - updateCaption(); +// updateCaption(); cfg.setGroup ( "View" ); promptExit = cfg. readBoolEntry ( "PromptExit", false ); openDesktop = cfg. readBoolEntry ( "OpenDesktop", true ); filePerms = cfg. readBoolEntry ( "FilePermissions", false ); + useSearchBar = cfg.readBoolEntry ( "SearchBar", false ); + if(useSearchBar) { + searchBarAction->setOn(true); + } else{ + } if(promptExit ) nAdvanced->setOn ( true ); if(openDesktop) desktopAction->setOn ( true ); if(filePerms) filePermAction->setOn ( true ); @@ -426,10 +435,25 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) wa-> setOn ( wrap ); setWordWrap ( wrap ); + if( qApp->argc() > 0) { + currentFileName=qApp->argv()[1]; +// qDebug("<<<<<<<<<<<<<<<<<<<<<<<< "+currentFileName); + 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 { + fileOpen(); } @@ -459,6 +483,7 @@ void TextEdit::cleanUp() { cfg. writeEntry ( "PromptExit", promptExit ); cfg. writeEntry ( "OpenDesktop", openDesktop ); cfg. writeEntry ( "FilePermissions", filePerms ); + cfg.writeEntry ( "SearchBar", useSearchBar ); } @@ -520,6 +545,19 @@ void TextEdit::setWordWrap(bool y) { editor->setEdited( state ); } +void TextEdit::setSearchBar(bool b) { + useSearchBar=b; + Config cfg("TextEdit"); + cfg.setGroup("View"); + cfg.writeEntry ( "SearchBar", b ); + searchBarAction->setOn(b); + if(b) + searchBar->show(); + else + searchBar->hide(); + editor->setFocus(); +} + void TextEdit::fileNew() { // if( !bFromDocView ) { // saveAs(); @@ -546,10 +584,10 @@ void TextEdit::fileOpen() { } void TextEdit::doSearchBar() { - Config cfg("TextEdit"); - cfg.setGroup("View"); - if(cfg.readEntry("SearchBar","Closed") != "Opened") + if(!useSearchBar) searchBar->hide(); + else + searchBar->show(); } #if 0 @@ -598,9 +636,9 @@ void TextEdit::editFind() { searchBar->show(); searchVisible = TRUE; searchEdit->setFocus(); - Config cfg("TextEdit"); - cfg.setGroup("View"); - cfg.writeEntry("SearchBar","Opened"); +// Config cfg("TextEdit"); +// cfg.setGroup("View"); +// cfg.writeEntry("SearchBar","Opened"); } @@ -612,10 +650,10 @@ void TextEdit::findNext() { void TextEdit::findClose() { searchVisible = FALSE; searchBar->hide(); - Config cfg("TextEdit"); - cfg.setGroup("View"); - cfg.writeEntry("SearchBar","Closed"); - cfg.write(); +// Config cfg("TextEdit"); +// cfg.setGroup("View"); +// cfg.writeEntry("SearchBar","Closed"); +// cfg.write(); } void TextEdit::search() { @@ -635,9 +673,32 @@ void TextEdit::newFile( const DocLnk &f ) { // editor->setEdited( FALSE); } +void TextEdit::openDotFile( const QString &f ) { + if(!currentFileName.isEmpty()) { + currentFileName=f; + + qDebug("openFile dotfile " + currentFileName); + QString txt; + QFile file(f); + file.open(IO_ReadWrite); + QTextStream t(&file); + while ( !t.atEnd()) { + txt+=t.readLine(); + } + editor->setText(txt); + 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) { switch ( QMessageBox::warning(this,tr("Text Editor"), @@ -652,6 +713,9 @@ file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?"), filer = sf.file(); break; } + } else if(fi.baseName().left(1) == "") { + currentFileName=f; + openDotFile(currentFileName); } else { DocLnk sf(f); filer = sf.file(); @@ -663,11 +727,12 @@ file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?"), nf.setType("text/plain"); nf.setFile(filer); currentFileName=filer; - QFileInfo fi( currentFileName); + nf.setName(fi.baseName()); + openFile(nf); + qDebug("openFile string "+currentFileName); - openFile(nf); showEditTools(); // Show filename in caption QString name = filer; @@ -876,7 +941,8 @@ void TextEdit::clear() { } void TextEdit::updateCaption( const QString &name ) { - if ( !doc ) + + if ( name.isEmpty() ) setCaption( tr("Text Editor") ); else { QString s = name; @@ -893,12 +959,25 @@ void TextEdit::updateCaption( const QString &name ) { } void TextEdit::setDocument(const QString& fileref) { + if(fileref != "Unnamed") { + currentFileName=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; - doSearchBar(); + +// doSearchBar(); + } + } + updateCaption( currentFileName); } void TextEdit::closeEvent( QCloseEvent *e ) { @@ -1000,3 +1079,4 @@ void TextEdit::editPasteTimeDate() { editor->paste(); #endif } + |