summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/apps/textedit/fileSaver.cpp3
-rw-r--r--core/apps/textedit/textedit.cpp8
2 files changed, 9 insertions, 2 deletions
diff --git a/core/apps/textedit/fileSaver.cpp b/core/apps/textedit/fileSaver.cpp
index b1ddc0b..209a258 100644
--- a/core/apps/textedit/fileSaver.cpp
+++ b/core/apps/textedit/fileSaver.cpp
@@ -175,16 +175,17 @@ void fileSaver::upDir()
}
void fileSaver::listDoubleClicked(QListViewItem *selectedItem)
{
}
void fileSaver::listClicked(QListViewItem *selectedItem)
{
+ if(selectedItem != NULL) {
QString strItem=selectedItem->text(0);
QString strSize=selectedItem->text(1);
// qDebug("strItem is "+strItem);
strSize.stripWhiteSpace();
// qDebug(strSize);
if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) { //if symlink
QString strItem2=strItem.right( (strItem.length()-strItem.find("->",0,TRUE)) -4);
@@ -211,17 +212,17 @@ void fileSaver::listClicked(QListViewItem *selectedItem)
} // else
// if( QFile::exists(strItem ) ) {
// qDebug("We found our files!!");
// OnOK();
} //end not symlink
chdir(strItem.latin1());
-
+ }
}
void fileSaver::closeEvent( QCloseEvent *e )
{
if(e->isAccepted()) {
e->accept();
} else {
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index f89ed6d..f99f259 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -505,17 +505,17 @@ void TextEdit::fileNew()
void TextEdit::fileOpen()
{
Config cfg("TextEdit");
cfg.setGroup("View");
bool b=FALSE;
// if(cfg.readEntry("useOldFileDialog") == "TRUE")
// b=TRUE;
// if(!b) {
- QString str = OFileDialog::getOpenFileName( 1,"/");//,"", "*", this );
+ QString str = OFileDialog::getOpenFileName( 2,"/");//,"", "*", this );
if(!str.isEmpty() )
openFile( str );
// } else {
// QString str;
// browseForFiles = new fileBrowser(this,tr("Open File"),TRUE,0, "*"); //
// browseForFiles->setFileView( viewSelection );
// browseForFiles->showMaximized();
// // if( result != -1 )
@@ -743,16 +743,17 @@ bool TextEdit::save()
} else {
currentFileName= name ;
qDebug("saveFile "+currentFileName);
struct stat buf;
mode_t mode;
stat(file.latin1(), &buf);
mode = buf.st_mode;
+
if(!fileIs) {
doc->setName( name);
FileManager fm;
if ( !fm.saveFile( *doc, rt ) ) {
return false;
}
} else {
qDebug("regular save file");
@@ -817,21 +818,26 @@ bool TextEdit::saveAs()
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 ) {
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;