on xenial help sign in
review comments
commitf897b88d56893f743d6afcf32850a72af858b5aa authorNick Dedekind <nick.dedekind@canonical.com> dateTue 5 Jan 2016, 06:09 (11 years ago) parent441e30a
5 files changed+11−11
plugins/Unity/Indicators/modelactionrootstate.cpp+7−7 plugins/Unity/Indicators/modelactionrootstate.h+1−1 qml/Components/VolumeControl.qml+1−1 qml/Panel/IndicatorItem.qml+1−1 tests/mocks/Unity/Indicators/ModelActionRootState.qml+1−1
plugins/Unity/Indicators/modelactionrootstate.cpp+7−7
@@ -1,5 +1,5 @@
11/*
2− * Copyright 2013 Canonical Ltd.
2+ * Copyright 2013-2016 Canonical Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU Lesser General Public License as published by
@@ -162,25 +162,25 @@ void ModelActionRootState::updateOtherActions()
162162
163163 if (m_menu && m_menu->rowCount() > 0) {
164164 QVariantMap map;
165− map[QStringLiteral("submenu-action")] = QLatin1String("string");
166− map[QStringLiteral("x-canonical-scroll-action")] = QLatin1String("string");
167− map[QStringLiteral("x-canonical-secondary-action")] = QLatin1String("string");
165+ map[QStringLiteral("submenu-action")] = QStringLiteral("string");
166+ map[QStringLiteral("x-canonical-scroll-action")] = QStringLiteral("string");
167+ map[QStringLiteral("x-canonical-secondary-action")] = QStringLiteral("string");
168168 m_menu->loadExtendedAttributes(0, map);
169169 QVariantMap extMap = m_menu->get(0, "ext").toMap();
170170
171− QString secondaryAction = extMap[QStringLiteral("xCanonicalSecondaryAction")].toString();
171+ QString secondaryAction = extMap.value(QStringLiteral("xCanonicalSecondaryAction")).toString();
172172 if (m_secondaryAction != secondaryAction) {
173173 m_secondaryAction = secondaryAction;
174174 Q_EMIT secondaryActionChanged();
175175 }
176176
177− QString scrollAction = extMap[QStringLiteral("xCanonicalScrollAction")].toString();
177+ QString scrollAction = extMap.value(QStringLiteral("xCanonicalScrollAction")).toString();
178178 if (m_scrollAction != scrollAction) {
179179 m_scrollAction = scrollAction;
180180 Q_EMIT scrollActionChanged();
181181 }
182182
183− QString submenuAction = extMap[QStringLiteral("submenuAction")].toString();
183+ QString submenuAction = extMap.value(QStringLiteral("submenuAction")).toString();
184184 if (m_submenuAction != submenuAction) {
185185 m_submenuAction = submenuAction;
186186 Q_EMIT submenuActionChanged();
plugins/Unity/Indicators/modelactionrootstate.h+1−1
@@ -1,5 +1,5 @@
11/*
2− * Copyright 2013 Canonical Ltd.
2+ * Copyright 2013-2016 Canonical Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU Lesser General Public License as published by
qml/Components/VolumeControl.qml+1−1
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2013-2015 Canonical, Ltd.
2+ * Copyright (C) 2013-2016 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
qml/Panel/IndicatorItem.qml+1−1
@@ -1,5 +1,5 @@
11/*
2− * Copyright 2013-2014 Canonical Ltd.
2+ * Copyright 2013-2016 Canonical Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU Lesser General Public License as published by
tests/mocks/Unity/Indicators/ModelActionRootState.qml+1−1
@@ -1,5 +1,5 @@
11/*
2− * Copyright 2013 Canonical Ltd.
2+ * Copyright 2013-2016 Canonical Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU Lesser General Public License as published by