Qt: Add icons by @andercard0

This commit is contained in:
Connor McLaughlin 2021-08-15 14:23:14 +10:00
parent 3236917479
commit e87761b9e6
255 changed files with 431 additions and 190 deletions

View File

@ -60,8 +60,7 @@
<string>Add</string> <string>Add</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="PostProcessingAdd"/>
<normaloff>:/icons/list-add.png</normaloff>:/icons/list-add.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
@ -77,8 +76,7 @@
<string>Remove</string> <string>Remove</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="PostProcessingRemove"/>
<normaloff>:/icons/list-remove.png</normaloff>:/icons/list-remove.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
@ -121,8 +119,7 @@
<string>Add</string> <string>Add</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="PostProcessingAdd"/>
<normaloff>:/icons/list-add.png</normaloff>:/icons/list-add.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
@ -138,8 +135,7 @@
<string>Remove</string> <string>Remove</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="PostProcessingRemove"/>
<normaloff>:/icons/list-remove.png</normaloff>:/icons/list-remove.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
@ -175,8 +171,7 @@
<string>Scan For New Games</string> <string>Scan For New Games</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="ScanForGames"/>
<normaloff>:/icons/folder-open.png</normaloff>:/icons/folder-open.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
@ -192,8 +187,7 @@
<string>Rescan All Games</string> <string>Rescan All Games</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="RescanAllGames"/>
<normaloff>:/icons/view-refresh.png</normaloff>:/icons/view-refresh.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>

View File

