Skip to content

Commit

Permalink
Qt: More icon overhaul and cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
kamfretoz committed Oct 16, 2023
1 parent ef377fb commit 0cfbdb0
Show file tree
Hide file tree
Showing 302 changed files with 1,141 additions and 1,059 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="controller-line">
<iconset theme="controller-digital-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="controller-line">
<iconset theme="controller-digital-line">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="toolButtonStyle">
Expand Down
8 changes: 4 additions & 4 deletions src/duckstation-qt/controllerbindingwidgets.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ ControllerBindingWidget_DigitalController::~ControllerBindingWidget_DigitalContr

QIcon ControllerBindingWidget_DigitalController::getIcon() const
{
return QIcon::fromTheme(QStringLiteral("controller-line"));
return QIcon::fromTheme(QStringLiteral("controller-digital-line"));
}

ControllerBindingWidget_Base* ControllerBindingWidget_DigitalController::createInstance(ControllerBindingWidget* parent)
Expand All @@ -827,7 +827,7 @@ ControllerBindingWidget_AnalogController::~ControllerBindingWidget_AnalogControl

QIcon ControllerBindingWidget_AnalogController::getIcon() const
{
return QIcon::fromTheme(QStringLiteral("ControllerSettings"));
return QIcon::fromTheme(QStringLiteral("controller-line"));
}

ControllerBindingWidget_Base* ControllerBindingWidget_AnalogController::createInstance(ControllerBindingWidget* parent)
Expand All @@ -850,7 +850,7 @@ ControllerBindingWidget_AnalogJoystick::~ControllerBindingWidget_AnalogJoystick(

QIcon ControllerBindingWidget_AnalogJoystick::getIcon() const
{
return QIcon::fromTheme(QStringLiteral("ControllerSettings"));
return QIcon::fromTheme(QStringLiteral("controller-line"));
}

ControllerBindingWidget_Base* ControllerBindingWidget_AnalogJoystick::createInstance(ControllerBindingWidget* parent)
Expand Down Expand Up @@ -890,7 +890,7 @@ ControllerBindingWidget_NeGcon::~ControllerBindingWidget_NeGcon()

QIcon ControllerBindingWidget_NeGcon::getIcon() const
{
return QIcon::fromTheme(QStringLiteral("steering-line"));
return QIcon::fromTheme(QStringLiteral("negcon-line"));
}

ControllerBindingWidget_Base* ControllerBindingWidget_NeGcon::createInstance(ControllerBindingWidget* parent)
Expand Down
2 changes: 1 addition & 1 deletion src/duckstation-qt/coverdownloaddialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
CoverDownloadDialog::CoverDownloadDialog(QWidget* parent /*= nullptr*/) : QDialog(parent)
{
m_ui.setupUi(this);
m_ui.coverIcon->setPixmap(QIcon::fromTheme("image-fill").pixmap(32));
m_ui.coverIcon->setPixmap(QIcon::fromTheme("artboard-2-line").pixmap(32));
updateEnabled();

connect(m_ui.start, &QPushButton::clicked, this, &CoverDownloadDialog::onStartClicked);
Expand Down
2 changes: 1 addition & 1 deletion src/duckstation-qt/coverdownloaddialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="resources/resources.qrc">:/icons/black/svg/image-fill.svg</pixmap>
<pixmap resource="resources/resources.qrc">:/icons/black/svg/artboard-2-line.svg</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
Expand Down
12 changes: 6 additions & 6 deletions src/duckstation-qt/gamelistsettingswidget.ui
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<string>Add</string>
</property>
<property name="icon">
<iconset theme="PostProcessingAdd"/>
<iconset theme="add-line"/>
</property>
</widget>
</item>
Expand All @@ -76,7 +76,7 @@
<string>Remove</string>
</property>
<property name="icon">
<iconset theme="PostProcessingRemove"/>
<iconset theme="minus-line"/>
</property>
</widget>
</item>
Expand Down Expand Up @@ -119,7 +119,7 @@
<string>Add</string>
</property>
<property name="icon">
<iconset theme="PostProcessingAdd"/>
<iconset theme="add-line"/>
</property>
</widget>
</item>
Expand All @@ -135,7 +135,7 @@
<string>Remove</string>
</property>
<property name="icon">
<iconset theme="PostProcessingRemove"/>
<iconset theme="minus-line"/>
</property>
</widget>
</item>
Expand Down Expand Up @@ -171,7 +171,7 @@
<string>Scan For New Games</string>
</property>
<property name="icon">
<iconset theme="ScanForGames"/>
<iconset theme="mag-line"/>
</property>
</widget>
</item>
Expand All @@ -187,7 +187,7 @@
<string>Rescan All Games</string>
</property>
<property name="icon">
<iconset theme="RescanAllGames"/>
<iconset theme="refresh-line"/>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion 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("controller-line")), tr("Use Global Settings"));
m_ui.inputProfile->addItem(QIcon::fromTheme(QStringLiteral("controller-digital-line")), tr("Use Global Settings"));
for (const std::string& name : InputManager::GetInputProfileNames())
m_ui.inputProfile->addItem(QString::fromStdString(name));

