git.iko.soy/unity8
on xenial help sign in
Fixed indicator header title
e0c01f4Nick Dedekind
Panel/MenuContent.qml+8−1
compare with xenial
unifiedsplit
@@ -16,6 +16,7 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19+import Unity.Indicators 0.1 as Indicators
19import "Menus"
20import "Menus"
20import "../Components"
21import "../Components"
21
22
@@ -179,7 +180,13 @@ Rectangle {
179 left: parent.left
180 left: parent.left
180 right: parent.right
181 right: parent.right
181 }
182 }
183+ text: {
184+ if (content.overviewActive)
185+ return i18n.tr("Device");
182− text: content.overviewActive ? i18n.tr("Device") : (indicatorsModel && menus.currentIndex >= 0 && menus.currentIndex < indicatorsModel.count) ? indicatorsModel.get(menus.currentIndex).title : ""
186+ if (indicatorsModel && menus.currentIndex >= 0 && menus.currentIndex < indicatorsModel.count)
187+ return indicatorsModel.data(menus.currentIndex, Indicators.IndicatorsModel.Title);
188+ return "";
189+ }
183 opacity: __shown ? 1 : 0
190 opacity: __shown ? 1 : 0
184 Behavior on opacity {NumberAnimation{duration: 100}}
191 Behavior on opacity {NumberAnimation{duration: 100}}
185 }
192 }