Changeset View
Changeset View
Standalone View
Standalone View
core/ModuleView.cpp
Show First 20 Lines • Show All 207 Lines • ▼ Show 20 Line(s) | 202 | { | |||
---|---|---|---|---|---|
208 | KCModuleProxy * moduleProxy = d->mPages.value( page ); | 208 | KCModuleProxy * moduleProxy = d->mPages.value( page ); | ||
209 | KCModuleInfo * moduleInfo = d->mModules.value( page ); | 209 | KCModuleInfo * moduleInfo = d->mModules.value( page ); | ||
210 | 210 | | |||
211 | if( !moduleInfo ) { | 211 | if( !moduleInfo ) { | ||
212 | // Seems like we have some form of a race condition going on here... | 212 | // Seems like we have some form of a race condition going on here... | ||
213 | return; | 213 | return; | ||
214 | } | 214 | } | ||
215 | 215 | | |||
216 | page->setHeader( moduleInfo->comment() ); | 216 | page->setHeader( moduleInfo->moduleName() ); | ||
217 | page->setIcon( QIcon::fromTheme( moduleInfo->icon() ) ); | 217 | page->setIcon( QIcon::fromTheme( moduleInfo->icon() ) ); | ||
218 | //HACK: not much other ways to detect is a qml kcm | 218 | //HACK: not much other ways to detect is a qml kcm | ||
219 | if ( moduleProxy && moduleProxy->realModule()->inherits("KCModuleQml") ) { | 219 | if ( moduleProxy && moduleProxy->realModule()->inherits("KCModuleQml") ) { | ||
220 | page->setHeaderVisible(false); | 220 | page->setHeaderVisible(false); | ||
221 | } | 221 | } | ||
222 | if( light ) { | 222 | if( light ) { | ||
223 | return; | 223 | return; | ||
224 | } | 224 | } | ||
225 | 225 | | |||
226 | if( moduleProxy && moduleProxy->realModule()->useRootOnlyMessage() ) { | 226 | if( moduleProxy && moduleProxy->realModule()->useRootOnlyMessage() ) { | ||
227 | page->setHeader( moduleInfo->comment() + QStringLiteral("<br><small>") + moduleProxy->realModule()->rootOnlyMessage() + QStringLiteral("</small>") ); | 227 | page->setHeader( moduleInfo->moduleName() + QStringLiteral("<br><small>") + moduleProxy->realModule()->rootOnlyMessage() + QStringLiteral("</small>") ); | ||
228 | page->setIcon( KDE::icon( moduleInfo->icon(), QStringList() << QStringLiteral("dialog-warning") ) ); | 228 | page->setIcon( KDE::icon( moduleInfo->icon(), QStringList() << QStringLiteral("dialog-warning") ) ); | ||
229 | } | 229 | } | ||
230 | } | 230 | } | ||
231 | 231 | | |||
232 | bool ModuleView::resolveChanges() | 232 | bool ModuleView::resolveChanges() | ||
233 | { | 233 | { | ||
234 | KCModuleProxy * currentProxy = d->mPages.value( d->mPageWidget->currentPage() ); | 234 | KCModuleProxy * currentProxy = d->mPages.value( d->mPageWidget->currentPage() ); | ||
235 | return resolveChanges(currentProxy); | 235 | return resolveChanges(currentProxy); | ||
▲ Show 20 Lines • Show All 204 Lines • Show Last 20 Lines |