@ -46,6 +46,8 @@ static constexpr char DISC_IMAGE_FILTER[] = QT_TRANSLATE_NOOP(
"(*.ecm);;Media Descriptor Sidecar Images (*.mds);;PlayStation EBOOTs (*.pbp);;PlayStation Executables (*.exe " "(*.ecm);;Media Descriptor Sidecar Images (*.mds);;PlayStation EBOOTs (*.pbp);;PlayStation Executables (*.exe "
"*.psexe);;Portable Sound Format Files (*.psf *.minipsf);;Playlists (*.m3u)"); "*.psexe);;Portable Sound Format Files (*.psf *.minipsf);;Playlists (*.m3u)");
static const char* DEFAULT_THEME_NAME = "darkfusion";
ALWAYS_INLINE static QString getWindowTitle(const QString& game_title) ALWAYS_INLINE static QString getWindowTitle(const QString& game_title)
{ {
if (game_title.isEmpty()) if (game_title.isEmpty())
@ -90,7 +92,7 @@ void MainWindow::initializeAndShow()
m_ui.setupUi(this); m_ui.setupUi(this);
setupAdditionalUi(); setupAdditionalUi();
connectSignals(); connectSignals();
updateTheme(); setThemeFromSettings();
resize(800, 700); resize(800, 700);
@ -1288,6 +1290,7 @@ void MainWindow::connectSignals()
addThemeToMenu(tr("Dark Fusion (Gray)"), QStringLiteral("darkfusion")); addThemeToMenu(tr("Dark Fusion (Gray)"), QStringLiteral("darkfusion"));
addThemeToMenu(tr("Dark Fusion (Blue)"), QStringLiteral("darkfusionblue")); addThemeToMenu(tr("Dark Fusion (Blue)"), QStringLiteral("darkfusionblue"));
addThemeToMenu(tr("QDarkStyle"), QStringLiteral("qdarkstyle")); addThemeToMenu(tr("QDarkStyle"), QStringLiteral("qdarkstyle"));
updateMenuSelectedTheme();
} }
void MainWindow::addThemeToMenu(const QString& name, const QString& key) void MainWindow::addThemeToMenu(const QString& name, const QString& key)
@ -1301,12 +1304,15 @@ void MainWindow::addThemeToMenu(const QString& name, const QString& key)
void MainWindow::setTheme(const QString& theme) void MainWindow::setTheme(const QString& theme)
{ {
m_host_interface->SetStringSettingValue("UI", "Theme", theme.toUtf8().constData()); m_host_interface->SetStringSettingValue("UI", "Theme", theme.toUtf8().constData());
updateTheme(); setThemeFromSettings();
updateMenuSelectedTheme();
} }
void MainWindow::updateTheme() void MainWindow::setThemeFromSettings()
{ {
QString theme = QString::fromStdString(m_host_interface->GetStringSettingValue("UI", "Theme", "darkfusion")); QString theme = QString::fromStdString(m_host_interface->GetStringSettingValue("UI", "Theme", DEFAULT_THEME_NAME));
QString icon_theme;
if (theme == QStringLiteral("qdarkstyle")) if (theme == QStringLiteral("qdarkstyle"))
{ {
qApp->setStyle(m_unthemed_style_name); qApp->setStyle(m_unthemed_style_name);
@ -1315,12 +1321,16 @@ void MainWindow::updateTheme()
QFile f(QStringLiteral(":qdarkstyle/style.qss")); QFile f(QStringLiteral(":qdarkstyle/style.qss"));
if (f.open(QFile::ReadOnly | QFile::Text)) if (f.open(QFile::ReadOnly | QFile::Text))
qApp->setStyleSheet(f.readAll()); qApp->setStyleSheet(f.readAll());
icon_theme = QStringLiteral("white");
} }
else if (theme == QStringLiteral("fusion")) else if (theme == QStringLiteral("fusion"))
{ {
qApp->setPalette(QApplication::style()->standardPalette()); qApp->setPalette(QApplication::style()->standardPalette());
qApp->setStyleSheet(QString()); qApp->setStyleSheet(QString());
qApp->setStyle(QStyleFactory::create("Fusion")); qApp->setStyle(QStyleFactory::create("Fusion"));
icon_theme = QStringLiteral("black");
} }
else if (theme == QStringLiteral("darkfusion")) else if (theme == QStringLiteral("darkfusion"))
{ {
@ -1356,6 +1366,8 @@ void MainWindow::updateTheme()
qApp->setPalette(darkPalette); qApp->setPalette(darkPalette);
qApp->setStyleSheet("QToolTip { color: #ffffff; background-color: #2a82da; border: 1px solid white; }"); qApp->setStyleSheet("QToolTip { color: #ffffff; background-color: #2a82da; border: 1px solid white; }");
icon_theme = QStringLiteral("white");
} }
else if (theme == QStringLiteral("darkfusionblue")) else if (theme == QStringLiteral("darkfusionblue"))
{ {
@ -1392,27 +1404,19 @@ void MainWindow::updateTheme()
qApp->setPalette(darkPalette); qApp->setPalette(darkPalette);
qApp->setStyleSheet("QToolTip { color: #ffffff; background-color: #2a82da; border: 1px solid white; }"); qApp->setStyleSheet("QToolTip { color: #ffffff; background-color: #2a82da; border: 1px solid white; }");
icon_theme = QStringLiteral("white");
} }
else else
{ {
qApp->setPalette(QApplication::style()->standardPalette()); qApp->setPalette(QApplication::style()->standardPalette());
qApp->setStyleSheet(QString()); qApp->setStyleSheet(QString());
qApp->setStyle(m_unthemed_style_name); qApp->setStyle(m_unthemed_style_name);
icon_theme = QStringLiteral("black");
} }
for (QObject* obj : m_ui.menuSettingsTheme->children()) QIcon::setThemeName(icon_theme);
{
QAction* action = qobject_cast<QAction*>(obj);
if (action)
{
QVariant action_data(action->data());
if (action_data.isValid())
{
QSignalBlocker blocker(action);
action->setChecked(action_data == theme);
}
}
}
} }
void MainWindow::onSettingsResetToDefault() void MainWindow::onSettingsResetToDefault()
@ -1435,6 +1439,7 @@ void MainWindow::onSettingsResetToDefault()
updateDebugMenuGPURenderer(); updateDebugMenuGPURenderer();
updateDebugMenuCropMode(); updateDebugMenuCropMode();
updateDebugMenuVisibility(); updateDebugMenuVisibility();
updateMenuSelectedTheme();
} }
void MainWindow::saveStateToConfig() void MainWindow::saveStateToConfig()
@ -1575,6 +1580,25 @@ void MainWindow::updateDebugMenuCropMode()
} }
} }
void MainWindow::updateMenuSelectedTheme()
{
QString theme = QString::fromStdString(m_host_interface->GetStringSettingValue("UI", "Theme", DEFAULT_THEME_NAME));
for (QObject* obj : m_ui.menuSettingsTheme->children())
{
QAction* action = qobject_cast<QAction*>(obj);
if (action)
{
QVariant action_data(action->data());
if (action_data.isValid())
{
QSignalBlocker blocker(action);
action->setChecked(action_data == theme);
}
}
}
}
void MainWindow::ensureGameListLoaded() void MainWindow::ensureGameListLoaded()
{ {
if (m_host_interface->getGameList()->IsGameListLoaded()) if (m_host_interface->getGameList()->IsGameListLoaded())

View File

@ -63,9 +63,6 @@ private Q_SLOTS:
void onMouseModeRequested(bool relative_mode, bool hide_cursor); void onMouseModeRequested(bool relative_mode, bool hide_cursor);
void updateMouseMode(bool paused); void updateMouseMode(bool paused);
void setTheme(const QString& theme);
void updateTheme();
void onSettingsResetToDefault(); void onSettingsResetToDefault();
void onEmulationStarting(); void onEmulationStarting();
void onEmulationStarted(); void onEmulationStarted();
@ -127,6 +124,8 @@ private:
return (m_display_container ? static_cast<QWidget*>(m_display_container) : static_cast<QWidget*>(m_display_widget)); return (m_display_container ? static_cast<QWidget*>(m_display_container) : static_cast<QWidget*>(m_display_widget));
} }
void setTheme(const QString& theme);
void setThemeFromSettings();
void setupAdditionalUi(); void setupAdditionalUi();
void connectSignals(); void connectSignals();
void addThemeToMenu(const QString& name, const QString& key); void addThemeToMenu(const QString& name, const QString& key);
@ -147,6 +146,7 @@ private:
void updateDebugMenuCPUExecutionMode(); void updateDebugMenuCPUExecutionMode();
void updateDebugMenuGPURenderer(); void updateDebugMenuGPURenderer();
void updateDebugMenuCropMode(); void updateDebugMenuCropMode();
void updateMenuSelectedTheme();
void ensureGameListLoaded(); void ensureGameListLoaded();
std::string getDeviceDiscPath(const QString& title); std::string getDeviceDiscPath(const QString& title);

