on xenial help sign in
enable the keyboard indicator, switch it to desktop profile
commit1e5b2905c2d9b5d36e528cedff96e91d499da04a authorLukáš Tinkl <lukas.tinkl@canonical.com> dateFri 17 Jun 2016, 12:48 (10 years ago) parentd8e6e9d
1 file changed+3−6
plugins/Unity/Indicators/indicatorsmanager.cpp+3−6
plugins/Unity/Indicators/indicatorsmanager.cpp+3−6
@@ -114,10 +114,6 @@ void IndicatorsManager::loadFile(const QFileInfo& file_info)
114114 QSettings indicator_settings(file_info.absoluteFilePath(), QSettings::IniFormat, this);
115115 const QString name = indicator_settings.value(QStringLiteral("Indicator Service/Name")).toString();
116116
117− if (m_platform.isPC() && name == QLatin1String("indicator-keyboard")) {
118− return; // convergence: skip this indicator until it works in Mir
119− }
120−
121117 auto iter = m_indicatorsData.constFind(name);
122118 if (iter != m_indicatorsData.constEnd())
123119 {
@@ -289,8 +285,9 @@ Indicator::Ptr IndicatorsManager::indicator(const QString& indicator_name)
289285 // can't control brightness for now and phone-on-desktop broken (FIXME)
290286 //
291287 // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)
292− if ((new_indicator->identifier() == QStringLiteral("indicator-session"))
293− || (new_indicator->identifier() == QStringLiteral("indicator-power") && m_platform.isPC())) {
288+ if ((new_indicator->identifier() == QStringLiteral("indicator-session")
289+ || new_indicator->identifier() == QStringLiteral("indicator-keyboard")
290+ || (new_indicator->identifier() == QStringLiteral("indicator-power") && m_platform.isPC()))) {
294291 new_indicator->setProfile(QStringLiteral("desktop"));
295292 } else {
296293 new_indicator->setProfile(m_profile);