From 3468afc5ec16716f016f80052e27dbf0ea707114 Mon Sep 17 00:00:00 2001 From: kamfretoz <14798312+kamfretoz@users.noreply.github.com> Date: Sun, 15 Oct 2023 16:05:26 +0700 Subject: [PATCH] Qt: Port over some custom icon from PCSX2 --- src/duckstation-qt/controllerbindingwidget.ui | 4 +- .../controllerbindingwidgets.cpp | 6 +- src/duckstation-qt/gamesummarywidget.cpp | 4 +- src/duckstation-qt/mainwindow.ui | 18 ++-- src/duckstation-qt/qtutils.cpp | 2 +- .../resources/icons/black/svg/cheats-line.svg | 1 + .../resources/icons/black/svg/chip-2-line.svg | 98 +++++++++++++++++++ .../resources/icons/black/svg/chip-line.svg | 84 ++++++++++++++++ .../icons/black/svg/controller-line.svg | 1 + .../black/svg/controller-strike-line.svg | 1 + .../icons/black/svg/disc-eject-line.svg | 74 ++++++++++++++ .../resources/icons/black/svg/disc-line.svg | 7 +- .../icons/black/svg/gamepad-line.svg | 6 -- .../resources/icons/black/svg/guncon-line.svg | 1 + .../icons/black/svg/hard-drive-2-line.svg | 6 -- .../icons/black/svg/keyboard-line.svg | 7 +- .../icons/black/svg/memcard-line.svg | 1 + .../icons/black/svg/sd-card-line.svg | 6 -- .../resources/icons/white/svg/cheats-line.svg | 1 + .../resources/icons/white/svg/chip-2-line.svg | 98 +++++++++++++++++++ .../resources/icons/white/svg/chip-line.svg | 84 ++++++++++++++++ .../icons/white/svg/controller-line.svg | 1 + .../white/svg/controller-strike-line.svg | 1 + .../icons/white/svg/disc-eject-line.svg | 74 ++++++++++++++ .../resources/icons/white/svg/disc-line.svg | 7 +- .../resources/icons/white/svg/dvd-line.svg | 6 -- .../resources/icons/white/svg/fire-line.svg | 1 - .../icons/white/svg/gamepad-line.svg | 6 -- .../resources/icons/white/svg/guncon-line.svg | 1 + .../icons/white/svg/hard-drive-2-line.svg | 6 -- .../icons/white/svg/keyboard-line.svg | 7 +- .../icons/white/svg/memcard-line.svg | 1 + .../icons/white/svg/sd-card-line.svg | 6 -- src/duckstation-qt/resources/resources.qrc | 34 +++---- src/duckstation-qt/settingsdialog.cpp | 6 +- src/duckstation-qt/setupwizarddialog.ui | 4 +- 36 files changed, 562 insertions(+), 109 deletions(-) create mode 100644 src/duckstation-qt/resources/icons/black/svg/cheats-line.svg create mode 100644 src/duckstation-qt/resources/icons/black/svg/chip-2-line.svg create mode 100644 src/duckstation-qt/resources/icons/black/svg/chip-line.svg create mode 100644 src/duckstation-qt/resources/icons/black/svg/controller-line.svg create mode 100644 src/duckstation-qt/resources/icons/black/svg/controller-strike-line.svg create mode 100644 src/duckstation-qt/resources/icons/black/svg/disc-eject-line.svg delete mode 100644 src/duckstation-qt/resources/icons/black/svg/gamepad-line.svg create mode 100644 src/duckstation-qt/resources/icons/black/svg/guncon-line.svg delete mode 100644 src/duckstation-qt/resources/icons/black/svg/hard-drive-2-line.svg create mode 100644 src/duckstation-qt/resources/icons/black/svg/memcard-line.svg delete mode 100644 src/duckstation-qt/resources/icons/black/svg/sd-card-line.svg create mode 100644 src/duckstation-qt/resources/icons/white/svg/cheats-line.svg create mode 100644 src/duckstation-qt/resources/icons/white/svg/chip-2-line.svg create mode 100644 src/duckstation-qt/resources/icons/white/svg/chip-line.svg create mode 100644 src/duckstation-qt/resources/icons/white/svg/controller-line.svg create mode 100644 src/duckstation-qt/resources/icons/white/svg/controller-strike-line.svg create mode 100644 src/duckstation-qt/resources/icons/white/svg/disc-eject-line.svg delete mode 100644 src/duckstation-qt/resources/icons/white/svg/dvd-line.svg delete mode 100644 src/duckstation-qt/resources/icons/white/svg/fire-line.svg delete mode 100644 src/duckstation-qt/resources/icons/white/svg/gamepad-line.svg create mode 100644 src/duckstation-qt/resources/icons/white/svg/guncon-line.svg delete mode 100644 src/duckstation-qt/resources/icons/white/svg/hard-drive-2-line.svg create mode 100644 src/duckstation-qt/resources/icons/white/svg/memcard-line.svg delete mode 100644 src/duckstation-qt/resources/icons/white/svg/sd-card-line.svg diff --git a/src/duckstation-qt/controllerbindingwidget.ui b/src/duckstation-qt/controllerbindingwidget.ui index 60f76d6f7..980bd69af 100644 --- a/src/duckstation-qt/controllerbindingwidget.ui +++ b/src/duckstation-qt/controllerbindingwidget.ui @@ -46,7 +46,7 @@ true - + .. @@ -120,7 +120,7 @@ Automatic Mapping - + .. diff --git a/src/duckstation-qt/controllerbindingwidgets.cpp b/src/duckstation-qt/controllerbindingwidgets.cpp index a325c7503..5ce113065 100644 --- a/src/duckstation-qt/controllerbindingwidgets.cpp +++ b/src/duckstation-qt/controllerbindingwidgets.cpp @@ -733,7 +733,7 @@ ControllerBindingWidget_Base::~ControllerBindingWidget_Base() QIcon ControllerBindingWidget_Base::getIcon() const { - return QIcon::fromTheme("BIOSSettings"); + return QIcon::fromTheme("controller-strike-line"); } void ControllerBindingWidget_Base::initBindingWidgets() @@ -804,7 +804,7 @@ ControllerBindingWidget_DigitalController::~ControllerBindingWidget_DigitalContr QIcon ControllerBindingWidget_DigitalController::getIcon() const { - return QIcon::fromTheme(QStringLiteral("gamepad-line")); + return QIcon::fromTheme(QStringLiteral("controller-line")); } ControllerBindingWidget_Base* ControllerBindingWidget_DigitalController::createInstance(ControllerBindingWidget* parent) @@ -913,7 +913,7 @@ ControllerBindingWidget_GunCon::~ControllerBindingWidget_GunCon() QIcon ControllerBindingWidget_GunCon::getIcon() const { - return QIcon::fromTheme(QStringLiteral("fire-line")); + return QIcon::fromTheme(QStringLiteral("guncon-line")); } ControllerBindingWidget_Base* ControllerBindingWidget_GunCon::createInstance(ControllerBindingWidget* parent) diff --git a/src/duckstation-qt/gamesummarywidget.cpp b/src/duckstation-qt/gamesummarywidget.cpp index 3f874a962..e062279c7 100644 --- a/src/duckstation-qt/gamesummarywidget.cpp +++ b/src/duckstation-qt/gamesummarywidget.cpp @@ -137,7 +137,7 @@ void GameSummaryWidget::populateUi(const std::string& path, const std::string& s m_ui.entryType->setCurrentIndex(static_cast(gentry->type)); } - m_ui.inputProfile->addItem(QIcon::fromTheme(QStringLiteral("gamepad-line")), tr("Use Global Settings")); + m_ui.inputProfile->addItem(QIcon::fromTheme(QStringLiteral("controller-line")), tr("Use Global Settings")); for (const std::string& name : InputManager::GetInputProfileNames()) m_ui.inputProfile->addItem(QString::fromStdString(name)); @@ -181,7 +181,7 @@ void GameSummaryWidget::populateTracksInfo() QTableWidgetItem* num = new QTableWidgetItem(tr("Track %1").arg(track)); num->setIcon(QIcon::fromTheme((mode == CDImage::TrackMode::Audio) ? QStringLiteral("file-music-line") : - QStringLiteral("dvd-line"))); + QStringLiteral("disc-line"))); m_ui.tracks->insertRow(row); m_ui.tracks->setItem(row, 0, num); m_ui.tracks->setItem(row, 1, new QTableWidgetItem(track_mode_strings[static_cast(mode)])); diff --git a/src/duckstation-qt/mainwindow.ui b/src/duckstation-qt/mainwindow.ui index 6d9206b00..f95ad67eb 100644 --- a/src/duckstation-qt/mainwindow.ui +++ b/src/duckstation-qt/mainwindow.ui @@ -39,7 +39,7 @@ Change Disc - + .. @@ -54,7 +54,7 @@ Cheats - + .. @@ -302,7 +302,7 @@ - + .. @@ -386,7 +386,7 @@ - + .. @@ -395,7 +395,7 @@ - + .. @@ -413,7 +413,7 @@ - + .. @@ -526,7 +526,7 @@ - + .. @@ -535,7 +535,7 @@ - + .. @@ -789,7 +789,7 @@ - + .. diff --git a/src/duckstation-qt/qtutils.cpp b/src/duckstation-qt/qtutils.cpp index 1d0766a93..768495084 100644 --- a/src/duckstation-qt/qtutils.cpp +++ b/src/duckstation-qt/qtutils.cpp @@ -861,7 +861,7 @@ QIcon GetIconForEntryType(GameList::EntryType type) switch (type) { case GameList::EntryType::Disc: - return QIcon::fromTheme(QStringLiteral("dvd-line")); + return QIcon::fromTheme(QStringLiteral("disc-line")); case GameList::EntryType::Playlist: return QIcon::fromTheme(QStringLiteral("play-list-2-line")); case GameList::EntryType::PSF: diff --git a/src/duckstation-qt/resources/icons/black/svg/cheats-line.svg b/src/duckstation-qt/resources/icons/black/svg/cheats-line.svg new file mode 100644 index 000000000..07a99bc0f --- /dev/null +++ b/src/duckstation-qt/resources/icons/black/svg/cheats-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/duckstation-qt/resources/icons/black/svg/chip-2-line.svg b/src/duckstation-qt/resources/icons/black/svg/chip-2-line.svg new file mode 100644 index 000000000..bd9f5fd22 --- /dev/null +++ b/src/duckstation-qt/resources/icons/black/svg/chip-2-line.svg @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/duckstation-qt/resources/icons/black/svg/chip-line.svg b/src/duckstation-qt/resources/icons/black/svg/chip-line.svg new file mode 100644 index 000000000..4c201b1ab --- /dev/null +++ b/src/duckstation-qt/resources/icons/black/svg/chip-line.svg @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + diff --git a/src/duckstation-qt/resources/icons/black/svg/controller-line.svg b/src/duckstation-qt/resources/icons/black/svg/controller-line.svg new file mode 100644 index 000000000..809c2070f --- /dev/null +++ b/src/duckstation-qt/resources/icons/black/svg/controller-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/duckstation-qt/resources/icons/black/svg/controller-strike-line.svg b/src/duckstation-qt/resources/icons/black/svg/controller-strike-line.svg new file mode 100644 index 000000000..b992aaf1f --- /dev/null +++ b/src/duckstation-qt/resources/icons/black/svg/controller-strike-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/duckstation-qt/resources/icons/black/svg/disc-eject-line.svg b/src/duckstation-qt/resources/icons/black/svg/disc-eject-line.svg new file mode 100644 index 000000000..742e2d447 --- /dev/null +++ b/src/duckstation-qt/resources/icons/black/svg/disc-eject-line.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + diff --git a/src/duckstation-qt/resources/icons/black/svg/disc-line.svg b/src/duckstation-qt/resources/icons/black/svg/disc-line.svg index ce505c56c..f2e4e059d 100644 --- a/src/duckstation-qt/resources/icons/black/svg/disc-line.svg +++ b/src/duckstation-qt/resources/icons/black/svg/disc-line.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/src/duckstation-qt/resources/icons/black/svg/gamepad-line.svg b/src/duckstation-qt/resources/icons/black/svg/gamepad-line.svg deleted file mode 100644 index 3d4649f4c..000000000 --- a/src/duckstation-qt/resources/icons/black/svg/gamepad-line.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/duckstation-qt/resources/icons/black/svg/guncon-line.svg b/src/duckstation-qt/resources/icons/black/svg/guncon-line.svg new file mode 100644 index 000000000..ffc45edf3 --- /dev/null +++ b/src/duckstation-qt/resources/icons/black/svg/guncon-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/duckstation-qt/resources/icons/black/svg/hard-drive-2-line.svg b/src/duckstation-qt/resources/icons/black/svg/hard-drive-2-line.svg deleted file mode 100644 index 05530193a..000000000 --- a/src/duckstation-qt/resources/icons/black/svg/hard-drive-2-line.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/duckstation-qt/resources/icons/black/svg/keyboard-line.svg b/src/duckstation-qt/resources/icons/black/svg/keyboard-line.svg index e878b9981..4790e0e88 100644 --- a/src/duckstation-qt/resources/icons/black/svg/keyboard-line.svg +++ b/src/duckstation-qt/resources/icons/black/svg/keyboard-line.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/src/duckstation-qt/resources/icons/black/svg/memcard-line.svg b/src/duckstation-qt/resources/icons/black/svg/memcard-line.svg new file mode 100644 index 000000000..0a8f1a590 --- /dev/null +++ b/src/duckstation-qt/resources/icons/black/svg/memcard-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/duckstation-qt/resources/icons/black/svg/sd-card-line.svg b/src/duckstation-qt/resources/icons/black/svg/sd-card-line.svg deleted file mode 100644 index 3ccb3dac3..000000000 --- a/src/duckstation-qt/resources/icons/black/svg/sd-card-line.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/duckstation-qt/resources/icons/white/svg/cheats-line.svg b/src/duckstation-qt/resources/icons/white/svg/cheats-line.svg new file mode 100644 index 000000000..6fc231135 --- /dev/null +++ b/src/duckstation-qt/resources/icons/white/svg/cheats-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/duckstation-qt/resources/icons/white/svg/chip-2-line.svg b/src/duckstation-qt/resources/icons/white/svg/chip-2-line.svg new file mode 100644 index 000000000..e0b2650e2 --- /dev/null +++ b/src/duckstation-qt/resources/icons/white/svg/chip-2-line.svg @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/duckstation-qt/resources/icons/white/svg/chip-line.svg b/src/duckstation-qt/resources/icons/white/svg/chip-line.svg new file mode 100644 index 000000000..4ebdda722 --- /dev/null +++ b/src/duckstation-qt/resources/icons/white/svg/chip-line.svg @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + diff --git a/src/duckstation-qt/resources/icons/white/svg/controller-line.svg b/src/duckstation-qt/resources/icons/white/svg/controller-line.svg new file mode 100644 index 000000000..3519287df --- /dev/null +++ b/src/duckstation-qt/resources/icons/white/svg/controller-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/duckstation-qt/resources/icons/white/svg/controller-strike-line.svg b/src/duckstation-qt/resources/icons/white/svg/controller-strike-line.svg new file mode 100644 index 000000000..3cd0fc5cf --- /dev/null +++ b/src/duckstation-qt/resources/icons/white/svg/controller-strike-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/duckstation-qt/resources/icons/white/svg/disc-eject-line.svg b/src/duckstation-qt/resources/icons/white/svg/disc-eject-line.svg new file mode 100644 index 000000000..ec0651be1 --- /dev/null +++ b/src/duckstation-qt/resources/icons/white/svg/disc-eject-line.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + diff --git a/src/duckstation-qt/resources/icons/white/svg/disc-line.svg b/src/duckstation-qt/resources/icons/white/svg/disc-line.svg index 217b1493f..343b2a20f 100644 --- a/src/duckstation-qt/resources/icons/white/svg/disc-line.svg +++ b/src/duckstation-qt/resources/icons/white/svg/disc-line.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/src/duckstation-qt/resources/icons/white/svg/dvd-line.svg b/src/duckstation-qt/resources/icons/white/svg/dvd-line.svg deleted file mode 100644 index e55acf9c9..000000000 --- a/src/duckstation-qt/resources/icons/white/svg/dvd-line.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/duckstation-qt/resources/icons/white/svg/fire-line.svg b/src/duckstation-qt/resources/icons/white/svg/fire-line.svg deleted file mode 100644 index 1b56f8aaa..000000000 --- a/src/duckstation-qt/resources/icons/white/svg/fire-line.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/duckstation-qt/resources/icons/white/svg/gamepad-line.svg b/src/duckstation-qt/resources/icons/white/svg/gamepad-line.svg deleted file mode 100644 index 2a1bd0bf0..000000000 --- a/src/duckstation-qt/resources/icons/white/svg/gamepad-line.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/duckstation-qt/resources/icons/white/svg/guncon-line.svg b/src/duckstation-qt/resources/icons/white/svg/guncon-line.svg new file mode 100644 index 000000000..3112f26b3 --- /dev/null +++ b/src/duckstation-qt/resources/icons/white/svg/guncon-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/duckstation-qt/resources/icons/white/svg/hard-drive-2-line.svg b/src/duckstation-qt/resources/icons/white/svg/hard-drive-2-line.svg deleted file mode 100644 index 1538ac93c..000000000 --- a/src/duckstation-qt/resources/icons/white/svg/hard-drive-2-line.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/duckstation-qt/resources/icons/white/svg/keyboard-line.svg b/src/duckstation-qt/resources/icons/white/svg/keyboard-line.svg index 0039fb0e0..07c92855a 100644 --- a/src/duckstation-qt/resources/icons/white/svg/keyboard-line.svg +++ b/src/duckstation-qt/resources/icons/white/svg/keyboard-line.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/src/duckstation-qt/resources/icons/white/svg/memcard-line.svg b/src/duckstation-qt/resources/icons/white/svg/memcard-line.svg new file mode 100644 index 000000000..81bb486d8 --- /dev/null +++ b/src/duckstation-qt/resources/icons/white/svg/memcard-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/duckstation-qt/resources/icons/white/svg/sd-card-line.svg b/src/duckstation-qt/resources/icons/white/svg/sd-card-line.svg deleted file mode 100644 index e80e0df43..000000000 --- a/src/duckstation-qt/resources/icons/white/svg/sd-card-line.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/duckstation-qt/resources/resources.qrc b/src/duckstation-qt/resources/resources.qrc index 47f77738e..d69d78c69 100644 --- a/src/duckstation-qt/resources/resources.qrc +++ b/src/duckstation-qt/resources/resources.qrc @@ -27,7 +27,6 @@ icons/black/16/AddGameDirectory.png icons/black/16/AdvancedSettings.png icons/black/16/AudioSettings.png - icons/black/16/BIOSSettings.png icons/black/16/ChangeDisc.png icons/black/16/Cheats.png icons/black/16/Clear.png @@ -68,7 +67,6 @@ icons/black/32/AddGameDirectory.png icons/black/32/AdvancedSettings.png icons/black/32/AudioSettings.png - icons/black/32/BIOSSettings.png icons/black/32/ChangeDisc.png icons/black/32/Cheats.png icons/black/32/Clear.png @@ -109,7 +107,6 @@ icons/black/64/AddGameDirectory.png icons/black/64/AdvancedSettings.png icons/black/64/AudioSettings.png - icons/black/64/BIOSSettings.png icons/black/64/ChangeDisc.png icons/black/64/Cheats.png icons/black/64/Clear.png @@ -148,16 +145,19 @@ icons/black/64/StartfileSettings.png icons/black/index.theme icons/black/svg/arrow-left-right-line.svg - icons/black/svg/artboard-2-line.svg icons/black/svg/book-open-line.svg icons/black/svg/brush-line.svg + icons/black/svg/cheats-line.svg icons/black/svg/checkbox-multiple-blank-line.svg + icons/black/svg/chip-line.svg + icons/black/svg/chip-2-line.svg icons/black/svg/close-line.svg + icons/black/svg/controller-line.svg + icons/black/svg/controller-strike-line.svg icons/black/svg/dashboard-line.svg icons/black/svg/disc-line.svg icons/black/svg/door-open-line.svg icons/black/svg/download-2-line.svg - icons/black/svg/dvd-line.svg icons/black/svg/eject-line.svg icons/black/svg/file-add-line.svg icons/black/svg/file-line.svg @@ -168,23 +168,21 @@ icons/black/svg/file-settings-line.svg icons/black/svg/file-unknow-line.svg icons/black/svg/filter-line.svg - icons/black/svg/fire-line.svg icons/black/svg/flashlight-line.svg - icons/black/svg/flask-line.svg icons/black/svg/folder-add-line.svg icons/black/svg/folder-open-line.svg icons/black/svg/folder-reduce-line.svg icons/black/svg/folder-settings-line.svg icons/black/svg/fullscreen-line.svg icons/black/svg/function-line.svg - icons/black/svg/gamepad-line.svg icons/black/svg/global-line.svg - icons/black/svg/hard-drive-2-line.svg + icons/black/svg/guncon-line.svg icons/black/svg/image-fill.svg icons/black/svg/keyboard-line.svg icons/black/svg/layout-grid-line.svg icons/black/svg/lightbulb-line.svg icons/black/svg/list-check.svg + icons/black/svg/memcard-line.svg icons/black/svg/mouse-line.svg icons/black/svg/paint-brush-line.svg icons/black/svg/paint-fill.svg @@ -198,7 +196,6 @@ icons/black/svg/restart-line.svg icons/black/svg/save-3-line.svg icons/black/svg/screenshot-2-line.svg - icons/black/svg/sd-card-line.svg icons/black/svg/settings-3-line.svg icons/black/svg/settings-5-line.svg icons/black/svg/shut-down-line.svg @@ -359,7 +356,6 @@ icons/white/16/AddGameDirectory.png icons/white/16/AdvancedSettings.png icons/white/16/AudioSettings.png - icons/white/16/BIOSSettings.png icons/white/16/ChangeDisc.png icons/white/16/Cheats.png icons/white/16/Clear.png @@ -400,7 +396,6 @@ icons/white/32/AddGameDirectory.png icons/white/32/AdvancedSettings.png icons/white/32/AudioSettings.png - icons/white/32/BIOSSettings.png icons/white/32/ChangeDisc.png icons/white/32/Cheats.png icons/white/32/Clear.png @@ -441,7 +436,6 @@ icons/white/64/AddGameDirectory.png icons/white/64/AdvancedSettings.png icons/white/64/AudioSettings.png - icons/white/64/BIOSSettings.png icons/white/64/ChangeDisc.png icons/white/64/Cheats.png icons/white/64/Clear.png @@ -480,16 +474,19 @@ icons/white/64/StartfileSettings.png icons/white/index.theme icons/white/svg/arrow-left-right-line.svg - icons/white/svg/artboard-2-line.svg icons/white/svg/book-open-line.svg icons/white/svg/brush-line.svg + icons/white/svg/cheats-line.svg + icons/white/svg/chip-line.svg + icons/white/svg/chip-2-line.svg icons/white/svg/checkbox-multiple-blank-line.svg icons/white/svg/close-line.svg + icons/white/svg/controller-line.svg + icons/white/svg/controller-strike-line.svg icons/white/svg/dashboard-line.svg icons/white/svg/disc-line.svg icons/white/svg/door-open-line.svg icons/white/svg/download-2-line.svg - icons/white/svg/dvd-line.svg icons/white/svg/eject-line.svg icons/white/svg/file-add-line.svg icons/white/svg/file-line.svg @@ -500,23 +497,21 @@ icons/white/svg/file-settings-line.svg icons/white/svg/file-unknow-line.svg icons/white/svg/filter-line.svg - icons/white/svg/fire-line.svg icons/white/svg/flashlight-line.svg - icons/white/svg/flask-line.svg icons/white/svg/folder-add-line.svg icons/white/svg/folder-open-line.svg icons/white/svg/folder-reduce-line.svg icons/white/svg/folder-settings-line.svg icons/white/svg/fullscreen-line.svg icons/white/svg/function-line.svg - icons/white/svg/gamepad-line.svg icons/white/svg/global-line.svg - icons/white/svg/hard-drive-2-line.svg + icons/white/svg/guncon-line.svg icons/white/svg/image-fill.svg icons/white/svg/keyboard-line.svg icons/white/svg/layout-grid-line.svg icons/white/svg/lightbulb-line.svg icons/white/svg/list-check.svg + icons/white/svg/memcard-line.svg icons/white/svg/mouse-line.svg icons/white/svg/paint-brush-line.svg icons/white/svg/paint-fill.svg @@ -530,7 +525,6 @@ icons/white/svg/restart-line.svg icons/white/svg/save-3-line.svg icons/white/svg/screenshot-2-line.svg - icons/white/svg/sd-card-line.svg icons/white/svg/settings-3-line.svg icons/white/svg/settings-5-line.svg icons/white/svg/shut-down-line.svg diff --git a/src/duckstation-qt/settingsdialog.cpp b/src/duckstation-qt/settingsdialog.cpp index d12b27aaf..5a58dca5c 100644 --- a/src/duckstation-qt/settingsdialog.cpp +++ b/src/duckstation-qt/settingsdialog.cpp @@ -81,11 +81,11 @@ void SettingsDialog::addPages() } addWidget(m_bios_settings = new BIOSSettingsWidget(this, m_ui.settingsContainer), tr("BIOS"), - QStringLiteral("hard-drive-2-line"), + QStringLiteral("chip-line"), tr("BIOS Settings
These options control which BIOS is used and how it will be " "patched.

Mouse over an option for additional information.")); addWidget(m_console_settings = new ConsoleSettingsWidget(this, m_ui.settingsContainer), tr("Console"), - QStringLiteral("artboard-2-line"), + QStringLiteral("chip-2-line"), tr("Console Settings
These options determine the configuration of the simulated " "console.

Mouse over an option for additional information.")); addWidget(m_emulation_settings = new EmulationSettingsWidget(this, m_ui.settingsContainer), tr("Emulation"), @@ -94,7 +94,7 @@ void SettingsDialog::addPages() "system.

Mouse over an option for additional information.")); addWidget( m_memory_card_settings = new MemoryCardSettingsWidget(this, m_ui.settingsContainer), tr("Memory Cards"), - QStringLiteral("sd-card-line"), + QStringLiteral("memcard-line"), tr("Memory Card Settings
This page lets you control what mode the memory card emulation will " "function in, and where the images for these cards will be stored on disk.")); addWidget( diff --git a/src/duckstation-qt/setupwizarddialog.ui b/src/duckstation-qt/setupwizarddialog.ui index e51fd7567..f3d182431 100644 --- a/src/duckstation-qt/setupwizarddialog.ui +++ b/src/duckstation-qt/setupwizarddialog.ui @@ -451,7 +451,7 @@ Automatic Mapping - + Qt::ToolButtonTextBesideIcon @@ -514,7 +514,7 @@ Automatic Mapping - + Qt::ToolButtonTextBesideIcon