summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/textedit.cpp49
1 files changed, 29 insertions, 20 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index ea27e1b..40ea501 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -501,25 +501,25 @@ void TextEdit::fileNew()
void TextEdit::fileOpen()
{
Config cfg("TextEdit");
cfg.setGroup("View");
bool b=FALSE;
QMap<QString, QStringList> map;
- map.insert(tr("All"), QStringList() );
- QStringList text;
- text << "text/*";
- map.insert(tr("Text"), text );
- text << "*";
- map.insert(tr("All"), text );
- QString str = OFileDialog::getOpenFileName( 2,"/", QString::null, map);
- if(!str.isEmpty() )
- openFile( str );
+ map.insert(tr("All"), QStringList() );
+ QStringList text;
+ text << "text/*";
+ map.insert(tr("Text"), text );
+ text << "*";
+ map.insert(tr("All"), text );
+ QString str = OFileDialog::getOpenFileName( 2,"/", QString::null, map);
+ if(!str.isEmpty() )
+ openFile( str );
}
void TextEdit::doSearchBar()
{
Config cfg("TextEdit");
cfg.setGroup("View");
if(cfg.readEntry("SearchBar","Closed") != "Opened")
@@ -787,27 +787,36 @@ bool TextEdit::saveAs()
docname = docname.left(40);
if ( docname.isEmpty() )
docname = tr("Unnamed");
doc->setName(docname);
currentFileName=docname;
}
}
-
-// QString str = OFileDialog::getSaveFileName( 2,"/");//,"", "*", this );
-// if(!str.isEmpty() ) {
-// openFile( str );
-
- fileSaveDlg=new fileSaver(this,tr("Save File As?"),TRUE, 0, currentFileName);
- qDebug("wanna save filename "+currentFileName);
- fileSaveDlg->exec();
- if( fileSaveDlg->result() == 1 ) {
+/*
+ QMap<QString, QStringList> map;
+ map.insert(tr("All"), QStringList() );
+ QStringList text;
+ 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;
+*/
+
+ fileSaveDlg=new fileSaver(this,tr("Save File As?"),TRUE, 0, currentFileName);
+ qDebug("wanna save filename "+currentFileName);
+ fileSaveDlg->exec();
+ if( fileSaveDlg->result() == 1 ) {
QString fileNm=fileSaveDlg->selectedFileName;
-// QString fileNm=srt;
+
+
qDebug("saving filename "+fileNm);
QFileInfo fi(fileNm);
currentFileName=fi.fileName();
if(doc) {
// QString file = doc->file();
// doc->removeFiles();
delete doc;
DocLnk nf;
@@ -832,17 +841,17 @@ bool TextEdit::saveAs()
delete filePerm;
}
}
}
editor->setEdited(TRUE);
edited1=FALSE;
edited=TRUE;
if(caption().left(1)=="*")
- setCaption(caption().right(caption().length()-1));
+ setCaption(caption().right(caption().length()-1));
if(fileSaveDlg)
delete fileSaveDlg;
return true;
} //end saveAs
void TextEdit::clear()
{