Skip to content

Commit

Permalink
Merge pull request #3031 from kamfretoz/ikon
Browse files Browse the repository at this point in the history
Qt: Port over some custom icon from PCSX2
  • Loading branch information
stenzek authored Oct 15, 2023
2 parents ad04f79 + 3468afc commit ae773e8
Show file tree
Hide file tree
Showing 36 changed files with 562 additions and 109 deletions.
4 changes: 2 additions & 2 deletions src/duckstation-qt/controllerbindingwidget.ui
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset theme="gamepad-line">
<iconset theme="controller-line">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="toolButtonStyle">
Expand Down Expand Up @@ -120,7 +120,7 @@
<string>Automatic Mapping</string>
</property>
<property name="icon">
<iconset theme="gamepad-line">
<iconset theme="controller-line">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="toolButtonStyle">
Expand Down
6 changes: 3 additions & 3 deletions src/duckstation-qt/controllerbindingwidgets.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions src/duckstation-qt/gamesummarywidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ void GameSummaryWidget::populateUi(const std::string& path, const std::string& s
m_ui.entryType->setCurrentIndex(static_cast<int>(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));

Expand Down Expand Up @@ -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<u32>(mode)]));
Expand Down
18 changes: 9 additions & 9 deletions src/duckstation-qt/mainwindow.ui
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<string>Change Disc</string>
</property>
<property name="icon">
<iconset theme="dvd-line">
<iconset theme="disc-line">
<normaloff>.</normaloff>.</iconset>
</property>
<actiongroup name="actionGroupChangeDiscSubImages"/>
Expand All @@ -54,7 +54,7 @@
<string>Cheats</string>
</property>
<property name="icon">
<iconset theme="flask-line">
<iconset theme="cheats-line">
<normaloff>.</normaloff>.</iconset>
</property>
</widget>
Expand Down Expand Up @@ -302,7 +302,7 @@
</action>
<action name="actionStartBios">
<property name="icon">
<iconset theme="hard-drive-2-line">
<iconset theme="chip-line">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
Expand Down Expand Up @@ -386,7 +386,7 @@
</action>
<action name="actionBIOSSettings">
<property name="icon">
<iconset theme="hard-drive-2-line">
<iconset theme="chip-line">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
Expand All @@ -395,7 +395,7 @@
</action>
<action name="actionConsoleSettings">
<property name="icon">
<iconset theme="artboard-2-line">
<iconset theme="chip-2-line">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
Expand All @@ -413,7 +413,7 @@
</action>
<action name="actionControllerSettings">
<property name="icon">
<iconset theme="gamepad-line">
<iconset theme="controller-line">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
Expand Down Expand Up @@ -526,7 +526,7 @@
</action>
<action name="actionChangeDisc">
<property name="icon">
<iconset theme="dvd-line">
<iconset theme="disc-line">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
Expand All @@ -535,7 +535,7 @@
</action>
<action name="actionCheats">
<property name="icon">
<iconset theme="flask-line">
<iconset theme="cheats-line">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
Expand Down Expand Up @@ -789,7 +789,7 @@
</action>
<action name="actionMemoryCardSettings">
<property name="icon">
<iconset theme="sd-card-line">
<iconset theme="memcard-line">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
Expand Down
2 changes: 1 addition & 1 deletion src/duckstation-qt/qtutils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
98 changes: 98 additions & 0 deletions src/duckstation-qt/resources/icons/black/svg/chip-2-line.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
84 changes: 84 additions & 0 deletions src/duckstation-qt/resources/icons/black/svg/chip-line.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit ae773e8

Please sign in to comment.