-rw-r--r-- | noncore/apps/tinykate/libkate/view/kateviewdialog.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/tinykate/libkate/view/kateviewdialog.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp b/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp index 4cb13e8..bd5b74f 100644 --- a/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp +++ b/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp | |||
@@ -511,49 +511,49 @@ ColorConfig::~ColorConfig() | |||
511 | } | 511 | } |
512 | 512 | ||
513 | void ColorConfig::setColors(QColor *colors) | 513 | void ColorConfig::setColors(QColor *colors) |
514 | { | 514 | { |
515 | m_back->setColor( colors[0] ); | 515 | m_back->setColor( colors[0] ); |
516 | m_selected->setColor( colors[1] ); | 516 | m_selected->setColor( colors[1] ); |
517 | } | 517 | } |
518 | 518 | ||
519 | void ColorConfig::getColors(QColor *colors) | 519 | void ColorConfig::getColors(QColor *colors) |
520 | { | 520 | { |
521 | colors[0] = m_back->color(); | 521 | colors[0] = m_back->color(); |
522 | colors[1] = m_selected->color(); | 522 | colors[1] = m_selected->color(); |
523 | } | 523 | } |
524 | 524 | ||
525 | FontConfig::FontConfig( QWidget *parent, char *name ) | 525 | FontConfig::FontConfig( QWidget *parent, char *name ) |
526 | : QWidget( parent, name ) | 526 | : QWidget( parent, name ) |
527 | { | 527 | { |
528 | // sizemanagment | 528 | // sizemanagment |
529 | QGridLayout *grid = new QGridLayout( this, 1, 1 ); | 529 | QGridLayout *grid = new QGridLayout( this, 1, 1 ); |
530 | // QString familyStr = cfg. readEntry ( "FontFamily", "Helvetica" ); | 530 | // QString familyStr = cfg. readEntry ( "FontFamily", "Helvetica" ); |
531 | // QString styleStr = cfg. readEntry ( "FontStyle", "Regular" ); | 531 | // QString styleStr = cfg. readEntry ( "FontStyle", "Regular" ); |
532 | // int size = cfg. readNumEntry ( "FontSize", 10 ); | 532 | // int size = cfg. readNumEntry ( "FontSize", 10 ); |
533 | // OFontSelector *m_fontselect; | 533 | // OFontSelector *m_fontselect; |
534 | 534 | ||
535 | m_fontselect = new OFontSelector ( false, this, "FontTab" ); | 535 | m_fontselect = new Opie::OFontSelector ( false, this, "FontTab" ); |
536 | // m_fontselect-> setSelectedFont ( familyStr, styleStr, size ); | 536 | // m_fontselect-> setSelectedFont ( familyStr, styleStr, size ); |
537 | // QWhatsThis::add( m_fontselect, | 537 | // QWhatsThis::add( m_fontselect, |
538 | // tr( "Select the desired name, style and size of the default font applications will use." ) ); | 538 | // tr( "Select the desired name, style and size of the default font applications will use." ) ); |
539 | 539 | ||
540 | connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )), | 540 | connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )), |
541 | this, SLOT( slotFontSelected( const QFont & ))); | 541 | this, SLOT( slotFontSelected( const QFont & ))); |
542 | grid->addWidget( m_fontselect, 0, 0); | 542 | grid->addWidget( m_fontselect, 0, 0); |
543 | 543 | ||
544 | 544 | ||
545 | // #if 0 | 545 | // #if 0 |
546 | // m_fontchooser = new KFontChooser ( this ); | 546 | // m_fontchooser = new KFontChooser ( this ); |
547 | // m_fontchooser->enableColumn(KFontChooser::StyleList, false); | 547 | // m_fontchooser->enableColumn(KFontChooser::StyleList, false); |
548 | // grid->addWidget( m_fontchooser, 0, 0); | 548 | // grid->addWidget( m_fontchooser, 0, 0); |
549 | 549 | ||
550 | // connect (m_fontchooser, SIGNAL (fontSelected( const QFont & )), this, SLOT (slotFontSelected( const QFont & ))); | 550 | // connect (m_fontchooser, SIGNAL (fontSelected( const QFont & )), this, SLOT (slotFontSelected( const QFont & ))); |
551 | // #endif | 551 | // #endif |
552 | } | 552 | } |
553 | 553 | ||
554 | FontConfig::~FontConfig() | 554 | FontConfig::~FontConfig() |
555 | { | 555 | { |
556 | } | 556 | } |
557 | 557 | ||
558 | void FontConfig::setFont ( const QFont &font ) | 558 | void FontConfig::setFont ( const QFont &font ) |
559 | { | 559 | { |
diff --git a/noncore/apps/tinykate/libkate/view/kateviewdialog.h b/noncore/apps/tinykate/libkate/view/kateviewdialog.h index 2ce5a11..98d8799 100644 --- a/noncore/apps/tinykate/libkate/view/kateviewdialog.h +++ b/noncore/apps/tinykate/libkate/view/kateviewdialog.h | |||
@@ -10,49 +10,49 @@ | |||
10 | 10 | ||
11 | /*************************************************************************** | 11 | /*************************************************************************** |
12 | * * | 12 | * * |
13 | * This program is free software; you can redistribute it and/or modify * | 13 | * This program is free software; you can redistribute it and/or modify * |
14 | * it under the terms of the GNU General Public License as published by * | 14 | * it under the terms of the GNU General Public License as published by * |
15 | * the Free Software Foundation; either version 2 of the License, or * | 15 | * the Free Software Foundation; either version 2 of the License, or * |
16 | * (at your option) any later version. * | 16 | * (at your option) any later version. * |
17 | * * | 17 | * * |
18 | ***************************************************************************/ | 18 | ***************************************************************************/ |
19 | // Dialogs | 19 | // Dialogs |
20 | 20 | ||
21 | #ifndef _KWDIALOG_H_ | 21 | #ifndef _KWDIALOG_H_ |
22 | #define _KWDIALOG_H_ | 22 | #define _KWDIALOG_H_ |
23 | 23 | ||
24 | 24 | ||
25 | class QCheckBox; | 25 | class QCheckBox; |
26 | class QLineEdit; | 26 | class QLineEdit; |
27 | class QPushButton; | 27 | 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 <opie2/ofontselector.h> |
35 | #include "kateview.h" | 35 | #include "kateview.h" |
36 | 36 | ||
37 | class SearchDialog : public KDialogBase | 37 | class SearchDialog : public KDialogBase |
38 | { | 38 | { |
39 | Q_OBJECT | 39 | Q_OBJECT |
40 | 40 | ||
41 | public: | 41 | public: |
42 | SearchDialog( QWidget *parent, QStringList &searchFor, QStringList &replaceWith, int flags ); | 42 | SearchDialog( QWidget *parent, QStringList &searchFor, QStringList &replaceWith, int flags ); |
43 | QString getSearchFor(); | 43 | QString getSearchFor(); |
44 | QString getReplaceWith(); | 44 | QString getReplaceWith(); |
45 | int getFlags(); | 45 | int getFlags(); |
46 | void setSearchText( const QString &searchstr ); | 46 | void setSearchText( const QString &searchstr ); |
47 | 47 | ||
48 | protected slots: | 48 | protected slots: |
49 | void slotOk(); | 49 | void slotOk(); |
50 | 50 | ||
51 | protected: | 51 | protected: |
52 | QComboBox *m_search; | 52 | QComboBox *m_search; |
53 | QComboBox *m_replace; | 53 | QComboBox *m_replace; |
54 | QCheckBox *m_opt1; | 54 | QCheckBox *m_opt1; |
55 | QCheckBox *m_opt2; | 55 | QCheckBox *m_opt2; |
56 | QCheckBox *m_opt3; | 56 | QCheckBox *m_opt3; |
57 | QCheckBox *m_optRegExp; | 57 | QCheckBox *m_optRegExp; |
58 | QCheckBox *m_opt4; | 58 | QCheckBox *m_opt4; |
@@ -163,34 +163,34 @@ public: | |||
163 | ~ColorConfig(); | 163 | ~ColorConfig(); |
164 | 164 | ||
165 | void setColors( QColor * ); | 165 | void setColors( QColor * ); |
166 | void getColors( QColor * ); | 166 | void getColors( QColor * ); |
167 | 167 | ||
168 | private: | 168 | private: |
169 | 169 | ||
170 | KColorButton *m_back; | 170 | KColorButton *m_back; |
171 | KColorButton *m_selected; | 171 | KColorButton *m_selected; |
172 | }; | 172 | }; |
173 | 173 | ||
174 | class FontConfig : public QWidget | 174 | class FontConfig : public QWidget |
175 | { | 175 | { |
176 | Q_OBJECT | 176 | Q_OBJECT |
177 | 177 | ||
178 | public: | 178 | public: |
179 | 179 | ||
180 | FontConfig( QWidget *parent = 0, char *name = 0 ); | 180 | FontConfig( QWidget *parent = 0, char *name = 0 ); |
181 | ~FontConfig(); | 181 | ~FontConfig(); |
182 | 182 | ||
183 | void setFont ( const QFont &font ); | 183 | void setFont ( const QFont &font ); |
184 | QFont getFont ( ) { return myFont; }; | 184 | QFont getFont ( ) { return myFont; }; |
185 | 185 | ||
186 | private: | 186 | private: |
187 | OFontSelector *m_fontselect; | 187 | Opie::OFontSelector *m_fontselect; |
188 | // class KFontChooser *m_fontchooser; | 188 | // class KFontChooser *m_fontchooser; |
189 | QFont myFont; | 189 | QFont myFont; |
190 | 190 | ||
191 | private slots: | 191 | private slots: |
192 | void slotFontSelected( const QFont &font ); | 192 | void slotFontSelected( const QFont &font ); |
193 | }; | 193 | }; |
194 | 194 | ||
195 | 195 | ||
196 | #endif //_KWDIALOG_H_ | 196 | #endif //_KWDIALOG_H_ |