summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/textedit.cpp40
-rw-r--r--core/apps/textedit/textedit.h5
2 files changed, 37 insertions, 8 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 03f3a1e..78c4d8a 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -162,16 +162,16 @@ public:
162 : QMultiLineEdit( parent, name ) 162 : QMultiLineEdit( parent, name )
163 { 163 {
164 clearTableFlags(); 164 clearTableFlags();
165 setTableFlags( Tbl_vScrollBar | Tbl_autoHScrollBar ); 165 setTableFlags( Tbl_vScrollBar | Tbl_autoHScrollBar );
166 } 166 }
167 167
168 //public slots:
169 void find( const QString &txt, bool caseSensitive, 168 void find( const QString &txt, bool caseSensitive,
170 bool backwards ); 169 bool backwards );
171 /* 170//public slots:
171 /*
172signals: 172signals:
173 void notFound(); 173 void notFound();
174 void searchWrapped(); 174 void searchWrapped();
175 */ 175 */
176 176
177private: 177private:
@@ -237,13 +237,14 @@ static const int nfontsizes = 6;
237static const int fontsize[nfontsizes] = {8,10,12,14,18,24}; 237static const int fontsize[nfontsizes] = {8,10,12,14,18,24};
238 238
239TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) 239TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
240 : QMainWindow( parent, name, f ), bFromDocView( FALSE ) 240 : QMainWindow( parent, name, f ), bFromDocView( FALSE )
241{ 241{
242 doc = 0; 242 doc = 0;
243 243 edited=FALSE;
244 edited1=FALSE;
244 setToolBarsMovable( FALSE ); 245 setToolBarsMovable( FALSE );
245 246
246 setIcon( Resource::loadPixmap( "TextEditor" ) ); 247 setIcon( Resource::loadPixmap( "TextEditor" ) );
247 248
248 QPEToolBar *bar = new QPEToolBar( this ); 249 QPEToolBar *bar = new QPEToolBar( this );
249 bar->setHorizontalStretchable( TRUE ); 250 bar->setHorizontalStretchable( TRUE );
@@ -397,12 +398,13 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
397 connect( fileSelector, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( openFile( const DocLnk & ) ) ); 398 connect( fileSelector, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( openFile( const DocLnk & ) ) );
398// fileOpen(); 399// fileOpen();
399 400
400 editor = new QpeEditor( editorStack ); 401 editor = new QpeEditor( editorStack );
401 editor->setFrameStyle( QFrame::Panel | QFrame::Sunken ); 402 editor->setFrameStyle( QFrame::Panel | QFrame::Sunken );
402 editorStack->addWidget( editor, get_unique_id() ); 403 editorStack->addWidget( editor, get_unique_id() );
404 connect( editor, SIGNAL( textChanged() ), this, SLOT( editorChanged() ) );
403 405
404 resize( 200, 300 ); 406 resize( 200, 300 );
405 407
406// setFontSize(defsize,TRUE); 408// setFontSize(defsize,TRUE);
407 FontDatabase fdb; 409 FontDatabase fdb;
408 QFont defaultFont=editor->font(); 410 QFont defaultFont=editor->font();
@@ -553,13 +555,16 @@ void TextEdit::newFileOpen()
553 qDebug("please open "+currentFileName); 555 qDebug("please open "+currentFileName);
554 openFile(fileName ); 556 openFile(fileName );
555 } 557 }
556 } 558 }
557 } 559 }
558 delete browseForFiles; 560 delete browseForFiles;
559 editor->setEdited( true ); 561 editor->setEdited( FALSE);
562 edited1=FALSE;
563 edited=FALSE;
564 setCaption(caption().right(caption().length()-1));
560} 565}
561 566
562#if 0 567#if 0
563void TextEdit::slotFind() 568void TextEdit::slotFind()
564{ 569{
565 FindDialog frmFind( "Text Editor", this ); 570 FindDialog frmFind( "Text Editor", this );
@@ -681,13 +686,17 @@ void TextEdit::openFile( const DocLnk &f )
681 686
682 fileNew(); 687 fileNew();
683 if ( doc ) 688 if ( doc )
684 delete doc; 689 delete doc;
685 doc = new DocLnk(f); 690 doc = new DocLnk(f);
686 editor->setText(txt); 691 editor->setText(txt);
687 editor->setEdited( false); 692 editor->setEdited( FALSE);
693 edited1=FALSE;
694 edited=FALSE;
695 setCaption(caption().right(caption().length()-1));
696
688 qDebug("openFile doclnk "+currentFileName); 697 qDebug("openFile doclnk "+currentFileName);
689 doc->setName(currentFileName); 698 doc->setName(currentFileName);
690 updateCaption(); 699 updateCaption();
691} 700}
692 701
693void TextEdit::showEditTools() 702void TextEdit::showEditTools()
@@ -728,13 +737,17 @@ bool TextEdit::save()
728 737
729 doc->setName( name); 738 doc->setName( name);
730 FileManager fm; 739 FileManager fm;
731 if ( !fm.saveFile( *doc, rt ) ) { 740 if ( !fm.saveFile( *doc, rt ) ) {
732 return false; 741 return false;
733 } 742 }
734 editor->setEdited( false ); 743 editor->setEdited( FALSE);
744 edited1=FALSE;
745 edited=FALSE;
746 setCaption(caption().right(caption().length()-1));
747
735 748
736 chmod( file.latin1(), mode); 749 chmod( file.latin1(), mode);
737 } 750 }
738 return true; 751 return true;
739 } 752 }
740 return false; 753 return false;
@@ -810,18 +823,23 @@ bool TextEdit::saveAs()
810 return false; 823 return false;
811 } 824 }
812 if( fileSaveDlg->filePermCheck->isChecked() ) { 825 if( fileSaveDlg->filePermCheck->isChecked() ) {
813 filePermissions *filePerm; 826 filePermissions *filePerm;
814 filePerm = new filePermissions(this, "Permissions",true,0,(const QString &)fileNm); 827 filePerm = new filePermissions(this, "Permissions",true,0,(const QString &)fileNm);
815 filePerm->exec(); 828 filePerm->exec();
816 editor->setEdited( false ); 829
817 if( filePerm) 830 if( filePerm)
818 delete filePerm; 831 delete filePerm;
819 } 832 }
820 } 833 }
821 } 834 }
835 editor->setEdited( FALSE);
836 edited1=FALSE;
837 edited=FALSE;
838 if(caption().left(1)=="*")
839 setCaption(caption().right(caption().length()-1));
822 840
823 if(fileSaveDlg) 841 if(fileSaveDlg)
824 delete fileSaveDlg; 842 delete fileSaveDlg;
825 return true; 843 return true;
826} 844}
827 845
@@ -935,6 +953,14 @@ void TextEdit::changeStartConfig( bool b ) {
935 cfg.writeEntry("startNew","TRUE"); 953 cfg.writeEntry("startNew","TRUE");
936 } else { 954 } else {
937 cfg.writeEntry("startNew","FALSE"); 955 cfg.writeEntry("startNew","FALSE");
938 } 956 }
939 update(); 957 update();
940} 958}
959
960void TextEdit::editorChanged() {
961 if(editor->edited() && edited && !edited1) {
962 setCaption( "*"+caption());
963 edited1=TRUE;
964 }
965 edited=TRUE;
966}
diff --git a/core/apps/textedit/textedit.h b/core/apps/textedit/textedit.h
index fb58738..e7e20e3 100644
--- a/core/apps/textedit/textedit.h
+++ b/core/apps/textedit/textedit.h
@@ -51,14 +51,17 @@ class TextEdit : public QMainWindow
51 51
52public: 52public:
53 TextEdit( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); 53 TextEdit( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
54 ~TextEdit(); 54 ~TextEdit();
55 QPopupMenu *font; 55 QPopupMenu *font;
56 QAction *nStart; 56 QAction *nStart;
57 bool edited, edited1;
57 void openFile( const QString & ); 58 void openFile( const QString & );
58 59public slots:
60 void editorChanged();
61
59protected: 62protected:
60 void closeEvent( QCloseEvent *e ); 63 void closeEvent( QCloseEvent *e );
61 64
62private slots: 65private slots:
63 void setDocument(const QString&); 66 void setDocument(const QString&);
64 void changeFont(); 67 void changeFont();