Diffstat (limited to 'core/apps/textedit/textedit.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/apps/textedit/textedit.cpp | 214 |
1 files changed, 147 insertions, 67 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 @@ -45,2 +45,3 @@ +#include <qtextstream.h> #include <qdatetime.h> @@ -61,3 +62,3 @@ #include <qlayout.h> - +#include <qapplication.h> #include <unistd.h> @@ -173,7 +174,6 @@ public: QpeEditor( QWidget *parent, const char * name = 0 ) - : QMultiLineEdit( parent, name ) - { + : QMultiLineEdit( parent, name ) { clearTableFlags(); setTableFlags( Tbl_vScrollBar | Tbl_autoHScrollBar ); - } +} @@ -226,5 +226,3 @@ void QpeEditor::find ( const QString &txt, bool caseSensitive, } - } - } @@ -359,2 +357,8 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) + 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(); @@ -412,3 +416,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) - updateCaption(); +// updateCaption(); @@ -416,6 +420,11 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) - promptExit = cfg. readBoolEntry ( "PromptExit", false ); - openDesktop = cfg. readBoolEntry ( "OpenDesktop", true ); - filePerms = cfg. readBoolEntry ( "FilePermissions", false ); - + 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 ); @@ -428,9 +437,24 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) - if(cfg.readEntry("startNew","TRUE") == "TRUE") { - nStart->setOn(TRUE); - fileNew(); - } else { - fileOpen(); - } - + 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(); + } + viewSelection = cfg.readNumEntry( "FileView", 0 ); @@ -449,14 +473,15 @@ void TextEdit::cleanUp() { QFont f = editor->font(); - cfg. writeEntry ( "Family", f. family ( )); - cfg. writeEntry ( "Size", f. pointSize ( )); - cfg. writeEntry ( "Weight", f. weight ( )); - cfg. writeEntry ( "Italic", f. italic ( )); + cfg.writeEntry ( "Family", f. family ( )); + cfg.writeEntry ( "Size", f. pointSize ( )); + cfg.writeEntry ( "Weight", f. weight ( )); + cfg.writeEntry ( "Italic", f. italic ( )); - cfg. setGroup ( "View" ); - cfg. writeEntry ( "Wrap", editor-> wordWrap ( ) == QMultiLineEdit::WidgetWidth ); - cfg. writeEntry ( "FileView", viewSelection ); + cfg.setGroup ( "View" ); + cfg.writeEntry ( "Wrap", editor-> wordWrap ( ) == QMultiLineEdit::WidgetWidth ); + cfg.writeEntry ( "FileView", viewSelection ); - cfg. writeEntry ( "PromptExit", promptExit ); - cfg. writeEntry ( "OpenDesktop", openDesktop ); - cfg. writeEntry ( "FilePermissions", filePerms ); + cfg.writeEntry ( "PromptExit", promptExit ); + cfg.writeEntry ( "OpenDesktop", openDesktop ); + cfg.writeEntry ( "FilePermissions", filePerms ); + cfg.writeEntry ( "SearchBar", useSearchBar ); } @@ -522,2 +547,15 @@ void TextEdit::setWordWrap(bool y) { +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() { @@ -548,6 +586,6 @@ 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(); } @@ -600,5 +638,5 @@ void TextEdit::editFind() { searchEdit->setFocus(); - Config cfg("TextEdit"); - cfg.setGroup("View"); - cfg.writeEntry("SearchBar","Opened"); +// Config cfg("TextEdit"); +// cfg.setGroup("View"); +// cfg.writeEntry("SearchBar","Opened"); @@ -614,6 +652,6 @@ void TextEdit::findClose() { 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(); } @@ -637,2 +675,24 @@ void TextEdit::newFile( const DocLnk &f ) { +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 ) { @@ -640,2 +700,3 @@ void TextEdit::openFile( const QString &f ) { QString filer; + QFileInfo fi( f); // bFromDocView = TRUE; @@ -643,5 +704,5 @@ void TextEdit::openFile( const QString &f ) { switch ( QMessageBox::warning(this,tr("Text Editor"), - tr("Text Editor has detected<BR>you selected a <B>.desktop</B> + 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) ) { + tr(".desktop File"),tr("Linked Document"),0,1,1) ) { case 0: @@ -654,7 +715,10 @@ file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?"), } + } else if(fi.baseName().left(1) == "") { + currentFileName=f; + openDotFile(currentFileName); } else { - DocLnk sf(f); - filer = sf.file(); - if(filer.right(1) == "/") - filer = f; + DocLnk sf(f); + filer = sf.file(); + if(filer.right(1) == "/") + filer = f; } @@ -665,7 +729,8 @@ file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?"), currentFileName=filer; - QFileInfo fi( currentFileName); - nf.setName(fi.baseName()); - qDebug("openFile string "+currentFileName); - openFile(nf); + nf.setName(fi.baseName()); + openFile(nf); + + qDebug("openFile string "+currentFileName); + showEditTools(); @@ -710,3 +775,3 @@ void TextEdit::showEditTools() { if ( searchVisible ) - searchBar->show(); + searchBar->show(); // updateCaption(); @@ -878,15 +943,16 @@ void TextEdit::clear() { void TextEdit::updateCaption( const QString &name ) { - if ( !doc ) - setCaption( tr("Text Editor") ); + + if ( name.isEmpty() ) + setCaption( tr("Text Editor") ); else { - QString s = name; - if ( s.isNull() ) - s = doc->name(); - if ( s.isEmpty() ) { - s = tr( "Unnamed" ); - currentFileName=s; - } - if(s.left(1) == "/") - s = s.right(s.length()-1); - setCaption( s + " - " + tr("Text Editor") ); + QString s = name; + if ( s.isNull() ) + s = doc->name(); + if ( s.isEmpty() ) { + s = tr( "Unnamed" ); + currentFileName=s; + } + if(s.left(1) == "/") + s = s.right(s.length()-1); + setCaption( s + " - " + tr("Text Editor") ); } @@ -895,8 +961,21 @@ void TextEdit::updateCaption( const QString &name ) { void TextEdit::setDocument(const QString& fileref) { - bFromDocView = TRUE; - openFile(fileref); - editor->setEdited(TRUE); - edited1=FALSE; - edited=TRUE; - doSearchBar(); + 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(); + } + } + updateCaption( currentFileName); } @@ -1002 +1081,2 @@ void TextEdit::editPasteTimeDate() { } + |