- replaced the custom font selector with OFontSelector

- fixed the broken Config handling (Font)
- various cleanups

4 files changed, 41 insertions, 371 deletions

diff --git a/core/apps/textedit/fontDialog.cpp b/core/apps/textedit/fontDialog.cpp
deleted file mode 100644
index 5cdf538..0000000
--- a/core/apps/textedit/fontDialog.cpp
+++ b/dev/null
@@ -1,237 +0,0 @@
-/****************************************************************************
-** Created: Sun Jan 27 11:03:24 2002 fileDialog.cpp
-copyright 2002 by L.J. Potter ljp@llornkcor.com
-
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
-#include "fontDialog.h"
-
-#include <qpe/fontdatabase.h>
-#include <qpe/config.h>
-
-#include <qstringlist.h>
-#include <qfontinfo.h>
-#include <qvaluelist.h>
-#include <qpe/qpeapplication.h>
-
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlistbox.h>
-#include <qmultilineedit.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qvariant.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-FontDialog::FontDialog( QWidget * parent,  const char* name , bool modal, WFlags fl )
-        :QDialog /*QWidget*/( parent, name , modal, fl )
-{
-    if ( !name )
-        setName( tr("FontDialog") );
-    setCaption( tr( "Font Dialog" ) );
-    FontTextLabel4 = new QLabel( this, "TextLabel4" );
-    FontTextLabel4->setGeometry( QRect(  145, 100, 30, 19  /*192, 0, 43, 19*/ ) );
-    FontTextLabel4->setText( tr( "Size" ) );
-
-    FamilyGroup = new QGroupBox( this, "FamilyGroup" );
-    FamilyGroup->setGeometry( QRect(  5, 5, 115, 135  /*0, 6, 185, 131 */) );
-    FamilyGroup->setTitle( tr( "Font" ) );
-
-    familyListBox = new QListBox( FamilyGroup, "familyListBox" );
-    familyListBox->setGeometry( QRect( 5, 20, 100, 105  /* 6, 18, 170, 105 */) );
-
-    GroupBox2 = new QGroupBox( this, "GroupBox2" );
-    GroupBox2->setGeometry( QRect(   120, 5, 100, 90/* 0, 138, 170, 90*/ ) );
-    GroupBox2->setTitle( tr( "Font Style" ) );
-
-    styleListBox = new QListBox( GroupBox2, "styleListBox" );
-    styleListBox->setGeometry( QRect( 5, 20, 90, 60 /*10, 20, 150, 61*/ ) );
-
-    sizeListBox = new QListBox( this, "sizeListBox" );
-    sizeListBox->setGeometry( QRect(  180, 100, 40, 60 /* 192, 24, 40, 108 */) );
-
-    MultiLineEdit1 = new QMultiLineEdit( this, "MultiLineEdit1" );
-    MultiLineEdit1->setGeometry( QRect(   5, 165, 215, 45 /* 6, 234, 222, 55*/ ) );
-    MultiLineEdit1->setText( tr( "The Quick Brown Fox Jumps Over The Lazy Dog" ) );
-    MultiLineEdit1->setWordWrap(QMultiLineEdit::WidgetWidth);
-
-    connect( familyListBox,SIGNAL( highlighted( const QString &)),SLOT( familyListBoxSlot(const QString &) ));
-    connect( styleListBox,SIGNAL(  highlighted( const QString &)),SLOT( styleListBoxSlot(const QString &) ));
-    connect( sizeListBox,SIGNAL(  highlighted( const QString &)),SLOT( sizeListBoxSlot(const QString &) ));
-
-    populateLists();
-//     MultiLineEdit1
-//      connect();
-//    move(5,15);
-    showMaximized();
-}
-
-FontDialog::~FontDialog()
-{
-}
-
-void FontDialog::familyListBoxSlot(const QString & text)
-{
-  int styleInt=styleListBox->currentItem();
-  int sizeInt=sizeListBox->currentItem();
-
-  styleListBox->clear();
-  sizeListBox->clear();
-  family= text;
-//  qDebug(family);
-  QStringList styles = fdb.styles( family ); // string list of styles of our current font family
-  styleListBox->insertStringList( styles);
-  QString dstyle;// = "\t" + style + " (";
-  QValueList<int> smoothies = fdb.smoothSizes( family, styleListBox->text(0) );
-  for ( QValueList<int>::Iterator points = smoothies.begin(); points != smoothies.end(); ++points ) {
-      dstyle = QString::number( *points );
-      sizeListBox ->insertItem( dstyle.left( dstyle.length() - 1 ));
-  }
-  if(styleInt == -1 || styleInt > styleListBox->count() )
-      styleListBox->setCurrentItem(0);
-  else
-      styleListBox->setCurrentItem(styleInt);
-
-  if(sizeInt == -1 || sizeInt > sizeListBox->count())
-      sizeListBox->setCurrentItem(0);
-  else
-      sizeListBox->setCurrentItem(sizeInt);
-
-  changeText();
-}
-
-void FontDialog::styleListBoxSlot(const QString &text)
-{
-    changeText();
-}
-
-void FontDialog::sizeListBoxSlot(const QString & text)
-{
-    changeText();
-}
-
-void FontDialog::populateLists()
-{
-//  QFont defaultFont=MultiLineEdit1->font();
-//          QFont defaultFont=Lview->font();
-//          QFontInfo fontInfo(defaultFont);
-  Config config("TextEdit");
-          config.setGroup("Font");
-          QString familyStr = config.readEntry("Family", "fixed");
-          QString styleStr = config.readEntry("Style", "Regular");
-          QString sizeStr = config.readEntry("Size", "10");
-          QString charSetStr = config.readEntry("CharSet", "iso10646-1" );
-          bool ok;
-          int i_size=sizeStr.toInt(&ok,10);
-          selectedFont = fdb.font(familyStr,styleStr,i_size,charSetStr);
-//          defaultFont.setItalic(TRUE);
-  families = fdb.families();
-  for ( QStringList::Iterator f = families.begin(); f != families.end();++f ) {
-      QString family = *f;
-//      if(family == defaultFont.family())
-//          qDebug(family);
-      familyListBox->insertItem( family);
-
-      if( familyListBox->text(0) == family) {
-          QStringList styles = fdb.styles( family ); // string list of styles of our current font family
-          styleListBox->insertStringList( styles);
-          for ( QStringList::Iterator s = styles.begin(); s != styles.end();++s ) { // for each font style
-             style = *s;
-              QString dstyle;// = "\t" + style + " (";
-              if(styleListBox->text(0) == style) {
-                  QValueList<int> smoothies = fdb.smoothSizes( family, style );
-                  for ( QValueList<int>::Iterator points = smoothies.begin(); points != smoothies.end(); ++points ) {
-                      dstyle = QString::number( *points ) + " ";
-
-                      sizeListBox ->insertItem( dstyle.left( dstyle.length() - 1 ));
-                  }
-                  dstyle = dstyle.left( dstyle.length() - 1 ) + ")";
-              }
-          } // styles
-      }
-  }
-  for(int i=0;i < familyListBox->count();i++) {
-      if( familyListBox->text(i) == familyStr)
-          familyListBox->setSelected( i, TRUE);
-  }
-
-  for(int i=0;i < styleListBox->count();i++) {
-      if( styleListBox->text(i) == styleStr)
-          styleListBox->setSelected( i, TRUE);
-  }
-
-  for(int i=0;i < sizeListBox->count();i++) {
-      if( sizeListBox->text(i) == sizeStr)
-          sizeListBox->setSelected( i, TRUE);
-  }
-  changeText();
-}
-
-void FontDialog::clearListBoxes() {
-    familyListBox->clear();
-    sizeListBox->clear();
-    styleListBox->clear();
-}
-
-void FontDialog::changeText()
-{
-    if( familyListBox->currentItem() == -1)
-        family= familyListBox->text(0);
-    else {
-        family = familyListBox->currentText();
-    }
-//          qDebug("Font family is "+family);
-    if( styleListBox->currentItem() == -1)
-        style=styleListBox->text(0);
-    else {
-        style = styleListBox->currentText();
-    }
-//          qDebug("font style is "+style);
-    if( sizeListBox->currentItem() == -1 )
-        size= sizeListBox->text(0);
-    else {
-     size = sizeListBox->currentText();
-    }
-
-//       qDebug("Font size is "+size);
-    bool ok;
-    int i_size= size.toInt(&ok,10);
-    QStringList charSetList= fdb.charSets(family);
-//      QStringList styles = fdb.styles( family ); // string list of styles of our current font family
-    QString charSet;
-          for ( QStringList::Iterator s = charSetList.begin(); s != charSetList.end();++s ) { // for each font style
-            charSet = *s;
-//            qDebug(charSet);
-          }
-    selectedFont = fdb.font(family,style,i_size,charSet);
-    QFontInfo fontInfo( selectedFont);
-//      if(fontInfo.italic() ) qDebug("italic");
-    selectedFont.setWeight(fontInfo.weight() );
-//      qDebug("Style are "+style+" %d ",fontInfo.weight());
-  Config cfg("TextEdit");
-    cfg.setGroup("Font");
-    cfg.writeEntry("Family",family);
-    cfg.writeEntry("Style",style);
-    cfg.writeEntry("Size",size);
-    cfg.writeEntry("CharSet",charSet);
-
-    if(style.find("Italic",0,TRUE) != -1) {
-          selectedFont = fdb.font(family,"Regular",i_size,charSet);
-          selectedFont.setItalic(TRUE); //ya right
-          cfg.writeEntry("Italic","TRUE");
-//            qDebug("Style is "+styleListBox->currentText());
-      } else
-          cfg.writeEntry("Italic","FALSE");
-  changedFonts=TRUE;
-    MultiLineEdit1->setFont( selectedFont);
-    MultiLineEdit1->update();
-}
-
diff --git a/core/apps/textedit/fontDialog.h b/core/apps/textedit/fontDialog.h
deleted file mode 100644
index ef930df..0000000
--- a/core/apps/textedit/fontDialog.h
+++ b/dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-** Created: Sun Jan 27 11:02:59 2002 fileDialog.h
-copyright 2002 by L.J. Potter ljp@llornkcor.com
-
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
-#ifndef FONTDIALOG_H
-#define FONTDIALOG_H
-
-#include <qvariant.h>
-#include <qdialog.h>
-#include <qpe/fontdatabase.h>
-#include <qfont.h>
-
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QLabel;
-class QListBox;
-class QListBoxItem;
-class QPushButton;
-class QGroupBox;
-class QMultiLineEdit;
-
-class FontDialog : public QDialog//  QWidget
-{ 
-    Q_OBJECT
-
-public:
-    FontDialog( QWidget * parent = 0, const char* name = 0 , bool modal=FALSE, WFlags fl = 0 );
-    ~FontDialog();
-
-    QLabel *FontTextLabel4;
-    QGroupBox *FamilyGroup, *GroupBox2;
-    QListBox *familyListBox, *styleListBox, *sizeListBox;
-    QMultiLineEdit *MultiLineEdit1;
-    QPushButton *PushButtonOk,*PushButtonCancel;
-    QStringList families;
-
-    FontDatabase fdb;
-    QString family, style, size;
-    QFont selectedFont;
-    bool changedFonts;
-    void populateLists();
-    void clearListBoxes();
-    void changeText();
-protected slots:
-
-    void familyListBoxSlot(const QString &);
-    void styleListBoxSlot(const QString &);
-    void sizeListBoxSlot(const QString &); 
-
-    
-};
-
-#endif // FONTDIALOG_H
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
@@ -1,990 +1,960 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 // changes added by L. J. Potter Sun 02-17-2002 21:31:31
 /*
   useAdvancedfeatures =
   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>
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qdatetime.h>
 #include <qclipboard.h>
 #include <qstringlist.h>
 #include <qaction.h>
 #include <qcolordialog.h>
 #include <qfileinfo.h>
 #include <qlineedit.h>
 #include <qmessagebox.h>
 #include <qobjectlist.h>
 #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
 
 
 /* XPM */
 static char * filesave_xpm[] = {
 "16 16 78 1",
 "   c None",
 ".  c #343434",
 "+  c #A0A0A0",
 "@  c #565656",
 "#  c #9E9E9E",
 "$  c #525252",
 "%  c #929292",
 "&  c #676767",
 "*  c #848484",
 "=  c #666666",
 "-  c #D8D8D8",
 ";  c #FFFFFF",
 ">  c #DBDBDB",
 ",  c #636363",
 "'  c #989898",
 ")  c #2D2D2D",
 "!  c #909090",
 "~  c #AEAEAE",
 "{  c #EAEAEA",
 "]  c #575757",
 "^  c #585858",
 "/  c #8A8A8A",
 "(  c #828282",
 "_  c #6F6F6F",
 ":  c #C9C9C9",
 "<  c #050505",
 "[  c #292929",
 "}  c #777777",
 "|  c #616161",
 "1  c #3A3A3A",
 "2  c #BEBEBE",
 "3  c #2C2C2C",
 "4  c #7C7C7C",
 "5  c #F6F6F6",
 "6  c #FCFCFC",
 "7  c #6B6B6B",
 "8  c #959595",
 "9  c #4F4F4F",
 "0  c #808080",
 "a  c #767676",
 "b  c #818181",
 "c  c #B8B8B8",
 "d  c #FBFBFB",
 "e  c #F9F9F9",
 "f  c #CCCCCC",
 "g  c #030303",
 "h  c #737373",
 "i  c #7A7A7A",
 "j  c #7E7E7E",
 "k  c #6A6A6A",
 "l  c #FAFAFA",
 "m  c #505050",
 "n  c #9D9D9D",
 "o  c #333333",
 "p  c #7B7B7B",
 "q  c #787878",
 "r  c #696969",
 "s  c #494949",
 "t  c #555555",
 "u  c #949494",
 "v  c #E6E6E6",
 "w  c #424242",
 "x  c #515151",
 "y  c #535353",
 "z  c #3E3E3E",
 "A  c #D4D4D4",
 "B  c #0C0C0C",
 "C  c #353535",
 "D  c #474747",
 "E  c #ECECEC",
 "F  c #919191",
 "G  c #7D7D7D",
 "H  c #000000",
 "I  c #404040",
 "J  c #858585",
 "K  c #323232",
 "L  c #D0D0D0",
 "M  c #1C1C1C",
 "    ...+        ",
 "   @#$%&..+     ",
 "   .*=-;;>,..+  ",
 "  ')!~;;;;;;{]..",
 "  ^/(-;;;;;;;_:<",
 "  [}|;;;;;;;{12$",
 " #34-55;;;;678$+",
 " 90ab=c;dd;e1fg ",
 " [ahij((kbl0mn$ ",
 " op^q^^7r&]s/$+ ",
 "@btu;vbwxy]zAB  ",
 "CzDEvEv;;DssF$  ",
 "G.H{E{E{IxsJ$+  ",
 "  +...vEKxzLM   ",
 "     +...z]n$   ",
 "        +...    "};
 
 
 #if QT_VERSION < 300
 
 class QpeEditor : public QMultiLineEdit
 {
     //    Q_OBJECT
 public:
     QpeEditor( QWidget *parent, const char * name = 0 )
   : QMultiLineEdit( parent, name )
         {
             clearTableFlags();
             setTableFlags( Tbl_vScrollBar | Tbl_autoHScrollBar );
         }
 
     void find( const QString &txt, bool caseSensitive,
                             bool backwards );
 //public slots:
       /*
 signals:
     void notFound();
     void searchWrapped();
     */
 
 private:
 
 };
 
 
 void QpeEditor::find ( const QString &txt, bool caseSensitive,
            bool backwards )
 {
     static bool wrap = FALSE;
     int line, col;
     if ( wrap ) {
         if ( !backwards )
             line = col = 0;
         wrap = FALSE;
           //  emit searchWrapped();
     } else {
         getCursorPosition( &line, &col );
     }
       //ignore backwards for now....
     if ( !backwards ) {
         for ( ; ; ) {
             if ( line >= numLines() ) {
                 wrap = TRUE;
                   //emit notFound();
                 break;
             }
             int findCol = getString( line )->find( txt, col, caseSensitive );
             if ( findCol >= 0 ) {
                 setCursorPosition( line, findCol, FALSE );
                 col = findCol + txt.length();
                 setCursorPosition( line, col, TRUE );
 
                   //found = TRUE;
                 break;
             }
             line++;
             col = 0;
         }
 
     }
 
 }
 
 
 #else
 
 #error "Must make a QpeEditor that inherits QTextEdit"
 
 #endif
 
 
 static const int nfontsizes = 6;
 static const int fontsize[nfontsizes] = {8,10,12,14,18,24};
 
 TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     : QMainWindow( parent, name, f ), bFromDocView( FALSE )
 {
     doc = 0;
     edited=FALSE;
     edited1=FALSE;
     setToolBarsMovable( FALSE );
     connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
 
     channel = new QCopChannel( "QPE/Application/textedit", this );
     connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
         this, SLOT(receive(const QCString&, const QByteArray&)) );
 
     setIcon( Resource::loadPixmap( "TextEditor" ) );
 
     QPEToolBar *bar = new QPEToolBar( this );
     bar->setHorizontalStretchable( TRUE );
     menu = bar;
 
     QPEMenuBar *mb = new QPEMenuBar( bar );
     QPopupMenu *file = new QPopupMenu( this );
     QPopupMenu *edit = new QPopupMenu( this );
     font = new QPopupMenu( this );
 
     bar = new QPEToolBar( this );
     editBar = bar;
 
     QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) );
     a->addTo( bar );
     a->addTo( file );
 
     a = new QAction( tr( "Open" ), Resource::loadPixmap( "fileopen" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( fileOpen() ) );
     a->addTo( bar );
     a->addTo( file );
 
     a = new QAction( tr( "Save" ), QPixmap(( const char** ) filesave_xpm  ) , QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( save() ) );
     file->insertSeparator();
     a->addTo( file );
 
     a = new QAction( tr( "Save As" ), QPixmap(( const char** ) filesave_xpm  ) , QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( saveAs() ) );
     a->addTo( file );
 
     a = new QAction( tr( "Cut" ), Resource::loadPixmap( "cut" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( editCut() ) );
     a->addTo( editBar );
     a->addTo( edit );
 
     a = new QAction( tr( "Copy" ), Resource::loadPixmap( "copy" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( editCopy() ) );
     a->addTo( editBar );
     a->addTo( edit );
 
     a = new QAction( tr( "Paste" ), Resource::loadPixmap( "paste" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( editPaste() ) );
     a->addTo( editBar );
     a->addTo( edit );
 
 
 #ifndef QT_NO_CLIPBOARD
     a = new QAction( tr( "Insert Time and Date" ), Resource::loadPixmap( "paste" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( editPasteTimeDate() ) );
     a->addTo( edit );
 #endif
     
     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();
     font->insertItem(tr("Font"), this, SLOT(changeFont()) );
 
     font->insertSeparator();
 
     nStart = new QAction( tr("Start with new file"), QString::null, 0, this, 0 );
     connect( nStart, SIGNAL( toggled(bool) ), this, SLOT( changeStartConfig(bool) ) );
     nStart->setToggleAction(TRUE);
     nStart->addTo( font );
 
     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 );
     mb->insertItem( tr( "Edit" ), edit );
     mb->insertItem( tr( "View" ), font );
 
     searchBar = new QPEToolBar(this);
     addToolBar( searchBar,  "Search", QMainWindow::Top, TRUE );
 
     searchBar->setHorizontalStretchable( TRUE );
 
     searchEdit = new QLineEdit( searchBar, "searchEdit" );
     searchBar->setStretchableWidget( searchEdit );
     connect( searchEdit, SIGNAL( textChanged( const QString & ) ),
        this, SLOT( search() ) );
 
     a = new QAction( tr( "Find Next" ), Resource::loadPixmap( "next" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) );
     a->addTo( searchBar );
     a->addTo( edit );
 
     a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) );
     a->addTo( searchBar );
 
     edit->insertSeparator();
     a = new QAction( tr( "Delete" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( editDelete() ) );
     a->addTo( edit );
 
     searchBar->hide();
 
     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();
      }
      
     viewSelection = cfg.readNumEntry( "FileView", 0 );
 }
 
 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();
     exit(0);
 }
 
 void TextEdit::zoomIn() {
     setFontSize(editor->font().pointSize()+1,FALSE);
 }
 
 void TextEdit::zoomOut() {
     setFontSize(editor->font().pointSize()-1,TRUE);
 }
 
 
 void TextEdit::setFontSize(int sz, bool round_down_not_up) {
     int s=10;
     for (int i=0; i<nfontsizes; i++) {
   if ( fontsize[i] == sz ) {
       s = sz;
       break;
   } else if ( round_down_not_up ) {
       if ( fontsize[i] < sz )
     s = fontsize[i];
   } else {
       if ( fontsize[i] > sz ) {
     s = fontsize[i];
     break;
       }
   }
     }
 
     QFont f = editor->font();
     f.setPointSize(s);
     editor->setFont(f);
 
     zin->setEnabled(s != fontsize[nfontsizes-1]);
     zout->setEnabled(s != fontsize[0]);
 }
 
 void TextEdit::setBold(bool y) {
     QFont f = editor->font();
     f.setBold(y);
     editor->setFont(f);
 }
 
 void TextEdit::setItalic(bool y) {
     QFont f = editor->font();
     f.setItalic(y);
     editor->setFont(f);
 }
 
 void TextEdit::setWordWrap(bool y) {
     bool state = editor->edited();
     editor->setWordWrap(y ? QMultiLineEdit::WidgetWidth : QMultiLineEdit::NoWrap );
     editor->setEdited( state );
 }
 
 void TextEdit::fileNew() {
 //     if( !bFromDocView  ) {
 //         saveAs();
 //     }
     newFile(DocLnk());
 }
 
 void TextEdit::fileOpen() {
     Config cfg("TextEdit");
     cfg.setGroup("View");
     //    bool b=FALSE;
 
     QMap<QString, QStringList> map;
     map.insert(tr("All"), QStringList() );
     QStringList text;
     text << "text/*";
     map.insert(tr("Text"), text );
     text << "*";
     map.insert(tr("All"), text );
     QString str = OFileDialog::getOpenFileName( 2,"/", QString::null, map);
     if(!str.isEmpty() )
         openFile( str );
     
 }
 
 void TextEdit::doSearchBar() {
     Config cfg("TextEdit");
     cfg.setGroup("View");
     if(cfg.readEntry("SearchBar","Closed") != "Opened")
         searchBar->hide();
 }
 
 #if 0
 void TextEdit::slotFind() {
     FindDialog frmFind( tr("Text Editor"), this );
     connect( &frmFind, SIGNAL(signalFindClicked(const QString &, bool, bool, int)),
        editor, SLOT(slotDoFind( const QString&,bool,bool)));
 
     //case sensitive, backwards, [category]
 
     connect( editor, SIGNAL(notFound()),
        &frmFind, SLOT(slotNotFound()) );
     connect( editor, SIGNAL(searchWrapped()),
        &frmFind, SLOT(slotWrapAround()) );
 
     frmFind.exec();
 
 
 }
 #endif
 
 void TextEdit::fileRevert() {
     clear();
     fileOpen();
 }
 
 void TextEdit::editCut() {
 #ifndef QT_NO_CLIPBOARD
     editor->cut();
 #endif
 }
 
 void TextEdit::editCopy() {
 #ifndef QT_NO_CLIPBOARD
     editor->copy();
 #endif
 }
 
 void TextEdit::editPaste() {
 #ifndef QT_NO_CLIPBOARD
     editor->paste();
 #endif
 }
 
 void TextEdit::editFind() {
     searchBar->show();
     searchVisible = TRUE;
     searchEdit->setFocus();
     Config cfg("TextEdit");
     cfg.setGroup("View");
     cfg.writeEntry("SearchBar","Opened");
     
 }
 
 void TextEdit::findNext() {
     editor->find( searchEdit->text(), FALSE, FALSE );
 
 }
 
 void TextEdit::findClose() {
     searchVisible = FALSE;
     searchBar->hide();
     Config cfg("TextEdit");
     cfg.setGroup("View");
     cfg.writeEntry("SearchBar","Closed");
     cfg.write();
 }
 
 void TextEdit::search() {
     editor->find( searchEdit->text(), FALSE, FALSE );
 }
 
 void TextEdit::newFile( const DocLnk &f ) {
     DocLnk nf = f;
     nf.setType("text/plain");
     clear();
     setWState (WState_Reserved1 );
     editor->setFocus();
     doc = new DocLnk(nf);
     currentFileName = "Unnamed";
     qDebug("newFile "+currentFileName);
     updateCaption( currentFileName);
 //    editor->setEdited( FALSE);
 }
 
 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(".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 nf;
     nf.setType("text/plain");
     nf.setFile(filer);
     currentFileName=filer;
     QFileInfo fi( currentFileName);
     nf.setName(fi.baseName());
     qDebug("openFile string "+currentFileName);
 
     openFile(nf);
     showEditTools();
       // Show filename in caption
     QString name = filer;
     int sep = name.findRev( '/' );
     if ( sep > 0 )
         name = name.mid( sep+1 );
     updateCaption( name );
 }
 
 void TextEdit::openFile( const DocLnk &f ) {
 //    clear();
 //    bFromDocView = TRUE;
     FileManager fm;
     QString txt;
     currentFileName=f.file();
     qDebug("openFile doclnk " + currentFileName);
     if ( !fm.loadFile( f, txt ) ) {
           // ####### could be a new file
         qDebug( "Cannot open file" );
     }
 //    fileNew();
     if ( doc )
         delete doc;
     doc = new DocLnk(f);
     editor->setText(txt);
     editor->setEdited( FALSE);
     edited1=FALSE;
     edited=FALSE;
 
     doc->setName(currentFileName);
     updateCaption();
 }
 
 void TextEdit::showEditTools() {
 //        if ( !doc )
 //      close();
 //    clear();
     menu->show();
     editBar->show();
     if ( searchVisible )
   searchBar->show();
 //    updateCaption();
     setWState (WState_Reserved1 );
 }
 
 /*!
   unprompted save */
 bool TextEdit::save() {
     QString file = doc->file();
     qDebug("saver file "+file);
     QString name= doc->name();
     qDebug("File named "+name);
     QString rt = editor->text();
     if( !rt.isEmpty() ) {
         if(name.isEmpty()) {
             saveAs();
         } else {
             currentFileName= name ;
             qDebug("saveFile "+currentFileName);
 
             struct stat buf;
             mode_t mode;
             stat(file.latin1(), &buf);
             mode = buf.st_mode;
 
             if(!fileIs) {
                 doc->setName( name);
                 FileManager fm;
                 if ( !fm.saveFile( *doc, rt ) ) {
                     return false;
                 }
             } else {
                 qDebug("regular save file");
                 QFile f(file);
                  if( f.open(IO_WriteOnly)) {
                      QCString crt = rt.utf8();
                      f.writeBlock(crt,crt.length());
                  } else {
                      QMessageBox::message(tr("Text Edit"),tr("Write Failed"));
                  return false;
                  }
                      
             }
             editor->setEdited( FALSE);
             edited1=FALSE;
             edited=FALSE;
             if(caption().left(1)=="*")
             setCaption(caption().right(caption().length()-1));
 
 
             chmod( file.latin1(), mode);
         }
         return true;
     }
     return false;
 }
 
 /*!
   prompted save */
 bool TextEdit::saveAs() {
     qDebug("saveAsFile "+currentFileName);
       // case of nothing to save... 
     if ( !doc ) {
 //|| !bFromDocView)
         qDebug("no doc");
         return true;
     }
     if ( !editor->edited() ) {
         delete doc;
         doc = 0;
         return true;
     }
 
     QString rt = editor->text();
     qDebug(currentFileName);
     
     if( currentFileName.isEmpty() || currentFileName == tr("Unnamed") || currentFileName == tr("Text Editor")) {
 //        qDebug("do silly TT filename thing");
         if ( doc->name().isEmpty() ) {
             QString pt = rt.simplifyWhiteSpace();
             int i = pt.find( ' ' );
             QString docname = pt;
             if ( i > 0 )
                 docname = pt.left( i );
               // remove "." at the beginning
             while( docname.startsWith( "." ) )
                 docname = docname.mid( 1 );
             docname.replace( QRegExp("/"), "_" );
               // cut the length. filenames longer than that don't make sense and something goes wrong when they get too long.
             if ( docname.length() > 40 )
                 docname = docname.left(40);
             if ( docname.isEmpty() )
                 docname = tr("Unnamed");
             doc->setName(docname);
             currentFileName=docname;
         }
     }
 
     QMap<QString, QStringList> map;
     map.insert(tr("All"), QStringList() );
     QStringList text;
     text << "text/*";
     map.insert(tr("Text"), text );
     text << "*";
     map.insert(tr("All"), text );
 
     QString str = OFileDialog::getSaveFileName( 2,"/", QString::null, map);
 
     if(!str.isEmpty() ) {
         QString fileNm=str;
 
         qDebug("saving filename "+fileNm);
         QFileInfo fi(fileNm);
         currentFileName=fi.fileName();
         if(doc) {
 //        QString file = doc->file();
 //        doc->removeFiles();
             delete doc;
             DocLnk nf;
             nf.setType("text/plain");
             nf.setFile( fileNm);
             doc = new DocLnk(nf);
 //        editor->setText(rt);
 //            qDebug("openFile doclnk "+currentFileName);
             doc->setName( currentFileName);
             updateCaption( currentFileName);
 
             FileManager fm;
             if ( !fm.saveFile( *doc, rt ) ) {
                 return false;
             }
 
             if( useAdvancedFeatures ) {
                 filePermissions *filePerm;
                 filePerm = new filePermissions(this, tr("Permissions"),true,0,(const QString &)fileNm);
                 filePerm->showMaximized();
                 filePerm->exec();
 
                 if( filePerm)
                     delete  filePerm;
             }
         }
         editor->setEdited( false);
         edited1 = false;
         edited = false;
         if(caption().left(1)=="*")
             setCaption(caption().right(caption().length()-1));
         
         return true;
     }
     qDebug("returning false");
     return false;
 } //end saveAs
 
 void TextEdit::clear() {
     delete doc;
     doc = 0;
     editor->clear();
 }
 
 void TextEdit::updateCaption( const QString &name ) {
     if ( !doc )
   setCaption( tr("Text Editor") );
     else {
   QString s = name;
   if ( s.isNull() )
       s = doc->name();
   if ( s.isEmpty()  ) {
       s = tr( "Unnamed" );
        currentFileName=s;
   }
   if(s.left(1) == "/")
       s = s.right(s.length()-1);
   setCaption( s + " - " + tr("Text Editor") );
     }
 }
 
 void TextEdit::setDocument(const QString& fileref) {
     bFromDocView = TRUE;
     openFile(fileref);
     editor->setEdited(TRUE);
     edited1=FALSE;
     edited=TRUE;
     doSearchBar();
 }
 
 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:
           if(doc) {
               doc->removeFiles();
               clear();
               setCaption( tr("Text Editor") );
           }
           break;
       case 1: 
             // exit
           break;
     };
 }
 
 void TextEdit::changeStartConfig( bool b ) {
 
     Config cfg("TextEdit");
     cfg.setGroup("View");
     if(b) {
         qDebug("bool");
         cfg.writeEntry("startNew","TRUE");
     } else {
         cfg.writeEntry("startNew","FALSE");
     }
     update();
 }
 
 void TextEdit::editorChanged() { 
     if(editor->edited() && edited && !edited1) {
         setCaption( "*"+caption());
         edited1=TRUE;
     }
     edited=TRUE;
 }
 
 void TextEdit::receive(const QCString&msg, const QByteArray&) {
     qDebug("QCop "+msg);
   if ( msg == "setDocument(QString)" ) {
       qDebug("bugger all");
   }
 
 }
 void TextEdit::doAbout() {
     QMessageBox::about(0,tr("Text Edit"),tr("Text Edit is copyright<BR>"
                          "2000 Trolltech AS, and<BR>"
                          "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();
   cb->setText( dt.toString());
   editor->paste();
 #endif
 }
diff --git a/core/apps/textedit/textedit.pro b/core/apps/textedit/textedit.pro
index f6e6530..500abde 100644
--- a/core/apps/textedit/textedit.pro
+++ b/core/apps/textedit/textedit.pro
@@ -1,24 +1,24 @@
 TEMPLATE  = app
 CONFIG    += qt warn_on release
 DESTDIR   = $(OPIEDIR)/bin
-HEADERS = textedit.h fontDialog.h filePermissions.h 
-SOURCES = main.cpp textedit.cpp fontDialog.cpp filePermissions.cpp
+HEADERS = textedit.h filePermissions.h 
+SOURCES = main.cpp textedit.cpp filePermissions.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
 TARGET    = textedit
 
 TRANSLATIONS = ../../../i18n/de/textedit.ts \
          ../../../i18n/en/textedit.ts \
          ../../../i18n/es/textedit.ts \
          ../../../i18n/fr/textedit.ts \
          ../../../i18n/hu/textedit.ts \
          ../../../i18n/ja/textedit.ts \
          ../../../i18n/ko/textedit.ts \
          ../../../i18n/no/textedit.ts \
          ../../../i18n/pl/textedit.ts \
          ../../../i18n/pt/textedit.ts \
          ../../../i18n/pt_BR/textedit.ts \
          ../../../i18n/sl/textedit.ts \
          ../../../i18n/zh_CN/textedit.ts \
          ../../../i18n/zh_TW/textedit.ts