From b476ed9186e27f9293d115eeaf89c12986222517 Mon Sep 17 00:00:00 2001 From: KamFretoZ <14798312+kamfretoz@users.noreply.github.com> Date: Sat, 17 Jun 2023 20:23:47 +0700 Subject: [PATCH] Qt: Icon Refine --- pcsx2-qt/MainWindow.ui | 2 +- pcsx2-qt/Settings/SettingsDialog.cpp | 2 +- .../resources/icons/black/svg/chip-line.svg | 50 ++++++------- .../resources/icons/black/svg/disc-2-line.svg | 12 +-- .../icons/black/svg/emulation-line.svg | 34 ++++----- .../icons/black/svg/heart-monitor-line.svg | 28 +++---- .../icons/black/svg/interface-line.svg | 42 +++++------ .../icons/black/svg/memcard-line.svg | 10 +-- .../icons/black/svg/network-line.svg | 74 ------------------- .../resources/icons/black/svg/pause-line.svg | 61 +++++++++++++-- .../icons/black/svg/warning-line.svg | 44 +++++------ .../resources/icons/white/svg/chip-line.svg | 50 ++++++------- .../resources/icons/white/svg/disc-2-line.svg | 14 ++-- .../icons/white/svg/emulation-line.svg | 34 ++++----- .../icons/white/svg/heart-monitor-line.svg | 28 +++---- .../icons/white/svg/interface-line.svg | 44 +++++------ .../icons/white/svg/memcard-line.svg | 10 +-- .../icons/white/svg/network-line.svg | 74 ------------------- .../resources/icons/white/svg/pause-line.svg | 61 +++++++++++++-- .../icons/white/svg/warning-line.svg | 46 ++++++------ pcsx2-qt/resources/resources.qrc | 2 - pcsx2/ps2/BiosTools.cpp | 2 +- 22 files changed, 338 insertions(+), 386 deletions(-) delete mode 100644 pcsx2-qt/resources/icons/black/svg/network-line.svg delete mode 100644 pcsx2-qt/resources/icons/white/svg/network-line.svg diff --git a/pcsx2-qt/MainWindow.ui b/pcsx2-qt/MainWindow.ui index d83af9490a..df97b7f7db 100644 --- a/pcsx2-qt/MainWindow.ui +++ b/pcsx2-qt/MainWindow.ui @@ -606,7 +606,7 @@ - + .. diff --git a/pcsx2-qt/Settings/SettingsDialog.cpp b/pcsx2-qt/Settings/SettingsDialog.cpp index 200a09c30f..5fad6a947c 100644 --- a/pcsx2-qt/Settings/SettingsDialog.cpp +++ b/pcsx2-qt/Settings/SettingsDialog.cpp @@ -142,7 +142,7 @@ void SettingsDialog::setupUi(const GameList::Entry* game) tr("Memory Card Settings
Create and configure Memory Cards here.

Mouse over an option for " "additional information.")); - addWidget(m_dev9_settings = new DEV9SettingsWidget(this, m_ui.settingsContainer), tr("Network & HDD"), QStringLiteral("network-line"), + addWidget(m_dev9_settings = new DEV9SettingsWidget(this, m_ui.settingsContainer), tr("Network & HDD"), QStringLiteral("global-line"), tr("Network & HDD Settings
These options control the network connectivity and internal HDD storage of the " "console.

Mouse over an option for additional information.")); diff --git a/pcsx2-qt/resources/icons/black/svg/chip-line.svg b/pcsx2-qt/resources/icons/black/svg/chip-line.svg index f0238fdb13..4c201b1ab7 100644 --- a/pcsx2-qt/resources/icons/black/svg/chip-line.svg +++ b/pcsx2-qt/resources/icons/black/svg/chip-line.svg @@ -8,7 +8,7 @@ version="1.1" id="svg5" inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" - sodipodi:docname="bios-line-black.svg" + sodipodi:docname="chip-line-black.svg" inkscape:export-filename="bios_exported.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96" @@ -28,8 +28,8 @@ inkscape:document-units="px" showgrid="false" inkscape:zoom="1.3037281" - inkscape:cx="448.71319" - inkscape:cy="283.41799" + inkscape:cx="212.85113" + inkscape:cy="209.39949" inkscape:window-width="1920" inkscape:window-height="956" inkscape:window-x="0" @@ -43,42 +43,42 @@ inkscape:groupmode="layer" id="layer1"> + width="185.14862" + height="370.29724" + x="163.42569" + y="70.222984" /> + cx="225.70091" + cy="130.64618" + rx="9.3720798" + ry="8.4348745" /> diff --git a/pcsx2-qt/resources/icons/black/svg/disc-2-line.svg b/pcsx2-qt/resources/icons/black/svg/disc-2-line.svg index 907e7bde20..ab295631d5 100644 --- a/pcsx2-qt/resources/icons/black/svg/disc-2-line.svg +++ b/pcsx2-qt/resources/icons/black/svg/disc-2-line.svg @@ -25,8 +25,8 @@ inkscape:document-units="px" showgrid="false" inkscape:zoom="0.98470142" - inkscape:cx="283.33462" - inkscape:cy="230.01896" + inkscape:cx="258.45398" + inkscape:cy="230.52673" inkscape:window-width="1920" inkscape:window-height="956" inkscape:window-x="0" @@ -40,20 +40,20 @@ inkscape:groupmode="layer" id="layer1"> diff --git a/pcsx2-qt/resources/icons/black/svg/emulation-line.svg b/pcsx2-qt/resources/icons/black/svg/emulation-line.svg index dc9fa9be32..01a2f1fa73 100644 --- a/pcsx2-qt/resources/icons/black/svg/emulation-line.svg +++ b/pcsx2-qt/resources/icons/black/svg/emulation-line.svg @@ -27,9 +27,9 @@ inkscape:deskcolor="#505050" inkscape:document-units="px" showgrid="false" - inkscape:zoom="0.921875" - inkscape:cx="326.50847" - inkscape:cy="204.47458" + inkscape:zoom="2.6074562" + inkscape:cx="129.05298" + inkscape:cy="350.53321" inkscape:window-width="1920" inkscape:window-height="956" inkscape:window-x="0" @@ -43,26 +43,26 @@ inkscape:groupmode="layer" id="layer1"> + width="123.23695" + height="369.71085" + x="150.59978" + y="71.144577" /> + width="78.14328" + height="307.17816" + x="273.83676" + y="133.67725" /> diff --git a/pcsx2-qt/resources/icons/black/svg/heart-monitor-line.svg b/pcsx2-qt/resources/icons/black/svg/heart-monitor-line.svg index 898d9e8336..ad93bcc350 100644 --- a/pcsx2-qt/resources/icons/black/svg/heart-monitor-line.svg +++ b/pcsx2-qt/resources/icons/black/svg/heart-monitor-line.svg @@ -25,8 +25,8 @@ inkscape:document-units="px" showgrid="false" inkscape:zoom="1.3037281" - inkscape:cx="177.18418" - inkscape:cy="273.44659" + inkscape:cx="178.33473" + inkscape:cy="273.8301" inkscape:window-width="1920" inkscape:window-height="956" inkscape:window-x="0" @@ -40,22 +40,22 @@ inkscape:groupmode="layer" id="layer1"> + width="405.06821" + height="238.85057" + x="53.465897" + y="95.476929" /> + width="305.17819" + height="33.373306" + x="103.41091" + y="400.26862" /> diff --git a/pcsx2-qt/resources/icons/black/svg/interface-line.svg b/pcsx2-qt/resources/icons/black/svg/interface-line.svg index a6f4054177..3b5ac0497d 100644 --- a/pcsx2-qt/resources/icons/black/svg/interface-line.svg +++ b/pcsx2-qt/resources/icons/black/svg/interface-line.svg @@ -22,8 +22,8 @@ inkscape:deskcolor="#505050" showgrid="false" inkscape:zoom="22.627417" - inkscape:cx="13.523417" - inkscape:cy="16.285553" + inkscape:cx="13.678097" + inkscape:cy="16.30765" inkscape:window-width="1920" inkscape:window-height="956" inkscape:window-x="0" @@ -31,34 +31,34 @@ inkscape:window-maximized="1" inkscape:current-layer="svg8" /> + cx="15.312269" + cy="7.6872182" + r="1.9730911" /> + cx="9.0217237" + cy="12.922025" + r="1.9730911" /> + width="18.606068" + height="13.961316" + x="2.6969662" + y="3.311192" /> diff --git a/pcsx2-qt/resources/icons/black/svg/memcard-line.svg b/pcsx2-qt/resources/icons/black/svg/memcard-line.svg index 4fac08d00e..c03a671a69 100644 --- a/pcsx2-qt/resources/icons/black/svg/memcard-line.svg +++ b/pcsx2-qt/resources/icons/black/svg/memcard-line.svg @@ -23,7 +23,7 @@ inkscape:deskcolor="#505050" showgrid="false" inkscape:zoom="0.84555556" - inkscape:cx="353.02234" + inkscape:cx="91.655716" inkscape:cy="449.40867" inkscape:window-width="1920" inkscape:window-height="956" @@ -58,18 +58,18 @@ id="Forma_2" data-name="Forma 2" class="cls-1" - d="m 692.86363,348.56899 66.82392,106.20442 -66.82392,96.65714 z" - style="stroke:#000000;stroke-width:35.7398;stroke-dasharray:none;fill:#000000;fill-opacity:1" /> + d="m 686.37762,366.71676 60.76307,96.57181 -60.76307,87.89045 z" + style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:40;stroke-dasharray:none" /> diff --git a/pcsx2-qt/resources/icons/black/svg/network-line.svg b/pcsx2-qt/resources/icons/black/svg/network-line.svg deleted file mode 100644 index 060d6e2a72..0000000000 --- a/pcsx2-qt/resources/icons/black/svg/network-line.svg +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - diff --git a/pcsx2-qt/resources/icons/black/svg/pause-line.svg b/pcsx2-qt/resources/icons/black/svg/pause-line.svg index 81cffce1df..fdf5ecf1d5 100644 --- a/pcsx2-qt/resources/icons/black/svg/pause-line.svg +++ b/pcsx2-qt/resources/icons/black/svg/pause-line.svg @@ -1,6 +1,57 @@ - - - - - + + + + + + + + + + diff --git a/pcsx2-qt/resources/icons/black/svg/warning-line.svg b/pcsx2-qt/resources/icons/black/svg/warning-line.svg index a5503b42ef..3fd2f73844 100644 --- a/pcsx2-qt/resources/icons/black/svg/warning-line.svg +++ b/pcsx2-qt/resources/icons/black/svg/warning-line.svg @@ -25,8 +25,8 @@ inkscape:document-units="px" showgrid="false" inkscape:zoom="0.921875" - inkscape:cx="314.57627" - inkscape:cy="347.66102" + inkscape:cx="138.30508" + inkscape:cy="262.50847" inkscape:window-width="1920" inkscape:window-height="956" inkscape:window-x="0" @@ -41,7 +41,7 @@ id="layer1"> + inkscape:transform-center-y="-58.775808" + transform="matrix(0.9143354,0,0,0.9143354,21.93014,85.039564)" + inkscape:transform-center-x="8.0278851e-06" /> + style="fill:#ffffff;stroke:#ffffff;stroke-width:29.2588" + x="256.00006" + y="300.50647" /> + width="30.832071" + height="126.2189" + x="240.58397" + y="192.89055" /> + cx="256.00003" + cy="361.47668" + rx="17.34306" + ry="17.583942" /> diff --git a/pcsx2-qt/resources/icons/white/svg/chip-line.svg b/pcsx2-qt/resources/icons/white/svg/chip-line.svg index f5d410c12c..4ebdda722e 100644 --- a/pcsx2-qt/resources/icons/white/svg/chip-line.svg +++ b/pcsx2-qt/resources/icons/white/svg/chip-line.svg @@ -27,9 +27,9 @@ inkscape:deskcolor="#505050" inkscape:document-units="px" showgrid="false" - inkscape:zoom="2.6074562" - inkscape:cx="264.62573" - inkscape:cy="140.17493" + inkscape:zoom="1.3037281" + inkscape:cx="212.0841" + inkscape:cy="209.39949" inkscape:window-width="1920" inkscape:window-height="956" inkscape:window-x="0" @@ -43,42 +43,42 @@ inkscape:groupmode="layer" id="layer1"> + width="185.14862" + height="370.29724" + x="163.42569" + y="70.222984" /> + cx="225.70091" + cy="130.64618" + rx="9.3720798" + ry="8.4348745" /> diff --git a/pcsx2-qt/resources/icons/white/svg/disc-2-line.svg b/pcsx2-qt/resources/icons/white/svg/disc-2-line.svg index 3d7d5481c4..64b91368fd 100644 --- a/pcsx2-qt/resources/icons/white/svg/disc-2-line.svg +++ b/pcsx2-qt/resources/icons/white/svg/disc-2-line.svg @@ -2,7 +2,7 @@ diff --git a/pcsx2-qt/resources/icons/white/svg/emulation-line.svg b/pcsx2-qt/resources/icons/white/svg/emulation-line.svg index c5db9e98df..0a7e9d769a 100644 --- a/pcsx2-qt/resources/icons/white/svg/emulation-line.svg +++ b/pcsx2-qt/resources/icons/white/svg/emulation-line.svg @@ -27,9 +27,9 @@ inkscape:deskcolor="#505050" inkscape:document-units="px" showgrid="false" - inkscape:zoom="3.6875" - inkscape:cx="70.644068" - inkscape:cy="511.86441" + inkscape:zoom="2.6074562" + inkscape:cx="128.66947" + inkscape:cy="411.51219" inkscape:window-width="1920" inkscape:window-height="956" inkscape:window-x="0" @@ -43,26 +43,26 @@ inkscape:groupmode="layer" id="layer1"> + width="123.23695" + height="369.71085" + x="150.59978" + y="71.144577" /> + width="78.14328" + height="307.17816" + x="273.83676" + y="133.67725" /> diff --git a/pcsx2-qt/resources/icons/white/svg/heart-monitor-line.svg b/pcsx2-qt/resources/icons/white/svg/heart-monitor-line.svg index a3c2dad592..3d0f6b93b9 100644 --- a/pcsx2-qt/resources/icons/white/svg/heart-monitor-line.svg +++ b/pcsx2-qt/resources/icons/white/svg/heart-monitor-line.svg @@ -25,8 +25,8 @@ inkscape:document-units="px" showgrid="false" inkscape:zoom="1.3037281" - inkscape:cx="177.18418" - inkscape:cy="273.44659" + inkscape:cx="177.5677" + inkscape:cy="273.8301" inkscape:window-width="1920" inkscape:window-height="956" inkscape:window-x="0" @@ -40,22 +40,22 @@ inkscape:groupmode="layer" id="layer1"> + width="405.06821" + height="238.85057" + x="53.465897" + y="95.476929" /> + width="305.17819" + height="33.373306" + x="103.41091" + y="400.26862" /> diff --git a/pcsx2-qt/resources/icons/white/svg/interface-line.svg b/pcsx2-qt/resources/icons/white/svg/interface-line.svg index 44470dcebf..f2570ebdb2 100644 --- a/pcsx2-qt/resources/icons/white/svg/interface-line.svg +++ b/pcsx2-qt/resources/icons/white/svg/interface-line.svg @@ -3,7 +3,7 @@ viewBox="0 0 24 24" version="1.1" id="svg8" - sodipodi:docname="interface.svg" + sodipodi:docname="interface-line.svg" inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" @@ -22,8 +22,8 @@ inkscape:deskcolor="#505050" showgrid="false" inkscape:zoom="22.627417" - inkscape:cx="13.545514" - inkscape:cy="16.285553" + inkscape:cx="13.633903" + inkscape:cy="16.30765" inkscape:window-width="1920" inkscape:window-height="956" inkscape:window-x="0" @@ -31,34 +31,34 @@ inkscape:window-maximized="1" inkscape:current-layer="svg8" /> + cx="15.312269" + cy="7.6872182" + r="1.9730911" /> + cx="9.0217237" + cy="12.922025" + r="1.9730911" /> + width="18.606068" + height="13.961316" + x="2.6969662" + y="3.311192" /> diff --git a/pcsx2-qt/resources/icons/white/svg/memcard-line.svg b/pcsx2-qt/resources/icons/white/svg/memcard-line.svg index 9eafbc9df8..2430bc23ad 100644 --- a/pcsx2-qt/resources/icons/white/svg/memcard-line.svg +++ b/pcsx2-qt/resources/icons/white/svg/memcard-line.svg @@ -23,7 +23,7 @@ inkscape:deskcolor="#505050" showgrid="false" inkscape:zoom="0.84555556" - inkscape:cx="353.02234" + inkscape:cx="90.473061" inkscape:cy="449.40867" inkscape:window-width="1920" inkscape:window-height="956" @@ -58,18 +58,18 @@ id="Forma_2" data-name="Forma 2" class="cls-1" - d="m 692.86363,348.56899 66.82392,106.20442 -66.82392,96.65714 z" - style="stroke:#ffffff;stroke-width:35.7398;stroke-dasharray:none;fill:#ffffff;fill-opacity:1" /> + d="m 686.37762,366.71676 60.76307,96.57181 -60.76307,87.89045 z" + style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:40;stroke-dasharray:none" /> diff --git a/pcsx2-qt/resources/icons/white/svg/network-line.svg b/pcsx2-qt/resources/icons/white/svg/network-line.svg deleted file mode 100644 index 0f7d06356d..0000000000 --- a/pcsx2-qt/resources/icons/white/svg/network-line.svg +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - diff --git a/pcsx2-qt/resources/icons/white/svg/pause-line.svg b/pcsx2-qt/resources/icons/white/svg/pause-line.svg index 061528c6aa..0dc094ef19 100644 --- a/pcsx2-qt/resources/icons/white/svg/pause-line.svg +++ b/pcsx2-qt/resources/icons/white/svg/pause-line.svg @@ -1,6 +1,57 @@ - - - - - + + + + + + + + + + diff --git a/pcsx2-qt/resources/icons/white/svg/warning-line.svg b/pcsx2-qt/resources/icons/white/svg/warning-line.svg index e0bf27660f..425eaeffab 100644 --- a/pcsx2-qt/resources/icons/white/svg/warning-line.svg +++ b/pcsx2-qt/resources/icons/white/svg/warning-line.svg @@ -24,9 +24,9 @@ inkscape:deskcolor="#505050" inkscape:document-units="px" showgrid="false" - inkscape:zoom="0.4609375" - inkscape:cx="15.186441" - inkscape:cy="172.47458" + inkscape:zoom="0.921875" + inkscape:cx="137.22034" + inkscape:cy="262.50847" inkscape:window-width="1920" inkscape:window-height="956" inkscape:window-x="0" @@ -41,7 +41,7 @@ id="layer1"> + inkscape:transform-center-y="-58.775808" + transform="matrix(0.9143354,0,0,0.9143354,21.93014,85.039564)" + inkscape:transform-center-x="8.0278851e-06" /> + style="fill:#000000;stroke:#000000;stroke-width:29.2588" + x="256.00006" + y="300.50647" /> + width="30.832071" + height="126.2189" + x="240.58397" + y="192.89055" /> + cx="256.00003" + cy="361.47668" + rx="17.34306" + ry="17.583942" /> diff --git a/pcsx2-qt/resources/resources.qrc b/pcsx2-qt/resources/resources.qrc index 7d2d76d8fb..c02307a0dc 100644 --- a/pcsx2-qt/resources/resources.qrc +++ b/pcsx2-qt/resources/resources.qrc @@ -50,7 +50,6 @@ icons/black/svg/login-box-line.svg icons/black/svg/memcard-line.svg icons/black/svg/mouse-line.svg - icons/black/svg/network-line.svg icons/black/svg/pause-line.svg icons/black/svg/play-line.svg icons/black/svg/price-tag-3-line.svg @@ -123,7 +122,6 @@ icons/white/svg/login-box-line.svg icons/white/svg/memcard-line.svg icons/white/svg/mouse-line.svg - icons/white/svg/network-line.svg icons/white/svg/pause-line.svg icons/white/svg/play-line.svg icons/white/svg/price-tag-3-line.svg diff --git a/pcsx2/ps2/BiosTools.cpp b/pcsx2/ps2/BiosTools.cpp index 40dfeea420..979e7a90ea 100644 --- a/pcsx2/ps2/BiosTools.cpp +++ b/pcsx2/ps2/BiosTools.cpp @@ -164,7 +164,7 @@ static bool LoadBiosVersion(std::FILE* fp, u32& version, std::string& descriptio version = strtol(vermaj, (char**)NULL, 0) << 8; version |= strtol(vermin, (char**)NULL, 0); - Console.WriteLn("Bios Found: %s", description.c_str()); + Console.WriteLn("BIOS Found: %s", description.c_str()); } else return false;