N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4066 from zhaowenlan1779/port-yuzu-946

Browse source 
Port "qt/main: Collapse if statement in UpdateRecentFiles()" from yuzu
This commit is contained in:
James Rowe 2018-08-09 09:41:10 -06:00 committed by GitHub
commit 77573b93ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/citra_qt/main.cpp
View file

@ -109,6 +109,8 @@ void GMainWindow::ShowCallouts() {
ShowCalloutMessage(telemetry_message, CalloutFlag::Telemetry); ShowCalloutMessage(telemetry_message, CalloutFlag::Telemetry);
} }
const int GMainWindow::max_recent_files_item;
GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) { GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) {
Log::Filter log_filter; Log::Filter log_filter;
log_filter.ParseFilterString(Settings::values.log_filter); log_filter.ParseFilterString(Settings::values.log_filter);
@ -808,11 +810,11 @@ void GMainWindow::StoreRecentFile(const QString& filename) {
} }
void GMainWindow::UpdateRecentFiles() { void GMainWindow::UpdateRecentFiles() {
unsigned int num_recent_files = const int num_recent_files =
std::min(UISettings::values.recent_files.size(), static_cast<int>(max_recent_files_item)); std::min(UISettings::values.recent_files.size(), max_recent_files_item);
for (unsigned int i = 0; i < num_recent_files; i++) { for (int i = 0; i < num_recent_files; i++) {
QString text = QString("&%1. %2").arg(i + 1).arg( const QString text = QString("&%1. %2").arg(i + 1).arg(
QFileInfo(UISettings::values.recent_files[i]).fileName()); QFileInfo(UISettings::values.recent_files[i]).fileName());
actions_recent_files[i]->setText(text); actions_recent_files[i]->setText(text);
actions_recent_files[i]->setData(UISettings::values.recent_files[i]); actions_recent_files[i]->setData(UISettings::values.recent_files[i]);
@ -824,12 +826,8 @@ void GMainWindow::UpdateRecentFiles() {
actions_recent_files[j]->setVisible(false); actions_recent_files[j]->setVisible(false);
} }
// Grey out the recent files menu if the list is empty // Enable the recent files menu if the list isn't empty
if (num_recent_files == 0) { ui.menu_recent_files->setEnabled(num_recent_files != 0);
ui.menu_recent_files->setEnabled(false);
} else {
ui.menu_recent_files->setEnabled(true);
}
} }
void GMainWindow::OnGameListLoadFile(QString game_path) { void GMainWindow::OnGameListLoadFile(QString game_path) {