author | paule <paule> | 2007-01-13 07:23:35 (UTC) |
---|---|---|
committer | paule <paule> | 2007-01-13 07:23:35 (UTC) |
commit | 80d1934bbbfaea40ee08cf6be738c6517de9477c (patch) (unidiff) | |
tree | 58b8f41630b3ad81422c9b47fd0ef1fc0967a8c0 | |
parent | bccf96bb5b516d05df54dbcee8b8402ded815ed4 (diff) | |
download | opie-80d1934bbbfaea40ee08cf6be738c6517de9477c.zip opie-80d1934bbbfaea40ee08cf6be738c6517de9477c.tar.gz opie-80d1934bbbfaea40ee08cf6be738c6517de9477c.tar.bz2 |
Delete configuration dialog object on closing
-rw-r--r-- | noncore/apps/tinykate/libkate/view/kateview.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/noncore/apps/tinykate/libkate/view/kateview.cpp b/noncore/apps/tinykate/libkate/view/kateview.cpp index c5673a5..b9ebb1a 100644 --- a/noncore/apps/tinykate/libkate/view/kateview.cpp +++ b/noncore/apps/tinykate/libkate/view/kateview.cpp | |||
@@ -2313,65 +2313,66 @@ void KateView::configDialog() | |||
2313 | 2313 | ||
2314 | hlManager = HlManager::self(); | 2314 | hlManager = HlManager::self(); |
2315 | 2315 | ||
2316 | defaultStyleList.setAutoDelete(true); | 2316 | defaultStyleList.setAutoDelete(true); |
2317 | hlManager->getDefaults(defaultStyleList); | 2317 | hlManager->getDefaults(defaultStyleList); |
2318 | 2318 | ||
2319 | hlDataList.setAutoDelete(true); | 2319 | hlDataList.setAutoDelete(true); |
2320 | //this gets the data from the KateConfig object | 2320 | //this gets the data from the KateConfig object |
2321 | hlManager->getHlDataList(hlDataList); | 2321 | hlManager->getHlDataList(hlDataList); |
2322 | 2322 | ||
2323 | page=kd->addPage(i18n("Highlighting")); | 2323 | page=kd->addPage(i18n("Highlighting")); |
2324 | (new QVBoxLayout(page))->setAutoAdd(true); | 2324 | (new QVBoxLayout(page))->setAutoAdd(true); |
2325 | 2325 | ||
2326 | hlPage = new HighlightDialogPage(hlManager, &defaultStyleList, &hlDataList, 0, page); | 2326 | hlPage = new HighlightDialogPage(hlManager, &defaultStyleList, &hlDataList, 0, page); |
2327 | if ( QPEApplication::execDialog( kd )) { | 2327 | if ( QPEApplication::execDialog( kd )) { |
2328 | // color options | 2328 | // color options |
2329 | colorConfig->getColors(colors); | 2329 | colorConfig->getColors(colors); |
2330 | myDoc->setFont (fontConfig->getFont()); | 2330 | myDoc->setFont (fontConfig->getFont()); |
2331 | 2331 | ||
2332 | applyColors(); | 2332 | applyColors(); |
2333 | // indent options | 2333 | // indent options |
2334 | indentConfig->getData(this); | 2334 | indentConfig->getData(this); |
2335 | // select options | 2335 | // select options |
2336 | selectConfig->getData(this); | 2336 | selectConfig->getData(this); |
2337 | // edit options | 2337 | // edit options |
2338 | editConfig->getData(this); | 2338 | editConfig->getData(this); |
2339 | // spell checker | 2339 | // spell checker |
2340 | hlManager->setHlDataList(hlDataList); | 2340 | hlManager->setHlDataList(hlDataList); |
2341 | hlManager->setDefaults(defaultStyleList); | 2341 | hlManager->setDefaults(defaultStyleList); |
2342 | hlPage->saveData(); | 2342 | hlPage->saveData(); |
2343 | } | 2343 | } |
2344 | 2344 | ||
2345 | // delete kd; | 2345 | qApp->processEvents(); |
2346 | delete kd; | ||
2346 | 2347 | ||
2347 | #endif | 2348 | #endif |
2348 | } | 2349 | } |
2349 | 2350 | ||
2350 | int KateView::getHl() { | 2351 | int KateView::getHl() { |
2351 | return myDoc->highlightNum(); | 2352 | return myDoc->highlightNum(); |
2352 | } | 2353 | } |
2353 | 2354 | ||
2354 | void KateView::setDontChangeHlOnSave() | 2355 | void KateView::setDontChangeHlOnSave() |
2355 | { | 2356 | { |
2356 | myDoc->setDontChangeHlOnSave(); | 2357 | myDoc->setDontChangeHlOnSave(); |
2357 | } | 2358 | } |
2358 | 2359 | ||
2359 | void KateView::setHl(int n) { | 2360 | void KateView::setHl(int n) { |
2360 | myDoc->setHighlight(n); | 2361 | myDoc->setHighlight(n); |
2361 | myDoc->setDontChangeHlOnSave(); | 2362 | myDoc->setDontChangeHlOnSave(); |
2362 | myDoc->updateViews(); | 2363 | myDoc->updateViews(); |
2363 | } | 2364 | } |
2364 | 2365 | ||
2365 | int KateView::getEol() { | 2366 | int KateView::getEol() { |
2366 | return myDoc->eolMode; | 2367 | return myDoc->eolMode; |
2367 | } | 2368 | } |
2368 | 2369 | ||
2369 | void KateView::setEol(int eol) { | 2370 | void KateView::setEol(int eol) { |
2370 | if (isReadOnly()) | 2371 | if (isReadOnly()) |
2371 | return; | 2372 | return; |
2372 | 2373 | ||
2373 | myDoc->eolMode = eol; | 2374 | myDoc->eolMode = eol; |
2374 | myDoc->setModified(true); | 2375 | myDoc->setModified(true); |
2375 | } | 2376 | } |
2376 | 2377 | ||
2377 | 2378 | ||