summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-08-30 12:16:14 (UTC)
committer llornkcor <llornkcor>2002-08-30 12:16:14 (UTC)
commit73ccaa41947cd22902b96c18f3b96a6f9f3e565c (patch) (side-by-side diff)
treedbddb746c97da59cd0af50e24ac2ef71603ee553
parent146dfec7bdcac24df009b434d0f4683c53ce7552 (diff)
downloadopie-73ccaa41947cd22902b96c18f3b96a6f9f3e565c.zip
opie-73ccaa41947cd22902b96c18f3b96a6f9f3e565c.tar.gz
opie-73ccaa41947cd22902b96c18f3b96a6f9f3e565c.tar.bz2
fixed canceling saveas dialog return
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/textedit.cpp158
1 files changed, 67 insertions, 91 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 107695a..d61da2a 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -362,10 +362,16 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
nAdvanced = new QAction( tr("Advanced features"), QString::null, 0, this, 0 );
connect( nAdvanced, SIGNAL( toggled(bool) ), this, SLOT( doAdvanced(bool) ) );
nAdvanced->setToggleAction(TRUE);
nAdvanced->addTo( font );
- if(cfg.readBoolEntry("AdvancedFeatures"))
- nAdvanced->setOn(TRUE);
+
+ if(cfg.readBoolEntry("AdvancedFeatures")) {
+ qDebug("using advanced features");
+ useAdvancedFeatures = true;
+ nAdvanced->setOn(TRUE);
+ } else
+ useAdvancedFeatures = false;
+
font->insertSeparator();
font->insertItem(tr("About"), this, SLOT( doAbout()) );
@@ -433,10 +439,12 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
viewSelection = cfg.readNumEntry( "FileView", 0 );
}
-void TextEdit::cleanUp()
-{
+TextEdit::~TextEdit() {
+}
+
+void TextEdit::cleanUp() {
// save();
Config cfg("TextEdit");
cfg.setGroup("View");
QFont f = editor->font();
@@ -444,28 +452,27 @@ void TextEdit::cleanUp()
cfg.writeEntry("Bold",f.bold());
cfg.writeEntry("Italic",f.italic());
cfg.writeEntry("Wrap",editor->wordWrap() == QMultiLineEdit::WidgetWidth);
cfg.writeEntry( "FileView", viewSelection );
-
}
-TextEdit::~TextEdit()
-{
+
+void TextEdit::accept() {
+ if(edited1)
+ saveAs();
+ exit(0);
}
-void TextEdit::zoomIn()
-{
+void TextEdit::zoomIn() {
setFontSize(editor->font().pointSize()+1,FALSE);
}
-void TextEdit::zoomOut()
-{
+void TextEdit::zoomOut() {
setFontSize(editor->font().pointSize()-1,TRUE);
}
-void TextEdit::setFontSize(int sz, bool round_down_not_up)
-{
+void TextEdit::setFontSize(int sz, bool round_down_not_up) {
int s=10;
for (int i=0; i<nfontsizes; i++) {
if ( fontsize[i] == sz ) {
s = sz;
@@ -488,39 +495,34 @@ void TextEdit::setFontSize(int sz, bool round_down_not_up)
zin->setEnabled(s != fontsize[nfontsizes-1]);
zout->setEnabled(s != fontsize[0]);
}
-void TextEdit::setBold(bool y)
-{
+void TextEdit::setBold(bool y) {
QFont f = editor->font();
f.setBold(y);
editor->setFont(f);
}
-void TextEdit::setItalic(bool y)
-{
+void TextEdit::setItalic(bool y) {
QFont f = editor->font();
f.setItalic(y);
editor->setFont(f);
}
-void TextEdit::setWordWrap(bool y)
-{
+void TextEdit::setWordWrap(bool y) {
bool state = editor->edited();
editor->setWordWrap(y ? QMultiLineEdit::WidgetWidth : QMultiLineEdit::NoWrap );
editor->setEdited( state );
}
-void TextEdit::fileNew()
-{
+void TextEdit::fileNew() {
// if( !bFromDocView ) {
// saveAs();
// }
newFile(DocLnk());
}
-void TextEdit::fileOpen()
-{
+void TextEdit::fileOpen() {
Config cfg("TextEdit");
cfg.setGroup("View");
// bool b=FALSE;
@@ -536,19 +538,17 @@ void TextEdit::fileOpen()
openFile( str );
}
-void TextEdit::doSearchBar()
-{
+void TextEdit::doSearchBar() {
Config cfg("TextEdit");
cfg.setGroup("View");
if(cfg.readEntry("SearchBar","Closed") != "Opened")
searchBar->hide();
}
#if 0
-void TextEdit::slotFind()
-{
+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)));
@@ -564,37 +564,32 @@ void TextEdit::slotFind()
}
#endif
-void TextEdit::fileRevert()
-{
+void TextEdit::fileRevert() {
clear();
fileOpen();
}
-void TextEdit::editCut()
-{
+void TextEdit::editCut() {
#ifndef QT_NO_CLIPBOARD
editor->cut();
#endif
}
-void TextEdit::editCopy()
-{
+void TextEdit::editCopy() {
#ifndef QT_NO_CLIPBOARD
editor->copy();
#endif
}
-void TextEdit::editPaste()
-{
+void TextEdit::editPaste() {
#ifndef QT_NO_CLIPBOARD
editor->paste();
#endif
}
-void TextEdit::editFind()
-{
+void TextEdit::editFind() {
searchBar->show();
searchVisible = TRUE;
searchEdit->setFocus();
Config cfg("TextEdit");
@@ -602,31 +597,27 @@ void TextEdit::editFind()
cfg.writeEntry("SearchBar","Opened");
}
-void TextEdit::findNext()
-{
+void TextEdit::findNext() {
editor->find( searchEdit->text(), FALSE, FALSE );
}
-void TextEdit::findClose()
-{
+void TextEdit::findClose() {
searchVisible = FALSE;
searchBar->hide();
Config cfg("TextEdit");
cfg.setGroup("View");
cfg.writeEntry("SearchBar","Closed");
cfg.write();
}
-void TextEdit::search()
-{
+void TextEdit::search() {
editor->find( searchEdit->text(), FALSE, FALSE );
}
-void TextEdit::newFile( const DocLnk &f )
-{
+void TextEdit::newFile( const DocLnk &f ) {
DocLnk nf = f;
nf.setType("text/plain");
clear();
setWState (WState_Reserved1 );
@@ -637,10 +628,9 @@ void TextEdit::newFile( const DocLnk &f )
updateCaption( currentFileName);
// editor->setEdited( FALSE);
}
-void TextEdit::openFile( const QString &f )
-{
+void TextEdit::openFile( const QString &f ) {
qDebug("filename is "+ f);
QString filer;
// bFromDocView = TRUE;
if(f.find(".desktop",0,TRUE) != -1 && useAdvancedFeatures) {
@@ -677,10 +667,9 @@ void TextEdit::openFile( const QString &f )
name = name.mid( sep+1 );
updateCaption( name );
}
-void TextEdit::openFile( const DocLnk &f )
-{
+void TextEdit::openFile( const DocLnk &f ) {
// clear();
// bFromDocView = TRUE;
FileManager fm;
QString txt;
@@ -702,10 +691,9 @@ void TextEdit::openFile( const DocLnk &f )
doc->setName(currentFileName);
updateCaption();
}
-void TextEdit::showEditTools()
-{
+void TextEdit::showEditTools() {
// if ( !doc )
// close();
// clear();
menu->show();
@@ -717,10 +705,9 @@ void TextEdit::showEditTools()
}
/*!
unprompted save */
-bool TextEdit::save()
-{
+bool TextEdit::save() {
QString file = doc->file();
qDebug("saver file "+file);
QString name= doc->name();
qDebug("File named "+name);
@@ -770,17 +757,16 @@ bool TextEdit::save()
}
/*!
prompted save */
-bool TextEdit::saveAs()
-{
-// qDebug("saveAsFile "+currentFileName);
- // case of nothing to save...
- if ( !doc )//|| !bFromDocView)
- {
- qDebug("no doc");
- return true;
- }
+bool TextEdit::saveAs() {
+ qDebug("saveAsFile "+currentFileName);
+ // case of nothing to save...
+ if ( !doc ) {
+//|| !bFromDocView)
+ qDebug("no doc");
+ return true;
+ }
if ( !editor->edited() ) {
delete doc;
doc = 0;
return true;
@@ -789,9 +775,9 @@ bool TextEdit::saveAs()
QString rt = editor->text();
qDebug(currentFileName);
if( currentFileName.isEmpty() || currentFileName == tr("Unnamed") || currentFileName == tr("Text Editor")) {
- qDebug("do silly TT filename thing");
+// qDebug("do silly TT filename thing");
if ( doc->name().isEmpty() ) {
QString pt = rt.simplifyWhiteSpace();
int i = pt.find( ' ' );
QString docname = pt;
@@ -817,9 +803,11 @@ bool TextEdit::saveAs()
text << "text/*";
map.insert(tr("Text"), text );
text << "*";
map.insert(tr("All"), text );
+
QString str = OFileDialog::getSaveFileName( 2,"/", QString::null, map);
+
if(!str.isEmpty() ) {
QString fileNm=str;
qDebug("saving filename "+fileNm);
@@ -847,31 +835,31 @@ bool TextEdit::saveAs()
filePermissions *filePerm;
filePerm = new filePermissions(this, tr("Permissions"),true,0,(const QString &)fileNm);
filePerm->exec();
- if( filePerm)
- delete filePerm;
+ if( filePerm)
+ delete filePerm;
}
}
+ editor->setEdited( false);
+ edited1 = false;
+ edited = false;
+ if(caption().left(1)=="*")
+ setCaption(caption().right(caption().length()-1));
+
+ return true;
}
- editor->setEdited(TRUE);
- edited1=FALSE;
- edited=TRUE;
- if(caption().left(1)=="*")
- setCaption(caption().right(caption().length()-1));
-
- return true;
+ qDebug("returning false");
+ return false;
} //end saveAs
-void TextEdit::clear()
-{
+void TextEdit::clear() {
delete doc;
doc = 0;
editor->clear();
}
-void TextEdit::updateCaption( const QString &name )
-{
+void TextEdit::updateCaption( const QString &name ) {
if ( !doc )
setCaption( tr("Text Editor") );
else {
QString s = name;
@@ -886,33 +874,22 @@ void TextEdit::updateCaption( const QString &name )
setCaption( s + " - " + tr("Text Editor") );
}
}
-void TextEdit::setDocument(const QString& fileref)
-{
+void TextEdit::setDocument(const QString& fileref) {
bFromDocView = TRUE;
openFile(fileref);
editor->setEdited(TRUE);
edited1=FALSE;
edited=TRUE;
doSearchBar();
}
-void TextEdit::closeEvent( QCloseEvent *e )
-{
+void TextEdit::closeEvent( QCloseEvent *e ) {
bFromDocView = FALSE;
e->accept();
}
-void TextEdit::accept()
- {
- //if(caption() !="Unnamed")
- if(edited1)
- saveAs();
- exit(0);
-
-}
-
void TextEdit::changeFont() {
FontDatabase fdb;
QFont defaultFont=editor->font();
QFontInfo fontInfo(defaultFont);
@@ -935,10 +912,9 @@ void TextEdit::changeFont() {
delete fontDlg;
}
-void TextEdit::editDelete()
-{
+void TextEdit::editDelete() {
switch ( QMessageBox::warning(this,tr("Text Editor"),tr("Do you really want\nto delete the current file\nfrom the disk?\nThis is irreversable!!"),tr("Yes"),tr("No"),0,0,1) ) {
case 0:
if(doc) {
doc->removeFiles();