git.iko.soy/unity8
on xenial help sign in
MediaPlayerMenu.running -> showTrack
d82176eNick Dedekind
po/unity8.pot+11−7
compare with xenial
unifiedsplit
@@ -8,7 +8,7 @@ msgid ""
8msgstr ""
8msgstr ""
9"Project-Id-Version: unity8\n"
9"Project-Id-Version: unity8\n"
10"Report-Msgid-Bugs-To: \n"
10"Report-Msgid-Bugs-To: \n"
11−"POT-Creation-Date: 2014-09-19 16:30+0100\n"
11+"POT-Creation-Date: 2014-09-24 10:43+0100\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -266,27 +266,31 @@ msgstr ""
266msgid "Conference"
266msgid "Conference"
267msgstr ""
267msgstr ""
268
268
269−#: qml/Panel/Indicators/MenuItemFactory.qml:747
269+#: qml/Panel/Indicators/MenuItemFactory.qml:600
270+msgid "Nothing is playing"
271+msgstr ""
272+
273+#: qml/Panel/Indicators/MenuItemFactory.qml:748
270msgid "In queue…"
274msgid "In queue…"
271msgstr ""
275msgstr ""
272
276
273−#: qml/Panel/Indicators/MenuItemFactory.qml:751
277+#: qml/Panel/Indicators/MenuItemFactory.qml:752
274msgid "Downloading"
278msgid "Downloading"
275msgstr ""
279msgstr ""
276
280
277−#: qml/Panel/Indicators/MenuItemFactory.qml:753
281+#: qml/Panel/Indicators/MenuItemFactory.qml:754
278msgid "Paused, tap to resume"
282msgid "Paused, tap to resume"
279msgstr ""
283msgstr ""
280
284
281−#: qml/Panel/Indicators/MenuItemFactory.qml:755
285+#: qml/Panel/Indicators/MenuItemFactory.qml:756
282msgid "Canceled"
286msgid "Canceled"
283msgstr ""
287msgstr ""
284
288
285−#: qml/Panel/Indicators/MenuItemFactory.qml:757
289+#: qml/Panel/Indicators/MenuItemFactory.qml:758
286msgid "Finished"
290msgid "Finished"
287msgstr ""
291msgstr ""
288
292
289−#: qml/Panel/Indicators/MenuItemFactory.qml:759
293+#: qml/Panel/Indicators/MenuItemFactory.qml:760
290msgid "Failed, tap to retry"
294msgid "Failed, tap to retry"
291msgstr ""
295msgstr ""
292
296
qml/Panel/Indicators/MenuItemFactory.qml+3−2
@@ -594,15 +594,16 @@ Item {
594 property var menuModel: menuFactory.menuModel
594 property var menuModel: menuFactory.menuModel
595 property int menuIndex: -1
595 property int menuIndex: -1
596 property var actionState: menuData && menuData.actionState || undefined
596 property var actionState: menuData && menuData.actionState || undefined
597+ property bool running: getExtendedProperty(actionState, "running", false)
597
598
598 playerIcon: menuData && menuData.icon || "image://theme/stock_music"
599 playerIcon: menuData && menuData.icon || "image://theme/stock_music"
599− playerName: menuData && menuData.label || ""
600+ playerName: menuData && menuData.label || i18n.tr("Nothing is playing")
600
601
601 albumArt: getExtendedProperty(actionState, "art-url", "image://theme/stock_music")
602 albumArt: getExtendedProperty(actionState, "art-url", "image://theme/stock_music")
602 song: getExtendedProperty(actionState, "title", "")
603 song: getExtendedProperty(actionState, "title", "")
603 artist: getExtendedProperty(actionState, "artist", "")
604 artist: getExtendedProperty(actionState, "artist", "")
604 album: getExtendedProperty(actionState, "album", "")
605 album: getExtendedProperty(actionState, "album", "")
605− running: getExtendedProperty(actionState, "running", false)
606+ showTrack: running && (state == "Playing" || state == "Paused")
606 state: getExtendedProperty(actionState, "state", "")
607 state: getExtendedProperty(actionState, "state", "")
607 enabled: menuData && menuData.sensitive || false
608 enabled: menuData && menuData.sensitive || false
608 highlightWhenPressed: false
609 highlightWhenPressed: false
tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml+16−3
@@ -638,7 +638,8 @@ Item {
638 album: "album1",
638 album: "album1",
639 running: true,
639 running: true,
640 state: "Playing",
640 state: "Playing",
641− enabled: true
641+ enabled: true,
642+ showTrack: true
642 },{
643 },{
643 label: "player2",
644 label: "player2",
644 icon: "file:://icon2",
645 icon: "file:://icon2",
@@ -648,7 +649,19 @@ Item {
648 album: "album2",
649 album: "album2",
649 running: false,
650 running: false,
650 state: "Paused",
651 state: "Paused",
651− enabled: false
652+ enabled: false,
653+ showTrack: false
654+ },{
655+ label: "player3",
656+ icon: "file:://icon3",
657+ albumArt: "file:://art3",
658+ song: "song3",
659+ artist: "artist3",
660+ album: "album3",
661+ running: true,
662+ state: "Stopped",
663+ enabled: true,
664+ showTrack: false
652 }
665 }
653 ];
666 ];
654 }
667 }
@@ -678,7 +691,7 @@ Item {
678 compare(loader.item.song, data.song, "Song does not match data");
691 compare(loader.item.song, data.song, "Song does not match data");
679 compare(loader.item.artist, data.artist, "Artist does not match data");
692 compare(loader.item.artist, data.artist, "Artist does not match data");
680 compare(loader.item.album, data.album, "Album does not match data");
693 compare(loader.item.album, data.album, "Album does not match data");
681− compare(loader.item.running, data.running, "Running does not match data");
694+ compare(loader.item.showTrack, data.showTrack, "Show track does not match data");
682 compare(loader.item.state, data.state, "State does not match data");
695 compare(loader.item.state, data.state, "State does not match data");
683 compare(loader.item.enabled, data.enabled, "Enabled does not match data");
696 compare(loader.item.enabled, data.enabled, "Enabled does not match data");
684 }
697 }