summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/textedit.cpp41
1 files changed, 21 insertions, 20 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 7b50a6c..6844023 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -388,5 +388,5 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
388 Config cfg("TextEdit"); 388 Config cfg("TextEdit");
389 389
390 cfg. setGroup ( "Font" ); 390 cfg. setGroup ( "Font" );
391 391
392 QFont defaultFont = editor-> font ( ); 392 QFont defaultFont = editor-> font ( );
@@ -409,6 +409,6 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
409 nAdvanced-> setOn ( true ); 409 nAdvanced-> setOn ( true );
410 410
411 bool wrap = cfg. readBoolEntry ( "Wrap", true ); 411 bool wrap = cfg. readBoolEntry ( "Wrap", true );
412 wa-> setOn ( wrap ); 412 wa-> setOn ( wrap );
413 setWordWrap ( wrap ); 413 setWordWrap ( wrap );
414 414
@@ -429,6 +429,6 @@ TextEdit::~TextEdit() {
429 429
430void TextEdit::cleanUp() { 430void TextEdit::cleanUp() {
431 qDebug("cleanUp");// save(); 431 qDebug("cleanUp");// save();
432 432
433 Config cfg ( "TextEdit" ); 433 Config cfg ( "TextEdit" );
434 cfg. setGroup ( "Font" ); 434 cfg. setGroup ( "Font" );
@@ -442,5 +442,5 @@ void TextEdit::cleanUp() {
442 cfg. writeEntry ( "Wrap", editor-> wordWrap ( ) == QMultiLineEdit::WidgetWidth ); 442 cfg. writeEntry ( "Wrap", editor-> wordWrap ( ) == QMultiLineEdit::WidgetWidth );
443 cfg. writeEntry ( "FileView", viewSelection ); 443 cfg. writeEntry ( "FileView", viewSelection );
444 cfg. writeEntry ( "AdvancedFeatures", useAdvancedFeatures ); 444 cfg. writeEntry ( "AdvancedFeatures", useAdvancedFeatures );
445} 445}
446 446
@@ -625,5 +625,6 @@ void TextEdit::openFile( const QString &f ) {
625 if(f.find(".desktop",0,TRUE) != -1 && useAdvancedFeatures) { 625 if(f.find(".desktop",0,TRUE) != -1 && useAdvancedFeatures) {
626 switch ( QMessageBox::warning(this,tr("Text Editor"), 626 switch ( QMessageBox::warning(this,tr("Text Editor"),
627 tr("Text Editor has detected<BR>you selected a <B>.desktop</B> file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?"), 627 tr("Text Editor has detected<BR>you selected a <B>.desktop</B>
628file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?"),
628 tr(".desktop File"),tr("Linked Document"),0,1,1) ) { 629 tr(".desktop File"),tr("Linked Document"),0,1,1) ) {
629 case 0: 630 case 0:
@@ -636,8 +637,8 @@ void TextEdit::openFile( const QString &f ) {
636 } 637 }
637 } else { 638 } else {
638 DocLnk sf(f); 639 DocLnk sf(f);
639 filer = sf.file(); 640 filer = sf.file();
640// filer = f; 641 if(filer.right(1) == "/")
641// fileIs = TRUE; 642 filer = f;
642 } 643 }
643 644
@@ -883,14 +884,14 @@ void TextEdit::closeEvent( QCloseEvent *e ) {
883 884
884void TextEdit::changeFont() { 885void TextEdit::changeFont() {
885 QDialog *d = new QDialog ( this, "FontDialog", true ); 886 QDialog *d = new QDialog ( this, "FontDialog", true );
886 d-> setCaption ( tr( "Choose font" )); 887 d-> setCaption ( tr( "Choose font" ));
887 QBoxLayout *lay = new QVBoxLayout ( d ); 888 QBoxLayout *lay = new QVBoxLayout ( d );
888 OFontSelector *ofs = new OFontSelector ( true, d ); 889 OFontSelector *ofs = new OFontSelector ( true, d );
889 lay-> addWidget ( ofs ); 890 lay-> addWidget ( ofs );
890 ofs-> setSelectedFont ( editor-> font ( )); 891 ofs-> setSelectedFont ( editor-> font ( ));
891 892
892 d-> showMaximized ( ); 893 d-> showMaximized ( );
893 if ( d-> exec ( ) == QDialog::Accepted ) 894 if ( d-> exec ( ) == QDialog::Accepted )
894 editor-> setFont ( ofs-> selectedFont ( )); 895 editor-> setFont ( ofs-> selectedFont ( ));
895 delete d; 896 delete d;
896 897