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
@@ -30,4 +30,4 @@ int main( int argc, char **argv )
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]);
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,4 +174,3 @@ public:
QpeEditor( QWidget *parent, const char * name = 0 )
- : QMultiLineEdit( parent, name )
- {
+ : QMultiLineEdit( parent, name ) {
clearTableFlags();
@@ -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();
@@ -419,3 +423,8 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
filePerms = cfg. readBoolEntry ( "FilePermissions", false );
+ useSearchBar = cfg.readBoolEntry ( "SearchBar", false );
+ if(useSearchBar) {
+ searchBarAction->setOn(true);
+ } else{
+ }
if(promptExit ) nAdvanced->setOn ( true );
@@ -428,3 +437,17 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
+ 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);
@@ -432,2 +455,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
} else {
+
fileOpen();
@@ -461,2 +485,3 @@ void TextEdit::cleanUp() {
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;
@@ -654,2 +715,5 @@ file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?"),
}
+ } else if(fi.baseName().left(1) == "") {
+ currentFileName=f;
+ openDotFile(currentFileName);
} else {
@@ -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());
+ openFile(nf);
+
qDebug("openFile string "+currentFileName);
- openFile(nf);
showEditTools();
@@ -878,3 +943,4 @@ void TextEdit::clear() {
void TextEdit::updateCaption( const QString &name ) {
- if ( !doc )
+
+ if ( name.isEmpty() )
setCaption( tr("Text Editor") );
@@ -895,2 +961,11 @@ 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;
@@ -900,3 +975,7 @@ void TextEdit::setDocument(const QString& fileref) {
edited=TRUE;
- doSearchBar();
+
+// doSearchBar();
+ }
+ }
+ updateCaption( currentFileName);
}
@@ -1002 +1081,2 @@ void TextEdit::editPasteTimeDate() {
}
+
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
@@ -59,3 +59,3 @@ public:
QPopupMenu *font;
- QAction *nStart, *nFileDlgOpt, *nAdvanced, *desktopAction, *filePermAction;
+ QAction *nStart, *nFileDlgOpt, *nAdvanced, *desktopAction, *filePermAction, *searchBarAction;
bool edited, edited1;
@@ -67,3 +67,3 @@ void receive(const QCString&, const QByteArray&);
protected:
- bool fileIs, useAdvancedFeatures, promptExit, openDesktop, filePerms;
+ bool fileIs, useAdvancedFeatures, promptExit, openDesktop, filePerms, useSearchBar;
void closeEvent( QCloseEvent *e );
@@ -108,4 +108,6 @@ private slots:
void setWordWrap(bool y);
+ void setSearchBar(bool);
private:
+ void openDotFile(const QString &);
void colorChanged( const QColor &c );