summaryrefslogtreecommitdiff
path: root/core/apps/textedit/textedit.cpp
Side-by-side diff
Diffstat (limited to 'core/apps/textedit/textedit.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/textedit.cpp108
1 files changed, 26 insertions, 82 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 3a189cb..68ee1b4 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -46,12 +46,13 @@
#include <qobjectlist.h>
#include <qpopupmenu.h>
#include <qspinbox.h>
#include <qtoolbutton.h>
#include <qwidgetstack.h>
#include <qcheckbox.h>
+#include <qcombo.h>
#include <unistd.h>
#include <sys/stat.h>
#include <stdlib.h> //getenv
/* XPM */
static char * filesave_xpm[] = {
@@ -222,20 +223,12 @@ void QpeEditor::find ( const QString &txt, bool caseSensitive,
#error "Must make a QpeEditor that inherits QTextEdit"
#endif
-
-
-static int u_id = 1;
-static int get_unique_id()
-{
- return u_id++;
-}
-
static const int nfontsizes = 6;
static const int fontsize[nfontsizes] = {8,10,12,14,18,24};
TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
: QMainWindow( parent, name, f ), bFromDocView( FALSE )
{
@@ -262,23 +255,17 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) );
a->addTo( bar );
a->addTo( file );
a = new QAction( tr( "Open" ), Resource::loadPixmap( "fileopen" ), QString::null, 0, this, 0 );
connect( a, SIGNAL( activated() ), this, SLOT( fileOpen() ) );
-// a->addTo( bar );
- a->addTo( file );
-
- a = new QAction( tr( "Browse" ), Resource::loadPixmap( "fileopen" ), QString::null, 0, this, 0 );
- connect( a, SIGNAL( activated() ), this, SLOT( newFileOpen() ) );
a->addTo( bar );
a->addTo( file );
a = new QAction( tr( "Save" ), QPixmap(( const char** ) filesave_xpm ) , QString::null, 0, this, 0 );
connect( a, SIGNAL( activated() ), this, SLOT( save() ) );
-// a->addTo( bar );
file->insertSeparator();
a->addTo( file );
a = new QAction( tr( "Save As" ), QPixmap(( const char** ) filesave_xpm ) , QString::null, 0, this, 0 );
connect( a, SIGNAL( activated() ), this, SLOT( saveAs() ) );
a->addTo( file );
@@ -295,19 +282,18 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
a = new QAction( tr( "Paste" ), Resource::loadPixmap( "paste" ), QString::null, 0, this, 0 );
connect( a, SIGNAL( activated() ), this, SLOT( editPaste() ) );
a->addTo( editBar );
a->addTo( edit );
- a = new QAction( tr( "Find..." ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 );
- connect( a, SIGNAL( activated() ), this, SLOT( editFind() ) );
- edit->insertSeparator();
- a->addTo( bar );
- a->addTo( edit );
+ a = new QAction( tr( "Find..." ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 );
+ connect( a, SIGNAL( activated() ), this, SLOT( editFind() ) );
+ edit->insertSeparator();
+ a->addTo( bar );
+ a->addTo( edit );
-
int defsize;
bool defb, defi, wrap;
Config cfg("TextEdit");
cfg.setGroup("View");
defsize = cfg.readNumEntry("FontSize",10);
@@ -368,42 +354,32 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
searchEdit = new QLineEdit( searchBar, "searchEdit" );
searchBar->setStretchableWidget( searchEdit );
connect( searchEdit, SIGNAL( textChanged( const QString & ) ),
this, SLOT( search() ) );
- a = new QAction( tr( "Find Next" ), Resource::loadPixmap( "next" ), QString::null, 0, this, 0 );
- connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) );
- a->addTo( searchBar );
- a->addTo( edit );
+ a = new QAction( tr( "Find Next" ), Resource::loadPixmap( "next" ), QString::null, 0, this, 0 );
+ connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) );
+ a->addTo( searchBar );
+ a->addTo( edit );
a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) );
a->addTo( searchBar );
- edit->insertSeparator();
- a = new QAction( tr( "Delete" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
- connect( a, SIGNAL( activated() ), this, SLOT( editDelete() ) );
- a->addTo( edit );
-
- searchBar->hide();
-
- editorStack = new QWidgetStack( this );
- setCentralWidget( editorStack );
+ edit->insertSeparator();
+ a = new QAction( tr( "Delete" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
+ connect( a, SIGNAL( activated() ), this, SLOT( editDelete() ) );
+ a->addTo( edit );
- searchVisible = FALSE;
+ searchBar->hide();
- fileSelector = new FileSelector( "text/*", editorStack, "fileselector" , TRUE, TRUE); //buggy
- connect( fileSelector, SIGNAL( closeMe() ), this, SLOT( showEditTools() ) );
- connect( fileSelector, SIGNAL( newSelected( const DocLnk &) ), this, SLOT( newFile( const DocLnk & ) ) );
- connect( fileSelector, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( openFile( const DocLnk & ) ) );
-// fileOpen();
- editor = new QpeEditor( editorStack );
+ editor = new QpeEditor( this );
+ setCentralWidget( editor );
editor->setFrameStyle( QFrame::Panel | QFrame::Sunken );
- editorStack->addWidget( editor, get_unique_id() );
connect( editor, SIGNAL( textChanged() ), this, SLOT( editorChanged() ) );
resize( 200, 300 );
// setFontSize(defsize,TRUE);
FontDatabase fdb;
@@ -426,13 +402,13 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
if(cfg.readEntry("startNew","TRUE") == "TRUE") {
nStart->setOn(TRUE);
fileNew();
} else {
fileOpen();
}
-
+ viewSelection = cfg.readNumEntry( "FileView", 0 );
}
TextEdit::~TextEdit()
{
// save();
@@ -440,12 +416,13 @@ TextEdit::~TextEdit()
cfg.setGroup("View");
QFont f = editor->font();
cfg.writeEntry("FontSize",f.pointSize());
cfg.writeEntry("Bold",f.bold());
cfg.writeEntry("Italic",f.italic());
cfg.writeEntry("Wrap",editor->wordWrap() == QMultiLineEdit::WidgetWidth);
+ cfg.writeEntry( "FileView", viewSelection );
}
void TextEdit::zoomIn()
{
setFontSize(editor->font().pointSize()+1,FALSE);
}
@@ -510,39 +487,14 @@ void TextEdit::fileNew()
}
newFile(DocLnk());
}
void TextEdit::fileOpen()
{
-// if ( !save() ) {
-// if ( QMessageBox::critical( this, tr( "Out of space" ),
-// tr( "Text Editor was unable to\n"
-// "save your changes.\n"
-// "Free some space and try again.\n"
-// "\nContinue anyway?" ),
-// QMessageBox::Yes|QMessageBox::Escape,
-// QMessageBox::No|QMessageBox::Default )
-// != QMessageBox::Yes )
-// return;
-// else {
-// delete doc;
-// doc = 0;
-// }
-// }
- menu->hide();
- editBar->hide();
- searchBar->hide();
- clearWState (WState_Reserved1 );
- editorStack->raiseWidget( fileSelector );
- fileSelector->reread();
- updateCaption();
-}
-
-void TextEdit::newFileOpen()
-{
browseForFiles=new fileBrowser(this,"Open File",TRUE,0, "*");
+ browseForFiles->setFileView( viewSelection );
browseForFiles->showMaximized();
if( browseForFiles->exec() != -1 ) {
QString selFile= browseForFiles->selectedFileName;
QStringList fileList=browseForFiles->fileList;
qDebug(selFile);
QStringList::ConstIterator f;
@@ -554,12 +506,13 @@ void TextEdit::newFileOpen()
if( fileName != "Unnamed" || fileName != "Empty Text" ) {
currentFileName = fileName;
qDebug("please open "+currentFileName);
openFile(fileName );
}
}
+ viewSelection = browseForFiles->SelectionCombo->currentItem();
}
delete browseForFiles;
editor->setEdited( FALSE);
edited1=FALSE;
edited=FALSE;
if(caption().left(1)=="*")
@@ -639,22 +592,22 @@ void TextEdit::search()
void TextEdit::newFile( const DocLnk &f )
{
DocLnk nf = f;
nf.setType("text/plain");
clear();
- editorStack->raiseWidget( editor );
setWState (WState_Reserved1 );
editor->setFocus();
doc = new DocLnk(nf);
qDebug("newFile "+currentFileName);
updateCaption(currentFileName);
}
void TextEdit::openFile( const QString &f )
{
+
bFromDocView = TRUE;
DocLnk nf;
nf.setType("text/plain");
nf.setFile(f);
currentFileName=f;
QFileInfo fi( currentFileName);
@@ -679,16 +632,16 @@ void TextEdit::openFile( const DocLnk &f )
QString txt;
currentFileName=f.name();
qDebug("openFile doclnk " + currentFileName);
if ( !fm.loadFile( f, txt ) ) {
// ####### could be a new file
qDebug( "Cannot open file" );
-
+
//return;
}
-
+
fileNew();
if ( doc )
delete doc;
doc = new DocLnk(f);
editor->setText(txt);
editor->setEdited( FALSE);
@@ -702,19 +655,17 @@ void TextEdit::openFile( const DocLnk &f )
void TextEdit::showEditTools()
{
// if ( !doc )
// close();
// clear();
- fileSelector->hide();
menu->show();
editBar->show();
if ( searchVisible )
searchBar->show();
// updateCaption();
- editorStack->raiseWidget( editor );
setWState (WState_Reserved1 );
}
/*!
unprompted save */
bool TextEdit::save()
@@ -883,21 +834,14 @@ void TextEdit::setDocument(const QString& fileref)
edited1=FALSE;
edited=TRUE;
}
void TextEdit::closeEvent( QCloseEvent *e )
{
- if ( editorStack->visibleWidget() == fileSelector && !bFromDocView ) {
- e->ignore();
- repaint();
-// fileRevert();
-
- } else {
- bFromDocView = FALSE;
- e->accept();
- }
+ bFromDocView = FALSE;
+ e->accept();
}
void TextEdit::accept()
{
QString file = doc->file();
if (file.find("_.txt",0,TRUE) ==-1)