diff --git a/src/duckstation-qt/gamelistmodel.cpp b/src/duckstation-qt/gamelistmodel.cpp index 3c7fa5eec..99eaa2b96 100644 --- a/src/duckstation-qt/gamelistmodel.cpp +++ b/src/duckstation-qt/gamelistmodel.cpp @@ -1,6 +1,7 @@ #include "gamelistmodel.h" #include "common/string_util.h" #include "core/system.h" +#include static constexpr std::array s_column_names = { {"Type", "Code", "Title", "File Title", "Size", "Region", "Compatibility"}}; @@ -277,12 +278,12 @@ bool GameListModel::lessThan(const QModelIndex& left_index, const QModelIndex& r void GameListModel::loadCommonImages() { // TODO: Use svg instead of png - m_type_disc_pixmap.load(QStringLiteral(":/icons/media-optical-24.png")); - m_type_exe_pixmap.load(QStringLiteral(":/icons/applications-system-24.png")); - m_type_playlist_pixmap.load(QStringLiteral(":/icons/address-book-new-22.png")); - m_region_eu_pixmap.addFile(QStringLiteral(":/icons/flag-eu.png")); - m_region_jp_pixmap.addFile(QStringLiteral(":/icons/flag-jp.png")); - m_region_us_pixmap.addFile(QStringLiteral(":/icons/flag-uc.png")); + m_type_disc_pixmap = QIcon(QStringLiteral(":/icons/media-optical-24.png")).pixmap(QSize(24, 24)); + m_type_exe_pixmap = QIcon(QStringLiteral(":/icons/applications-system-24.png")).pixmap(QSize(24, 24)); + m_type_playlist_pixmap = QIcon(QStringLiteral(":/icons/address-book-new-22.png")).pixmap(QSize(22, 22)); + m_region_eu_pixmap = QIcon(QStringLiteral(":/icons/flag-eu.png")).pixmap(QSize(42, 30)); + m_region_jp_pixmap = QIcon(QStringLiteral(":/icons/flag-jp.png")).pixmap(QSize(42, 30)); + m_region_us_pixmap = QIcon(QStringLiteral(":/icons/flag-uc.png")).pixmap(QSize(42, 30)); for (int i = 0; i < static_cast(GameListCompatibilityRating::Count); i++) m_compatibiliy_pixmaps[i].load(QStringLiteral(":/icons/star-%1.png").arg(i)); diff --git a/src/duckstation-qt/gamelistmodel.h b/src/duckstation-qt/gamelistmodel.h index 365083a4b..edf04892e 100644 --- a/src/duckstation-qt/gamelistmodel.h +++ b/src/duckstation-qt/gamelistmodel.h @@ -2,7 +2,6 @@ #include "core/types.h" #include "frontend-common/game_list.h" #include -#include #include #include #include @@ -56,9 +55,9 @@ private: QPixmap m_type_exe_pixmap; QPixmap m_type_playlist_pixmap; - QIcon m_region_jp_pixmap; - QIcon m_region_eu_pixmap; - QIcon m_region_us_pixmap; + QPixmap m_region_jp_pixmap; + QPixmap m_region_eu_pixmap; + QPixmap m_region_us_pixmap; std::array(GameListCompatibilityRating::Count)> m_compatibiliy_pixmaps; }; \ No newline at end of file diff --git a/src/duckstation-qt/gamelistwidget.cpp b/src/duckstation-qt/gamelistwidget.cpp index 41f789cad..f43c81eff 100644 --- a/src/duckstation-qt/gamelistwidget.cpp +++ b/src/duckstation-qt/gamelistwidget.cpp @@ -47,7 +47,6 @@ void GameListWidget::initialize(QtHostInterface* host_interface) m_table_sort_model->setSourceModel(m_table_model); m_table_view = new QTableView(this); m_table_view->setModel(m_table_sort_model); - m_table_view->setIconSize(QSize(32, 32)); m_table_view->setSortingEnabled(true); m_table_view->setSelectionMode(QAbstractItemView::SingleSelection); m_table_view->setSelectionBehavior(QAbstractItemView::SelectRows); @@ -148,7 +147,7 @@ void GameListWidget::resizeEvent(QResizeEvent* event) void GameListWidget::resizeTableViewColumnsToFit() { - QtUtils::ResizeColumnsForTableView(m_table_view, {32, 80, -1, -1, 100, 45, 100}); + QtUtils::ResizeColumnsForTableView(m_table_view, {32, 80, -1, -1, 100, 50, 100}); } static TinyString getColumnVisibilitySettingsKeyName(int column) diff --git a/src/duckstation-qt/mainwindow.ui b/src/duckstation-qt/mainwindow.ui index 5e47ee565..2cb4f6191 100644 --- a/src/duckstation-qt/mainwindow.ui +++ b/src/duckstation-qt/mainwindow.ui @@ -61,7 +61,7 @@ - :/icons/actions-tools-wizard.png:/icons/actions-tools-wizard.png + :/icons/conical-flask-red.png:/icons/conical-flask-red.png @@ -400,7 +400,7 @@ - :/icons/actions-tools-wizard-32.png:/icons/actions-tools-wizard-32.png + :/icons/conical-flask-red.png:/icons/conical-flask-red.png Cheats... @@ -454,7 +454,7 @@ - :/icons/applications-system.png:/icons/applications-system.png + :/icons/preferences-system.png:/icons/preferences-system.png &Settings... @@ -565,7 +565,7 @@ - :/icons/video-display.png:/icons/video-display.png + :/icons/camera-photo.png:/icons/camera-photo.png &Screenshot diff --git a/src/duckstation-qt/resources/icons/actions-tools-wizard-32.png b/src/duckstation-qt/resources/icons/actions-tools-wizard-32.png deleted file mode 100644 index 34e4a79ba..000000000 Binary files a/src/duckstation-qt/resources/icons/actions-tools-wizard-32.png and /dev/null differ diff --git a/src/duckstation-qt/resources/icons/actions-tools-wizard-32@2x.png b/src/duckstation-qt/resources/icons/actions-tools-wizard-32@2x.png deleted file mode 100644 index 9fe9a333d..000000000 Binary files a/src/duckstation-qt/resources/icons/actions-tools-wizard-32@2x.png and /dev/null differ diff --git a/src/duckstation-qt/resources/icons/actions-tools-wizard.png b/src/duckstation-qt/resources/icons/actions-tools-wizard.png deleted file mode 100644 index 64bc04c00..000000000 Binary files a/src/duckstation-qt/resources/icons/actions-tools-wizard.png and /dev/null differ diff --git a/src/duckstation-qt/resources/icons/actions-tools-wizard@2x.png b/src/duckstation-qt/resources/icons/actions-tools-wizard@2x.png deleted file mode 100644 index 34e4a79ba..000000000 Binary files a/src/duckstation-qt/resources/icons/actions-tools-wizard@2x.png and /dev/null differ diff --git a/src/duckstation-qt/resources/icons/address-book-new-22@2x.png b/src/duckstation-qt/resources/icons/address-book-new-22@2x.png new file mode 100644 index 000000000..1d59f2b9c Binary files /dev/null and b/src/duckstation-qt/resources/icons/address-book-new-22@2x.png differ diff --git a/src/duckstation-qt/resources/icons/antialias-icon.png b/src/duckstation-qt/resources/icons/antialias-icon.png new file mode 100644 index 000000000..1c097222d Binary files /dev/null and b/src/duckstation-qt/resources/icons/antialias-icon.png differ diff --git a/src/duckstation-qt/resources/icons/antialias-icon@2x.png b/src/duckstation-qt/resources/icons/antialias-icon@2x.png new file mode 100644 index 000000000..6802afed4 Binary files /dev/null and b/src/duckstation-qt/resources/icons/antialias-icon@2x.png differ diff --git a/src/duckstation-qt/resources/icons/applications-development@2x.png b/src/duckstation-qt/resources/icons/applications-development@2x.png new file mode 100644 index 000000000..f6bc82031 Binary files /dev/null and b/src/duckstation-qt/resources/icons/applications-development@2x.png differ diff --git a/src/duckstation-qt/resources/icons/applications-other@2x.png b/src/duckstation-qt/resources/icons/applications-other@2x.png new file mode 100644 index 000000000..9be3849c9 Binary files /dev/null and b/src/duckstation-qt/resources/icons/applications-other@2x.png differ diff --git a/src/duckstation-qt/resources/icons/applications-system-24@2x.png b/src/duckstation-qt/resources/icons/applications-system-24@2x.png new file mode 100644 index 000000000..1914a8d0f Binary files /dev/null and b/src/duckstation-qt/resources/icons/applications-system-24@2x.png differ diff --git a/src/duckstation-qt/resources/icons/applications-system@2x.png b/src/duckstation-qt/resources/icons/applications-system@2x.png new file mode 100644 index 000000000..845e40dab Binary files /dev/null and b/src/duckstation-qt/resources/icons/applications-system@2x.png differ diff --git a/src/duckstation-qt/resources/icons/audio-card@2x.png b/src/duckstation-qt/resources/icons/audio-card@2x.png new file mode 100644 index 000000000..9e9998312 Binary files /dev/null and b/src/duckstation-qt/resources/icons/audio-card@2x.png differ diff --git a/src/duckstation-qt/resources/icons/camera-photo.png b/src/duckstation-qt/resources/icons/camera-photo.png new file mode 100644 index 000000000..57834263e Binary files /dev/null and b/src/duckstation-qt/resources/icons/camera-photo.png differ diff --git a/src/duckstation-qt/resources/icons/camera-photo@2x.png b/src/duckstation-qt/resources/icons/camera-photo@2x.png new file mode 100644 index 000000000..ba1201d65 Binary files /dev/null and b/src/duckstation-qt/resources/icons/camera-photo@2x.png differ diff --git a/src/duckstation-qt/resources/icons/camera-video.png b/src/duckstation-qt/resources/icons/camera-video.png new file mode 100644 index 000000000..67d30525d Binary files /dev/null and b/src/duckstation-qt/resources/icons/camera-video.png differ diff --git a/src/duckstation-qt/resources/icons/camera-video@2x.png b/src/duckstation-qt/resources/icons/camera-video@2x.png new file mode 100644 index 000000000..41499708e Binary files /dev/null and b/src/duckstation-qt/resources/icons/camera-video@2x.png differ diff --git a/src/duckstation-qt/resources/icons/conical-flask-red.png b/src/duckstation-qt/resources/icons/conical-flask-red.png new file mode 100644 index 000000000..70dcb2d02 Binary files /dev/null and b/src/duckstation-qt/resources/icons/conical-flask-red.png differ diff --git a/src/duckstation-qt/resources/icons/conical-flask-red@2x.png b/src/duckstation-qt/resources/icons/conical-flask-red@2x.png new file mode 100644 index 000000000..111936a34 Binary files /dev/null and b/src/duckstation-qt/resources/icons/conical-flask-red@2x.png differ diff --git a/src/duckstation-qt/resources/icons/document-open.png b/src/duckstation-qt/resources/icons/document-open.png index f35f25835..c13e9f187 100644 Binary files a/src/duckstation-qt/resources/icons/document-open.png and b/src/duckstation-qt/resources/icons/document-open.png differ diff --git a/src/duckstation-qt/resources/icons/document-open@2x.png b/src/duckstation-qt/resources/icons/document-open@2x.png new file mode 100644 index 000000000..5f1bd8fa0 Binary files /dev/null and b/src/duckstation-qt/resources/icons/document-open@2x.png differ diff --git a/src/duckstation-qt/resources/icons/document-save@2x.png b/src/duckstation-qt/resources/icons/document-save@2x.png new file mode 100644 index 000000000..dba66fa12 Binary files /dev/null and b/src/duckstation-qt/resources/icons/document-save@2x.png differ diff --git a/src/duckstation-qt/resources/icons/drive-optical@2x.png b/src/duckstation-qt/resources/icons/drive-optical@2x.png new file mode 100644 index 000000000..0bb2d15e0 Binary files /dev/null and b/src/duckstation-qt/resources/icons/drive-optical@2x.png differ diff --git a/src/duckstation-qt/resources/icons/drive-removable-media@2x.png b/src/duckstation-qt/resources/icons/drive-removable-media@2x.png new file mode 100644 index 000000000..c28fd3826 Binary files /dev/null and b/src/duckstation-qt/resources/icons/drive-removable-media@2x.png differ diff --git a/src/duckstation-qt/resources/icons/folder-open@2x.png b/src/duckstation-qt/resources/icons/folder-open@2x.png new file mode 100644 index 000000000..8b96f1d58 Binary files /dev/null and b/src/duckstation-qt/resources/icons/folder-open@2x.png differ diff --git a/src/duckstation-qt/resources/icons/input-gaming@2x.png b/src/duckstation-qt/resources/icons/input-gaming@2x.png new file mode 100644 index 000000000..433e3e6f5 Binary files /dev/null and b/src/duckstation-qt/resources/icons/input-gaming@2x.png differ diff --git a/src/duckstation-qt/resources/icons/list-add@2x.png b/src/duckstation-qt/resources/icons/list-add@2x.png new file mode 100644 index 000000000..47e3d10c3 Binary files /dev/null and b/src/duckstation-qt/resources/icons/list-add@2x.png differ diff --git a/src/duckstation-qt/resources/icons/list-remove@2x.png b/src/duckstation-qt/resources/icons/list-remove@2x.png new file mode 100644 index 000000000..e5f58e7d0 Binary files /dev/null and b/src/duckstation-qt/resources/icons/list-remove@2x.png differ diff --git a/src/duckstation-qt/resources/icons/media-flash-24@2x.png b/src/duckstation-qt/resources/icons/media-flash-24@2x.png new file mode 100644 index 000000000..59d0a96d7 Binary files /dev/null and b/src/duckstation-qt/resources/icons/media-flash-24@2x.png differ diff --git a/src/duckstation-qt/resources/icons/media-flash@2x.png b/src/duckstation-qt/resources/icons/media-flash@2x.png new file mode 100644 index 000000000..61ee1fa54 Binary files /dev/null and b/src/duckstation-qt/resources/icons/media-flash@2x.png differ diff --git a/src/duckstation-qt/resources/icons/media-optical-24@2x.png b/src/duckstation-qt/resources/icons/media-optical-24@2x.png new file mode 100644 index 000000000..e35712509 Binary files /dev/null and b/src/duckstation-qt/resources/icons/media-optical-24@2x.png differ diff --git a/src/duckstation-qt/resources/icons/media-optical@2x.png b/src/duckstation-qt/resources/icons/media-optical@2x.png new file mode 100644 index 000000000..f402ce3bd Binary files /dev/null and b/src/duckstation-qt/resources/icons/media-optical@2x.png differ diff --git a/src/duckstation-qt/resources/icons/media-playback-pause@2x.png b/src/duckstation-qt/resources/icons/media-playback-pause@2x.png new file mode 100644 index 000000000..05d7d1895 Binary files /dev/null and b/src/duckstation-qt/resources/icons/media-playback-pause@2x.png differ diff --git a/src/duckstation-qt/resources/icons/media-playback-start@2x.png b/src/duckstation-qt/resources/icons/media-playback-start@2x.png new file mode 100644 index 000000000..69b7251c9 Binary files /dev/null and b/src/duckstation-qt/resources/icons/media-playback-start@2x.png differ diff --git a/src/duckstation-qt/resources/icons/media-record.png b/src/duckstation-qt/resources/icons/media-record.png new file mode 100644 index 000000000..ef2918c8e Binary files /dev/null and b/src/duckstation-qt/resources/icons/media-record.png differ diff --git a/src/duckstation-qt/resources/icons/media-record@2x.png b/src/duckstation-qt/resources/icons/media-record@2x.png new file mode 100644 index 000000000..0850a2b41 Binary files /dev/null and b/src/duckstation-qt/resources/icons/media-record@2x.png differ diff --git a/src/duckstation-qt/resources/icons/preferences-desktop-keyboard-shortcuts.png b/src/duckstation-qt/resources/icons/preferences-desktop-keyboard-shortcuts.png new file mode 100644 index 000000000..41b900be8 Binary files /dev/null and b/src/duckstation-qt/resources/icons/preferences-desktop-keyboard-shortcuts.png differ diff --git a/src/duckstation-qt/resources/icons/preferences-desktop-keyboard-shortcuts@2x.png b/src/duckstation-qt/resources/icons/preferences-desktop-keyboard-shortcuts@2x.png new file mode 100644 index 000000000..61c3ee33b Binary files /dev/null and b/src/duckstation-qt/resources/icons/preferences-desktop-keyboard-shortcuts@2x.png differ diff --git a/src/duckstation-qt/resources/icons/preferences-system.png b/src/duckstation-qt/resources/icons/preferences-system.png new file mode 100644 index 000000000..7c1cf60b4 Binary files /dev/null and b/src/duckstation-qt/resources/icons/preferences-system.png differ diff --git a/src/duckstation-qt/resources/icons/preferences-system@2x.png b/src/duckstation-qt/resources/icons/preferences-system@2x.png new file mode 100644 index 000000000..dcba3165d Binary files /dev/null and b/src/duckstation-qt/resources/icons/preferences-system@2x.png differ diff --git a/src/duckstation-qt/resources/icons/software-update-available.png b/src/duckstation-qt/resources/icons/software-update-available.png new file mode 100644 index 000000000..2c10ce03b Binary files /dev/null and b/src/duckstation-qt/resources/icons/software-update-available.png differ diff --git a/src/duckstation-qt/resources/icons/software-update-available@2x.png b/src/duckstation-qt/resources/icons/software-update-available@2x.png new file mode 100644 index 000000000..2dff5b9aa Binary files /dev/null and b/src/duckstation-qt/resources/icons/software-update-available@2x.png differ diff --git a/src/duckstation-qt/resources/icons/system-file-manager.png b/src/duckstation-qt/resources/icons/system-file-manager.png new file mode 100644 index 000000000..a431ad90b Binary files /dev/null and b/src/duckstation-qt/resources/icons/system-file-manager.png differ diff --git a/src/duckstation-qt/resources/icons/system-file-manager@2x.png b/src/duckstation-qt/resources/icons/system-file-manager@2x.png new file mode 100644 index 000000000..4859b4236 Binary files /dev/null and b/src/duckstation-qt/resources/icons/system-file-manager@2x.png differ diff --git a/src/duckstation-qt/resources/icons/system-search.png b/src/duckstation-qt/resources/icons/system-search.png index 950d792af..cc9e81359 100644 Binary files a/src/duckstation-qt/resources/icons/system-search.png and b/src/duckstation-qt/resources/icons/system-search.png differ diff --git a/src/duckstation-qt/resources/icons/system-search@2x.png b/src/duckstation-qt/resources/icons/system-search@2x.png new file mode 100644 index 000000000..86e1471af Binary files /dev/null and b/src/duckstation-qt/resources/icons/system-search@2x.png differ diff --git a/src/duckstation-qt/resources/icons/system-shutdown@2x.png b/src/duckstation-qt/resources/icons/system-shutdown@2x.png new file mode 100644 index 000000000..ed42bf1a5 Binary files /dev/null and b/src/duckstation-qt/resources/icons/system-shutdown@2x.png differ diff --git a/src/duckstation-qt/resources/icons/utilities-system-monitor@2x.png b/src/duckstation-qt/resources/icons/utilities-system-monitor@2x.png new file mode 100644 index 000000000..87e581063 Binary files /dev/null and b/src/duckstation-qt/resources/icons/utilities-system-monitor@2x.png differ diff --git a/src/duckstation-qt/resources/icons/video-display@2x.png b/src/duckstation-qt/resources/icons/video-display@2x.png new file mode 100644 index 000000000..9f1aed63d Binary files /dev/null and b/src/duckstation-qt/resources/icons/video-display@2x.png differ diff --git a/src/duckstation-qt/resources/icons/view-fullscreen@2x.png b/src/duckstation-qt/resources/icons/view-fullscreen@2x.png new file mode 100644 index 000000000..f72bbae52 Binary files /dev/null and b/src/duckstation-qt/resources/icons/view-fullscreen@2x.png differ diff --git a/src/duckstation-qt/resources/icons/view-refresh@2x.png b/src/duckstation-qt/resources/icons/view-refresh@2x.png new file mode 100644 index 000000000..8ae679bd4 Binary files /dev/null and b/src/duckstation-qt/resources/icons/view-refresh@2x.png differ diff --git a/src/duckstation-qt/resources/resources.qrc b/src/duckstation-qt/resources/resources.qrc index c1e775c78..a70865ce5 100644 --- a/src/duckstation-qt/resources/resources.qrc +++ b/src/duckstation-qt/resources/resources.qrc @@ -1,56 +1,94 @@ - icons/flag-eu.svg + icons/address-book-new-22.png + icons/address-book-new-22@2x.png + icons/antialias-icon.png + icons/antialias-icon@2x.png + icons/applications-development.png + icons/applications-development@2x.png + icons/applications-internet.png + icons/applications-other.png + icons/applications-other@2x.png + icons/applications-system.png + icons/applications-system@2x.png + icons/applications-system-24.png + icons/applications-system-24@2x.png + icons/audio-card.png + icons/audio-card@2x.png + icons/camera-photo.png + icons/camera-photo@2x.png + icons/camera-video.png + icons/camera-video@2x.png + icons/conical-flask-red.png + icons/conical-flask-red@2x.png + icons/document-open.png + icons/document-open@2x.png + icons/document-save.png + icons/document-save@2x.png + icons/drive-optical.png + icons/drive-optical@2x.png + icons/drive-removable-media.png + icons/drive-removable-media@2x.png + icons/duck.png + icons/duck_128.png + icons/duck_64.png + icons/edit-find.png icons/flag-eu.png icons/flag-eu@2x.png - icons/flag-jp.svg icons/flag-jp.png icons/flag-jp@2x.png - icons/flag-uc.svg icons/flag-uc.png icons/flag-uc@2x.png - icons/flag-us.svg icons/flag-us.png icons/flag-us@2x.png + icons/folder-open.png + icons/folder-open@2x.png + icons/input-gaming.png + icons/input-gaming@2x.png + icons/list-add.png + icons/list-add@2x.png + icons/list-remove.png + icons/list-remove@2x.png + icons/media-flash.png + icons/media-flash@2x.png + icons/media-flash-24.png + icons/media-flash-24@2x.png + icons/media-optical.png + icons/media-optical@2x.png + icons/media-optical-24.png + icons/media-optical-24@2x.png + icons/media-playback-pause.png + icons/media-playback-pause@2x.png + icons/media-playback-start.png + icons/media-playback-start@2x.png + icons/media-record.png + icons/media-record@2x.png + icons/preferences-desktop-keyboard-shortcuts.png + icons/preferences-desktop-keyboard-shortcuts@2x.png + icons/preferences-system.png + icons/preferences-system@2x.png + icons/software-update-available.png + icons/software-update-available@2x.png icons/star-0.png icons/star-1.png icons/star-2.png icons/star-3.png icons/star-4.png icons/star-5.png - icons/address-book-new-22.png - icons/actions-tools-wizard.png - icons/actions-tools-wizard@2x.png - icons/actions-tools-wizard-32.png - icons/actions-tools-wizard-32@2x.png - icons/applications-internet.png + icons/system-file-manager.png + icons/system-file-manager@2x.png icons/system-search.png - icons/list-add.png - icons/list-remove.png - icons/duck.png - icons/edit-find.png - icons/folder-open.png - icons/applications-development.png - icons/applications-other.png - icons/applications-system.png - icons/applications-system-24.png - icons/audio-card.png - icons/document-open.png - icons/document-save.png - icons/drive-optical.png - icons/drive-removable-media.png - icons/input-gaming.png - icons/media-flash.png - icons/media-flash-24.png - icons/media-optical.png - icons/media-optical-24.png - icons/media-playback-pause.png - icons/media-playback-start.png + icons/system-search@2x.png icons/system-shutdown.png + icons/system-shutdown@2x.png icons/utilities-system-monitor.png + icons/utilities-system-monitor@2x.png icons/video-display.png + icons/video-display@2x.png icons/view-fullscreen.png + icons/view-fullscreen@2x.png icons/view-refresh.png + icons/view-refresh@2x.png diff --git a/src/duckstation-qt/settingsdialog.ui b/src/duckstation-qt/settingsdialog.ui index 9fab8e48a..d588f0e5c 100644 --- a/src/duckstation-qt/settingsdialog.ui +++ b/src/duckstation-qt/settingsdialog.ui @@ -82,7 +82,7 @@ - :/icons/folder-open.png:/icons/folder-open.png + :/icons/system-file-manager.png:/icons/system-file-manager.png @@ -91,7 +91,7 @@ - :/icons/applications-other.png:/icons/applications-other.png + :/icons/preferences-desktop-keyboard-shortcuts.png:/icons/preferences-desktop-keyboard-shortcuts.png