Merge lp:~vthompson/music-app/fix-1410639-edit-playlist-placeholder into lp:music-app/remix

[Victor Thompson]

Use the same placeholder text that is used in creating a playlist when editing the name

Use the same placeholder text that is used in creating a playlist when editing the name. Currently the app incorrectly displays the existing name as the placeholder text. It does so because it abuses the placeholder text as a property to compare the new name against.

This also adds changes to the text as per design direction.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:783
http://91.189.93.70:8080/job/music-app-ci/1211/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/666
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/666/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/63

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1211/rebuild

review: Approve (continuous-integration)

[lp:~vthompson/music-app/fix-1410639-edit-playlist-placeholder]

784. By Victor Thompson on 2015-01-16

update dialog text and button colors

785. By Victor Thompson on 2015-01-16

update pot file

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:785
http://91.189.93.70:8080/job/music-app-ci/1216/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/716
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/716/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/68

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1216/rebuild

review: Approve (continuous-integration)

[lp:~vthompson/music-app/fix-1410639-edit-playlist-placeholder]

786. By Victor Thompson on 2015-01-16

Use blank text field when changing playlist name

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:786
http://91.189.93.70:8080/job/music-app-ci/1217/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/717
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/717/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/69

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1217/rebuild

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM :)

review: Approve

=== modified file 'Style.qml'
--- Style.qml	2014-10-22 16:03:45 +0000
+++ Style.qml	2015-01-17 06:18:22 +0000
@@ -46,7 +46,8 @@
     }
 
     property QtObject dialog: QtObject {
-        property color confirmButtonColor: UbuntuColors.orange;
+        property color confirmButtonColor: UbuntuColors.green;
+        property color confirmRemoveButtonColor: UbuntuColors.red;
         property color cancelButtonColor: UbuntuColors.coolGrey;
         property color normalTextFieldColor: common.white
     }
 
