Diffstat (limited to 'noncore/apps/tinykate/libkate') (more/less context) (ignore whitespace changes)
5 files changed, 61 insertions, 62 deletions
diff --git a/noncore/apps/tinykate/libkate/config.in b/noncore/apps/tinykate/libkate/config.in index 47d7ef5..2e7e62c 100644 --- a/noncore/apps/tinykate/libkate/config.in +++ b/noncore/apps/tinykate/libkate/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config LIBKATE | 1 | config LIBKATE |
2 | boolean "libkate" | 2 | boolean "libkate" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBQTAUX && LIBOPIE2CORE && LIBOPIE2UI |
diff --git a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.h b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.h index 5c5c5a4..5eefc77 100644 --- a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.h +++ b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.h | |||
@@ -17,9 +17,9 @@ | |||
17 | 17 | ||
18 | #ifndef SYNTAXDOCUMENT_H | 18 | #ifndef SYNTAXDOCUMENT_H |
19 | #define SYNTAXDOCUMENT_H | 19 | #define SYNTAXDOCUMENT_H |
20 | 20 | ||
21 | #include <opie/xmltree.h> | 21 | #include <opie2/xmltree.h> |
22 | #include <qlist.h> | 22 | #include <qlist.h> |
23 | #include <qstringlist.h> | 23 | #include <qstringlist.h> |
24 | 24 | ||
25 | 25 | ||
@@ -42,9 +42,9 @@ class syntaxContextData | |||
42 | }; | 42 | }; |
43 | 43 | ||
44 | typedef QList<syntaxModeListItem> SyntaxModeList; | 44 | typedef QList<syntaxModeListItem> SyntaxModeList; |
45 | 45 | ||
46 | class SyntaxDocument | 46 | class SyntaxDocument |
47 | { | 47 | { |
48 | public: | 48 | public: |
49 | SyntaxDocument(); | 49 | SyntaxDocument(); |
50 | ~SyntaxDocument(); | 50 | ~SyntaxDocument(); |
@@ -53,9 +53,9 @@ class SyntaxDocument | |||
53 | SyntaxModeList modeList(); | 53 | SyntaxModeList modeList(); |
54 | 54 | ||
55 | syntaxContextData* getGroupInfo(const QString& langName, const QString &group); | 55 | syntaxContextData* getGroupInfo(const QString& langName, const QString &group); |
56 | void freeGroupInfo(syntaxContextData* data); | 56 | void freeGroupInfo(syntaxContextData* data); |
57 | syntaxContextData* getConfig(const QString& mainGroupName, const QString &Config); | 57 | syntaxContextData* getConfig(const QString& mainGroupName, const QString &Config); |
58 | bool nextItem(syntaxContextData* data); | 58 | bool nextItem(syntaxContextData* data); |
59 | bool nextGroup(syntaxContextData* data); | 59 | bool nextGroup(syntaxContextData* data); |
60 | syntaxContextData* getSubItems(syntaxContextData* data); | 60 | syntaxContextData* getSubItems(syntaxContextData* data); |
61 | QString groupItemData(syntaxContextData* data,QString name); | 61 | QString groupItemData(syntaxContextData* data,QString name); |
diff --git a/noncore/apps/tinykate/libkate/libkate.pro b/noncore/apps/tinykate/libkate/libkate.pro index 7266b18..f1b8063 100644 --- a/noncore/apps/tinykate/libkate/libkate.pro +++ b/noncore/apps/tinykate/libkate/libkate.pro | |||
@@ -1,8 +1,8 @@ | |||
1 | TEMPLATE= lib | 1 | TEMPLATE = lib |
2 | CONFIG = qt warn_on release | 2 | CONFIG = qt warn_on release |
3 | HEADERS = microkde/kapplication.h \ | 3 | HEADERS = microkde/kapplication.h \ |
4 | kateconfig.h \ | 4 | kateconfig.h \ |
5 | microkde/kdebug.h \ | 5 | microkde/kdebug.h \ |
6 | microkde/kdialog.h \ | 6 | microkde/kdialog.h \ |
7 | microkde/kdialogbase.h \ | 7 | microkde/kdialogbase.h \ |
8 | microkde/kfiledialog.h \ | 8 | microkde/kfiledialog.h \ |
@@ -23,29 +23,29 @@ HEADERS = microkde/kapplication.h \ | |||
23 | microkde/knumvalidator.h \ | 23 | microkde/knumvalidator.h \ |
24 | microkde/kstaticdeleter.h \ | 24 | microkde/kstaticdeleter.h \ |
25 | microkde/klistview.h \ | 25 | microkde/klistview.h \ |
26 | microkde/kglobalsettings.h \ | 26 | microkde/kglobalsettings.h \ |
27 | microkde/kcolorbtn.h \ | 27 | microkde/kcolorbtn.h \ |
28 | \ | 28 | \ |
29 | \ | 29 | \ |
30 | qt3back/qregexp3.h \ | 30 | qt3back/qregexp3.h \ |
31 | microkde/ksharedptr.h \ | 31 | microkde/ksharedptr.h \ |
32 | document/katebuffer.h document/katedialogs.h \ | 32 | document/katebuffer.h document/katedialogs.h \ |
33 | document/katetextline.h \ | 33 | document/katetextline.h \ |
34 | document/katecmd.h \ | 34 | document/katecmd.h \ |
35 | document/katehighlight.h \ | 35 | document/katehighlight.h \ |
36 | document/katecmds.h document/katedocument.h \ | 36 | document/katecmds.h document/katedocument.h \ |
37 | document/katesyntaxdocument.h \ | 37 | document/katesyntaxdocument.h \ |
38 | view/kateundohistory.h \ | 38 | view/kateundohistory.h \ |
39 | view/kateview.h \ | 39 | view/kateview.h \ |
40 | view/kateviewdialog.h \ | 40 | view/kateviewdialog.h \ |
41 | interfaces/view.h \ | 41 | interfaces/view.h \ |
42 | interfaces/document.h \ | 42 | interfaces/document.h \ |
43 | ktexteditor/ktexteditor.h | 43 | ktexteditor/ktexteditor.h |
44 | 44 | ||
45 | SOURCES = microkde/kapplication.cpp \ | 45 | SOURCES = microkde/kapplication.cpp \ |
46 | microkde/kdialogbase.cpp \ | 46 | microkde/kdialogbase.cpp \ |
47 | kateconfig.cpp \ | 47 | kateconfig.cpp \ |
48 | microkde/klocale.cpp \ | 48 | microkde/klocale.cpp \ |
49 | microkde/kmessagebox.cpp \ | 49 | microkde/kmessagebox.cpp \ |
50 | microkde/kprocess.cpp \ | 50 | microkde/kprocess.cpp \ |
51 | microkde/kstandarddirs.cpp \ | 51 | microkde/kstandarddirs.cpp \ |
@@ -55,35 +55,35 @@ SOURCES = microkde/kapplication.cpp \ | |||
55 | microkde/krun.cpp \ | 55 | microkde/krun.cpp \ |
56 | microkde/knumvalidator.cpp \ | 56 | microkde/knumvalidator.cpp \ |
57 | microkde/kglobal.cpp \ | 57 | microkde/kglobal.cpp \ |
58 | microkde/kglobalsettings.cpp \ | 58 | microkde/kglobalsettings.cpp \ |
59 | microkde/kcolorbtn.cpp \ | 59 | microkde/kcolorbtn.cpp \ |
60 | \ | 60 | \ |
61 | \ | 61 | \ |
62 | qt3back/qregexp3.cpp \ | 62 | qt3back/qregexp3.cpp \ |
63 | ktexteditor/ktexteditor.cpp \ | 63 | ktexteditor/ktexteditor.cpp \ |
64 | document/katebuffer.cpp document/katedialogs.cpp \ | 64 | document/katebuffer.cpp document/katedialogs.cpp \ |
65 | document/katehighlight.cpp \ | 65 | document/katehighlight.cpp \ |
66 | document/katecmd.cpp \ | 66 | document/katecmd.cpp \ |
67 | document/katesyntaxdocument.cpp document/katecmds.cpp \ | 67 | document/katesyntaxdocument.cpp document/katecmds.cpp \ |
68 | document/katedocument.cpp document/katetextline.cpp \ | 68 | document/katedocument.cpp document/katetextline.cpp \ |
69 | view/kateundohistory.cpp \ | 69 | view/kateundohistory.cpp \ |
70 | view/kateview.cpp \ | 70 | view/kateview.cpp \ |
71 | view/kateviewdialog.cpp \ | 71 | view/kateviewdialog.cpp \ |
72 | interfaces/interfaces.cpp | 72 | interfaces/interfaces.cpp |
73 | 73 | ||
74 | INTERFACES= | 74 | INTERFACES = |
75 | INCLUDEPATH+= $(OPIEDIR)/include \ | 75 | INCLUDEPATH += $(OPIEDIR)/include \ |
76 | $(OPIEDIR)/noncore/apps/tinykate/libkate \ | 76 | $(OPIEDIR)/noncore/apps/tinykate/libkate \ |
77 | $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \ | 77 | $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \ |
78 | $(OPIEDIR)/noncore/apps/tinykate/libkate/document \ | 78 | $(OPIEDIR)/noncore/apps/tinykate/libkate/document \ |
79 | $(OPIEDIR)/noncore/apps/tinykate/libkate/view \ | 79 | $(OPIEDIR)/noncore/apps/tinykate/libkate/view \ |
80 | $(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \ | 80 | $(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \ |
81 | $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \ | 81 | $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \ |
82 | $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back | 82 | $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back |
83 | DEPENDPATH+= $(OPIEDIR)/include | 83 | DEPENDPATH += $(OPIEDIR)/include |
84 | LIBS += -lqpe -lopie | 84 | LIBS += -lqpe -lqtaux2 -lopiecore2 -lopieui2 |
85 | TARGET = tinykate | 85 | TARGET = tinykate |
86 | 86 | ||
87 | INCLUDEPATH += $(OPIEDIR)/include | 87 | INCLUDEPATH += $(OPIEDIR)/include |
88 | DESTDIR = $(OPIEDIR)/lib$(PROJMAK) | 88 | DESTDIR = $(OPIEDIR)/lib$(PROJMAK) |
89 | 89 | ||
diff --git a/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp b/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp index 7be5af5..1320cbc 100644 --- a/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp +++ b/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp | |||
@@ -22,12 +22,11 @@ | |||
22 | #include <qpainter.h> | 22 | #include <qpainter.h> |
23 | #include <qdrawutil.h> | 23 | #include <qdrawutil.h> |
24 | #include <qapplication.h> | 24 | #include <qapplication.h> |
25 | #include <kglobalsettings.h> | 25 | #include <kglobalsettings.h> |
26 | //#include "kcolordialog.h" | ||
27 | #include "kcolorbtn.h" | 26 | #include "kcolorbtn.h" |
28 | 27 | ||
29 | #include <opie/colordialog.h> | 28 | #include <opie2/qcolordialog.h> |
30 | 29 | ||
31 | KColorButton::KColorButton( QWidget *parent, const char *name ) | 30 | KColorButton::KColorButton( QWidget *parent, const char *name ) |
32 | : QPushButton( parent, name ), dragFlag(false) | 31 | : QPushButton( parent, name ), dragFlag(false) |
33 | { | 32 | { |
@@ -57,12 +56,12 @@ void KColorButton::drawButtonLabel( QPainter *painter ) | |||
57 | int t = r.y(); | 56 | int t = r.y(); |
58 | int w = r.width(); | 57 | int w = r.width(); |
59 | int h = r.height(); | 58 | int h = r.height(); |
60 | int b = 5; | 59 | int b = 5; |
61 | 60 | ||
62 | QColor lnCol = colorGroup().text(); | 61 | QColor lnCol = colorGroup().text(); |
63 | QColor fillCol = isEnabled() ? col : backgroundColor(); | 62 | QColor fillCol = isEnabled() ? col : backgroundColor(); |
64 | 63 | ||
65 | if ( isDown() ) { | 64 | if ( isDown() ) { |
66 | qDrawPlainRect( painter, l+b+1, t+b+1, w-b*2, h-b*2, lnCol, 1, 0 ); | 65 | qDrawPlainRect( painter, l+b+1, t+b+1, w-b*2, h-b*2, lnCol, 1, 0 ); |
67 | b++; | 66 | b++; |
68 | painter->fillRect( l+b+1, t+b+1, w-b*2, h-b*2, fillCol ); | 67 | painter->fillRect( l+b+1, t+b+1, w-b*2, h-b*2, fillCol ); |
@@ -74,9 +73,9 @@ void KColorButton::drawButtonLabel( QPainter *painter ) | |||
74 | } | 73 | } |
75 | 74 | ||
76 | void KColorButton::chooseColor() | 75 | void KColorButton::chooseColor() |
77 | { | 76 | { |
78 | QColor newCol=OColorDialog::getColor( col); | 77 | QColor newCol=QColorDialog::getColor( col); |
79 | if( newCol != QDialog::Rejected ) | 78 | if( newCol != QDialog::Rejected ) |
80 | { | 79 | { |
81 | col=newCol; | 80 | col=newCol; |
82 | repaint( false ); | 81 | repaint( false ); |
diff --git a/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp b/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp index 6a19e01..4cb13e8 100644 --- a/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp +++ b/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp | |||
@@ -34,9 +34,9 @@ | |||
34 | #include <qpushbutton.h> | 34 | #include <qpushbutton.h> |
35 | #include <qobjectlist.h> | 35 | #include <qobjectlist.h> |
36 | #include <qradiobutton.h> | 36 | #include <qradiobutton.h> |
37 | #include <qwhatsthis.h> | 37 | #include <qwhatsthis.h> |
38 | #include <qstringlist.h> | 38 | #include <qstringlist.h> |
39 | #include <klocale.h> | 39 | #include <klocale.h> |
40 | #include <kcolorbtn.h> | 40 | #include <kcolorbtn.h> |
41 | #include <qcombobox.h> | 41 | #include <qcombobox.h> |
42 | #include <kglobal.h> | 42 | #include <kglobal.h> |
@@ -45,9 +45,9 @@ | |||
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> | 49 | #include <opie2/ofontselector.h> |
50 | 50 | ||
51 | 51 | ||
52 | SearchDialog::SearchDialog( QWidget *parent, QStringList &searchFor, QStringList &replaceWith, int flags ) | 52 | SearchDialog::SearchDialog( QWidget *parent, QStringList &searchFor, QStringList &replaceWith, int flags ) |
53 | : KDialogBase( parent, 0L, true, i18n( "Find Text" ), Ok | Cancel, Ok ) | 53 | : KDialogBase( parent, 0L, true, i18n( "Find Text" ), Ok | Cancel, Ok ) |
@@ -424,9 +424,9 @@ EditConfigTab::EditConfigTab(QWidget *parent, KateView *view) | |||
424 | 424 | ||
425 | e3 = new QSpinBox(this); | 425 | e3 = new QSpinBox(this); |
426 | e3->setMinValue(5); | 426 | e3->setMinValue(5); |
427 | e3->setMaxValue( 30000); | 427 | e3->setMaxValue( 30000); |
428 | #warning fixme e3->setLabel(i18n("Undo steps:")); | 428 | #warning fixme e3->setLabel(i18n("Undo steps:")); |
429 | e3->setValue((int)view->undoSteps()); | 429 | e3->setValue((int)view->undoSteps()); |
430 | 430 | ||
431 | leLayout->addWidget(e1, 0, AlignLeft); | 431 | leLayout->addWidget(e1, 0, AlignLeft); |
432 | leLayout->addWidget(e2, 0, AlignLeft); | 432 | leLayout->addWidget(e2, 0, AlignLeft); |
@@ -540,9 +540,9 @@ FontConfig::FontConfig( QWidget *parent, char *name ) | |||
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); |