starred/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2026-02-04 05:04:33 +00:00
Code Issues 1.1k Packages Projects Releases 20 Wiki Activity

Qt: Name consistency improvements

Browse Source
This commit is contained in:
Stenzek
2025-12-06 14:13:47 +10:00
parent a870f62709
commit 1541200903
8 changed files with 59 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/achievements.cpp
View File

@@ -2097,7 +2097,7 @@ bool Achievements::DownloadGameIcons(ProgressCallback* progress, Error* error)
if (game_ids.empty())
{
Error::SetStringView(error, TRANSLATE_SV("Achievements", "No games need badge downloads."));
Error::SetStringView(error, TRANSLATE_SV("Achievements", "All available icons have already been downloaded."));
return false;
}
@@ -2147,7 +2147,7 @@ bool Achievements::DownloadGameIcons(ProgressCallback* progress, Error* error)
[&titles_response]() { rc_api_destroy_fetch_game_titles_response(&titles_response.value()); });
if (titles_response->num_entries == 0)
{
Error::SetStringView(error, TRANSLATE_SV("Achievements", "No badge names returned."));
Error::SetStringView(error, TRANSLATE_SV("Achievements", "No image names returned."));
return false;
}
@@ -2198,12 +2198,12 @@ bool Achievements::DownloadGameIcons(ProgressCallback* progress, Error* error)
if (badges_to_download == 0)
{
Error::SetStringView(error, TRANSLATE_SV("Achievements", "All badges have already been downloaded."));
Error::SetStringView(error, TRANSLATE_SV("Achievements", "All icons have already been downloaded."));
return false;
}
progress->SetProgressRange(badges_to_download);
progress->FormatStatusText(TRANSLATE_FS("Achievements", "Downloading {} game badges..."), badges_to_download);
progress->FormatStatusText(TRANSLATE_FS("Achievements", "Downloading {} game icons..."), badges_to_download);
WaitForHTTPRequestsWithYield(lock);
return true;
}

6
src/duckstation-qt/aboutdialog.cpp
View File

@@ -55,7 +55,7 @@ p, li { white-space: pre-wrap; }
.arg(tr("Icon by"))
.arg(tr("License")));
connect(m_ui.buttonBox, &QDialogButtonBox::rejected, this, &QDialog::accept);
connect(m_ui.buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
}
AboutDialog::~AboutDialog() = default;
@@ -84,8 +84,8 @@ void AboutDialog::openThirdPartyNotices(QWidget* parent)
}
layout->addWidget(tb, 1);
QDialogButtonBox* const bb = new QDialogButtonBox(QDialogButtonBox::Close, dialog);
connect(bb, &QDialogButtonBox::rejected, dialog, &QDialog::accept);
QDialogButtonBox* const bb = new QDialogButtonBox(QDialogButtonBox::Ok, dialog);
connect(bb, &QDialogButtonBox::accepted, dialog, &QDialog::accept);
layout->addWidget(bb, 0);
dialog->open();

2
src/duckstation-qt/aboutdialog.ui
View File

@@ -79,7 +79,7 @@
<item row="1" column="0" colspan="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::StandardButton::Close</set>
<set>QDialogButtonBox::StandardButton::Ok</set>
</property>
</widget>
</item>

19
src/duckstation-qt/gamelistwidget.cpp
View File

