Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-10-23 15:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Qt: Use svgs for region icons

Browse source
This commit is contained in:
Connor McLaughlin 2020-09-09 19:03:49 +10:00
parent 9c4e935de9
commit c2e7e8254f
5 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/duckstation-qt/duckstation-qt.vcxproj.filters
View file

@ -62,9 +62,6 @@
<UniqueIdentifier>{4230e20b-2aff-4c86-966c-b620263a371d}</UniqueIdentifier> <UniqueIdentifier>{4230e20b-2aff-4c86-966c-b620263a371d}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup>
<QtResource Include="resources\resources.qrc" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<QtMoc Include="consolesettingswidget.h" /> <QtMoc Include="consolesettingswidget.h" />
<QtMoc Include="gamelistsettingswidget.h" /> <QtMoc Include="gamelistsettingswidget.h" />
@ -137,4 +134,9 @@
<Filter>translations</Filter> <Filter>translations</Filter>
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup>
<QtResource Include="resources\resources.qrc">
<Filter>resources</Filter>
</QtResource>
</ItemGroup>
</Project> </Project>

7
src/duckstation-qt/gamelistmodel.cpp
View file

@ -280,10 +280,9 @@ void GameListModel::loadCommonImages()
m_type_disc_pixmap.load(QStringLiteral(":/icons/media-optical-24.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_exe_pixmap.load(QStringLiteral(":/icons/applications-system-24.png"));
m_type_playlist_pixmap.load(QStringLiteral(":/icons/address-book-new-22.png")); m_type_playlist_pixmap.load(QStringLiteral(":/icons/address-book-new-22.png"));
m_region_eu_pixmap.load(QStringLiteral(":/icons/flag-eu.png")); m_region_eu_pixmap.addFile(QStringLiteral(":/icons/flag-eu.svg"));
m_region_jp_pixmap.load(QStringLiteral(":/icons/flag-jp.png")); m_region_jp_pixmap.addFile(QStringLiteral(":/icons/flag-jp.svg"));
m_region_us_pixmap.load(QStringLiteral(":/icons/flag-uc.png")); m_region_us_pixmap.addFile(QStringLiteral(":/icons/flag-uc.svg"));
m_region_eu_pixmap.load(QStringLiteral(":/icons/flag-eu.png"));
for (int i = 0; i < static_cast<int>(GameListCompatibilityRating::Count); i++) for (int i = 0; i < static_cast<int>(GameListCompatibilityRating::Count); i++)
m_compatibiliy_pixmaps[i].load(QStringLiteral(":/icons/star-%1.png").arg(i)); m_compatibiliy_pixmaps[i].load(QStringLiteral(":/icons/star-%1.png").arg(i));

7
src/duckstation-qt/gamelistmodel.h
View file

@ -2,6 +2,7 @@
#include "core/types.h" #include "core/types.h"
#include "frontend-common/game_list.h" #include "frontend-common/game_list.h"
#include <QtCore/QAbstractTableModel> #include <QtCore/QAbstractTableModel>
#include <QtGui/QIcon>
#include <QtGui/QPixmap> #include <QtGui/QPixmap>
#include <array> #include <array>
#include <optional> #include <optional>
@ -55,9 +56,9 @@ private:
QPixmap m_type_exe_pixmap; QPixmap m_type_exe_pixmap;
QPixmap m_type_playlist_pixmap; QPixmap m_type_playlist_pixmap;
QPixmap m_region_jp_pixmap; QIcon m_region_jp_pixmap;
QPixmap m_region_eu_pixmap; QIcon m_region_eu_pixmap;
QPixmap m_region_us_pixmap; QIcon m_region_us_pixmap;
std::array<QPixmap, static_cast<int>(GameListCompatibilityRating::Count)> m_compatibiliy_pixmaps; std::array<QPixmap, static_cast<int>(GameListCompatibilityRating::Count)> m_compatibiliy_pixmaps;
}; };

3
src/duckstation-qt/gamelistwidget.cpp
View file

@ -47,6 +47,7 @@ void GameListWidget::initialize(QtHostInterface* host_interface)
m_table_sort_model->setSourceModel(m_table_model); m_table_sort_model->setSourceModel(m_table_model);
m_table_view = new QTableView(this); m_table_view = new QTableView(this);
m_table_view->setModel(m_table_sort_model); m_table_view->setModel(m_table_sort_model);
m_table_view->setIconSize(QSize(32, 32));
m_table_view->setSortingEnabled(true); m_table_view->setSortingEnabled(true);
m_table_view->setSelectionMode(QAbstractItemView::SingleSelection); m_table_view->setSelectionMode(QAbstractItemView::SingleSelection);
m_table_view->setSelectionBehavior(QAbstractItemView::SelectRows); m_table_view->setSelectionBehavior(QAbstractItemView::SelectRows);
@ -147,7 +148,7 @@ void GameListWidget::resizeEvent(QResizeEvent* event)
void GameListWidget::resizeTableViewColumnsToFit() void GameListWidget::resizeTableViewColumnsToFit()
{ {
QtUtils::ResizeColumnsForTableView(m_table_view, {32, 80, -1, -1, 100, 60, 100}); QtUtils::ResizeColumnsForTableView(m_table_view, {32, 80, -1, -1, 100, 45, 100});
} }
static TinyString getColumnVisibilitySettingsKeyName(int column) static TinyString getColumnVisibilitySettingsKeyName(int column)

2
src/duckstation-qt/resources/resources.qrc
View file

@ -9,11 +9,9 @@
<file>icons/flag-uc.svg</file> <file>icons/flag-uc.svg</file>
<file>icons/flag-uc.png</file> <file>icons/flag-uc.png</file>
<file>icons/flag-uc@2x.png</file> <file>icons/flag-uc@2x.png</file>
<!--
<file>icons/flag-us.svg</file> <file>icons/flag-us.svg</file>
<file>icons/flag-us.png</file> <file>icons/flag-us.png</file>
<file>icons/flag-us@2x.png</file> <file>icons/flag-us@2x.png</file>
-->
<file>icons/star-0.png</file> <file>icons/star-0.png</file>
<file>icons/star-1.png</file> <file>icons/star-1.png</file>
<file>icons/star-2.png</file> <file>icons/star-2.png</file>