Diffstat (limited to 'noncore/apps/tinykate/libkate/view/kateviewdialog.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/tinykate/libkate/view/kateviewdialog.cpp | 37 |
1 files changed, 27 insertions, 10 deletions
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 | ||
50 | SearchDialog::SearchDialog( QWidget *parent, QStringList &searchFor, QStringList &replaceWith, int flags ) | 52 | SearchDialog::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 | ||
537 | FontConfig::~FontConfig() | 554 | FontConfig::~FontConfig() |
@@ -540,10 +557,10 @@ FontConfig::~FontConfig() | |||
540 | 557 | ||
541 | void FontConfig::setFont ( const QFont &font ) | 558 | void FontConfig::setFont ( const QFont &font ) |
542 | { | 559 | { |
543 | #if 0 | 560 | //#if 0 |
544 | m_fontchooser->setFont (font); | 561 | m_fontselect->setFont (font); |
545 | myFont = font; | 562 | myFont = font; |
546 | #endif | 563 | //#endif |
547 | } | 564 | } |
548 | 565 | ||
549 | void FontConfig::slotFontSelected( const QFont &font ) | 566 | void FontConfig::slotFontSelected( const QFont &font ) |