Changeset View
Changeset View
Standalone View
Standalone View
shell/shellcorona.cpp
Show First 20 Lines • Show All 1597 Lines • ▼ Show 20 Line(s) | 1591 | { | |||
---|---|---|---|---|---|
1598 | 1598 | | |||
1599 | delete m_addPanelsMenu; | 1599 | delete m_addPanelsMenu; | ||
1600 | m_addPanelsMenu = 0; | 1600 | m_addPanelsMenu = 0; | ||
1601 | 1601 | | |||
1602 | KPluginInfo::List panelContainmentPlugins = Plasma::PluginLoader::listContainmentsOfType(QStringLiteral("Panel")); | 1602 | KPluginInfo::List panelContainmentPlugins = Plasma::PluginLoader::listContainmentsOfType(QStringLiteral("Panel")); | ||
1603 | 1603 | | |||
1604 | auto filter = [](const KPluginMetaData &md) -> bool | 1604 | auto filter = [](const KPluginMetaData &md) -> bool | ||
1605 | { | 1605 | { | ||
1606 | return md.value(QStringLiteral("X-Plasma-Shell")) == qApp->applicationName() && md.value(QStringLiteral("X-Plasma-ContainmentCategories")).contains(QStringLiteral("panel")); | 1606 | return md.value(QStringLiteral("NoDisplay")) != QStringLiteral("true") && md.value(QStringLiteral("X-Plasma-ContainmentCategories")).contains(QStringLiteral("panel")); | ||
davidedmundson: != QLatin1String()
and below. | |||||
1607 | }; | 1607 | }; | ||
1608 | QList<KPluginMetaData> templates = KPackage::PackageLoader::self()->findPackages(QStringLiteral("Plasma/LayoutTemplate"), QString(), filter); | 1608 | QList<KPluginMetaData> templates = KPackage::PackageLoader::self()->findPackages(QStringLiteral("Plasma/LayoutTemplate"), QString(), filter); | ||
1609 | 1609 | | |||
1610 | if (panelContainmentPlugins.count() + templates.count() == 1) { | 1610 | if (panelContainmentPlugins.count() + templates.count() == 1) { | ||
1611 | m_addPanelAction = new QAction(i18n("Add Panel"), this); | 1611 | m_addPanelAction = new QAction(i18n("Add Panel"), this); | ||
1612 | m_addPanelAction->setData(Plasma::Types::AddAction); | 1612 | m_addPanelAction->setData(Plasma::Types::AddAction); | ||
1613 | connect(m_addPanelAction, SIGNAL(triggered(bool)), this, SLOT(addPanel())); | 1613 | connect(m_addPanelAction, SIGNAL(triggered(bool)), this, SLOT(addPanel())); | ||
1614 | } else if (!panelContainmentPlugins.isEmpty()) { | 1614 | } else if (!panelContainmentPlugins.isEmpty()) { | ||
Show All 14 Lines | |||||
1629 | void ShellCorona::populateAddPanelsMenu() | 1629 | void ShellCorona::populateAddPanelsMenu() | ||
1630 | { | 1630 | { | ||
1631 | m_addPanelsMenu->clear(); | 1631 | m_addPanelsMenu->clear(); | ||
1632 | const KPluginInfo emptyInfo; | 1632 | const KPluginInfo emptyInfo; | ||
1633 | 1633 | | |||
1634 | KPluginInfo::List panelContainmentPlugins = Plasma::PluginLoader::listContainmentsOfType(QStringLiteral("Panel")); | 1634 | KPluginInfo::List panelContainmentPlugins = Plasma::PluginLoader::listContainmentsOfType(QStringLiteral("Panel")); | ||
1635 | QMap<QString, QPair<KPluginInfo, KPluginMetaData> > sorted; | 1635 | QMap<QString, QPair<KPluginInfo, KPluginMetaData> > sorted; | ||
1636 | foreach (const KPluginInfo &plugin, panelContainmentPlugins) { | 1636 | foreach (const KPluginInfo &plugin, panelContainmentPlugins) { | ||
1637 | if (plugin.property(QStringLiteral("NoDisplay")).toString() == QStringLiteral("true")) { | ||||
1638 | continue; | ||||
1639 | } | ||||
1637 | sorted.insert(plugin.name(), qMakePair(plugin, KPluginMetaData())); | 1640 | sorted.insert(plugin.name(), qMakePair(plugin, KPluginMetaData())); | ||
1638 | } | 1641 | } | ||
1639 | 1642 | | |||
1640 | auto filter = [](const KPluginMetaData &md) -> bool | 1643 | auto filter = [](const KPluginMetaData &md) -> bool | ||
1641 | { | 1644 | { | ||
1642 | return md.value(QStringLiteral("X-Plasma-Shell")) == qApp->applicationName() && md.value(QStringLiteral("X-Plasma-ContainmentCategories")).contains(QStringLiteral("panel")); | 1645 | return md.value(QStringLiteral("NoDisplay")) != QStringLiteral("true") && md.value(QStringLiteral("X-Plasma-ContainmentCategories")).contains(QStringLiteral("panel")); | ||
1643 | }; | 1646 | }; | ||
1644 | QList<KPluginMetaData> templates = KPackage::PackageLoader::self()->findPackages(QStringLiteral("Plasma/LayoutTemplate"), QString(), filter); | 1647 | QList<KPluginMetaData> templates = KPackage::PackageLoader::self()->findPackages(QStringLiteral("Plasma/LayoutTemplate"), QString(), filter); | ||
1645 | for (auto tpl : templates) { | 1648 | for (auto tpl : templates) { | ||
1646 | sorted.insert(tpl.name(), qMakePair(emptyInfo, tpl)); | 1649 | sorted.insert(tpl.name(), qMakePair(emptyInfo, tpl)); | ||
1647 | } | 1650 | } | ||
1648 | 1651 | | |||
1649 | QMapIterator<QString, QPair<KPluginInfo, KPluginMetaData> > it(sorted); | 1652 | QMapIterator<QString, QPair<KPluginInfo, KPluginMetaData> > it(sorted); | ||
1650 | KPackage::Package package = KPackage::PackageLoader::self()->loadPackage(QStringLiteral("Plasma/LayoutTemplate")); | 1653 | KPackage::Package package = KPackage::PackageLoader::self()->loadPackage(QStringLiteral("Plasma/LayoutTemplate")); | ||
▲ Show 20 Lines • Show All 314 Lines • Show Last 20 Lines |
!= QLatin1String()
and below.