Changeset View
Changeset View
Standalone View
Standalone View
src/widgets/krun.cpp
Show First 20 Lines • Show All 1412 Lines • ▼ Show 20 Line(s) | |||||
1413 | { | 1413 | { | ||
1414 | d->m_bAutoDelete = b; | 1414 | d->m_bAutoDelete = b; | ||
1415 | } | 1415 | } | ||
1416 | 1416 | | |||
1417 | void KRun::setEnableExternalBrowser(bool b) | 1417 | void KRun::setEnableExternalBrowser(bool b) | ||
1418 | { | 1418 | { | ||
1419 | if (b) { | 1419 | if (b) { | ||
1420 | d->m_externalBrowser = KConfigGroup(KSharedConfig::openConfig(), "General").readEntry("BrowserApplication"); | 1420 | d->m_externalBrowser = KConfigGroup(KSharedConfig::openConfig(), "General").readEntry("BrowserApplication"); | ||
1421 | | ||||
1422 | // If a default browser isn't set in kdeglobals, fall back to mimeapps.list | ||||
1423 | if (!d->m_externalBrowser.isEmpty()) { | ||||
dfaure: no space after "!" | |||||
1424 | return; | ||||
1425 | } | ||||
1426 | | ||||
1427 | KSharedConfig::Ptr profile = KSharedConfig::openConfig(QStringLiteral("mimeapps.list"), KConfig::NoGlobals, QStandardPaths::GenericConfigLocation); | ||||
1428 | KConfigGroup defaultApps(profile, "Default Applications"); | ||||
1429 | | ||||
1430 | d->m_externalBrowser = defaultApps.readEntry("x-scheme-handler/https"); | ||||
1431 | if (d->m_externalBrowser.isEmpty()) { | ||||
I personally would have gone for // If a default browser isn't set in kdeglobals, fall back to mimeapps.list if (!d->m_externalBrowser.isEmpty()) { return; } KSharedConfig::Ptr profile = KSharedConfig::openConfig(QStringLiteral("mimeapps.list"), KConfig::NoGlobals, QStandardPaths::GenericConfigLocation); KConfigGroup defaultApps(profile, "Default Applications"); d->m_externalBrowser = defaultApps.readEntry("x-scheme-handler/https"); if (d->m_externalBrowser.isEmpty()) { d->m_externalBrowser = defaultApps.readEntry("x-scheme-handler/http"); } to avoid too much nesting. achauvel: I personally would have gone for
```
// If a default browser isn't set in kdeglobals… | |||||
1432 | d->m_externalBrowser = defaultApps.readEntry("x-scheme-handler/http"); | ||||
1433 | } | ||||
1421 | } else { | 1434 | } else { | ||
1422 | d->m_externalBrowser.clear(); | 1435 | d->m_externalBrowser.clear(); | ||
1423 | } | 1436 | } | ||
1424 | } | 1437 | } | ||
1425 | 1438 | | |||
1426 | void KRun::setPreferredService(const QString &desktopEntryName) | 1439 | void KRun::setPreferredService(const QString &desktopEntryName) | ||
1427 | { | 1440 | { | ||
1428 | d->m_preferredService = desktopEntryName; | 1441 | d->m_preferredService = desktopEntryName; | ||
▲ Show 20 Lines • Show All 214 Lines • Show Last 20 Lines |
no space after "!"