summaryrefslogtreecommitdiff
path: root/core/apps/textedit/textedit.cpp
Unidiff
Diffstat (limited to 'core/apps/textedit/textedit.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/textedit.cpp90
1 files changed, 44 insertions, 46 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 59a605a..749e0ac 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -55,8 +55,6 @@
55#include <sys/stat.h> 55#include <sys/stat.h>
56#include <stdlib.h> //getenv 56#include <stdlib.h> //getenv
57 57
58#include "resource.h"
59
60#if QT_VERSION < 300 58#if QT_VERSION < 300
61 59
62class QpeEditor : public QMultiLineEdit 60class QpeEditor : public QMultiLineEdit
@@ -210,14 +208,14 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
210 a->addTo( bar ); 208 a->addTo( bar );
211 a->addTo( file ); 209 a->addTo( file );
212 210
213 a = new QAction( tr( "Save" ), QPixmap(( const char** ) filesave_xpm ) , 211 a = new QAction( tr( "Save" ), Resource::loadPixmap("save") ,
214 QString::null, 0, this, 0 ); 212 QString::null, 0, this, 0 );
215 connect( a, SIGNAL( activated() ), this, SLOT( save() ) ); 213 connect( a, SIGNAL( activated() ), this, SLOT( save() ) );
216 file->insertSeparator(); 214 file->insertSeparator();
217 a->addTo( bar ); 215 a->addTo( bar );
218 a->addTo( file ); 216 a->addTo( file );
219 217
220 a = new QAction( tr( "Save As" ), QPixmap(( const char** ) filesave_xpm ) , 218 a = new QAction( tr( "Save As" ), Resource::loadPixmap("save") ,
221 QString::null, 0, this, 0 ); 219 QString::null, 0, this, 0 );
222 connect( a, SIGNAL( activated() ), this, SLOT( saveAs() ) ); 220 connect( a, SIGNAL( activated() ), this, SLOT( saveAs() ) );
223 a->addTo( file ); 221 a->addTo( file );
@@ -694,58 +692,58 @@ void TextEdit::openDotFile( const QString &f ) {
694} 692}
695 693
696void TextEdit::openFile( const QString &f ) { 694void TextEdit::openFile( const QString &f ) {
697 qDebug("filename is "+ f); 695 qDebug("filename is "+ f);
698 QString filer; 696 QString filer;
699 QFileInfo fi( f); 697 QFileInfo fi( f);
700// bFromDocView = true; 698// bFromDocView = true;
701 if(f.find(".desktop",0,true) != -1 && !openDesktop ) 699 if(f.find(".desktop",0,true) != -1 && !openDesktop )
702 { 700 {
703 switch ( QMessageBox::warning(this,tr("Text Editor"), 701 switch ( QMessageBox::warning(this,tr("Text Editor"),
704 tr("Text Editor has detected<BR>you selected a <B>.desktop</B> 702 tr("Text Editor has detected<BR>you selected a <B>.desktop</B>
705file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?"), 703file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?"),
706 tr(".desktop File"),tr("Linked Document"),0,1,1) ) 704 tr(".desktop File"),tr("Linked Document"),0,1,1) )
707 { 705 {
708 case 0: //desktop 706 case 0: //desktop
709 filer = f; 707 filer = f;
710 break; 708 break;
711 case 1: //linked 709 case 1: //linked
712 DocLnk sf(f); 710 DocLnk sf(f);
713 filer = sf.file(); 711 filer = sf.file();
714 break; 712 break;
715 }; 713 };
716 } 714 }
717 else if(fi.baseName().left(1) == "") 715 else if(fi.baseName().left(1) == "")
718 { 716 {
719 qDebug("opening dotfile"); 717 qDebug("opening dotfile");
720 currentFileName=f; 718 currentFileName=f;
721 openDotFile(currentFileName); 719 openDotFile(currentFileName);
722 return; 720 return;
723 } 721 }
724 else 722 else
725 { 723 {
726 DocLnk sf(f); 724 DocLnk sf(f);
727 filer = sf.file(); 725 filer = sf.file();
728 if(filer.right(1) == "/") 726 if(filer.right(1) == "/")
729 filer = f; 727 filer = f;
730 } 728 }
731 729
732 DocLnk nf; 730 DocLnk nf;
733 nf.setType("text/plain"); 731 nf.setType("text/plain");
734 nf.setFile(filer); 732 nf.setFile(filer);
735 currentFileName=filer; 733 currentFileName=filer;
736 734
737 nf.setName(fi.baseName()); 735 nf.setName(fi.baseName());
738 openFile(nf); 736 openFile(nf);
739 737
740 qDebug("openFile string "+currentFileName); 738 qDebug("openFile string "+currentFileName);
741 739
742 showEditTools(); 740 showEditTools();
743 // Show filename in caption 741 // Show filename in caption
744 QString name = filer; 742 QString name = filer;
745 int sep = name.findRev( '/' ); 743 int sep = name.findRev( '/' );
746 if ( sep > 0 ) 744 if ( sep > 0 )
747 name = name.mid( sep+1 ); 745 name = name.mid( sep+1 );
748 updateCaption( name ); 746 updateCaption( name );
749} 747}
750 748
751void TextEdit::openFile( const DocLnk &f ) { 749void TextEdit::openFile( const DocLnk &f ) {