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 | |||
@@ -2343,13 +2343,13 @@ void KateView::configDialog() | |||
2343 | // spell checker | 2343 | // spell checker |
2344 | hlManager->setHlDataList(hlDataList); | 2344 | hlManager->setHlDataList(hlDataList); |
2345 | hlManager->setDefaults(defaultStyleList); | 2345 | hlManager->setDefaults(defaultStyleList); |
2346 | hlPage->saveData(); | 2346 | hlPage->saveData(); |
2347 | } | 2347 | } |
2348 | 2348 | ||
2349 | delete kd; | 2349 | // delete kd; |
2350 | 2350 | ||
2351 | #endif | 2351 | #endif |
2352 | } | 2352 | } |
2353 | 2353 | ||
2354 | int KateView::getHl() { | 2354 | int KateView::getHl() { |
2355 | return myDoc->highlightNum(); | 2355 | return myDoc->highlightNum(); |
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 | |||
@@ -43,12 +43,14 @@ | |||
43 | #include <qvbox.h> | 43 | #include <qvbox.h> |
44 | #include <qspinbox.h> | 44 | #include <qspinbox.h> |
45 | #include <kfontdialog.h> | 45 | #include <kfontdialog.h> |
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 ) |
52 | , m_replace( 0L ) | 54 | , m_replace( 0L ) |
53 | { | 55 | { |
54 | QWidget *page = new QWidget( this ); | 56 | QWidget *page = new QWidget( this ); |
@@ -522,31 +524,46 @@ void ColorConfig::getColors(QColor *colors) | |||
522 | 524 | ||
523 | FontConfig::FontConfig( QWidget *parent, char *name ) | 525 | FontConfig::FontConfig( QWidget *parent, char *name ) |
524 | : QWidget( parent, name ) | 526 | : QWidget( parent, 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() |
538 | { | 555 | { |
539 | } | 556 | } |
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 ) |
550 | { | 567 | { |
551 | myFont = font; | 568 | myFont = font; |
552 | } | 569 | } |
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 | |||
@@ -28,12 +28,13 @@ class QPushButton; | |||
28 | class QRadioButton; | 28 | class QRadioButton; |
29 | class QSpinBox; | 29 | class QSpinBox; |
30 | class KColorButton; | 30 | class KColorButton; |
31 | class QComboBox; | 31 | class 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 | ||
36 | class SearchDialog : public KDialogBase | 37 | class SearchDialog : public KDialogBase |
37 | { | 38 | { |
38 | Q_OBJECT | 39 | Q_OBJECT |
39 | 40 | ||
@@ -180,12 +181,13 @@ public: | |||
180 | ~FontConfig(); | 181 | ~FontConfig(); |
181 | 182 | ||
182 | void setFont ( const QFont &font ); | 183 | void setFont ( const QFont &font ); |
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 | ||
189 | private slots: | 191 | private slots: |
190 | void slotFontSelected( const QFont &font ); | 192 | void slotFontSelected( const QFont &font ); |
191 | }; | 193 | }; |