Diffstat (limited to 'core/apps/textedit/textedit.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/apps/textedit/textedit.cpp | 124 |
1 files changed, 47 insertions, 77 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index f6a869a..7b50a6c 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp @@ -27,8 +27,9 @@ #include "textedit.h" #include "filePermissions.h" -#include "fontDialog.h" +//#include "fontDialog.h" #include <opie/ofileselector.h> #include <opie/ofiledialog.h> +#include <opie/ofontselector.h> #include <qpe/fontdatabase.h> @@ -58,4 +59,5 @@ #include <qcheckbox.h> #include <qcombo.h> +#include <qlayout.h> #include <unistd.h> @@ -313,13 +315,4 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) a->addTo( edit ); - int defsize; - bool defb, defi, wrap; - - Config cfg("TextEdit"); - cfg.setGroup("View"); - defsize = cfg.readNumEntry("FontSize",10); - defb = cfg.readBoolEntry("Bold",FALSE); - defi = cfg.readBoolEntry("Italic",FALSE); - wrap = cfg.readBoolEntry("Wrap",TRUE); zin = new QAction( tr("Zoom in"), QString::null, 0, this, 0 ); @@ -333,21 +326,4 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) font->insertSeparator(); -#if 0 - QAction *ba = new QAction( tr("Bold"), QString::null, 0, this, 0 ); - connect( ba, SIGNAL( toggled(bool) ), this, SLOT( setBold(bool) ) ); - ba->setToggleAction(TRUE); - ba->addTo( font ); - - QAction *ia = new QAction( tr("Italic"), QString::null, 0, this, 0 ); - connect( ia, SIGNAL( toggled(bool) ), this, SLOT( setItalic(bool) ) ); - ia->setToggleAction(TRUE); - ia->addTo( font ); - - ba->setOn(defb); - ia->setOn(defi); - - font->insertSeparator(); -#endif - QAction *wa = new QAction( tr("Wrap lines"), QString::null, 0, this, 0 ); connect( wa, SIGNAL( toggled(bool) ), this, SLOT( setWordWrap(bool) ) ); @@ -370,10 +346,4 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) nAdvanced->addTo( font ); - if(cfg.readBoolEntry("AdvancedFeatures")) { - qDebug("using advanced features"); - useAdvancedFeatures = true; - nAdvanced->setOn(TRUE); - } else - useAdvancedFeatures = false; font->insertSeparator(); @@ -416,24 +386,31 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) connect( editor, SIGNAL( textChanged() ), this, SLOT( editorChanged() ) ); -// resize( 200, 300 ); + Config cfg("TextEdit"); + + cfg. setGroup ( "Font" ); -// setFontSize(defsize,TRUE); - FontDatabase fdb; - QFont defaultFont=editor->font(); - QFontInfo fontInfo(defaultFont); + QFont defaultFont = editor-> font ( ); - cfg.setGroup("Font"); - QString family = cfg.readEntry("Family", fontInfo.family()); - QString style = cfg.readEntry("Style", fdb.styleString(defaultFont)); - int i_size = cfg.readNumEntry("Size", fontInfo.pointSize()/10); - QString charSet = cfg.readEntry("CharSet", QFont::encodingName( fontInfo.charSet()) ); + QString family = cfg. readEntry ( "Family", defaultFont. family ( )); + int size = cfg. readNumEntry ( "Size", defaultFont. pointSize ( )); + int weight = cfg. readNumEntry ( "Weight", defaultFont. weight ( )); + bool italic = cfg. readBoolEntry ( "Italic", defaultFont. italic ( )); - defaultFont = fdb.font(family,style,i_size,charSet); - editor->setFont( defaultFont); + defaultFont = QFont ( family, size, weight, italic ); + editor-> setFont ( defaultFont ); - wa->setOn(wrap); updateCaption(); - cfg.setGroup("View"); + cfg.setGroup ( "View" ); + + useAdvancedFeatures = cfg. readBoolEntry ( "AdvancedFeatures", false ); + + if ( useAdvancedFeatures ) + nAdvanced-> setOn ( true ); + + bool wrap = cfg. readBoolEntry ( "Wrap", true ); + wa-> setOn ( wrap ); + setWordWrap ( wrap ); + if(cfg.readEntry("startNew","TRUE") == "TRUE") { nStart->setOn(TRUE); @@ -452,13 +429,18 @@ TextEdit::~TextEdit() { void TextEdit::cleanUp() { -qDebug("cleanUp");// save(); - Config cfg("TextEdit"); - cfg.setGroup("View"); + qDebug("cleanUp");// save(); + + Config cfg ( "TextEdit" ); + cfg. setGroup ( "Font" ); QFont f = editor->font(); - cfg.writeEntry("FontSize",f.pointSize()); - cfg.writeEntry("Bold",f.bold()); - cfg.writeEntry("Italic",f.italic()); - cfg.writeEntry("Wrap",editor->wordWrap() == QMultiLineEdit::WidgetWidth); - cfg.writeEntry( "FileView", viewSelection ); + 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 ); } @@ -901,24 +883,15 @@ void TextEdit::closeEvent( QCloseEvent *e ) { void TextEdit::changeFont() { - FontDatabase fdb; - QFont defaultFont=editor->font(); - QFontInfo fontInfo(defaultFont); - Config cfg("TextEdit"); - cfg.setGroup("Font"); - QString family = cfg.readEntry("Family", fontInfo.family()); - QString style = cfg.readEntry("Style", fdb.styleString(defaultFont)); - int i_size = cfg.readNumEntry("Size", fontInfo.pointSize()/10); - QString charSet = cfg.readEntry("CharSet", QFont::encodingName( fontInfo.charSet()) ); - - defaultFont = fdb.font(family,style,i_size,charSet); - - FontDialog *fontDlg; - fontDlg=new FontDialog(this,tr("FontDialog"),TRUE); + 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 ( )); - fontDlg->exec(); - - QFont myFont=fontDlg->selectedFont; - editor->setFont( myFont); - delete fontDlg; + d-> showMaximized ( ); + if ( d-> exec ( ) == QDialog::Accepted ) + editor-> setFont ( ofs-> selectedFont ( )); + delete d; } @@ -976,7 +949,4 @@ void TextEdit::doAbout() { void TextEdit::doAdvanced(bool b) { useAdvancedFeatures=b; - Config cfg("TextEdit"); - cfg.setGroup("View"); - cfg.writeEntry("AdvancedFeatures",b); } |