View File

@ -10,6 +10,9 @@
<height>600</height> <height>600</height>
</rect> </rect>
</property> </property>
<property name="acceptDrops">
<bool>true</bool>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>DuckStation</string> <string>DuckStation</string>
</property> </property>
@ -17,9 +20,6 @@
<iconset resource="resources/resources.qrc"> <iconset resource="resources/resources.qrc">
<normaloff>:/icons/duck.png</normaloff>:/icons/duck.png</iconset> <normaloff>:/icons/duck.png</normaloff>:/icons/duck.png</iconset>
</property> </property>
<property name="acceptDrops">
<bool>true</bool>
</property>
<widget class="QStackedWidget" name="mainContainer"> <widget class="QStackedWidget" name="mainContainer">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>0</number>
@ -33,7 +33,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>754</width> <width>754</width>
<height>21</height> <height>22</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuSystem"> <widget class="QMenu" name="menuSystem">
@ -45,14 +45,13 @@
<string>Change Disc</string> <string>Change Disc</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="ChangeDisc"/>
<normaloff>:/icons/media-optical.png</normaloff>:/icons/media-optical.png</iconset>
</property> </property>
<actiongroup name="actionGroupChangeDiscSubImages"/>
<addaction name="actionChangeDiscFromFile"/> <addaction name="actionChangeDiscFromFile"/>
<addaction name="actionChangeDiscFromDevice"/> <addaction name="actionChangeDiscFromDevice"/>
<addaction name="actionChangeDiscFromGameList"/> <addaction name="actionChangeDiscFromGameList"/>
<addaction name="actionRemoveDisc"/> <addaction name="actionRemoveDisc"/>
<actiongroup name="actionGroupChangeDiscSubImages" />
<addaction name="separator"/> <addaction name="separator"/>
</widget> </widget>
<widget class="QMenu" name="menuCheats"> <widget class="QMenu" name="menuCheats">
@ -60,8 +59,7 @@
<string>Cheats</string> <string>Cheats</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="Cheats"/>
<normaloff>:/icons/conical-flask-red.png</normaloff>:/icons/conical-flask-red.png</iconset>
</property> </property>
</widget> </widget>
<widget class="QMenu" name="menuLoadState"> <widget class="QMenu" name="menuLoadState">
@ -69,8 +67,7 @@
<string>Load State</string> <string>Load State</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="LoadState"/>
<normaloff>:/icons/document-open.png</normaloff>:/icons/document-open.png</iconset>
</property> </property>
</widget> </widget>
<widget class="QMenu" name="menuSaveState"> <widget class="QMenu" name="menuSaveState">
@ -78,8 +75,7 @@
<string>Save State</string> <string>Save State</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="SaveState"/>
<normaloff>:/icons/document-save.png</normaloff>:/icons/document-save.png</iconset>
</property> </property>
</widget> </widget>
<addaction name="actionStartFile"/> <addaction name="actionStartFile"/>
@ -275,8 +271,7 @@
<widget class="QStatusBar" name="statusBar"/> <widget class="QStatusBar" name="statusBar"/>
<action name="actionStartFile"> <action name="actionStartFile">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="StartfileSettings"/>
<normaloff>:/icons/media-optical.png</normaloff>:/icons/media-optical.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Start &amp;File...</string> <string>Start &amp;File...</string>
@ -284,8 +279,7 @@
</action> </action>
<action name="actionStartDisc"> <action name="actionStartDisc">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="StartdiscSettings"/>
<normaloff>:/icons/drive-optical.png</normaloff>:/icons/drive-optical.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Start &amp;Disc...</string> <string>Start &amp;Disc...</string>
@ -293,8 +287,7 @@
</action> </action>
<action name="actionStartBios"> <action name="actionStartBios">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="BIOSSettings"/>
<normaloff>:/icons/drive-removable-media.png</normaloff>:/icons/drive-removable-media.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Start &amp;BIOS</string> <string>Start &amp;BIOS</string>
@ -302,8 +295,7 @@
</action> </action>
<action name="actionScanForNewGames"> <action name="actionScanForNewGames">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="ScanForGames"/>
<normaloff>:/icons/folder-open.png</normaloff>:/icons/folder-open.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Scan For New Games</string> <string>&amp;Scan For New Games</string>
@ -311,8 +303,7 @@
</action> </action>
<action name="actionRescanAllGames"> <action name="actionRescanAllGames">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="RescanAllGames"/>
<normaloff>:/icons/view-refresh.png</normaloff>:/icons/view-refresh.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Rescan All Games</string> <string>&amp;Rescan All Games</string>
@ -320,8 +311,7 @@
</action> </action>
<action name="actionPowerOff"> <action name="actionPowerOff">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="PowerOff"/>
<normaloff>:/icons/system-shutdown.png</normaloff>:/icons/system-shutdown.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Power &amp;Off</string> <string>Power &amp;Off</string>
@ -329,8 +319,7 @@
</action> </action>
<action name="actionReset"> <action name="actionReset">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="Reset"/>
<normaloff>:/icons/view-refresh.png</normaloff>:/icons/view-refresh.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Reset</string> <string>&amp;Reset</string>
@ -341,8 +330,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="Pause"/>
<normaloff>:/icons/media-playback-pause.png</normaloff>:/icons/media-playback-pause.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Pause</string> <string>&amp;Pause</string>
@ -350,8 +338,7 @@
</action> </action>
<action name="actionLoadState"> <action name="actionLoadState">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="LoadState"/>
<normaloff>:/icons/document-open.png</normaloff>:/icons/document-open.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Load State</string> <string>&amp;Load State</string>
@ -359,22 +346,23 @@
</action> </action>
<action name="actionSaveState"> <action name="actionSaveState">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="SaveState"/>
<normaloff>:/icons/document-save.png</normaloff>:/icons/document-save.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Save State</string> <string>&amp;Save State</string>
</property> </property>
</action> </action>
<action name="actionExit"> <action name="actionExit">
<property name="icon">
<iconset theme="Exit"/>
</property>
<property name="text"> <property name="text">
<string>E&amp;xit</string> <string>E&amp;xit</string>
</property> </property>
</action> </action>
<action name="actionBIOSSettings"> <action name="actionBIOSSettings">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="BIOSSettings"/>
<normaloff>:/icons/media-flash-2.png</normaloff>:/icons/media-flash-2.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>B&amp;IOS Settings...</string> <string>B&amp;IOS Settings...</string>
@ -382,8 +370,7 @@
</action> </action>
<action name="actionConsoleSettings"> <action name="actionConsoleSettings">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="ConsoleSettings"/>
<normaloff>:/icons/utilities-system-monitor.png</normaloff>:/icons/utilities-system-monitor.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>C&amp;onsole Settings...</string> <string>C&amp;onsole Settings...</string>
@ -391,8 +378,7 @@
</action> </action>
<action name="actionEmulationSettings"> <action name="actionEmulationSettings">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="EmulationSettings"/>
<normaloff>:/icons/applications-other.png</normaloff>:/icons/applications-other.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>E&amp;mulation Settings...</string> <string>E&amp;mulation Settings...</string>
@ -400,8 +386,7 @@
</action> </action>
<action name="actionControllerSettings"> <action name="actionControllerSettings">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="ControllerSettings"/>
<normaloff>:/icons/input-gaming.png</normaloff>:/icons/input-gaming.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Controller Settings...</string> <string>&amp;Controller Settings...</string>
@ -409,8 +394,7 @@
</action> </action>
<action name="actionHotkeySettings"> <action name="actionHotkeySettings">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="HotkeySettings"/>
<normaloff>:/icons/preferences-desktop-keyboard-shortcuts.png</normaloff>:/icons/preferences-desktop-keyboard-shortcuts.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Hotkey Settings...</string> <string>&amp;Hotkey Settings...</string>
@ -418,8 +402,7 @@
</action> </action>
<action name="actionDisplaySettings"> <action name="actionDisplaySettings">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="DisplaySettings"/>
<normaloff>:/icons/video-display.png</normaloff>:/icons/video-display.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Display Settings...</string> <string>&amp;Display Settings...</string>
@ -427,8 +410,7 @@
</action> </action>
<action name="actionEnhancementSettings"> <action name="actionEnhancementSettings">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="EnhancementSettings"/>
<normaloff>:/icons/antialias-icon.png</normaloff>:/icons/antialias-icon.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Enhancement Settings...</string> <string>&amp;Enhancement Settings...</string>
@ -436,8 +418,7 @@
</action> </action>
<action name="actionPostProcessingSettings"> <action name="actionPostProcessingSettings">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="PostprocessingSettings"/>
<normaloff>:/icons/applications-graphics.png</normaloff>:/icons/applications-graphics.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Post-Processing Settings...</string> <string>&amp;Post-Processing Settings...</string>
@ -445,8 +426,7 @@
</action> </action>
<action name="actionFullscreen"> <action name="actionFullscreen">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="Fullscreen"/>
<normaloff>:/icons/view-fullscreen.png</normaloff>:/icons/view-fullscreen.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Fullscreen</string> <string>Fullscreen</string>
@ -460,8 +440,7 @@
<action name="actionGitHubRepository"> <action name="actionGitHubRepository">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset resource="resources/resources.qrc">
<normaloff>:/icons/github.png</normaloff>:/icons/github.png <normaloff>:/icons/github.png</normaloff>:/icons/github.png</iconset>
</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;GitHub Repository...</string> <string>&amp;GitHub Repository...</string>
@ -470,8 +449,7 @@
<action name="actionIssueTracker"> <action name="actionIssueTracker">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset resource="resources/resources.qrc">
<normaloff>:/icons/IssueTracker.png</normaloff>:/icons/IssueTracker.png <normaloff>:/icons/IssueTracker.png</normaloff>:/icons/IssueTracker.png</iconset>
</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Issue Tracker...</string> <string>&amp;Issue Tracker...</string>
@ -480,8 +458,7 @@
<action name="actionDiscordServer"> <action name="actionDiscordServer">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset resource="resources/resources.qrc">
<normaloff>:/icons/discord.png</normaloff>:/icons/discord.png <normaloff>:/icons/discord.png</normaloff>:/icons/discord.png</iconset>
</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Discord Server...</string> <string>&amp;Discord Server...</string>
@ -490,8 +467,7 @@
<action name="actionCheckForUpdates"> <action name="actionCheckForUpdates">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset resource="resources/resources.qrc">
<normaloff>:/icons/update.png</normaloff>:/icons/update.png <normaloff>:/icons/update.png</normaloff>:/icons/update.png</iconset>
</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Check for &amp;Updates...</string> <string>Check for &amp;Updates...</string>
@ -500,8 +476,7 @@
<action name="actionAboutQt"> <action name="actionAboutQt">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset resource="resources/resources.qrc">
<normaloff>:/icons/QT.png</normaloff>:/icons/QT.png <normaloff>:/icons/QT.png</normaloff>:/icons/QT.png</iconset>
</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>About &amp;Qt...</string> <string>About &amp;Qt...</string>
@ -510,8 +485,7 @@
<action name="actionAbout"> <action name="actionAbout">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset resource="resources/resources.qrc">
<normaloff>:/icons/duck_64.png</normaloff>:/icons/duck_64.png <normaloff>:/icons/duck_64.png</normaloff>:/icons/duck_64.png</iconset>
</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;About DuckStation...</string> <string>&amp;About DuckStation...</string>
@ -528,8 +502,7 @@
</action> </action>
<action name="actionCheats"> <action name="actionCheats">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="Cheats"/>
<normaloff>:/icons/conical-flask-red.png</normaloff>:/icons/conical-flask-red.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Cheats...</string> <string>Cheats...</string>
@ -537,8 +510,7 @@
</action> </action>
<action name="actionAudioSettings"> <action name="actionAudioSettings">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="AudioSettings"/>
<normaloff>:/icons/audio-card.png</normaloff>:/icons/audio-card.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Audio Settings...</string> <string>Audio Settings...</string>
@ -546,8 +518,7 @@
</action> </action>
<action name="actionAchievementSettings"> <action name="actionAchievementSettings">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="AchievementsSettings"/>
<normaloff>:/icons/trophy.png</normaloff>:/icons/trophy.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Achievement Settings...</string> <string>Achievement Settings...</string>
@ -555,8 +526,7 @@
</action> </action>
<action name="actionGameListSettings"> <action name="actionGameListSettings">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="GamelistSettings"/>
<normaloff>:/icons/folder-open.png</normaloff>:/icons/folder-open.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Game List Settings...</string> <string>Game List Settings...</string>
@ -564,8 +534,7 @@
</action> </action>
<action name="actionGeneralSettings"> <action name="actionGeneralSettings">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="GeneralSettings"/>
<normaloff>:/icons/applications-system.png</normaloff>:/icons/applications-system.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>General Settings...</string> <string>General Settings...</string>
@ -573,8 +542,7 @@
</action> </action>
<action name="actionAdvancedSettings"> <action name="actionAdvancedSettings">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="AdvancedSettings"/>
<normaloff>:/icons/applications-development.png</normaloff>:/icons/applications-development.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Advanced Settings...</string> <string>Advanced Settings...</string>
@ -582,8 +550,7 @@
</action> </action>
<action name="actionAddGameDirectory"> <action name="actionAddGameDirectory">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="AddGameDirectory"/>
<normaloff>:/icons/edit-find.png</normaloff>:/icons/edit-find.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Add Game Directory...</string> <string>Add Game Directory...</string>
@ -591,8 +558,7 @@
</action> </action>
<action name="actionSettings"> <action name="actionSettings">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="GeneralSettings"/>
<normaloff>:/icons/preferences-system.png</normaloff>:/icons/preferences-system.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Settings...</string> <string>&amp;Settings...</string>
@ -749,8 +715,7 @@
</action> </action>
<action name="actionScreenshot"> <action name="actionScreenshot">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="Screenshot"/>
<normaloff>:/icons/camera-photo.png</normaloff>:/icons/camera-photo.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Screenshot</string> <string>&amp;Screenshot</string>
@ -758,8 +723,7 @@
</action> </action>
<action name="actionMemoryCardSettings"> <action name="actionMemoryCardSettings">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="MemorycardSettings"/>
<normaloff>:/icons/media-flash-24.png</normaloff>:/icons/media-flash-24.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Memory Card Settings...</string> <string>&amp;Memory Card Settings...</string>
@ -767,8 +731,7 @@
</action> </action>
<action name="actionResumeLastState"> <action name="actionResumeLastState">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="Resume"/>
<normaloff>:/icons/media-playback-start.png</normaloff>:/icons/media-playback-start.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Resume</string> <string>Resume</string>
@ -811,6 +774,9 @@
</property> </property>
</action> </action>
<action name="actionViewGameList"> <action name="actionViewGameList">
<property name="icon">
<iconset theme="GameList"/>
</property>
<property name="text"> <property name="text">
<string>Game &amp;List</string> <string>Game &amp;List</string>
</property> </property>
@ -847,6 +813,9 @@
</property> </property>
</action> </action>
<action name="actionViewGameGrid"> <action name="actionViewGameGrid">
<property name="icon">
<iconset theme="GameGrid"/>
</property>
<property name="text"> <property name="text">
<string>Game &amp;Grid</string> <string>Game &amp;Grid</string>
</property> </property>
@ -895,8 +864,7 @@
</action> </action>
<action name="actionPowerOffWithoutSaving"> <action name="actionPowerOffWithoutSaving">
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="PoweroffWsaving"/>
<normaloff>:/icons/process-stop.png</normaloff>:/icons/process-stop.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Power Off &amp;Without Saving</string> <string>Power Off &amp;Without Saving</string>

