author | llornkcor <llornkcor> | 2002-12-22 18:24:31 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-12-22 18:24:31 (UTC) |
commit | 3ae485ccb47ca618bc00d96a0e81c978a1cfbdaf (patch) (unidiff) | |
tree | f4a50457221d593f258d2f3f3d55c7b47a7b976d | |
parent | c82ed38520b4038678ab0ab0c9f0ba147d8791ea (diff) | |
download | opie-3ae485ccb47ca618bc00d96a0e81c978a1cfbdaf.zip opie-3ae485ccb47ca618bc00d96a0e81c978a1cfbdaf.tar.gz opie-3ae485ccb47ca618bc00d96a0e81c978a1cfbdaf.tar.bz2 |
use ofontselector, and temp fix for dialog crash
-rw-r--r-- | noncore/apps/tinykate/libkate/view/kateview.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/tinykate/libkate/view/kateviewdialog.cpp | 37 | ||||
-rw-r--r-- | noncore/apps/tinykate/libkate/view/kateviewdialog.h | 2 |
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 | |||
@@ -2348,3 +2348,3 @@ void KateView::configDialog() | |||
2348 | 2348 | ||
2349 | delete kd; | 2349 | // delete kd; |
2350 | 2350 | ||
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 | |||
@@ -48,2 +48,4 @@ | |||
48 | #include "kateviewdialog.h" | 48 | #include "kateviewdialog.h" |
49 | #include <opie/ofontselector.h> | ||
50 | |||
49 | 51 | ||
@@ -527,9 +529,24 @@ FontConfig::FontConfig( QWidget *parent, char *name ) | |||
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 | } |
@@ -542,6 +559,6 @@ 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 | } |
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 | |||
@@ -33,2 +33,3 @@ class QComboBox; | |||
33 | #include <kdialogbase.h> | 33 | #include <kdialogbase.h> |
34 | #include <opie/ofontselector.h> | ||
34 | #include "kateview.h" | 35 | #include "kateview.h" |
@@ -185,2 +186,3 @@ public: | |||
185 | private: | 186 | private: |
187 | OFontSelector *m_fontselect; | ||
186 | // class KFontChooser *m_fontchooser; | 188 | // class KFontChooser *m_fontchooser; |