Expand Down
12 changes: 6 additions & 6 deletions src/duckstation-qt/mainwindow.ui
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@
</action>
<action name="actionEmulationSettings">
<property name="icon">
<iconset theme="dashboard-line">
<iconset theme="emulation-line">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
Expand All @@ -413,7 +413,7 @@
</action>
<action name="actionControllerSettings">
<property name="icon">
<iconset theme="controller-line">
<iconset theme="controller-digital-line">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
Expand All @@ -431,7 +431,7 @@
</action>
<action name="actionDisplaySettings">
<property name="icon">
<iconset theme="brush-line">
<iconset theme="image-fill">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
Expand All @@ -440,7 +440,7 @@
</action>
<action name="actionEnhancementSettings">
<property name="icon">
<iconset theme="paint-fill">
<iconset theme="sparkle-fill">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
Expand All @@ -449,7 +449,7 @@
</action>
<action name="actionPostProcessingSettings">
<property name="icon">
<iconset theme="pantone-line">
<iconset theme="sun-fill">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
Expand Down Expand Up @@ -571,7 +571,7 @@
</action>
<action name="actionGameListSettings">
<property name="icon">
<iconset theme="folder-settings-line">
<iconset theme="folder-open-line">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
Expand Down
14 changes: 7 additions & 7 deletions src/duckstation-qt/postprocessingsettingswidget.ui
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
<string>&amp;Reload Shaders</string>
</property>
<property name="icon">
<iconset resource="resources/resources.qrc">
<normaloff>:/icons/view-refresh.png</normaloff>:/icons/view-refresh.png</iconset>
<iconset theme="refresh-line">
<normaloff>.</normaloff>.</iconset>
</property>
</widget>
</item>
Expand Down Expand Up @@ -97,7 +97,7 @@
<string>Add</string>
</property>
<property name="icon">
<iconset theme="PostProcessingAdd">
<iconset theme="add-line">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="toolButtonStyle">
Expand All @@ -117,7 +117,7 @@
<string>Remove</string>
</property>
<property name="icon">
<iconset theme="PostProcessingRemove">
<iconset theme="minus-line">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="toolButtonStyle">
Expand All @@ -137,7 +137,7 @@
<string>Clear</string>
</property>
<property name="icon">
<iconset theme="Clear">
<iconset theme="trash-fill">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="toolButtonStyle">
Expand All @@ -157,7 +157,7 @@
<string>Move Up</string>
</property>
<property name="icon">
<iconset theme="MoveUp">
<iconset theme="arrow-up-line">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="toolButtonStyle">
Expand All @@ -177,7 +177,7 @@
<string>Move Down</string>
</property>
<property name="icon">
<iconset theme="MoveDown">
<iconset theme="arrow-down-line">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="toolButtonStyle">
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 @@ -868,7 +868,7 @@ QIcon GetIconForEntryType(GameList::EntryType type)
return QIcon::fromTheme(QStringLiteral("file-music-line"));
case GameList::EntryType::PSExe:
default:
return QIcon::fromTheme(QStringLiteral("settings-5-line"));
return QIcon::fromTheme(QStringLiteral("settings-3-line"));
}
}

Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed src/duckstation-qt/resources/icons/black/16/Cheats.png
Binary file not shown.
Binary file removed src/duckstation-qt/resources/icons/black/16/Clear.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed src/duckstation-qt/resources/icons/black/16/Exit.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed src/duckstation-qt/resources/icons/black/16/MoveUp.png
Diff not rendered.
Binary file removed src/duckstation-qt/resources/icons/black/16/Options.png
Diff not rendered.
Binary file removed src/duckstation-qt/resources/icons/black/16/Pause.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed src/duckstation-qt/resources/icons/black/16/Reset.png
Diff not rendered.
Binary file removed src/duckstation-qt/resources/icons/black/16/Resume.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed src/duckstation-qt/resources/icons/black/32/Clear.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed src/duckstation-qt/resources/icons/black/32/Exit.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed src/duckstation-qt/resources/icons/black/32/MoveUp.png
Diff not rendered.
Binary file removed src/duckstation-qt/resources/icons/black/32/Options.png
Diff not rendered.
Binary file removed src/duckstation-qt/resources/icons/black/32/Pause.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed src/duckstation-qt/resources/icons/black/32/Reset.png
Diff not rendered.
Binary file removed src/duckstation-qt/resources/icons/black/32/Resume.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed src/duckstation-qt/resources/icons/black/64/Exit.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
14 changes: 1 addition & 13 deletions src/duckstation-qt/resources/icons/black/index.theme
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,8 @@
Name=Black Icon Theme
Comment=Black Icon Theme

[16]
Size=16
Type=Fixed

[32]
Size=32
Type=Fixed

[64]
Size=64
Type=Fixed

[svg]
Size=64
Size=128
Type=Scalable
MinSize=64
MaxSize=1024
1 change: 1 addition & 0 deletions src/duckstation-qt/resources/icons/black/svg/add-line.svg
6 changes: 0 additions & 6 deletions src/duckstation-qt/resources/icons/black/svg/brush-line.svg
Diff not rendered.
99 changes: 1 addition & 98 deletions src/duckstation-qt/resources/icons/black/svg/chip-2-line.svg
Loading

0 comments on commit 0cfbdb0

Please sign in to comment.