2 files changed, 41 insertions, 3 deletions

diff --git a/libopie/ofontselector.cpp b/libopie/ofontselector.cpp
index e1090b5..b905474 100644
--- a/libopie/ofontselector.cpp
+++ b/libopie/ofontselector.cpp
@@ -31,6 +31,7 @@
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qfont.h>
+#include <qmultilineedit.h>
 
 #include <qpe/fontdatabase.h>
 
@@ -41,6 +42,7 @@ public:
         QListBox *   m_font_family_list;
         QComboBox *  m_font_style_list;
         QComboBox *  m_font_size_list;
+        QMultiLineEdit *m_preview;
 
         bool         m_pointbug;
 
@@ -101,7 +103,7 @@ static int qt_version ( )
 }
 
 
-OFontSelector::OFontSelector ( QWidget *parent, const char *name, WFlags fl ) : QWidget ( parent, name, fl )
+OFontSelector::OFontSelector ( bool withpreview, QWidget *parent, const char *name, WFlags fl ) : QWidget ( parent, name, fl )
 {
         d = new OFontSelectorPrivate ( );
 
@@ -129,6 +131,19 @@ OFontSelector::OFontSelector ( QWidget *parent, const char *name, WFlags fl ) :
 
         d-> m_pointbug = ( qt_version ( ) <= 233 );
 
+        if ( withpreview ) {
+                d-> m_preview = new QMultiLineEdit ( this, "Preview" );
+                d-> m_preview-> setAlignment ( AlignCenter );
+                d-> m_preview-> setWordWrap ( QMultiLineEdit::WidgetWidth );
+                d-> m_preview-> setMargin ( 3 ); 
+                d-> m_preview-> setText ( tr( "The Quick Brown Fox Jumps Over The Lazy Dog" ));
+                gridLayout-> addRowSpacing ( 5, 4 );
+                gridLayout-> addMultiCellWidget ( d-> m_preview, 6, 6, 0, 1 );
+                gridLayout-> setRowStretch ( 6, 5 );
+        }
+        else
+                d-> m_preview = 0;
+
         loadFonts ( d-> m_font_family_list );
 }
 
@@ -304,7 +319,12 @@ void OFontSelector::fontSizeClicked ( int /*index*/ )
 
 void OFontSelector::changeFont ( )
 {
-        emit fontSelected ( selectedFont ( ));
+        QFont f = selectedFont ( );
+
+        if ( d-> m_preview )
+                d-> m_preview-> setFont ( f );
+
+        emit fontSelected ( f );
 }
 
 
@@ -325,3 +345,18 @@ QFont OFontSelector::selectedFont ( )
         else
                 return QFont ( );
 }
+
+
+void OFontSelector::resizeEvent ( QResizeEvent *re )
+{
+        if ( d-> m_preview ) {
+                d-> m_preview-> setMinimumHeight ( 1 );
+                d-> m_preview-> setMaximumHeight ( 32767 );
+        }
+
+        QWidget::resizeEvent ( re );
+        
+        if ( d-> m_preview )
+                d-> m_preview-> setFixedHeight ( d-> m_preview-> height ( ));
+                
+}
diff --git a/libopie/ofontselector.h b/libopie/ofontselector.h
index a9c8a72..10d16f0 100644
--- a/libopie/ofontselector.h
+++ b/libopie/ofontselector.h
@@ -40,7 +40,7 @@ class OFontSelector : public QWidget
     Q_OBJECT
 
 public:
-    OFontSelector ( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+    OFontSelector ( bool withpreview, QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     virtual ~OFontSelector ( );
 
         bool selectedFont ( QString &family, QString &style, int &size );
@@ -64,6 +64,9 @@ protected slots:
     virtual void fontStyleClicked ( int );
     virtual void fontSizeClicked ( int );
 
+protected:
+        virtual void resizeEvent ( QResizeEvent *re );
+
 private:
         void loadFonts ( QListBox * );