From 36d4f2602f750aa09cbaf1131b92381c637b42b0 Mon Sep 17 00:00:00 2001 From: Florin9doi Date: Mon, 29 Jul 2024 23:30:18 +0300 Subject: [PATCH] Pad: Add Jogcon and Negcon images from @kamfretoz / MBee --- pcsx2-qt/Settings/ControllerBindingWidget.cpp | 4 +- .../resources/icons/black/svg/jogcon-line.svg | 20 ++ .../resources/icons/black/svg/negcon-line.svg | 30 +++ .../resources/icons/white/svg/jogcon-line.svg | 23 ++ .../resources/icons/white/svg/negcon-line.svg | 1 + pcsx2-qt/resources/images/Jogcon.svg | 243 ++++++++++++++++++ pcsx2-qt/resources/images/Negcon.svg | 112 ++++++++ pcsx2-qt/resources/resources.qrc | 4 + 8 files changed, 435 insertions(+), 2 deletions(-) create mode 100644 pcsx2-qt/resources/icons/black/svg/jogcon-line.svg create mode 100644 pcsx2-qt/resources/icons/black/svg/negcon-line.svg create mode 100644 pcsx2-qt/resources/icons/white/svg/jogcon-line.svg create mode 100644 pcsx2-qt/resources/icons/white/svg/negcon-line.svg create mode 100644 pcsx2-qt/resources/images/Jogcon.svg create mode 100644 pcsx2-qt/resources/images/Negcon.svg diff --git a/pcsx2-qt/Settings/ControllerBindingWidget.cpp b/pcsx2-qt/Settings/ControllerBindingWidget.cpp index 0f4cb17024..fc209d13fd 100644 --- a/pcsx2-qt/Settings/ControllerBindingWidget.cpp +++ b/pcsx2-qt/Settings/ControllerBindingWidget.cpp @@ -928,7 +928,7 @@ ControllerBindingWidget_Jogcon::~ControllerBindingWidget_Jogcon() QIcon ControllerBindingWidget_Jogcon::getIcon() const { - return QIcon::fromTheme("controller-line"); + return QIcon::fromTheme("jogcon-line"); } ControllerBindingWidget_Base* ControllerBindingWidget_Jogcon::createInstance(ControllerBindingWidget* parent) @@ -949,7 +949,7 @@ ControllerBindingWidget_Negcon::~ControllerBindingWidget_Negcon() QIcon ControllerBindingWidget_Negcon::getIcon() const { - return QIcon::fromTheme("controller-line"); + return QIcon::fromTheme("negcon-line"); } ControllerBindingWidget_Base* ControllerBindingWidget_Negcon::createInstance(ControllerBindingWidget* parent) diff --git a/pcsx2-qt/resources/icons/black/svg/jogcon-line.svg b/pcsx2-qt/resources/icons/black/svg/jogcon-line.svg new file mode 100644 index 0000000000..e2713d43f8 --- /dev/null +++ b/pcsx2-qt/resources/icons/black/svg/jogcon-line.svg @@ -0,0 +1,20 @@ + + + + + diff --git a/pcsx2-qt/resources/icons/black/svg/negcon-line.svg b/pcsx2-qt/resources/icons/black/svg/negcon-line.svg new file mode 100644 index 0000000000..2d3d907b22 --- /dev/null +++ b/pcsx2-qt/resources/icons/black/svg/negcon-line.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/pcsx2-qt/resources/icons/white/svg/jogcon-line.svg b/pcsx2-qt/resources/icons/white/svg/jogcon-line.svg new file mode 100644 index 0000000000..60fcb49105 --- /dev/null +++ b/pcsx2-qt/resources/icons/white/svg/jogcon-line.svg @@ -0,0 +1,23 @@ + + + + + + diff --git a/pcsx2-qt/resources/icons/white/svg/negcon-line.svg b/pcsx2-qt/resources/icons/white/svg/negcon-line.svg new file mode 100644 index 0000000000..cc4ba5cd01 --- /dev/null +++ b/pcsx2-qt/resources/icons/white/svg/negcon-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/pcsx2-qt/resources/images/Jogcon.svg b/pcsx2-qt/resources/images/Jogcon.svg new file mode 100644 index 0000000000..765a87ea9a --- /dev/null +++ b/pcsx2-qt/resources/images/Jogcon.svg @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pcsx2-qt/resources/images/Negcon.svg b/pcsx2-qt/resources/images/Negcon.svg new file mode 100644 index 0000000000..bfff3272dc --- /dev/null +++ b/pcsx2-qt/resources/images/Negcon.svg @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A + + + + B + + + + II + + + + I + + + + + + + + + + + + + + + + + + + + + + diff --git a/pcsx2-qt/resources/resources.qrc b/pcsx2-qt/resources/resources.qrc index 5bf25c58c6..c77881678c 100644 --- a/pcsx2-qt/resources/resources.qrc +++ b/pcsx2-qt/resources/resources.qrc @@ -56,6 +56,7 @@ icons/black/svg/heart-circle-line.svg icons/black/svg/image-fill.svg icons/black/svg/interface-line.svg + icons/black/svg/jogcon-line.svg icons/black/svg/keyboard-2-line.svg icons/black/svg/keyboard-line.svg icons/black/svg/keyboardmania-line.svg @@ -67,6 +68,7 @@ icons/black/svg/minus-line.svg icons/black/svg/mouse-line.svg icons/black/svg/msd-line.svg + icons/black/svg/negcon-line.svg icons/black/svg/pause-line.svg icons/black/svg/pencil-line.svg icons/black/svg/pin-filled.svg @@ -156,6 +158,7 @@ icons/white/svg/heart-circle-line.svg icons/white/svg/image-fill.svg icons/white/svg/interface-line.svg + icons/white/svg/jogcon-line.svg icons/white/svg/keyboard-2-line.svg icons/white/svg/keyboard-line.svg icons/white/svg/keyboardmania-line.svg @@ -167,6 +170,7 @@ icons/white/svg/minus-line.svg icons/white/svg/mouse-line.svg icons/white/svg/msd-line.svg + icons/white/svg/negcon-line.svg icons/white/svg/pause-line.svg icons/white/svg/pencil-line.svg icons/white/svg/pin-filled.svg