summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-11-09 20:52:24 (UTC)
committer llornkcor <llornkcor>2002-11-09 20:52:24 (UTC)
commitc1f59c3404e9c0312e3d0418d5286b12d2e98d92 (patch) (side-by-side diff)
treea7700be7ae3af4656c365c664e4db9822fdf7e3a
parentb9cd525928755b78fe5041c4ea9d674a457dfa0d (diff)
downloadopie-c1f59c3404e9c0312e3d0418d5286b12d2e98d92.zip
opie-c1f59c3404e9c0312e3d0418d5286b12d2e98d92.tar.gz
opie-c1f59c3404e9c0312e3d0418d5286b12d2e98d92.tar.bz2
fixes and options. commandline now works a bit more sane, and makes new file if not found
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
@@ -19,17 +19,17 @@
**********************************************************************/
#include "textedit.h"
#include <qpe/qpeapplication.h>
int main( int argc, char **argv )
{
QPEApplication a( argc, 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
@@ -34,41 +34,42 @@
#include <qpe/fontdatabase.h>
#include <qpe/global.h>
#include <qpe/fileselector.h>
#include <qpe/applnk.h>
#include <qpe/resource.h>
#include <qpe/config.h>
#include <qpe/qpeapplication.h>
#include <qpe/qpemenubar.h>
#include <qpe/qpetoolbar.h>
#include <qpe/qcopenvelope_qws.h>
+#include <qtextstream.h>
#include <qdatetime.h>
#include <qclipboard.h>
#include <qstringlist.h>
#include <qaction.h>
#include <qcolordialog.h>
#include <qfileinfo.h>
#include <qlineedit.h>
#include <qmessagebox.h>
#include <qobjectlist.h>
#include <qpopupmenu.h>
#include <qspinbox.h>
#include <qtoolbutton.h>
#include <qwidgetstack.h>
#include <qcheckbox.h>
#include <qcombo.h>
#include <qlayout.h>
-
+#include <qapplication.h>
#include <unistd.h>
#include <sys/stat.h>
#include <stdlib.h> //getenv
/* XPM */
static char * filesave_xpm[] = {
"16 16 78 1",
" c None",
". c #343434",
"+ c #A0A0A0",
"@ c #565656",
@@ -162,29 +163,28 @@ static char * filesave_xpm[] = {
" +...vEKxzLM ",
" +...z]n$ ",
" +... "};
#if QT_VERSION < 300
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 );
- }
+}
void find( const QString &txt, bool caseSensitive,
bool backwards );
//public slots:
/*
signals:
void notFound();
void searchWrapped();
*/
private:
@@ -215,27 +215,25 @@ void QpeEditor::find ( const QString &txt, bool caseSensitive,
int findCol = getString( line )->find( txt, col, caseSensitive );
if ( findCol >= 0 ) {
setCursorPosition( line, findCol, FALSE );
col = findCol + txt.length();
setCursorPosition( line, col, TRUE );
//found = TRUE;
break;
}
line++;
col = 0;
}
-
}
-
}
#else
#error "Must make a QpeEditor that inherits QTextEdit"
#endif
static const int nfontsizes = 6;
static const int fontsize[nfontsizes] = {8,10,12,14,18,24};
@@ -348,24 +346,30 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
nAdvanced->addTo( advancedMenu );
desktopAction = new QAction( tr("Always open linked file"), QString::null, 0, this, 0 );
connect( desktopAction, SIGNAL( toggled(bool) ), this, SLOT( doDesktop(bool) ) );
desktopAction->setToggleAction(TRUE);
desktopAction->addTo( advancedMenu);
filePermAction = new QAction( tr("File Permissions"), QString::null, 0, this, 0 );
connect( filePermAction, SIGNAL( toggled(bool) ), this, SLOT( doFilePerms(bool) ) );
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()) );
mb->insertItem( tr( "File" ), file );
mb->insertItem( tr( "Edit" ), edit );
mb->insertItem( tr( "View" ), font );
searchBar = new QPEToolBar(this);
addToolBar( searchBar, "Search", QMainWindow::Top, TRUE );
searchBar->setHorizontalStretchable( TRUE );
@@ -401,73 +405,94 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
cfg. setGroup ( "Font" );
QFont defaultFont = editor-> font ( );
QString family = cfg. readEntry ( "Family", defaultFont. family ( ));
int size = cfg. readNumEntry ( "Size", defaultFont. pointSize ( ));
int weight = cfg. readNumEntry ( "Weight", defaultFont. weight ( ));
bool italic = cfg. readBoolEntry ( "Italic", defaultFont. italic ( ));
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 );
-
+ 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 );
bool wrap = cfg. readBoolEntry ( "Wrap", true );
wa-> setOn ( wrap );
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 );
}
TextEdit::~TextEdit() {
if( edited1 & promptExit )
saveAs();
}
void TextEdit::cleanUp() {
qDebug("cleanUp");// save();
Config cfg ( "TextEdit" );
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 );
}
void TextEdit::accept() {
if( edited1)
saveAs();
exit(0);
}
void TextEdit::zoomIn() {
setFontSize(editor->font().pointSize()+1,FALSE);
}
@@ -511,24 +536,37 @@ void TextEdit::setBold(bool y) {
void TextEdit::setItalic(bool y) {
QFont f = editor->font();
f.setItalic(y);
editor->setFont(f);
}
void TextEdit::setWordWrap(bool y) {
bool state = editor->edited();
editor->setWordWrap(y ? QMultiLineEdit::WidgetWidth : QMultiLineEdit::NoWrap );
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();
// }
newFile(DocLnk());
}
void TextEdit::fileOpen() {
Config cfg("TextEdit");
cfg.setGroup("View");
// bool b=FALSE;
@@ -537,28 +575,28 @@ void TextEdit::fileOpen() {
QStringList text;
text << "text/*";
map.insert(tr("Text"), text );
text << "*";
map.insert(tr("All"), text );
QString str = OFileDialog::getOpenFileName( 2, QPEApplication::documentDir(), QString::null, map);
if(!str.isEmpty() )
openFile( str );
}
void TextEdit::doSearchBar() {
- Config cfg("TextEdit");
- cfg.setGroup("View");
- if(cfg.readEntry("SearchBar","Closed") != "Opened")
+ if(!useSearchBar)
searchBar->hide();
+ else
+ searchBar->show();
}
#if 0
void TextEdit::slotFind() {
FindDialog frmFind( tr("Text Editor"), this );
connect( &frmFind, SIGNAL(signalFindClicked(const QString &, bool, bool, int)),
editor, SLOT(slotDoFind( const QString&,bool,bool)));
//case sensitive, backwards, [category]
connect( editor, SIGNAL(notFound()),
&frmFind, SLOT(slotNotFound()) );
@@ -589,94 +627,121 @@ void TextEdit::editCopy() {
}
void TextEdit::editPaste() {
#ifndef QT_NO_CLIPBOARD
editor->paste();
#endif
}
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");
}
void TextEdit::findNext() {
editor->find( searchEdit->text(), FALSE, FALSE );
}
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() {
editor->find( searchEdit->text(), FALSE, FALSE );
}
void TextEdit::newFile( const DocLnk &f ) {
DocLnk nf = f;
nf.setType("text/plain");
clear();
setWState (WState_Reserved1 );
editor->setFocus();
doc = new DocLnk(nf);
currentFileName = "Unnamed";
qDebug("newFile "+currentFileName);
updateCaption( currentFileName);
// 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"),
- 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;
break;
case 1:
DocLnk sf(f);
filer = sf.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;
}
DocLnk nf;
nf.setType("text/plain");
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
QString name = filer;
int sep = name.findRev( '/' );
if ( sep > 0 )
name = name.mid( sep+1 );
updateCaption( name );
}
void TextEdit::openFile( const DocLnk &f ) {
// clear();
// bFromDocView = TRUE;
@@ -699,25 +764,25 @@ void TextEdit::openFile( const DocLnk &f ) {
doc->setName(currentFileName);
updateCaption();
}
void TextEdit::showEditTools() {
// if ( !doc )
// close();
// clear();
menu->show();
editBar->show();
if ( searchVisible )
- searchBar->show();
+ searchBar->show();
// updateCaption();
setWState (WState_Reserved1 );
}
/*!
unprompted save */
bool TextEdit::save() {
QString file = doc->file();
qDebug("saver file "+file);
QString name= doc->name();
qDebug("File named "+name);
QString rt = editor->text();
@@ -867,47 +932,61 @@ bool TextEdit::saveAs() {
}
qDebug("returning false");
return false;
} //end saveAs
void TextEdit::clear() {
delete doc;
doc = 0;
editor->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);
}
void TextEdit::closeEvent( QCloseEvent *e ) {
bFromDocView = FALSE;
e->accept();
}
void TextEdit::changeFont() {
QDialog *d = new QDialog ( this, "FontDialog", true );
d-> setCaption ( tr( "Choose font" ));
QBoxLayout *lay = new QVBoxLayout ( d );
OFontSelector *ofs = new OFontSelector ( true, d );
@@ -991,12 +1070,13 @@ void TextEdit::doFilePerms(bool b) {
cfg.setGroup ( "View" );
cfg.writeEntry ( "FilePermissions", b);
}
void TextEdit::editPasteTimeDate() {
#ifndef QT_NO_CLIPBOARD
QClipboard *cb = QApplication::clipboard();
QDateTime dt = QDateTime::currentDateTime();
cb->setText( dt.toString());
editor->paste();
#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
@@ -48,33 +48,33 @@ class FileSelector;
class QpeEditor;
class QPopupMenu;
class TextEdit : public QMainWindow
{
Q_OBJECT
public:
TextEdit( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
~TextEdit();
QPopupMenu *font;
- QAction *nStart, *nFileDlgOpt, *nAdvanced, *desktopAction, *filePermAction;
+ QAction *nStart, *nFileDlgOpt, *nAdvanced, *desktopAction, *filePermAction, *searchBarAction;
bool edited, edited1;
void openFile( const QString & );
QCopChannel * channel;
public slots:
void editorChanged();
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();
private slots:
void editPasteTimeDate();
void doPrompt(bool);
void doDesktop(bool);
void doFilePerms(bool);
void doAbout();
void setDocument(const QString&);
void changeFont();
void fileNew();
void fileRevert();
@@ -97,26 +97,28 @@ private slots:
void search();
void accept();
void newFile( const DocLnk & );
void openFile( const DocLnk & );
void showEditTools();
void zoomIn();
void zoomOut();
void setBold(bool y);
void setItalic(bool y);
void setWordWrap(bool y);
+ void setSearchBar(bool);
private:
+ void openDotFile(const QString &);
void colorChanged( const QColor &c );
void clear();
void updateCaption( const QString &name=QString::null );
void setFontSize(int sz, bool round_down_not_up);
private:
// fileSaver *fileSaveDlg;
// fileBrowser *browseForFiles;
QpeEditor* editor;
QToolBar *menu, *editBar, *searchBar;
QPopupMenu *advancedMenu;
QLineEdit *searchEdit;