Diffstat (limited to 'core/apps/textedit/textedit.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/apps/textedit/textedit.cpp | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index ca760bb..759e440 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp | |||
@@ -886,89 +886,89 @@ bool TextEdit::saveAs() { | |||
886 | docname = tr("Unnamed"); | 886 | docname = tr("Unnamed"); |
887 | if(doc) doc->setName(docname); | 887 | if(doc) doc->setName(docname); |
888 | currentFileName=docname; | 888 | currentFileName=docname; |
889 | // } | 889 | // } |
890 | // else | 890 | // else |
891 | // odebug << "hmmmmmm" << oendl; | 891 | // odebug << "hmmmmmm" << oendl; |
892 | } | 892 | } |
893 | 893 | ||
894 | 894 | ||
895 | QMap<QString, QStringList> map; | 895 | QMap<QString, QStringList> map; |
896 | map.insert(tr("All"), QStringList() ); | 896 | map.insert(tr("All"), QStringList() ); |
897 | QStringList text; | 897 | QStringList text; |
898 | text << "text/*"; | 898 | text << "text/*"; |
899 | map.insert(tr("Text"), text ); | 899 | map.insert(tr("Text"), text ); |
900 | text << "*"; | 900 | text << "*"; |
901 | map.insert(tr("All"), text ); | 901 | map.insert(tr("All"), text ); |
902 | 902 | ||
903 | QFileInfo cuFi( currentFileName); | 903 | QFileInfo cuFi( currentFileName); |
904 | QString filee = cuFi.fileName(); | 904 | QString filee = cuFi.fileName(); |
905 | QString dire = cuFi.dirPath(); | 905 | QString dire = cuFi.dirPath(); |
906 | if(dire==".") | 906 | if(dire==".") |
907 | dire = QPEApplication::documentDir(); | 907 | dire = QPEApplication::documentDir(); |
908 | QString str; | 908 | QString str; |
909 | if( !featureAutoSave) { | 909 | if( !featureAutoSave) { |
910 | str = OFileDialog::getSaveFileName( 2, | 910 | str = OFileDialog::getSaveFileName( 2, |
911 | dire, | 911 | dire, |
912 | filee, map); | 912 | filee, map); |
913 | } else | 913 | } else |
914 | str=currentFileName; | 914 | str = currentFileName; |
915 | 915 | ||
916 | if(!str.isEmpty()) { | 916 | if(!str.isEmpty()) { |
917 | QString fileNm=str; | 917 | QString fileNm=str; |
918 | 918 | ||
919 | odebug << "saving filename "+fileNm << oendl; | 919 | odebug << "saving filename "+fileNm << oendl; |
920 | QFileInfo fi(fileNm); | 920 | QFileInfo fi(fileNm); |
921 | currentFileName=fi.fileName(); | 921 | currentFileName=fi.fileName(); |
922 | if(doc) | 922 | if(doc) |
923 | // QString file = doc->file(); | 923 | // QString file = doc->file(); |
924 | // doc->removeFiles(); | 924 | // doc->removeFiles(); |
925 | delete doc; | 925 | delete doc; |
926 | DocLnk nf; | 926 | DocLnk nf; |
927 | nf.setType("text/plain"); | 927 | nf.setType("text/plain"); |
928 | nf.setFile( fileNm); | 928 | nf.setFile( fileNm); |
929 | doc = new DocLnk(nf); | 929 | doc = new DocLnk(nf); |
930 | // editor->setText(rt); | 930 | // editor->setText(rt); |
931 | odebug << "Saving file as "+currentFileName << oendl; | 931 | odebug << "Saving file as "+currentFileName << oendl; |
932 | doc->setName( fi.baseName() /*currentFileName*/); | 932 | doc->setName( fi.baseName() /*currentFileName*/); |
933 | updateCaption( currentFileName); | 933 | updateCaption( currentFileName); |
934 | 934 | ||
935 | FileManager fm; | 935 | FileManager fm; |
936 | if ( !fm.saveFile( *doc, rt ) ) { | 936 | if ( !fm.saveFile( *doc, rt ) ) { |
937 | QMessageBox::message(tr("Text Edit"),tr("Save Failed")); | 937 | QMessageBox::message(tr("Text Edit"),tr("Save Failed")); |
938 | return false; | 938 | return false; |
939 | } | 939 | } |
940 | 940 | ||
941 | if( filePerms ) { | 941 | if( filePerms ) { |
942 | filePermissions *filePerm; | 942 | filePermissions *filePerm; |
943 | filePerm = new filePermissions(this, | 943 | filePerm = new filePermissions(this, |
944 | tr("Permissions"),true, | 944 | tr("Permissions"),true, |
945 | 0,(const QString &)fileNm); | 945 | 0,(const QString &)fileNm); |
946 | QPEApplication::execDialog( filePerm ); | 946 | QPEApplication::execDialog( filePerm ); |
947 | 947 | ||
948 | if( filePerm) | 948 | if( filePerm) |
949 | delete filePerm; | 949 | delete filePerm; |
950 | } | 950 | } |
951 | // } | 951 | // } |
952 | editor->setEdited( false); | 952 | editor->setEdited( false); |
953 | edited1 = false; | 953 | edited1 = false; |
954 | edited = false; | 954 | edited = false; |
955 | if(caption().left(1)=="*") | 955 | if(caption().left(1)=="*") |
956 | setCaption(caption().right(caption().length()-1)); | 956 | setCaption(caption().right(caption().length()-1)); |
957 | 957 | ||
958 | return true; | 958 | return true; |
959 | } | 959 | } |
960 | odebug << "returning false" << oendl; | 960 | odebug << "returning false" << oendl; |
961 | currentFileName = ""; | 961 | currentFileName = ""; |
962 | return false; | 962 | return false; |
963 | } //end saveAs | 963 | } //end saveAs |
964 | 964 | ||
965 | void TextEdit::clear() { | 965 | void TextEdit::clear() { |
966 | delete doc; | 966 | delete doc; |
967 | doc = 0; | 967 | doc = 0; |
968 | editor->clear(); | 968 | editor->clear(); |
969 | } | 969 | } |
970 | 970 | ||
971 | void TextEdit::updateCaption( const QString &name ) { | 971 | void TextEdit::updateCaption( const QString &name ) { |
972 | 972 | ||
973 | if ( name.isEmpty() ) | 973 | if ( name.isEmpty() ) |
974 | setCaption( tr("Text Editor") ); | 974 | setCaption( tr("Text Editor") ); |