summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/tinykate/libkate/view/kateview.cpp2
-rw-r--r--noncore/apps/tinykate/libkate/view/kateviewdialog.cpp37
-rw-r--r--noncore/apps/tinykate/libkate/view/kateviewdialog.h2
3 files changed, 30 insertions, 11 deletions
diff --git a/noncore/apps/tinykate/libkate/view/kateview.cpp b/noncore/apps/tinykate/libkate/view/kateview.cpp
index 6453458..63e941f 100644
--- a/noncore/apps/tinykate/libkate/view/kateview.cpp
+++ b/noncore/apps/tinykate/libkate/view/kateview.cpp
@@ -2346,7 +2346,7 @@ void KateView::configDialog()
2346 hlPage->saveData(); 2346 hlPage->saveData();
2347 } 2347 }
2348 2348
2349 delete kd; 2349// delete kd;
2350 2350
2351#endif 2351#endif
2352} 2352}
diff --git a/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp b/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp
index a311042..6a19e01 100644
--- a/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp
+++ b/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp
@@ -46,6 +46,8 @@
46 46
47#include "../document/katedocument.h" 47#include "../document/katedocument.h"
48#include "kateviewdialog.h" 48#include "kateviewdialog.h"
49#include <opie/ofontselector.h>
50
49 51
50SearchDialog::SearchDialog( QWidget *parent, QStringList &searchFor, QStringList &replaceWith, int flags ) 52SearchDialog::SearchDialog( QWidget *parent, QStringList &searchFor, QStringList &replaceWith, int flags )
51 : KDialogBase( parent, 0L, true, i18n( "Find Text" ), Ok | Cancel, Ok ) 53 : KDialogBase( parent, 0L, true, i18n( "Find Text" ), Ok | Cancel, Ok )
@@ -525,13 +527,28 @@ FontConfig::FontConfig( QWidget *parent, char *name )
525{ 527{
526 // sizemanagment 528 // sizemanagment
527 QGridLayout *grid = new QGridLayout( this, 1, 1 ); 529 QGridLayout *grid = new QGridLayout( this, 1, 1 );
528#if 0 530// QString familyStr = cfg. readEntry ( "FontFamily", "Helvetica" );
529 m_fontchooser = new KFontChooser ( this ); 531// QString styleStr = cfg. readEntry ( "FontStyle", "Regular" );
530 m_fontchooser->enableColumn(KFontChooser::StyleList, false); 532// int size = cfg. readNumEntry ( "FontSize", 10 );
531 grid->addWidget( m_fontchooser, 0, 0); 533// OFontSelector *m_fontselect;
532 534
533 connect (m_fontchooser, SIGNAL (fontSelected( const QFont & )), this, SLOT (slotFontSelected( const QFont & ))); 535 m_fontselect = new OFontSelector ( false, this, "FontTab" );
534#endif 536// m_fontselect-> setSelectedFont ( familyStr, styleStr, size );
537// QWhatsThis::add( m_fontselect,
538// tr( "Select the desired name, style and size of the default font applications will use." ) );
539
540 connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )),
541 this, SLOT( slotFontSelected( const QFont & )));
542 grid->addWidget( m_fontselect, 0, 0);
543
544
545// #if 0
546// m_fontchooser = new KFontChooser ( this );
547// m_fontchooser->enableColumn(KFontChooser::StyleList, false);
548// grid->addWidget( m_fontchooser, 0, 0);
549
550// connect (m_fontchooser, SIGNAL (fontSelected( const QFont & )), this, SLOT (slotFontSelected( const QFont & )));
551// #endif
535} 552}
536 553
537FontConfig::~FontConfig() 554FontConfig::~FontConfig()
@@ -540,10 +557,10 @@ FontConfig::~FontConfig()
540 557
541void FontConfig::setFont ( const QFont &font ) 558void FontConfig::setFont ( const QFont &font )
542{ 559{
543#if 0 560//#if 0
544 m_fontchooser->setFont (font); 561m_fontselect->setFont (font);
545 myFont = font; 562 myFont = font;
546#endif 563//#endif
547} 564}
548 565
549void FontConfig::slotFontSelected( const QFont &font ) 566void FontConfig::slotFontSelected( const QFont &font )
diff --git a/noncore/apps/tinykate/libkate/view/kateviewdialog.h b/noncore/apps/tinykate/libkate/view/kateviewdialog.h
index 60f30bd..2ce5a11 100644
--- a/noncore/apps/tinykate/libkate/view/kateviewdialog.h
+++ b/noncore/apps/tinykate/libkate/view/kateviewdialog.h
@@ -31,6 +31,7 @@ class KColorButton;
31class QComboBox; 31class QComboBox;
32 32
33#include <kdialogbase.h> 33#include <kdialogbase.h>
34#include <opie/ofontselector.h>
34#include "kateview.h" 35#include "kateview.h"
35 36
36class SearchDialog : public KDialogBase 37class SearchDialog : public KDialogBase
@@ -183,6 +184,7 @@ public:
183 QFont getFont ( ) { return myFont; }; 184 QFont getFont ( ) { return myFont; };
184 185
185 private: 186 private:
187 OFontSelector *m_fontselect;
186// class KFontChooser *m_fontchooser; 188// class KFontChooser *m_fontchooser;
187 QFont myFont; 189 QFont myFont;
188 190