summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/apps/textedit/main.cpp4
-rw-r--r--core/apps/textedit/textedit.cpp120
-rw-r--r--core/apps/textedit/textedit.h6
3 files changed, 106 insertions, 24 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,6 +173,5 @@ class QpeEditor : public QMultiLineEdit
public:
QpeEditor( QWidget *parent, const char * name = 0 )
- : QMultiLineEdit( parent, name )
- {
+ : QMultiLineEdit( parent, name ) {
clearTableFlags();
setTableFlags( Tbl_vScrollBar | Tbl_autoHScrollBar );
@@ -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,5 +415,5 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
editor-> setFont ( defaultFont );
- updateCaption();
+// updateCaption();
cfg.setGroup ( "View" );
@@ -418,5 +422,10 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
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,8 +436,23 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
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();
}
@@ -460,4 +484,5 @@ void TextEdit::cleanUp() {
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,7 +674,30 @@ 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) {
@@ -653,4 +714,7 @@ 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);
@@ -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());
+ openFile(nf);
+
qDebug("openFile string "+currentFileName);
- openFile(nf);
showEditTools();
// Show filename in caption
@@ -877,5 +942,6 @@ void TextEdit::clear() {
void TextEdit::updateCaption( const QString &name ) {
- if ( !doc )
+
+ if ( name.isEmpty() )
setCaption( tr("Text Editor") );
else {
@@ -894,4 +960,13 @@ 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);
@@ -899,5 +974,9 @@ void TextEdit::setDocument(const QString& fileref) {
edited1=FALSE;
edited=TRUE;
- doSearchBar();
+
+// 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();