=== modified file 'common/SongsPage.qml'
--- common/SongsPage.qml	2015-01-11 17:04:55 +0000
+++ common/SongsPage.qml	2015-01-17 06:18:22 +0000
@@ -495,16 +495,14 @@
         Dialog {
             id: dialogEditPlaylist
             // TRANSLATORS: this is a title of a dialog with a prompt to rename a playlist
-            title: i18n.tr("Change name")
-            text: i18n.tr("Enter the new name of the playlist.")
+            title: i18n.tr("Rename playlist")
 
-            property alias oldPlaylistName: playlistName.placeholderText
+            property string oldPlaylistName: ""
 
             TextField {
                 id: playlistName
                 inputMethodHints: Qt.ImhNoPredictiveText
-
-                onPlaceholderTextChanged: text = placeholderText
+                placeholderText: i18n.tr("Enter playlist name")
             }
             Label {
                 id: editplaylistoutput
@@ -519,12 +517,12 @@
                     editplaylistoutput.visible = true
 
                     if (playlistName.text.length > 0) { // make sure something is acually inputed
-                        console.debug("Debug: User changed name from "+playlistName.placeholderText+" to "+playlistName.text)
-
-                        if (Playlists.renamePlaylist(playlistName.placeholderText, playlistName.text) === true) {
-
-                            if (Library.recentContainsPlaylist(playlistName.placeholderText)) {
-                                Library.recentRenamePlaylist(playlistName.placeholderText, playlistName.text)
+                        console.debug("Debug: User changed name from "+oldPlaylistName+" to "+playlistName.text)
+
+                        if (Playlists.renamePlaylist(oldPlaylistName, playlistName.text) === true) {
+
+                            if (Library.recentContainsPlaylist(oldPlaylistName)) {
+                                Library.recentRenamePlaylist(oldPlaylistName, playlistName.text)
                             }
 
                             line2 = playlistName.text
@@ -556,14 +554,14 @@
         Dialog {
             id: dialogRemovePlaylist
             // TRANSLATORS: this is a title of a dialog with a prompt to delete a playlist
-            title: i18n.tr("Are you sure?")
-            text: i18n.tr("This will delete your playlist.")
+            title: i18n.tr("Permanently delete playlist?")
+            text: "("+i18n.tr("This cannot be undone")+")"
 
             property string oldPlaylistName
 
             Button {
                 text: i18n.tr("Remove")
-                color: styleMusic.dialog.confirmButtonColor
+                color: styleMusic.dialog.confirmRemoveButtonColor
                 onClicked: {
                     // removing playlist
                     Playlists.removePlaylist(dialogRemovePlaylist.oldPlaylistName)
 
=== modified file 'music-app.qml'
--- music-app.qml	2015-01-12 18:50:35 +0000
+++ music-app.qml	2015-01-17 06:18:22 +0000
@@ -836,12 +836,11 @@
         Dialog {
             id: dialogNewPlaylist
             objectName: "dialogNewPlaylist"
-            title: i18n.tr("New Playlist")
-            text: i18n.tr("Name your playlist.")
+            title: i18n.tr("New playlist")
             TextField {
                 id: playlistName
                 objectName: "playlistNameTextField"
-                placeholderText: i18n.tr("Name")
+                placeholderText: i18n.tr("Enter playlist name")
                 inputMethodHints: Qt.ImhNoPredictiveText
             }
             Label {
 
=== modified file 'po/com.ubuntu.music.pot'
--- po/com.ubuntu.music.pot	2015-01-11 20:22:15 +0000
+++ po/com.ubuntu.music.pot	2015-01-17 06:18:22 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: music-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-11 20:21+0000\n"
+"POT-Creation-Date: 2015-01-16 16:52-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -57,13 +57,13 @@
 msgstr ""
 
 #: ../MusicNowPlaying.qml:35 ../music-app.qml:656 ../music-app.qml:688
-#: ../music-app.qml:1048 ../music-app.qml:1060 ../music-app.qml:1088
-#: ../music-app.qml:1089
+#: ../music-app.qml:1047 ../music-app.qml:1059 ../music-app.qml:1087
+#: ../music-app.qml:1088
 msgid "Queue"
 msgstr ""
 
-#: ../MusicNowPlaying.qml:35 ../music-app.qml:656 ../music-app.qml:890
-#: ../music-app.qml:1047 ../music-app.qml:1088 ../music-app.qml:1089
+#: ../MusicNowPlaying.qml:35 ../music-app.qml:656 ../music-app.qml:889
+#: ../music-app.qml:1046 ../music-app.qml:1087 ../music-app.qml:1088
 msgid "Now playing"
 msgstr ""
 
@@ -131,7 +131,7 @@
 msgid "Add to queue"
 msgstr ""
 
-#: ../MusicaddtoPlaylist.qml:42 ../music-app.qml:1144
+#: ../MusicaddtoPlaylist.qml:42 ../music-app.qml:1143
 msgid "Select playlist"
 msgstr ""
 
@@ -158,7 +158,7 @@
 msgid "Add to Queue"
 msgstr ""
 
-#: ../common/ListItemActions/Remove.qml:27 ../common/SongsPage.qml:565
+#: ../common/ListItemActions/Remove.qml:27 ../common/SongsPage.qml:564
 msgid "Remove"
 msgstr ""
 
@@ -176,37 +176,37 @@
 
 #. TRANSLATORS: this is a title of a dialog with a prompt to rename a playlist
 #: ../common/SongsPage.qml:498
-msgid "Change name"
-msgstr ""
-
-#: ../common/SongsPage.qml:499
-msgid "Enter the new name of the playlist."
-msgstr ""
-
-#: ../common/SongsPage.qml:516
+msgid "Rename playlist"
+msgstr ""
+
+#: ../common/SongsPage.qml:505 ../music-app.qml:843
+msgid "Enter playlist name"
+msgstr ""
+
+#: ../common/SongsPage.qml:515
 msgid "Change"
 msgstr ""
 
-#: ../common/SongsPage.qml:537 ../music-app.qml:870
+#: ../common/SongsPage.qml:536 ../music-app.qml:869
 msgid "Playlist already exists"
 msgstr ""
 
-#: ../common/SongsPage.qml:541 ../music-app.qml:875
+#: ../common/SongsPage.qml:540 ../music-app.qml:874
 msgid "Please type in a name."
 msgstr ""
 
-#: ../common/SongsPage.qml:546 ../common/SongsPage.qml:584
-#: ../music-app.qml:481 ../music-app.qml:881
+#: ../common/SongsPage.qml:545 ../common/SongsPage.qml:583
+#: ../music-app.qml:481 ../music-app.qml:880
 msgid "Cancel"
 msgstr ""
 
 #. TRANSLATORS: this is a title of a dialog with a prompt to delete a playlist
+#: ../common/SongsPage.qml:558
+msgid "Permanently delete playlist?"
+msgstr ""
+
 #: ../common/SongsPage.qml:559
-msgid "Are you sure?"
-msgstr ""
-
-#: ../common/SongsPage.qml:560
-msgid "This will delete your playlist."
+msgid "This cannot be undone"
 msgstr ""
 
 #: ../music-app.qml:145
@@ -297,7 +297,7 @@
 msgid "No songs played today"
 msgstr ""
 
-#: ../music-app.qml:579 ../music-app.qml:1084
+#: ../music-app.qml:579 ../music-app.qml:1083
 #: com.ubuntu.music_music.desktop.in.in.h:1
 msgid "Music"
 msgstr ""
@@ -307,42 +307,34 @@
 msgstr ""
 
 #: ../music-app.qml:839
-msgid "New Playlist"
-msgstr ""
-
-#: ../music-app.qml:840
-msgid "Name your playlist."
-msgstr ""
-
-#: ../music-app.qml:844
-msgid "Name"
-msgstr ""
-
-#: ../music-app.qml:854
+msgid "New playlist"
+msgstr ""
+
+#: ../music-app.qml:853
 msgid "Create"
 msgstr ""
 
-#: ../music-app.qml:1118
+#: ../music-app.qml:1117
 msgid "No music found"
 msgstr ""
 
-#: ../music-app.qml:1129
+#: ../music-app.qml:1128
 msgid "Please import music"
 msgstr ""
 
-#: ../music-app.qml:1158
+#: ../music-app.qml:1157
 msgid "No playlists found"
 msgstr ""
 
-#: ../music-app.qml:1169
+#: ../music-app.qml:1168
 msgid "Click the + to create a playlist"
 msgstr ""
 
-#: ../music-app.qml:1198
+#: ../music-app.qml:1197
 msgid "No recent albums or playlists found"
 msgstr ""
 
-#: ../music-app.qml:1209
+#: ../music-app.qml:1208
 msgid "Play some music to see your favorites"
 msgstr ""