author | llornkcor <llornkcor> | 2003-06-14 17:39:26 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2003-06-14 17:39:26 (UTC) |
commit | e2a1c237211e4009ce2b76d3adc3860fbb255732 (patch) (side-by-side diff) | |
tree | 6d76151c961368c111f478fe58cb367424c6e2c6 /noncore/apps/tinykate/libkate/view | |
parent | 437e389cc5cca518c5f26677f98c464f9255ec04 (diff) | |
download | opie-e2a1c237211e4009ce2b76d3adc3860fbb255732.zip opie-e2a1c237211e4009ce2b76d3adc3860fbb255732.tar.gz opie-e2a1c237211e4009ce2b76d3adc3860fbb255732.tar.bz2 |
changes by craig graham. please test to make sure nothing important was taken out.
Diffstat (limited to 'noncore/apps/tinykate/libkate/view') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/tinykate/libkate/view/kateview.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/noncore/apps/tinykate/libkate/view/kateview.cpp b/noncore/apps/tinykate/libkate/view/kateview.cpp index af3b30d..de81d0f 100644 --- a/noncore/apps/tinykate/libkate/view/kateview.cpp +++ b/noncore/apps/tinykate/libkate/view/kateview.cpp @@ -2196,15 +2196,13 @@ bool KateView::askReplaceEnd() { str = i18n("%1 replacement(s) made.\n" "End of document reached.\n" "Continue from the beginning?").arg(replaces); - query = KMessageBox::questionYesNo(this, str, i18n("Replace"), - i18n("Continue"), i18n("Stop")); + query = KMessageBox::questionYesNo(this, str, i18n("Continue"), i18n("Stop")); } else { // backward search str = i18n("%1 replacement(s) made.\n" "Beginning of document reached.\n" "Continue from the end?").arg(replaces); - query = KMessageBox::questionYesNo(this, str, i18n("Replace"), - i18n("Continue"), i18n("Stop")); + query = KMessageBox::questionYesNo(this, str, i18n("Continue"), i18n("Stop")); } replaces = 0; continueSearch(s); @@ -2268,6 +2266,7 @@ void KateView::configDialog() { #warning fixme + QScrollView *pScroll; #if 1 KDialogBase *kd = new KDialogBase(KDialogBase::IconList, @@ -2304,8 +2303,9 @@ void KateView::configDialog() // edit options page=kd->addPage(i18n("Edit")); (new QVBoxLayout(page))->setAutoAdd(true); - + pScroll=new QScrollView(page); EditConfigTab *editConfig = new EditConfigTab(page, this); + pScroll->addChild(editConfig); @@ -2325,9 +2325,11 @@ void KateView::configDialog() page=kd->addPage(i18n("Highlighting")); (new QVBoxLayout(page))->setAutoAdd(true); + pScroll=new QScrollView(page); + hlPage = new HighlightDialogPage(hlManager, &defaultStyleList, &hlDataList, 0, pScroll->viewport()); + pScroll->addChild(hlPage); - hlPage = new HighlightDialogPage(hlManager, &defaultStyleList, &hlDataList, 0, page); - kd->showMaximized(); + kd->showMaximized(); if (kd->exec()) { // color options colorConfig->getColors(colors); |