Diffstat (limited to 'noncore/apps/tinykate/libkate/view/kateview.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/apps/tinykate/libkate/view/kateview.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
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 | |||
@@ -2193,19 +2193,21 @@ bool KateView::askReplaceEnd() { | |||
2193 | // ask for continue | 2193 | // ask for continue |
2194 | if (!(s.flags & KateView::sfBackward)) { | 2194 | if (!(s.flags & KateView::sfBackward)) { |
2195 | // forward search | 2195 | // forward search |
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); |
2209 | return (query == KMessageBox::No); | 2211 | return (query == KMessageBox::No); |
2210 | } | 2212 | } |
2211 | 2213 | ||
@@ -2263,13 +2265,12 @@ void KateView::writeSessionConfig(KateConfig *config) | |||
2263 | } | 2265 | } |
2264 | 2266 | ||
2265 | void KateView::configDialog() | 2267 | 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, |
2273 | i18n("Configure Editor"), | 2274 | i18n("Configure Editor"), |
2274 | KDialogBase::Ok | KDialogBase::Cancel | | 2275 | KDialogBase::Ok | KDialogBase::Cancel | |
2275 | KDialogBase::Help , | 2276 | KDialogBase::Help , |
@@ -2300,15 +2301,14 @@ void KateView::configDialog() | |||
2300 | 2301 | ||
2301 | SelectConfigTab *selectConfig = new SelectConfigTab(page, this); | 2302 | SelectConfigTab *selectConfig = new SelectConfigTab(page, this); |
2302 | 2303 | ||
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 | ||
2312 | HighlightDialogPage *hlPage; | 2312 | HighlightDialogPage *hlPage; |
2313 | HlManager *hlManager; | 2313 | HlManager *hlManager; |
2314 | HlDataList hlDataList; | 2314 | HlDataList hlDataList; |
@@ -2322,16 +2322,14 @@ void KateView::configDialog() | |||
2322 | hlDataList.setAutoDelete(true); | 2322 | hlDataList.setAutoDelete(true); |
2323 | //this gets the data from the KateConfig object | 2323 | //this gets the data from the KateConfig object |
2324 | hlManager->getHlDataList(hlDataList); | 2324 | hlManager->getHlDataList(hlDataList); |
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 |
2335 | colorConfig->getColors(colors); | 2333 | colorConfig->getColors(colors); |
2336 | myDoc->setFont (fontConfig->getFont()); | 2334 | myDoc->setFont (fontConfig->getFont()); |
2337 | 2335 | ||