From d308c6005fb67936972c06b6126f121d792f489b Mon Sep 17 00:00:00 2001 From: ykeara Date: Sat, 12 Jan 2019 14:44:43 -0600 Subject: [PATCH] resized svg back to original hackish fix --- src/res/qml/UtilitiesPage.qml | 66 ++++++++++++------- src/res/qml/media_keys/outline-pause-24px.svg | 1 - .../media_keys/outline-play_arrow-24px.svg | 1 - .../qml/media_keys/outline-skip_next-24px.svg | 1 - .../media_keys/outline-skip_previous-24px.svg | 1 - src/res/qml/media_keys/outline-stop-24px.svg | 1 - .../media_keys/outline_pause_white_24dp.svg | 1 + .../outline_play_arrow_white_24dp.svg | 1 + .../outline_skip_next_white_24dp.svg | 1 + .../outline_skip_previous_white_24dp.svg | 1 + .../media_keys/outline_stop_white_24dp.svg | 1 + 11 files changed, 48 insertions(+), 28 deletions(-) delete mode 100644 src/res/qml/media_keys/outline-pause-24px.svg delete mode 100644 src/res/qml/media_keys/outline-play_arrow-24px.svg delete mode 100644 src/res/qml/media_keys/outline-skip_next-24px.svg delete mode 100644 src/res/qml/media_keys/outline-skip_previous-24px.svg delete mode 100644 src/res/qml/media_keys/outline-stop-24px.svg create mode 100644 src/res/qml/media_keys/outline_pause_white_24dp.svg create mode 100644 src/res/qml/media_keys/outline_play_arrow_white_24dp.svg create mode 100644 src/res/qml/media_keys/outline_skip_next_white_24dp.svg create mode 100644 src/res/qml/media_keys/outline_skip_previous_white_24dp.svg create mode 100644 src/res/qml/media_keys/outline_stop_white_24dp.svg diff --git a/src/res/qml/UtilitiesPage.qml b/src/res/qml/UtilitiesPage.qml index d1ab100..f085376 100644 --- a/src/res/qml/UtilitiesPage.qml +++ b/src/res/qml/UtilitiesPage.qml @@ -349,12 +349,17 @@ MyStackViewPage { property bool playButtonIsPlay: false MyPushButton2 { id: previousSongButton - Layout.preferredHeight: 50 - Layout.preferredWidth: 50 + Layout.preferredHeight: 48 + Layout.preferredWidth: 48 contentItem: Image { - source: "media_keys/outline_skip_previous_white_24dp.png" - sourceSize.width: 50 - sourceSize.height: 50 + source: "media_keys/outline_skip_previous_white_24dp.svg" + sourceSize: Qt.size( imgSP.sourceSize.width*2, imgSP.sourceSize.height*2 ) + Image{ + id: imgSP + source: parent.source + width:0 + height:0 + } anchors.fill: parent } onClicked: { @@ -370,18 +375,23 @@ MyStackViewPage { } MyPushButton2 { id: stopSongButton - Layout.preferredHeight: 50 - Layout.preferredWidth: 50 + Layout.preferredHeight: 48 + Layout.preferredWidth: 48 contentItem: Image { - source: "media_keys/outline_stop_white_24dp.png" - sourceSize.width: 50 - sourceSize.height: 50 + source: "media_keys/outline_stop_white_24dp.svg" + sourceSize: Qt.size( imgS.sourceSize.width*2, imgS.sourceSize.height*2 ) + Image{ + id: imgS + source: parent.source + width:0 + height:0 + } anchors.fill: parent } onClicked: { UtilitiesTabController.sendMediaStopSong() - playPauseSongButton.contentItem.source = "media_keys/outline_play_arrow_white_24dp.png" + playPauseSongButton.contentItem.source = "media_keys/outline_play_arrow_white_24dp.svg" parent.playButtonIsPlay = true } @@ -394,23 +404,28 @@ MyStackViewPage { } MyPushButton2 { id: playPauseSongButton - Layout.preferredHeight: 50 - Layout.preferredWidth: 50 + Layout.preferredHeight: 48 + Layout.preferredWidth: 48 contentItem: Image { // Assume that music is playing when people enter VR. - source: "media_keys/outline_pause_white_24dp.png" - sourceSize.width: 50 - sourceSize.height: 50 + source: "media_keys/outline_pause_white_24dp.svg" + sourceSize: Qt.size( imgP.sourceSize.width*2, imgP.sourceSize.height*2 ) + Image{ + id: imgP + source: parent.source + width:0 + height:0 + } anchors.fill: parent } onClicked: { UtilitiesTabController.sendMediaPausePlay() if (parent.playButtonIsPlay) { - playPauseSongButton.contentItem.source = "media_keys/outline_pause_white_24dp.png" + playPauseSongButton.contentItem.source = "media_keys/outline_pause_white_24dp.svg" parent.playButtonIsPlay = false } else { - playPauseSongButton.contentItem.source = "media_keys/outline_play_arrow_white_24dp.png" + playPauseSongButton.contentItem.source = "media_keys/outline_play_arrow_white_24dp.svg" parent.playButtonIsPlay = true } @@ -425,13 +440,18 @@ MyStackViewPage { } MyPushButton2 { id: nextSongButton - Layout.preferredHeight: 50 - Layout.preferredWidth: 50 + Layout.preferredHeight: 48 + Layout.preferredWidth: 48 contentItem: Image { - source: "media_keys/outline_skip_next_white_24dp.png" - sourceSize.width: 50 - sourceSize.height: 50 + source: "media_keys/outline_skip_next_white_24dp.svg" + sourceSize: Qt.size( imgSN.sourceSize.width*2, imgSN.sourceSize.height*2 ) + Image{ + id: imgSN + source: parent.source + width:0 + height:0 + } anchors.fill: parent } onClicked: { diff --git a/src/res/qml/media_keys/outline-pause-24px.svg b/src/res/qml/media_keys/outline-pause-24px.svg deleted file mode 100644 index 3c8ab22..0000000 --- a/src/res/qml/media_keys/outline-pause-24px.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/res/qml/media_keys/outline-play_arrow-24px.svg b/src/res/qml/media_keys/outline-play_arrow-24px.svg deleted file mode 100644 index ff2dcd6..0000000 --- a/src/res/qml/media_keys/outline-play_arrow-24px.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/res/qml/media_keys/outline-skip_next-24px.svg b/src/res/qml/media_keys/outline-skip_next-24px.svg deleted file mode 100644 index 93bd3ba..0000000 --- a/src/res/qml/media_keys/outline-skip_next-24px.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/res/qml/media_keys/outline-skip_previous-24px.svg b/src/res/qml/media_keys/outline-skip_previous-24px.svg deleted file mode 100644 index 17c24b2..0000000 --- a/src/res/qml/media_keys/outline-skip_previous-24px.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/res/qml/media_keys/outline-stop-24px.svg b/src/res/qml/media_keys/outline-stop-24px.svg deleted file mode 100644 index dd0a6c1..0000000 --- a/src/res/qml/media_keys/outline-stop-24px.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/res/qml/media_keys/outline_pause_white_24dp.svg b/src/res/qml/media_keys/outline_pause_white_24dp.svg new file mode 100644 index 0000000..f59d7c9 --- /dev/null +++ b/src/res/qml/media_keys/outline_pause_white_24dp.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/res/qml/media_keys/outline_play_arrow_white_24dp.svg b/src/res/qml/media_keys/outline_play_arrow_white_24dp.svg new file mode 100644 index 0000000..2b248b9 --- /dev/null +++ b/src/res/qml/media_keys/outline_play_arrow_white_24dp.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/res/qml/media_keys/outline_skip_next_white_24dp.svg b/src/res/qml/media_keys/outline_skip_next_white_24dp.svg new file mode 100644 index 0000000..23fa6ea --- /dev/null +++ b/src/res/qml/media_keys/outline_skip_next_white_24dp.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/res/qml/media_keys/outline_skip_previous_white_24dp.svg b/src/res/qml/media_keys/outline_skip_previous_white_24dp.svg new file mode 100644 index 0000000..1d08e59 --- /dev/null +++ b/src/res/qml/media_keys/outline_skip_previous_white_24dp.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/res/qml/media_keys/outline_stop_white_24dp.svg b/src/res/qml/media_keys/outline_stop_white_24dp.svg new file mode 100644 index 0000000..2123cee --- /dev/null +++ b/src/res/qml/media_keys/outline_stop_white_24dp.svg @@ -0,0 +1 @@ + \ No newline at end of file