summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/main.cpp4
-rw-r--r--core/apps/textedit/textedit.cpp214
-rw-r--r--core/apps/textedit/textedit.h6
3 files changed, 153 insertions, 71 deletions
diff --git a/core/apps/textedit/main.cpp b/core/apps/textedit/main.cpp
index d0d37d2..4f27667 100644
--- a/core/apps/textedit/main.cpp
+++ b/core/apps/textedit/main.cpp
@@ -29,6 +29,6 @@ int main( int argc, char **argv )
TextEdit e;
a.showMainDocumentWidget(&e);
- if ( argc == 3 && argv[1] == QCString("-f") )
- e.openFile(argv[2]);
+// if ( argc == 3 && argv[1] == QCString("-f") )
+// e.openFile(argv[2]);
a.exec();
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
@@ -44,4 +44,5 @@
#include <qpe/qcopenvelope_qws.h>
+#include <qtextstream.h>
#include <qdatetime.h>
#include <qclipboard.h>
@@ -60,5 +61,5 @@
#include <qcombo.h>
#include <qlayout.h>
-
+#include <qapplication.h>
#include <unistd.h>
#include <sys/stat.h>
@@ -172,9 +173,8 @@ class QpeEditor : public QMultiLineEdit
public:
QpeEditor( QWidget *parent, const char * name = 0 )
- : QMultiLineEdit( parent, name )
- {
+ : QMultiLineEdit( parent, name ) {
clearTableFlags();
setTableFlags( Tbl_vScrollBar | Tbl_autoHScrollBar );
- }
+}
void find( const QString &txt, bool caseSensitive,
@@ -225,7 +225,5 @@ void QpeEditor::find ( const QString &txt, bool caseSensitive,
col = 0;
}
-
}
-
}
@@ -358,4 +356,10 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
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();
@@ -411,12 +415,17 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
editor-> setFont ( defaultFont );
- updateCaption();
+// updateCaption();
cfg.setGroup ( "View" );
- 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 );
if(openDesktop) desktopAction->setOn ( true );
@@ -427,11 +436,26 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
setWordWrap ( wrap );
- 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 );
}
@@ -448,16 +472,17 @@ void TextEdit::cleanUp() {
cfg. setGroup ( "Font" );
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 );
}
@@ -521,4 +546,17 @@ 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() {
// if( !bFromDocView ) {
@@ -547,8 +585,8 @@ 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();
}
@@ -599,7 +637,7 @@ void TextEdit::editFind() {
searchVisible = TRUE;
searchEdit->setFocus();
- Config cfg("TextEdit");
- cfg.setGroup("View");
- cfg.writeEntry("SearchBar","Opened");
+// Config cfg("TextEdit");
+// cfg.setGroup("View");
+// cfg.writeEntry("SearchBar","Opened");
}
@@ -613,8 +651,8 @@ 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();
}
@@ -636,13 +674,36 @@ 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 ) {
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"),
- 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:
filer = f;
@@ -653,9 +714,12 @@ file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?"),
break;
}
+ } 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;
}
@@ -664,9 +728,10 @@ file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?"),
nf.setFile(filer);
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();
// Show filename in caption
@@ -709,5 +774,5 @@ void TextEdit::showEditTools() {
editBar->show();
if ( searchVisible )
- searchBar->show();
+ searchBar->show();
// updateCaption();
setWState (WState_Reserved1 );
@@ -877,27 +942,41 @@ 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") );
}
}
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);
}
@@ -1001,2 +1080,3 @@ void TextEdit::editPasteTimeDate() {
#endif
}
+
diff --git a/core/apps/textedit/textedit.h b/core/apps/textedit/textedit.h
index 4848051..a95e742 100644
--- a/core/apps/textedit/textedit.h
+++ b/core/apps/textedit/textedit.h
@@ -58,5 +58,5 @@ public:
QPopupMenu *font;
- QAction *nStart, *nFileDlgOpt, *nAdvanced, *desktopAction, *filePermAction;
+ QAction *nStart, *nFileDlgOpt, *nAdvanced, *desktopAction, *filePermAction, *searchBarAction;
bool edited, edited1;
void openFile( const QString & );
@@ -66,5 +66,5 @@ public slots:
void receive(const QCString&, const QByteArray&);
protected:
- bool fileIs, useAdvancedFeatures, promptExit, openDesktop, filePerms;
+ bool fileIs, useAdvancedFeatures, promptExit, openDesktop, filePerms, useSearchBar;
void closeEvent( QCloseEvent *e );
void doSearchBar();
@@ -107,6 +107,8 @@ private slots:
void setItalic(bool y);
void setWordWrap(bool y);
+ void setSearchBar(bool);
private:
+ void openDotFile(const QString &);
void colorChanged( const QColor &c );
void clear();