@@ -2163,25 +2163,6 @@ void GameListWidget::setPreferAchievementGameIcons(bool enabled)
m_model->refreshIcons();
}
void GameListWidget::downloadAllGameIcons()
{
QtAsyncTaskWithProgressDialog::create(this, TRANSLATE_STR("GameListWidget", "Download Game Badges"),
TRANSLATE_STR("GameListWidget", "Downloading game badges..."), true, 0, 0, 0.0f,
[](ProgressCallback* progress) -> std::function<void()> {
Error error;
const bool result = Achievements::DownloadGameIcons(progress, &error);
return [error = std::move(error), result]() {
if (!result)
{
g_main_window->reportError(
tr("Error"), QString::fromStdString(error.GetDescription()));
}
g_main_window->refreshGameListModel();
};
});
}
void GameListWidget::setShowCoverTitles(bool enabled)
{
if (m_model->getShowCoverTitles() == enabled)

1
src/duckstation-qt/gamelistwidget.h
View File

@@ -283,7 +283,6 @@ public:
void setShowGameIcons(bool enabled);
void setAnimateGameIcons(bool enabled);
void setPreferAchievementGameIcons(bool enabled);
void downloadAllGameIcons();
void setShowCoverTitles(bool enabled);
void refreshGridCovers();
void focusSearchWidget();

33
src/duckstation-qt/mainwindow.cpp
View File

@@ -17,11 +17,13 @@
#include "memoryeditorwindow.h"
#include "memoryscannerwindow.h"
#include "qthost.h"
#include "qtprogresscallback.h"
#include "qtutils.h"
#include "selectdiscdialog.h"
#include "settingswindow.h"
#include "settingwidgetbinder.h"
#include "core/achievements.h"
#include "core/cheats.h"
#include "core/game_list.h"
#include "core/host.h"
@@ -530,7 +532,6 @@ void MainWindow::updateGameListRelatedActions()
m_ui.actionViewZoomOut->setDisabled(disable);
m_ui.actionGridViewRefreshCovers->setDisabled(disable || !game_grid);
m_ui.actionPreferAchievementGameIcons->setDisabled(disable || !game_list);
m_ui.actionDownloadAllGameIcons->setDisabled(disable);
m_ui.actionChangeGameListBackground->setDisabled(disable);
m_ui.actionClearGameListBackground->setDisabled(disable || !has_background);
}
@@ -2475,8 +2476,12 @@ void MainWindow::connectSignals()
connect(m_ui.actionMemoryEditor, &QAction::triggered, this, &MainWindow::onToolsMemoryEditorTriggered);
connect(m_ui.actionMemoryScanner, &QAction::triggered, this, &MainWindow::onToolsMemoryScannerTriggered);
connect(m_ui.actionISOBrowser, &QAction::triggered, this, &MainWindow::onToolsISOBrowserTriggered);
connect(m_ui.actionCoverDownloader, &QAction::triggered, this, &MainWindow::onToolsCoverDownloaderTriggered);
connect(m_ui.actionControllerTest, &QAction::triggered, g_emu_thread, &EmuThread::startControllerTest);
connect(m_ui.actionCoverDownloader, &QAction::triggered, this, &MainWindow::onToolsCoverDownloaderTriggered);
connect(m_ui.actionToolsDownloadAchievementGameIcons, &QAction::triggered, this,
&MainWindow::onToolsDownloadAchievementGameIconsTriggered);
connect(m_ui.actionToolsRefreshAchievementProgress, &QAction::triggered, g_emu_thread,
&EmuThread::refreshAchievementsAllProgress);
connect(m_ui.actionMediaCapture, &QAction::triggered, this, &MainWindow::onToolsMediaCaptureTriggered);
connect(m_ui.actionCaptureGPUFrame, &QAction::triggered, g_emu_thread, &EmuThread::captureGPUFrameDump);
connect(m_ui.actionCPUDebugger, &QAction::triggered, this, &MainWindow::openCPUDebugger);
@@ -2492,15 +2497,12 @@ void MainWindow::connectSignals()
connect(m_ui.actionAnimateGameIcons, &QAction::triggered, m_game_list_widget, &GameListWidget::setAnimateGameIcons);
connect(m_ui.actionPreferAchievementGameIcons, &QAction::triggered, m_game_list_widget,
&GameListWidget::setPreferAchievementGameIcons);
connect(m_ui.actionDownloadAllGameIcons, &QAction::triggered, m_game_list_widget, &GameListWidget::downloadAllGameIcons);
connect(m_ui.actionGridViewShowTitles, &QAction::triggered, m_game_list_widget, &GameListWidget::setShowCoverTitles);
connect(m_ui.actionGridViewShowTitles, &QAction::triggered, m_game_list_widget, &GameListWidget::setShowCoverTitles);
connect(m_ui.actionViewZoomIn, &QAction::triggered, this, &MainWindow::onViewZoomInActionTriggered);
connect(m_ui.actionViewZoomOut, &QAction::triggered, this, &MainWindow::onViewZoomOutActionTriggered);
connect(m_ui.actionGridViewRefreshCovers, &QAction::triggered, m_game_list_widget,
&GameListWidget::refreshGridCovers);
connect(m_ui.actionViewRefreshAchievementProgress, &QAction::triggered, g_emu_thread,
&EmuThread::refreshAchievementsAllProgress);
connect(m_ui.actionChangeGameListBackground, &QAction::triggered, this,
&MainWindow::onViewChangeGameListBackgroundTriggered);
connect(m_ui.actionClearGameListBackground, &QAction::triggered, this,
@@ -3212,7 +3214,8 @@ void MainWindow::onAchievementsLoginSuccess(const QString& username, quint32 poi
void MainWindow::onAchievementsActiveChanged(bool active)
{
m_ui.actionViewRefreshAchievementProgress->setEnabled(active);
m_ui.actionToolsRefreshAchievementProgress->setEnabled(active);
m_ui.actionToolsDownloadAchievementGameIcons->setEnabled(active);
}
void MainWindow::onAchievementsHardcoreModeChanged(bool enabled)
@@ -3288,6 +3291,24 @@ void MainWindow::onToolsCoverDownloaderTriggered()
QtUtils::ShowOrRaiseWindow(m_cover_download_window, this, true);
}
void MainWindow::onToolsDownloadAchievementGameIconsTriggered()
{
QtAsyncTaskWithProgressDialog::create(
this, TRANSLATE_STR("GameListWidget", "Download Game Badges"),
TRANSLATE_STR("GameListWidget", "Downloading game badges..."), true, 0, 0, 0.0f, [](ProgressCallback* progress) {
Error error;
const bool result = Achievements::DownloadGameIcons(progress, &error);
return [error = std::move(error), result]() {
if (!result)
{
g_main_window->reportError(tr("Error"), QString::fromStdString(error.GetDescription()));
}
g_main_window->refreshGameListModel();
};
});
}
void MainWindow::onToolsMediaCaptureTriggered(bool checked)
{
if (!s_locals.system_valid)

5
src/duckstation-qt/mainwindow.h
View File

@@ -198,8 +198,6 @@ private:
void doSettings(const char* category = nullptr);
void openGamePropertiesForCurrentGame(const char* category = nullptr);
void doControllerSettings(ControllerSettingsWindow::Category category = ControllerSettingsWindow::Category::Count);
void onViewChangeGameListBackgroundTriggered();
void onViewClearGameListBackgroundTriggered();
void openSelectDiscDialog(const QString& title, std::function<void(std::string)> callback);
void setGameListEntryCoverImage(const GameList::Entry* entry);
@@ -290,6 +288,8 @@ private:
void onViewZoomOutActionTriggered();
void onViewSortByActionTriggered();
void onViewSortOrderActionTriggered();
void onViewChangeGameListBackgroundTriggered();
void onViewClearGameListBackgroundTriggered();
void onGitHubRepositoryActionTriggered();
void onDiscordServerActionTriggered();
void onAboutActionTriggered();
@@ -299,6 +299,7 @@ private:
void onToolsMemoryScannerTriggered();
void onToolsISOBrowserTriggered();
void onToolsCoverDownloaderTriggered();
void onToolsDownloadAchievementGameIconsTriggered();
void onToolsMediaCaptureTriggered(bool checked);
void onToolsOpenDataDirectoryTriggered();
void onToolsOpenTextureDirectoryTriggered();

26
src/duckstation-qt/mainwindow.ui
View File

@@ -189,11 +189,17 @@
<property name="title">
<string>&amp;Window Size</string>
</property>
<property name="icon">
<iconset theme="window-2-line"/>
</property>
</widget>
<widget class="QMenu" name="menuSortBy">
<property name="title">
<string>Sort B&amp;y</string>
</property>
<property name="icon">
<iconset theme="sort-alphabet-asc"/>
</property>
</widget>
<addaction name="actionViewToolbar"/>
<addaction name="actionViewLockToolbar"/>
@@ -218,14 +224,12 @@
<addaction name="actionShowGameIcons"/>
<addaction name="actionAnimateGameIcons"/>
<addaction name="actionPreferAchievementGameIcons"/>
<addaction name="actionDownloadAllGameIcons"/>
<addaction name="separator"/>
<addaction name="actionGridViewShowTitles"/>
<addaction name="actionGridViewRefreshCovers"/>
<addaction name="separator"/>
<addaction name="actionChangeGameListBackground"/>
<addaction name="actionClearGameListBackground"/>
<addaction name="actionViewRefreshAchievementProgress"/>
</widget>
<widget class="QMenu" name="menu_Tools">
<property name="title">
@@ -237,6 +241,9 @@
<addaction name="actionCoverDownloader"/>
<addaction name="actionControllerTest"/>
<addaction name="separator"/>
<addaction name="actionToolsDownloadAchievementGameIcons"/>
<addaction name="actionToolsRefreshAchievementProgress"/>
<addaction name="separator"/>
<addaction name="actionMemoryEditor"/>
<addaction name="actionMemoryScanner"/>
<addaction name="actionISOBrowser"/>
@@ -1072,6 +1079,9 @@
</property>
</action>
<action name="actionGridViewRefreshCovers">
<property name="icon">
<iconset theme="refresh-line"/>
</property>
<property name="text">
<string>Refresh Grid &amp;Covers</string>
</property>
@@ -1321,10 +1331,13 @@
<string>Removes the background image shown in the game list/grid.</string>
</property>
</action>
<action name="actionViewRefreshAchievementProgress">
<action name="actionToolsRefreshAchievementProgress">
<property name="enabled">
<bool>false</bool>
</property>
<property name="icon">
<iconset theme="refresh-line"/>
</property>
<property name="text">
<string>Refresh Achievement &amp;Progress</string>
</property>
@@ -1388,12 +1401,15 @@
<string>Prioritizes the games badges used for RetroAchievements over memory card icons.</string>
</property>
</action>
<action name="actionDownloadAllGameIcons">
<action name="actionToolsDownloadAchievementGameIcons">
<property name="enabled">
<bool>false</bool>
</property>
<property name="icon">
<iconset theme="download-2-line"/>
</property>
<property name="text">
<string>Download All Game Icons</string>
<string>Download Achievement &amp;Icons</string>
</property>
<property name="toolTip">
<string>Downloads icons for all games from RetroAchievements.</string>