author | sandman <sandman> | 2002-10-01 21:01:04 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-10-01 21:01:04 (UTC) |
commit | 2987dafbdfa6602c5e165fe862546ea32f5fd3ca (patch) (side-by-side diff) | |
tree | 0c3cae31e893a072c1167b27e9331b5d65c28763 /core/apps/textedit/textedit.cpp | |
parent | 609b04531d5a1caae189397922eb0068aa0e2634 (diff) | |
download | opie-2987dafbdfa6602c5e165fe862546ea32f5fd3ca.zip opie-2987dafbdfa6602c5e165fe862546ea32f5fd3ca.tar.gz opie-2987dafbdfa6602c5e165fe862546ea32f5fd3ca.tar.bz2 |
- replaced the custom font selector with OFontSelector
- fixed the broken Config handling (Font)
- various cleanups
Diffstat (limited to 'core/apps/textedit/textedit.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/apps/textedit/textedit.cpp | 108 |
1 files changed, 39 insertions, 69 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 @@ -23,16 +23,17 @@ 1) do not prompt on cancel, even if text is edited. 2) prompt user is .desktop file 3) prompt user for File Permissions on saveAs */ #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> #include <qpe/global.h> #include <qpe/fileselector.h> #include <qpe/applnk.h> #include <qpe/resource.h> @@ -54,12 +55,13 @@ #include <qpopupmenu.h> #include <qspinbox.h> #include <qtoolbutton.h> #include <qwidgetstack.h> #include <qcheckbox.h> #include <qcombo.h> +#include <qlayout.h> #include <unistd.h> #include <sys/stat.h> #include <stdlib.h> //getenv @@ -309,49 +311,23 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) a = new QAction( tr( "Find..." ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 ); connect( a, SIGNAL( activated() ), this, SLOT( editFind() ) ); edit->insertSeparator(); a->addTo( bar ); 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 ); connect( zin, SIGNAL( activated() ), this, SLOT( zoomIn() ) ); zin->addTo( font ); zout = new QAction( tr("Zoom out"), QString::null, 0, this, 0 ); connect( zout, SIGNAL( activated() ), this, SLOT( zoomOut() ) ); zout->addTo( font ); 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) ) ); wa->setToggleAction(TRUE); wa->addTo( font ); font->insertSeparator(); @@ -366,18 +342,12 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) nAdvanced = new QAction( tr("Advanced features"), QString::null, 0, this, 0 ); connect( nAdvanced, SIGNAL( toggled(bool) ), this, SLOT( doAdvanced(bool) ) ); nAdvanced->setToggleAction(TRUE); nAdvanced->addTo( font ); - if(cfg.readBoolEntry("AdvancedFeatures")) { - qDebug("using advanced features"); - useAdvancedFeatures = true; - nAdvanced->setOn(TRUE); - } else - useAdvancedFeatures = false; font->insertSeparator(); font->insertItem(tr("About"), this, SLOT( doAbout()) ); mb->insertItem( tr( "File" ), file ); @@ -412,32 +382,39 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) editor = new QpeEditor( this ); setCentralWidget( editor ); editor->setFrameStyle( QFrame::Panel | QFrame::Sunken ); 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); - 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); + defaultFont = QFont ( family, size, weight, italic ); editor->setFont( defaultFont); - wa->setOn(wrap); updateCaption(); 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); fileNew(); } else { fileOpen(); } @@ -449,20 +426,25 @@ TextEdit::~TextEdit() { if( edited1 & !useAdvancedFeatures ) saveAs(); } void TextEdit::cleanUp() { qDebug("cleanUp");// save(); + Config cfg("TextEdit"); - cfg.setGroup("View"); + cfg. setGroup ( "Font" ); QFont f = editor->font(); - cfg.writeEntry("FontSize",f.pointSize()); - cfg.writeEntry("Bold",f.bold()); + 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 ); } void TextEdit::accept() { if( edited1) saveAs(); @@ -897,32 +879,23 @@ void TextEdit::setDocument(const QString& fileref) { void TextEdit::closeEvent( QCloseEvent *e ) { bFromDocView = FALSE; e->accept(); } 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); + 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 ( )); - FontDialog *fontDlg; - fontDlg=new FontDialog(this,tr("FontDialog"),TRUE); - - fontDlg->exec(); - - QFont myFont=fontDlg->selectedFont; - editor->setFont( myFont); - delete fontDlg; + d-> showMaximized ( ); + if ( d-> exec ( ) == QDialog::Accepted ) + 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) ) { case 0: @@ -972,15 +945,12 @@ void TextEdit::doAbout() { "2002 by <B>L. J. Potter <BR>llornkcor@handhelds.org</B><BR>" "and is licensed under the GPL")); } void TextEdit::doAdvanced(bool b) { useAdvancedFeatures=b; - Config cfg("TextEdit"); - cfg.setGroup("View"); - cfg.writeEntry("AdvancedFeatures",b); } void TextEdit::editPasteTimeDate() { #ifndef QT_NO_CLIPBOARD QClipboard *cb = QApplication::clipboard(); QDateTime dt = QDateTime::currentDateTime(); |