author | kergoth <kergoth> | 2003-08-09 16:12:19 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-08-09 16:12:19 (UTC) |
commit | 1c58d1407f9584fedcdae390a04e2b37e5853361 (patch) (unidiff) | |
tree | 3c6e741c4d382d1a53c182930052b684d6e35b91 /noncore/apps/tinykate/libkate | |
parent | e3f4607edd0c1ca1434adb446df1d4a1d27c6a86 (diff) | |
download | opie-1c58d1407f9584fedcdae390a04e2b37e5853361.zip opie-1c58d1407f9584fedcdae390a04e2b37e5853361.tar.gz opie-1c58d1407f9584fedcdae390a04e2b37e5853361.tar.bz2 |
Merge from BRANCH_1_0
6 files changed, 20 insertions, 20 deletions
diff --git a/noncore/apps/tinykate/libkate/document/katebuffer.cpp b/noncore/apps/tinykate/libkate/document/katebuffer.cpp index 38ba55d..22a4917 100644 --- a/noncore/apps/tinykate/libkate/document/katebuffer.cpp +++ b/noncore/apps/tinykate/libkate/document/katebuffer.cpp | |||
@@ -121,7 +121,7 @@ KWBuffer::slotLoadFile() | |||
121 | int | 121 | int |
122 | KWBuffer::count() | 122 | KWBuffer::count() |
123 | { | 123 | { |
124 | // qDebug("m_stringList.count %d",m_stringList.count()); | 124 | qDebug("m_stringList.count %d",m_stringList.count()); |
125 | return m_lineCount; | 125 | return m_lineCount; |
126 | //return m_stringList.count(); | 126 | //return m_stringList.count(); |
127 | // return m_totalLines; | 127 | // return m_totalLines; |
diff --git a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp index 844f27d..f90a5f8 100644 --- a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp +++ b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp | |||
@@ -71,7 +71,7 @@ void SyntaxDocument::setupModeList(bool force) | |||
71 | mli->section = config->readEntry("section",""); | 71 | mli->section = config->readEntry("section",""); |
72 | mli->mimetype = config->readEntry("mimetype",""); | 72 | mli->mimetype = config->readEntry("mimetype",""); |
73 | mli->extension = config->readEntry("extension",""); | 73 | mli->extension = config->readEntry("extension",""); |
74 | mli->identifier = *it; | 74 | mli->identifier = path+*it; |
75 | myModeList.append(mli); | 75 | myModeList.append(mli); |
76 | } | 76 | } |
77 | else | 77 | else |
@@ -105,6 +105,7 @@ void SyntaxDocument::setupModeList(bool force) | |||
105 | } | 105 | } |
106 | } | 106 | } |
107 | } | 107 | } |
108 | config->write(); | ||
108 | // config->sync(); | 109 | // config->sync(); |
109 | } | 110 | } |
110 | 111 | ||
diff --git a/noncore/apps/tinykate/libkate/libkate.pro b/noncore/apps/tinykate/libkate/libkate.pro index 5cb0b14..b282059 100644 --- a/noncore/apps/tinykate/libkate/libkate.pro +++ b/noncore/apps/tinykate/libkate/libkate.pro | |||
@@ -25,6 +25,8 @@ HEADERS = microkde/kapplication.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 | \ | ||
29 | \ | ||
28 | qt3back/qregexp3.h \ | 30 | qt3back/qregexp3.h \ |
29 | microkde/ksharedptr.h \ | 31 | microkde/ksharedptr.h \ |
30 | document/katebuffer.h document/katedialogs.h \ | 32 | document/katebuffer.h document/katedialogs.h \ |
@@ -49,12 +51,15 @@ SOURCES = microkde/kapplication.cpp \ | |||
49 | microkde/kstandarddirs.cpp \ | 51 | microkde/kstandarddirs.cpp \ |
50 | microkde/ktempfile.cpp \ | 52 | microkde/ktempfile.cpp \ |
51 | microkde/kurlrequester.cpp \ | 53 | microkde/kurlrequester.cpp \ |
54 | microkde/kcolordialog.cpp \ | ||
52 | microkde/kfontdialog.cpp \ | 55 | microkde/kfontdialog.cpp \ |
53 | microkde/krun.cpp \ | 56 | microkde/krun.cpp \ |
54 | microkde/knumvalidator.cpp \ | 57 | microkde/knumvalidator.cpp \ |
55 | microkde/kglobal.cpp \ | 58 | microkde/kglobal.cpp \ |
56 | microkde/kglobalsettings.cpp \ | 59 | microkde/kglobalsettings.cpp \ |
57 | microkde/kcolorbtn.cpp \ | 60 | microkde/kcolorbtn.cpp \ |
61 | \ | ||
62 | \ | ||
58 | qt3back/qregexp3.cpp \ | 63 | qt3back/qregexp3.cpp \ |
59 | ktexteditor/ktexteditor.cpp \ | 64 | ktexteditor/ktexteditor.cpp \ |
60 | document/katebuffer.cpp document/katedialogs.cpp \ | 65 | document/katebuffer.cpp document/katedialogs.cpp \ |
diff --git a/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp b/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp index 976f1db..5d21f15 100644 --- a/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp +++ b/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp | |||
@@ -23,11 +23,9 @@ | |||
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" | 26 | #include "kcolordialog.h" |
27 | #include "kcolorbtn.h" | 27 | #include "kcolorbtn.h" |
28 | 28 | ||
29 | #include <opie/colordialog.h> | ||
30 | |||
31 | KColorButton::KColorButton( QWidget *parent, const char *name ) | 29 | KColorButton::KColorButton( QWidget *parent, const char *name ) |
32 | : QPushButton( parent, name ), dragFlag(false) | 30 | : QPushButton( parent, name ), dragFlag(false) |
33 | { | 31 | { |
@@ -75,12 +73,12 @@ void KColorButton::drawButtonLabel( QPainter *painter ) | |||
75 | 73 | ||
76 | void KColorButton::chooseColor() | 74 | void KColorButton::chooseColor() |
77 | { | 75 | { |
78 | QColor newCol=OColorDialog::getColor( col); | 76 | if( KColorDialog::getColor( col) == QDialog::Rejected ) |
79 | if( newCol != QDialog::Rejected ) | ||
80 | { | 77 | { |
81 | col=newCol; | 78 | return; |
79 | } | ||
80 | |||
82 | repaint( false ); | 81 | repaint( false ); |
83 | emit changed( col ); | 82 | emit changed( col ); |
84 | } | 83 | } |
85 | } | ||
86 | 84 | ||
diff --git a/noncore/apps/tinykate/libkate/microkde/kcolordialog.h b/noncore/apps/tinykate/libkate/microkde/kcolordialog.h index 1d5c27e..0f831cd 100644 --- a/noncore/apps/tinykate/libkate/microkde/kcolordialog.h +++ b/noncore/apps/tinykate/libkate/microkde/kcolordialog.h | |||
@@ -2,11 +2,9 @@ | |||
2 | #define MINIKDE_KCOLORDIALOG_H | 2 | #define MINIKDE_KCOLORDIALOG_H |
3 | 3 | ||
4 | #include <qcolor.h> | 4 | #include <qcolor.h> |
5 | #include <opie/colordialog.h> | ||
6 | 5 | ||
7 | class KColorDialog : OColorDialog | 6 | class KColorDialog |
8 | { | 7 | { |
9 | Q_OBJECT | ||
10 | public: | 8 | public: |
11 | enum { Accepted }; | 9 | enum { Accepted }; |
12 | 10 | ||
diff --git a/noncore/apps/tinykate/libkate/view/kateview.cpp b/noncore/apps/tinykate/libkate/view/kateview.cpp index de81d0f..af3b30d 100644 --- a/noncore/apps/tinykate/libkate/view/kateview.cpp +++ b/noncore/apps/tinykate/libkate/view/kateview.cpp | |||
@@ -2196,13 +2196,15 @@ bool KateView::askReplaceEnd() { | |||
2196 | str = i18n("%1 replacement(s) made.\n" | 2196 | str = i18n("%1 replacement(s) made.\n" |
2197 | "End of document reached.\n" | 2197 | "End of document reached.\n" |
2198 | "Continue from the beginning?").arg(replaces); | 2198 | "Continue from the beginning?").arg(replaces); |
2199 | query = KMessageBox::questionYesNo(this, str, i18n("Continue"), i18n("Stop")); | 2199 | query = KMessageBox::questionYesNo(this, str, i18n("Replace"), |
2200 | i18n("Continue"), i18n("Stop")); | ||
2200 | } else { | 2201 | } else { |
2201 | // backward search | 2202 | // backward search |
2202 | str = i18n("%1 replacement(s) made.\n" | 2203 | str = i18n("%1 replacement(s) made.\n" |
2203 | "Beginning of document reached.\n" | 2204 | "Beginning of document reached.\n" |
2204 | "Continue from the end?").arg(replaces); | 2205 | "Continue from the end?").arg(replaces); |
2205 | query = KMessageBox::questionYesNo(this, str, i18n("Continue"), i18n("Stop")); | 2206 | query = KMessageBox::questionYesNo(this, str, i18n("Replace"), |
2207 | i18n("Continue"), i18n("Stop")); | ||
2206 | } | 2208 | } |
2207 | replaces = 0; | 2209 | replaces = 0; |
2208 | continueSearch(s); | 2210 | continueSearch(s); |
@@ -2266,7 +2268,6 @@ void KateView::configDialog() | |||
2266 | { | 2268 | { |
2267 | 2269 | ||
2268 | #warning fixme | 2270 | #warning fixme |
2269 | QScrollView *pScroll; | ||
2270 | 2271 | ||
2271 | #if 1 | 2272 | #if 1 |
2272 | KDialogBase *kd = new KDialogBase(KDialogBase::IconList, | 2273 | KDialogBase *kd = new KDialogBase(KDialogBase::IconList, |
@@ -2303,9 +2304,8 @@ void KateView::configDialog() | |||
2303 | // edit options | 2304 | // edit options |
2304 | page=kd->addPage(i18n("Edit")); | 2305 | page=kd->addPage(i18n("Edit")); |
2305 | (new QVBoxLayout(page))->setAutoAdd(true); | 2306 | (new QVBoxLayout(page))->setAutoAdd(true); |
2306 | pScroll=new QScrollView(page); | 2307 | |
2307 | EditConfigTab *editConfig = new EditConfigTab(page, this); | 2308 | EditConfigTab *editConfig = new EditConfigTab(page, this); |
2308 | pScroll->addChild(editConfig); | ||
2309 | 2309 | ||
2310 | 2310 | ||
2311 | 2311 | ||
@@ -2325,10 +2325,8 @@ void KateView::configDialog() | |||
2325 | 2325 | ||
2326 | page=kd->addPage(i18n("Highlighting")); | 2326 | page=kd->addPage(i18n("Highlighting")); |
2327 | (new QVBoxLayout(page))->setAutoAdd(true); | 2327 | (new QVBoxLayout(page))->setAutoAdd(true); |
2328 | pScroll=new QScrollView(page); | ||
2329 | hlPage = new HighlightDialogPage(hlManager, &defaultStyleList, &hlDataList, 0, pScroll->viewport()); | ||
2330 | pScroll->addChild(hlPage); | ||
2331 | 2328 | ||
2329 | hlPage = new HighlightDialogPage(hlManager, &defaultStyleList, &hlDataList, 0, page); | ||
2332 | kd->showMaximized(); | 2330 | kd->showMaximized(); |
2333 | if (kd->exec()) { | 2331 | if (kd->exec()) { |
2334 | // color options | 2332 | // color options |