-rw-r--r-- | core/apps/textedit/textedit.cpp | 24 | ||||
-rw-r--r-- | core/apps/textedit/textedit.h | 5 |
2 files changed, 23 insertions, 6 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index b276cbb..0af18da 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp | |||
@@ -342,12 +342,21 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
342 | font->insertItem(tr("Font"), this, SLOT(changeFont()) ); | 342 | font->insertItem(tr("Font"), this, SLOT(changeFont()) ); |
343 | 343 | ||
344 | font->insertSeparator(); | 344 | font->insertSeparator(); |
345 | |||
345 | nStart = new QAction( tr("Start with new file"), QString::null, 0, this, 0 ); | 346 | nStart = new QAction( tr("Start with new file"), QString::null, 0, this, 0 ); |
346 | connect( nStart, SIGNAL( toggled(bool) ), this, SLOT( changeStartConfig(bool) ) ); | 347 | connect( nStart, SIGNAL( toggled(bool) ), this, SLOT( changeStartConfig(bool) ) ); |
347 | nStart->setToggleAction(TRUE); | 348 | nStart->setToggleAction(TRUE); |
348 | nStart->addTo( font ); | 349 | nStart->addTo( font ); |
350 | |||
351 | nAdvanced = new QAction( tr("Advanced features"), QString::null, 0, this, 0 ); | ||
352 | connect( nAdvanced, SIGNAL( toggled(bool) ), this, SLOT( doAdvanced(bool) ) ); | ||
353 | nAdvanced->setToggleAction(TRUE); | ||
354 | nAdvanced->addTo( font ); | ||
355 | if(cfg.readBoolEntry("AdvancedFeatures")) | ||
356 | nAdvanced->setOn(TRUE); | ||
349 | font->insertSeparator(); | 357 | font->insertSeparator(); |
350 | font->insertItem(tr("About"), this, SLOT( doAbout()) ); | 358 | |
359 | font->insertItem(tr("About"), this, SLOT( doAbout()) ); | ||
351 | 360 | ||
352 | mb->insertItem( tr( "File" ), file ); | 361 | mb->insertItem( tr( "File" ), file ); |
353 | mb->insertItem( tr( "Edit" ), edit ); | 362 | mb->insertItem( tr( "Edit" ), edit ); |
@@ -623,7 +632,7 @@ void TextEdit::openFile( const QString &f ) | |||
623 | qDebug("filename is "+ f); | 632 | qDebug("filename is "+ f); |
624 | QString filer; | 633 | QString filer; |
625 | // bFromDocView = TRUE; | 634 | // bFromDocView = TRUE; |
626 | if(f.find(".desktop",0,TRUE) != -1) { | 635 | if(f.find(".desktop",0,TRUE) != -1 && useAdvancedFeatures) { |
627 | switch ( QMessageBox::warning(this,tr("Text Editor"), | 636 | switch ( QMessageBox::warning(this,tr("Text Editor"), |
628 | tr("Text Editor has detected\n you selected a .desktop file.\nOpen .desktop file or linked file?"), | 637 | tr("Text Editor has detected\n you selected a .desktop file.\nOpen .desktop file or linked file?"), |
629 | tr(".desktop File"),tr("Linked Document"),0,1,1) ) { | 638 | tr(".desktop File"),tr("Linked Document"),0,1,1) ) { |
@@ -823,14 +832,14 @@ bool TextEdit::saveAs() | |||
823 | return false; | 832 | return false; |
824 | } | 833 | } |
825 | 834 | ||
826 | // if( fileSaveDlg->filePermCheck->isChecked() ) { | 835 | if( useAdvancedFfeatures ) { |
827 | filePermissions *filePerm; | 836 | filePermissions *filePerm; |
828 | filePerm = new filePermissions(this, tr("Permissions"),true,0,(const QString &)fileNm); | 837 | filePerm = new filePermissions(this, tr("Permissions"),true,0,(const QString &)fileNm); |
829 | filePerm->exec(); | 838 | filePerm->exec(); |
830 | 839 | ||
831 | if( filePerm) | 840 | if( filePerm) |
832 | delete filePerm; | 841 | delete filePerm; |
833 | // } | 842 | } |
834 | } | 843 | } |
835 | } | 844 | } |
836 | editor->setEdited(TRUE); | 845 | editor->setEdited(TRUE); |
@@ -966,3 +975,10 @@ void TextEdit::doAbout() { | |||
966 | "2002 by L.J.Potter \nljp@llornkcor.com\n" | 975 | "2002 by L.J.Potter \nljp@llornkcor.com\n" |
967 | "and is licensed under the GPL"); | 976 | "and is licensed under the GPL"); |
968 | } | 977 | } |
978 | |||
979 | void TextEdit::doAdvanced(bool b) { | ||
980 | useAdvancedFeatures=b; | ||
981 | Config cfg("TextEdit"); | ||
982 | cfg.setGroup("View"); | ||
983 | cfg.writeEntry("AdvancedFeatures",b); | ||
984 | } | ||
diff --git a/core/apps/textedit/textedit.h b/core/apps/textedit/textedit.h index 764d852..aec6427 100644 --- a/core/apps/textedit/textedit.h +++ b/core/apps/textedit/textedit.h | |||
@@ -57,7 +57,7 @@ public: | |||
57 | ~TextEdit(); | 57 | ~TextEdit(); |
58 | 58 | ||
59 | QPopupMenu *font; | 59 | QPopupMenu *font; |
60 | QAction *nStart, *nFileDlgOpt; | 60 | QAction *nStart, *nFileDlgOpt, *nAdvanced; |
61 | bool edited, edited1; | 61 | bool edited, edited1; |
62 | void openFile( const QString & ); | 62 | void openFile( const QString & ); |
63 | QCopChannel * channel; | 63 | QCopChannel * channel; |
@@ -65,10 +65,11 @@ public slots: | |||
65 | void editorChanged(); | 65 | void editorChanged(); |
66 | void receive(const QCString&, const QByteArray&); | 66 | void receive(const QCString&, const QByteArray&); |
67 | protected: | 67 | protected: |
68 | bool fileIs; | 68 | bool fileIs, useAdvancedFeatures; |
69 | void closeEvent( QCloseEvent *e ); | 69 | void closeEvent( QCloseEvent *e ); |
70 | void doSearchBar(); | 70 | void doSearchBar(); |
71 | private slots: | 71 | private slots: |
72 | void doAdvanced(bool); | ||
72 | void doAbout(); | 73 | void doAbout(); |
73 | void setDocument(const QString&); | 74 | void setDocument(const QString&); |
74 | void changeFont(); | 75 | void changeFont(); |