-rw-r--r-- | core/apps/textedit/fileSaver.cpp | 3 | ||||
-rw-r--r-- | core/apps/textedit/textedit.cpp | 8 |
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 | |||
@@ -177,12 +177,13 @@ void fileSaver::upDir() | |||
177 | void fileSaver::listDoubleClicked(QListViewItem *selectedItem) | 177 | void fileSaver::listDoubleClicked(QListViewItem *selectedItem) |
178 | { | 178 | { |
179 | } | 179 | } |
180 | 180 | ||
181 | void fileSaver::listClicked(QListViewItem *selectedItem) | 181 | void fileSaver::listClicked(QListViewItem *selectedItem) |
182 | { | 182 | { |
183 | if(selectedItem != NULL) { | ||
183 | QString strItem=selectedItem->text(0); | 184 | QString strItem=selectedItem->text(0); |
184 | QString strSize=selectedItem->text(1); | 185 | QString strSize=selectedItem->text(1); |
185 | // qDebug("strItem is "+strItem); | 186 | // qDebug("strItem is "+strItem); |
186 | strSize.stripWhiteSpace(); | 187 | strSize.stripWhiteSpace(); |
187 | // qDebug(strSize); | 188 | // qDebug(strSize); |
188 | 189 | ||
@@ -213,13 +214,13 @@ void fileSaver::listClicked(QListViewItem *selectedItem) | |||
213 | // qDebug("We found our files!!"); | 214 | // qDebug("We found our files!!"); |
214 | 215 | ||
215 | // OnOK(); | 216 | // OnOK(); |
216 | } //end not symlink | 217 | } //end not symlink |
217 | chdir(strItem.latin1()); | 218 | chdir(strItem.latin1()); |
218 | 219 | ||
219 | 220 | } | |
220 | } | 221 | } |
221 | 222 | ||
222 | 223 | ||
223 | void fileSaver::closeEvent( QCloseEvent *e ) | 224 | void fileSaver::closeEvent( QCloseEvent *e ) |
224 | { | 225 | { |
225 | if(e->isAccepted()) { | 226 | if(e->isAccepted()) { |
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 | |||
@@ -507,13 +507,13 @@ void TextEdit::fileOpen() | |||
507 | Config cfg("TextEdit"); | 507 | Config cfg("TextEdit"); |
508 | cfg.setGroup("View"); | 508 | cfg.setGroup("View"); |
509 | bool b=FALSE; | 509 | bool b=FALSE; |
510 | // if(cfg.readEntry("useOldFileDialog") == "TRUE") | 510 | // if(cfg.readEntry("useOldFileDialog") == "TRUE") |
511 | // b=TRUE; | 511 | // b=TRUE; |
512 | // if(!b) { | 512 | // if(!b) { |
513 | QString str = OFileDialog::getOpenFileName( 1,"/");//,"", "*", this ); | 513 | QString str = OFileDialog::getOpenFileName( 2,"/");//,"", "*", this ); |
514 | if(!str.isEmpty() ) | 514 | if(!str.isEmpty() ) |
515 | openFile( str ); | 515 | openFile( str ); |
516 | // } else { | 516 | // } else { |
517 | // QString str; | 517 | // QString str; |
518 | // browseForFiles = new fileBrowser(this,tr("Open File"),TRUE,0, "*"); // | 518 | // browseForFiles = new fileBrowser(this,tr("Open File"),TRUE,0, "*"); // |
519 | // browseForFiles->setFileView( viewSelection ); | 519 | // browseForFiles->setFileView( viewSelection ); |
@@ -745,12 +745,13 @@ bool TextEdit::save() | |||
745 | qDebug("saveFile "+currentFileName); | 745 | qDebug("saveFile "+currentFileName); |
746 | 746 | ||
747 | struct stat buf; | 747 | struct stat buf; |
748 | mode_t mode; | 748 | mode_t mode; |
749 | stat(file.latin1(), &buf); | 749 | stat(file.latin1(), &buf); |
750 | mode = buf.st_mode; | 750 | mode = buf.st_mode; |
751 | |||
751 | if(!fileIs) { | 752 | if(!fileIs) { |
752 | doc->setName( name); | 753 | doc->setName( name); |
753 | FileManager fm; | 754 | FileManager fm; |
754 | if ( !fm.saveFile( *doc, rt ) ) { | 755 | if ( !fm.saveFile( *doc, rt ) ) { |
755 | return false; | 756 | return false; |
756 | } | 757 | } |
@@ -819,17 +820,22 @@ bool TextEdit::saveAs() | |||
819 | doc->setName(docname); | 820 | doc->setName(docname); |
820 | currentFileName=docname; | 821 | currentFileName=docname; |
821 | } | 822 | } |
822 | } | 823 | } |
823 | 824 | ||
824 | 825 | ||
826 | // QString str = OFileDialog::getSaveFileName( 2,"/");//,"", "*", this ); | ||
827 | // if(!str.isEmpty() ) { | ||
828 | // openFile( str ); | ||
829 | |||
825 | fileSaveDlg=new fileSaver(this,tr("Save File As?"),TRUE, 0, currentFileName); | 830 | fileSaveDlg=new fileSaver(this,tr("Save File As?"),TRUE, 0, currentFileName); |
826 | qDebug("wanna save filename "+currentFileName); | 831 | qDebug("wanna save filename "+currentFileName); |
827 | fileSaveDlg->exec(); | 832 | fileSaveDlg->exec(); |
828 | if( fileSaveDlg->result() == 1 ) { | 833 | if( fileSaveDlg->result() == 1 ) { |
829 | QString fileNm=fileSaveDlg->selectedFileName; | 834 | QString fileNm=fileSaveDlg->selectedFileName; |
835 | // QString fileNm=srt; | ||
830 | qDebug("saving filename "+fileNm); | 836 | qDebug("saving filename "+fileNm); |
831 | QFileInfo fi(fileNm); | 837 | QFileInfo fi(fileNm); |
832 | currentFileName=fi.fileName(); | 838 | currentFileName=fi.fileName(); |
833 | if(doc) { | 839 | if(doc) { |
834 | // QString file = doc->file(); | 840 | // QString file = doc->file(); |
835 | // doc->removeFiles(); | 841 | // doc->removeFiles(); |