| -rw-r--r-- | core/apps/textedit/textedit.cpp | 41 |
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 ) Config cfg("TextEdit"); - cfg. setGroup ( "Font" ); + cfg. setGroup ( "Font" ); QFont defaultFont = editor-> font ( ); @@ -409,6 +409,6 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) nAdvanced-> setOn ( true ); - bool wrap = cfg. readBoolEntry ( "Wrap", true ); - wa-> setOn ( wrap ); + bool wrap = cfg. readBoolEntry ( "Wrap", true ); + wa-> setOn ( wrap ); setWordWrap ( wrap ); @@ -429,6 +429,6 @@ TextEdit::~TextEdit() { void TextEdit::cleanUp() { - qDebug("cleanUp");// save(); - + qDebug("cleanUp");// save(); + Config cfg ( "TextEdit" ); cfg. setGroup ( "Font" ); @@ -442,5 +442,5 @@ void TextEdit::cleanUp() { cfg. writeEntry ( "Wrap", editor-> wordWrap ( ) == QMultiLineEdit::WidgetWidth ); cfg. writeEntry ( "FileView", viewSelection ); - cfg. writeEntry ( "AdvancedFeatures", useAdvancedFeatures ); + cfg. writeEntry ( "AdvancedFeatures", useAdvancedFeatures ); } @@ -625,5 +625,6 @@ void TextEdit::openFile( const QString &f ) { if(f.find(".desktop",0,TRUE) != -1 && useAdvancedFeatures) { switch ( QMessageBox::warning(this,tr("Text Editor"), - tr("Text Editor has detected<BR>you selected a <B>.desktop</B> file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?"), + tr("Text Editor has detected<BR>you selected a <B>.desktop</B> +file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?"), tr(".desktop File"),tr("Linked Document"),0,1,1) ) { case 0: @@ -636,8 +637,8 @@ void TextEdit::openFile( const QString &f ) { } } else { - DocLnk sf(f); - filer = sf.file(); -// filer = f; -// fileIs = TRUE; + DocLnk sf(f); + filer = sf.file(); + if(filer.right(1) == "/") + filer = f; } @@ -883,14 +884,14 @@ void TextEdit::closeEvent( QCloseEvent *e ) { void TextEdit::changeFont() { - QDialog *d = new QDialog ( this, "FontDialog", true ); - d-> setCaption ( tr( "Choose font" )); - QBoxLayout *lay = new QVBoxLayout ( d ); - OFontSelector *ofs = new OFontSelector ( true, d ); - lay-> addWidget ( ofs ); - ofs-> setSelectedFont ( editor-> font ( )); - - d-> showMaximized ( ); + QDialog *d = new QDialog ( this, "FontDialog", true ); + d-> setCaption ( tr( "Choose font" )); + QBoxLayout *lay = new QVBoxLayout ( d ); + OFontSelector *ofs = new OFontSelector ( true, d ); + lay-> addWidget ( ofs ); + ofs-> setSelectedFont ( editor-> font ( )); + + d-> showMaximized ( ); if ( d-> exec ( ) == QDialog::Accepted ) - editor-> setFont ( ofs-> selectedFont ( )); + editor-> setFont ( ofs-> selectedFont ( )); delete d; |