Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace material icons with symbols #1194

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/gui/NavigableMessageDialog.qml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ NavigableDialog {
Image {
id: dialogImage
source: (standardButtons & Dialog.Yes) ?
"qrc:/res/baseline-help_outline-24px.svg" :
"qrc:/res/baseline-error_outline-24px.svg"
"qrc:/res/help_FILL0_wght700_GRAD200_opsz48.svg" :
"qrc:/res/error_FILL0_wght700_GRAD200_opsz48.svg"
sourceSize {
// The icon should be square so use the height as the width too
width: 50
Expand Down
10 changes: 5 additions & 5 deletions app/gui/PcView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ CenteredGridView {
Image {
id: pcIcon
anchors.horizontalCenter: parent.horizontalCenter
source: "qrc:/res/desktop_windows-48px.svg"
source: "qrc:/res/desktop_windows_FILL0_wght700_GRAD200_opsz48.svg"
sourceSize {
width: 200
height: 200
Expand All @@ -132,7 +132,7 @@ CenteredGridView {
anchors.verticalCenter: pcIcon.verticalCenter
anchors.verticalCenterOffset: !model.online ? -18 : -16
visible: !model.statusUnknown && (!model.online || !model.paired)
source: !model.online ? "qrc:/res/warning_FILL1_wght300_GRAD200_opsz24.svg" : "qrc:/res/baseline-lock-24px.svg"
source: !model.online ? "qrc:/res/warning_FILL1_wght700_GRAD200_opsz48.svg" : "qrc:/res/lock_FILL1_wght700_GRAD200_opsz48.svg"
sourceSize {
width: !model.online ? 75 : 70
height: !model.online ? 75 : 70
Expand Down Expand Up @@ -332,16 +332,16 @@ CenteredGridView {
{
if (result === -1) {
text = qsTr("The network test could not be performed because none of Moonlight's connection testing servers were reachable from this PC. Check your Internet connection or try again later.")
imageSrc = "qrc:/res/baseline-warning-24px.svg"
imageSrc = "qrc:/res/warning_FILL1_wght700_GRAD200_opsz48.svg"
}
else if (result === 0) {
text = qsTr("This network does not appear to be blocking Moonlight. If you still have trouble connecting, check your PC's firewall settings.") + "\n\n" + qsTr("If you are trying to stream over the Internet, install the Moonlight Internet Hosting Tool on your gaming PC and run the included Internet Streaming Tester to check your gaming PC's Internet connection.")
imageSrc = "qrc:/res/baseline-check_circle_outline-24px.svg"
imageSrc = "qrc:/res/check_circle_FILL0_wght700_GRAD200_opsz48.svg"
}
else {
text = qsTr("Your PC's current network connection seems to be blocking Moonlight. Streaming over the Internet may not work while connected to this network.") + "\n\n" + qsTr("The following network ports were blocked:") + "\n"
text += blockedPorts
imageSrc = "qrc:/res/baseline-error_outline-24px.svg"
imageSrc = "qrc:/res/error_FILL0_wght700_GRAD200_opsz48.svg"
}

// Stop showing the spinner and show the image instead
Expand Down
12 changes: 6 additions & 6 deletions app/gui/main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ ApplicationWindow {
// Only make the button visible if the user has navigated somewhere.
visible: stackView.depth > 1

iconSource: "qrc:/res/arrow_left.svg"
iconSource: "qrc:/res/arrow_back_FILL1_wght700_GRAD200_opsz48.svg"

onClicked: goBack()

Expand Down Expand Up @@ -302,7 +302,7 @@ ApplicationWindow {
id: addPcButton
visible: qmltypeof(stackView.currentItem, "PcView")

iconSource: "qrc:/res/ic_add_to_queue_white_48px.svg"
iconSource: "qrc:/res/add_to_queue_FILL0_wght700_GRAD200_opsz48.svg"

ToolTip.delay: 1000
ToolTip.timeout: 3000
Expand All @@ -329,7 +329,7 @@ ApplicationWindow {

id: updateButton

iconSource: "qrc:/res/update.svg"
iconSource: "qrc:/res/update_FILL1_wght700_GRAD200_opsz48.svg"

ToolTip.delay: 1000
ToolTip.timeout: 3000
Expand Down Expand Up @@ -366,7 +366,7 @@ ApplicationWindow {
id: helpButton
visible: SystemProperties.hasBrowser

iconSource: "qrc:/res/question_mark.svg"
iconSource: "qrc:/res/help_FILL1_wght700_GRAD200_opsz48.svg"

ToolTip.delay: 1000
ToolTip.timeout: 3000
Expand Down Expand Up @@ -396,7 +396,7 @@ ApplicationWindow {
ToolTip.visible: hovered
ToolTip.text: qsTr("Gamepad Mapper")

iconSource: "qrc:/res/ic_videogame_asset_white_48px.svg"
iconSource: "qrc:/res/videogame_asset_FILL0_wght700_GRAD200_opsz48.svg"

onClicked: navigateTo("qrc:/gui/GamepadMapper.qml", "GamepadMapper")

Expand All @@ -408,7 +408,7 @@ ApplicationWindow {
NavigableToolButton {
id: settingsButton

iconSource: "qrc:/res/settings.svg"
iconSource: "qrc:/res/settings_FILL1_wght700_GRAD200_opsz48.svg"

onClicked: navigateTo("qrc:/gui/SettingsView.qml", "SettingsView")

Expand Down
1 change: 1 addition & 0 deletions app/res/add_to_queue_FILL0_wght700_GRAD200_opsz48.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/res/arrow_back_FILL1_wght700_GRAD200_opsz48.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 0 additions & 4 deletions app/res/arrow_left.svg

This file was deleted.

1 change: 0 additions & 1 deletion app/res/baseline-check_circle_outline-24px.svg

This file was deleted.

1 change: 0 additions & 1 deletion app/res/baseline-error_outline-24px.svg

This file was deleted.

1 change: 0 additions & 1 deletion app/res/baseline-help_outline-24px.svg

This file was deleted.

4 changes: 0 additions & 4 deletions app/res/baseline-lock-24px.svg

This file was deleted.

4 changes: 0 additions & 4 deletions app/res/baseline-warning-24px.svg

This file was deleted.

1 change: 1 addition & 0 deletions app/res/check_circle_FILL0_wght700_GRAD200_opsz48.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 0 additions & 4 deletions app/res/desktop_windows-48px.svg

This file was deleted.

1 change: 1 addition & 0 deletions app/res/desktop_windows_FILL0_wght700_GRAD200_opsz48.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/res/error_FILL0_wght700_GRAD200_opsz48.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/res/help_FILL0_wght700_GRAD200_opsz48.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/res/help_FILL1_wght700_GRAD200_opsz48.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 0 additions & 4 deletions app/res/ic_add_to_queue_white_48px.svg

This file was deleted.

4 changes: 0 additions & 4 deletions app/res/ic_videogame_asset_white_48px.svg

This file was deleted.

1 change: 1 addition & 0 deletions app/res/lock_FILL1_wght700_GRAD200_opsz48.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/res/play_arrow_FILL1_wght700_GRAD200_opsz48.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 0 additions & 5 deletions app/res/question_mark.svg

This file was deleted.

4 changes: 0 additions & 4 deletions app/res/settings.svg

This file was deleted.

1 change: 1 addition & 0 deletions app/res/settings_FILL1_wght700_GRAD200_opsz48.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/res/stop_FILL1_wght700_GRAD200_opsz48.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions app/res/update.svg

This file was deleted.

Loading