author | llornkcor <llornkcor> | 2002-10-03 13:04:26 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-10-03 13:04:26 (UTC) |
commit | 8a7f57c5c172958d67d8397eed1860c914df485d (patch) (side-by-side diff) | |
tree | f665602210cf23240c626dabb15b2b4e13ad5e60 /core | |
parent | ee864e9e055fd23778a8e5dd3c35e3a29cded368 (diff) | |
download | opie-8a7f57c5c172958d67d8397eed1860c914df485d.zip opie-8a7f57c5c172958d67d8397eed1860c914df485d.tar.gz opie-8a7f57c5c172958d67d8397eed1860c914df485d.tar.bz2 |
fix not opening
-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 @@ -384,13 +384,13 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) setCentralWidget( editor ); editor->setFrameStyle( QFrame::Panel | QFrame::Sunken ); connect( editor, SIGNAL( textChanged() ), this, SLOT( editorChanged() ) ); Config cfg("TextEdit"); - cfg. setGroup ( "Font" ); + cfg. setGroup ( "Font" ); QFont defaultFont = editor-> font ( ); QString family = cfg. readEntry ( "Family", defaultFont. family ( )); int size = cfg. readNumEntry ( "Size", defaultFont. pointSize ( )); int weight = cfg. readNumEntry ( "Weight", defaultFont. weight ( )); @@ -405,14 +405,14 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) useAdvancedFeatures = cfg. readBoolEntry ( "AdvancedFeatures", false ); if ( useAdvancedFeatures ) nAdvanced-> setOn ( true ); - bool wrap = cfg. readBoolEntry ( "Wrap", true ); - wa-> setOn ( wrap ); + bool wrap = cfg. readBoolEntry ( "Wrap", true ); + wa-> setOn ( wrap ); setWordWrap ( wrap ); if(cfg.readEntry("startNew","TRUE") == "TRUE") { nStart->setOn(TRUE); fileNew(); } else { @@ -425,26 +425,26 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) TextEdit::~TextEdit() { if( edited1 & !useAdvancedFeatures ) saveAs(); } void TextEdit::cleanUp() { - qDebug("cleanUp");// save(); - + qDebug("cleanUp");// save(); + Config cfg ( "TextEdit" ); cfg. setGroup ( "Font" ); QFont f = editor->font(); cfg. writeEntry ( "Family", f. family ( )); cfg. writeEntry ( "Size", f. pointSize ( )); cfg. writeEntry ( "Weight", f. weight ( )); cfg. writeEntry ( "Italic", f. italic ( )); cfg. setGroup ( "View" ); cfg. writeEntry ( "Wrap", editor-> wordWrap ( ) == QMultiLineEdit::WidgetWidth ); cfg. writeEntry ( "FileView", viewSelection ); - cfg. writeEntry ( "AdvancedFeatures", useAdvancedFeatures ); + cfg. writeEntry ( "AdvancedFeatures", useAdvancedFeatures ); } void TextEdit::accept() { if( edited1) saveAs(); @@ -621,27 +621,28 @@ void TextEdit::newFile( const DocLnk &f ) { void TextEdit::openFile( const QString &f ) { qDebug("filename is "+ f); QString filer; // bFromDocView = TRUE; 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: filer = f; break; case 1: DocLnk sf(f); filer = sf.file(); break; } } else { - DocLnk sf(f); - filer = sf.file(); -// filer = f; -// fileIs = TRUE; + DocLnk sf(f); + filer = sf.file(); + if(filer.right(1) == "/") + filer = f; } DocLnk nf; nf.setType("text/plain"); nf.setFile(filer); currentFileName=filer; @@ -879,22 +880,22 @@ void TextEdit::setDocument(const QString& fileref) { void TextEdit::closeEvent( QCloseEvent *e ) { bFromDocView = FALSE; e->accept(); } 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; } void TextEdit::editDelete() { switch ( QMessageBox::warning(this,tr("Text Editor"),tr("Do you really want<BR>to <B>delete</B> the current file\nfrom the disk?<BR>This is <B>irreversable!!</B>"),tr("Yes"),tr("No"),0,0,1) ) { |