View File

@ -50,8 +50,7 @@
<string>Add</string> <string>Add</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="PostProcessingAdd"/>
<normaloff>:/icons/list-add.png</normaloff>:/icons/list-add.png</iconset>
</property> </property>
<property name="toolButtonStyle"> <property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum> <enum>Qt::ToolButtonTextBesideIcon</enum>
@ -70,8 +69,7 @@
<string>Remove</string> <string>Remove</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="PostProcessingRemove"/>
<normaloff>:/icons/list-remove.png</normaloff>:/icons/list-remove.png</iconset>
</property> </property>
<property name="toolButtonStyle"> <property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum> <enum>Qt::ToolButtonTextBesideIcon</enum>
@ -90,8 +88,7 @@
<string>Clear</string> <string>Clear</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="Clear"/>
<normaloff>:/icons/edit-clear-16.png</normaloff>:/icons/edit-clear-16.png</iconset>
</property> </property>
<property name="toolButtonStyle"> <property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum> <enum>Qt::ToolButtonTextBesideIcon</enum>
@ -110,8 +107,7 @@
<string>Move Up</string> <string>Move Up</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="MoveUp"/>
<normaloff>:/icons/go-up-16.png</normaloff>:/icons/go-up-16.png</iconset>
</property> </property>
<property name="toolButtonStyle"> <property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum> <enum>Qt::ToolButtonTextBesideIcon</enum>
@ -130,8 +126,7 @@
<string>Move Down</string> <string>Move Down</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="MoveDown"/>
<normaloff>:/icons/go-down-16.png</normaloff>:/icons/go-down-16.png</iconset>
</property> </property>
<property name="toolButtonStyle"> <property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum> <enum>Qt::ToolButtonTextBesideIcon</enum>
@ -150,8 +145,7 @@
<string>Options...</string> <string>Options...</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="resources/resources.qrc"> <iconset theme="Options"/>
<normaloff>:/icons/preferences-system.png</normaloff>:/icons/preferences-system.png</iconset>
</property> </property>
<property name="toolButtonStyle"> <property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum> <enum>Qt::ToolButtonTextBesideIcon</enum>

Binary file not shown.

After

Width:  |  Height:  |  Size: 378 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 418 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 356 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 391 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 394 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 522 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 649 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 408 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 409 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 441 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 379 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 448 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 589 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 360 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 424 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 525 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 357 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 431 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 409 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 562 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 499 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 396 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 346 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 544 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 370 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 376 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 392 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 486 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 317 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 216 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 462 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 443 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 627 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 432 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 420 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 468 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 395 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 414 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 373 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 579 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 560 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 615 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 686 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 584 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 655 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 867 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 745 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 785 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 912 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 492 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 877 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 811 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 507 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 705 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 983 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 574 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 737 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 763 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 563 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 599 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 968 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 637 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 646 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 619 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 828 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 451 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 261 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 898 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 729 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 702 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 749 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 881 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 584 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 699 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 629 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 711 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Some files were not shown because too many files have changed in this diff Show More