summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/textedit.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index bd0014a..f6a869a 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -798,96 +798,97 @@ bool TextEdit::saveAs() {
798 docname.replace( QRegExp("/"), "_" ); 798 docname.replace( QRegExp("/"), "_" );
799 // cut the length. filenames longer than that don't make sense and something goes wrong when they get too long. 799 // cut the length. filenames longer than that don't make sense and something goes wrong when they get too long.
800 if ( docname.length() > 40 ) 800 if ( docname.length() > 40 )
801 docname = docname.left(40); 801 docname = docname.left(40);
802 if ( docname.isEmpty() ) 802 if ( docname.isEmpty() )
803 docname = tr("Unnamed"); 803 docname = tr("Unnamed");
804 doc->setName(docname); 804 doc->setName(docname);
805 currentFileName=docname; 805 currentFileName=docname;
806 } 806 }
807 } 807 }
808 808
809 QMap<QString, QStringList> map; 809 QMap<QString, QStringList> map;
810 map.insert(tr("All"), QStringList() ); 810 map.insert(tr("All"), QStringList() );
811 QStringList text; 811 QStringList text;
812 text << "text/*"; 812 text << "text/*";
813 map.insert(tr("Text"), text ); 813 map.insert(tr("Text"), text );
814 text << "*"; 814 text << "*";
815 map.insert(tr("All"), text ); 815 map.insert(tr("All"), text );
816 816
817 QString str = OFileDialog::getSaveFileName( 2,"/", QString::null, map); 817 QString str = OFileDialog::getSaveFileName( 2,"/", QString::null, map);
818 818
819 if(!str.isEmpty() ) { 819 if(!str.isEmpty() ) {
820 QString fileNm=str; 820 QString fileNm=str;
821 821
822 qDebug("saving filename "+fileNm); 822 qDebug("saving filename "+fileNm);
823 QFileInfo fi(fileNm); 823 QFileInfo fi(fileNm);
824 currentFileName=fi.fileName(); 824 currentFileName=fi.fileName();
825 if(doc) { 825 if(doc) {
826// QString file = doc->file(); 826// QString file = doc->file();
827// doc->removeFiles(); 827// doc->removeFiles();
828 delete doc; 828 delete doc;
829 DocLnk nf; 829 DocLnk nf;
830 nf.setType("text/plain"); 830 nf.setType("text/plain");
831 nf.setFile( fileNm); 831 nf.setFile( fileNm);
832 doc = new DocLnk(nf); 832 doc = new DocLnk(nf);
833// editor->setText(rt); 833// editor->setText(rt);
834// qDebug("openFile doclnk "+currentFileName); 834// qDebug("openFile doclnk "+currentFileName);
835 doc->setName( currentFileName); 835 doc->setName( currentFileName);
836 updateCaption( currentFileName); 836 updateCaption( currentFileName);
837 837
838 FileManager fm; 838 FileManager fm;
839 if ( !fm.saveFile( *doc, rt ) ) { 839 if ( !fm.saveFile( *doc, rt ) ) {
840 return false; 840 return false;
841 } 841 }
842 842
843 if( useAdvancedFeatures ) { 843 if( useAdvancedFeatures ) {
844 filePermissions *filePerm; 844 filePermissions *filePerm;
845 filePerm = new filePermissions(this, tr("Permissions"),true,0,(const QString &)fileNm); 845 filePerm = new filePermissions(this, tr("Permissions"),true,0,(const QString &)fileNm);
846 filePerm->showMaximized();
846 filePerm->exec(); 847 filePerm->exec();
847 848
848 if( filePerm) 849 if( filePerm)
849 delete filePerm; 850 delete filePerm;
850 } 851 }
851 } 852 }
852 editor->setEdited( false); 853 editor->setEdited( false);
853 edited1 = false; 854 edited1 = false;
854 edited = false; 855 edited = false;
855 if(caption().left(1)=="*") 856 if(caption().left(1)=="*")
856 setCaption(caption().right(caption().length()-1)); 857 setCaption(caption().right(caption().length()-1));
857 858
858 return true; 859 return true;
859 } 860 }
860 qDebug("returning false"); 861 qDebug("returning false");
861 return false; 862 return false;
862} //end saveAs 863} //end saveAs
863 864
864void TextEdit::clear() { 865void TextEdit::clear() {
865 delete doc; 866 delete doc;
866 doc = 0; 867 doc = 0;
867 editor->clear(); 868 editor->clear();
868} 869}
869 870
870void TextEdit::updateCaption( const QString &name ) { 871void TextEdit::updateCaption( const QString &name ) {
871 if ( !doc ) 872 if ( !doc )
872 setCaption( tr("Text Editor") ); 873 setCaption( tr("Text Editor") );
873 else { 874 else {
874 QString s = name; 875 QString s = name;
875 if ( s.isNull() ) 876 if ( s.isNull() )
876 s = doc->name(); 877 s = doc->name();
877 if ( s.isEmpty() ) { 878 if ( s.isEmpty() ) {
878 s = tr( "Unnamed" ); 879 s = tr( "Unnamed" );
879 currentFileName=s; 880 currentFileName=s;
880 } 881 }
881 if(s.left(1) == "/") 882 if(s.left(1) == "/")
882 s = s.right(s.length()-1); 883 s = s.right(s.length()-1);
883 setCaption( s + " - " + tr("Text Editor") ); 884 setCaption( s + " - " + tr("Text Editor") );
884 } 885 }
885} 886}
886 887
887void TextEdit::setDocument(const QString& fileref) { 888void TextEdit::setDocument(const QString& fileref) {
888 bFromDocView = TRUE; 889 bFromDocView = TRUE;
889 openFile(fileref); 890 openFile(fileref);
890 editor->setEdited(TRUE); 891 editor->setEdited(TRUE);
891 edited1=FALSE; 892 edited1=FALSE;
892 edited=TRUE; 893 edited=TRUE;
893 doSearchBar(); 894 doSearchBar();