prifak/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix this shit up

Browse Source
This commit is contained in:
fearlessTobi
2019-06-08 02:57:03 +02:00
parent 0d567ac1cc
commit d28af5097a
17 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/yuzu/configuration/config.cpp
View File

@@ -519,7 +519,8 @@ void Config::ReadPathValues() {
UISettings::values.game_directory_deepscan =
ReadSetting(QStringLiteral("gameListDeepScan"), false).toBool();
UISettings::values.recent_files = ReadSetting(QStringLiteral("recentFiles")).toStringList();
UISettings::values.language = ReadSetting(QStringLiteral("language"), QStringLiteral("")).toString();
UISettings::values.language =
ReadSetting(QStringLiteral("language"), QStringLiteral("")).toString();
qt_config->endGroup();
}

2
src/yuzu/configuration/configure_debug.cpp
View File

@@ -52,6 +52,6 @@ void ConfigureDebug::ApplyConfiguration() {
Log::SetGlobalFilter(filter);
}
void ConfigureDebug::retranslateUi() {
void ConfigureDebug::RetranslateUI() {
ui->retranslateUi(this);
}

2
src/yuzu/configuration/configure_debug.h
View File

@@ -19,7 +19,7 @@ public:
~ConfigureDebug() override;
void ApplyConfiguration();
void retranslateUi();
void RetranslateUI();
void SetConfiguration();
std::unique_ptr<Ui::ConfigureDebug> ui;

59
src/yuzu/configuration/configure_dialog.cpp
View File

@@ -33,7 +33,7 @@ void ConfigureDialog::SetConfiguration() {
ui->generalTab->SetConfiguration();
ui->uiTab->SetConfiguration();
ui->systemTab->SetConfiguration();
ui->inputTab->loadConfiguration();
ui->inputTab->LoadConfiguration();
ui->graphicsTab->SetConfiguration();
ui->audioTab->SetConfiguration();
ui->debugTab->SetConfiguration();
@@ -60,10 +60,14 @@ void ConfigureDialog::PopulateSelectionList() {
const std::array<std::pair<QString, QStringList>, 4> items{
{{tr("General"),
{QT_TR_NOOP("General"), QT_TR_NOOP("Web"), QT_TR_NOOP("Debug"), QT_TR_NOOP("UI")}},
{tr("System"), {QT_TR_NOOP("System"), QT_TR_NOOP("Profiles"), QT_TR_NOOP("Audio")}},
{tr("Graphics"), {QT_TR_NOOP("Graphics")}},
{tr("Controls"), {QT_TR_NOOP("Input"), QT_TR_NOOP("Hotkeys")}}}};
{QT_TR_NOOP(QStringLiteral("General")), QT_TR_NOOP(QStringLiteral("Web")),
QT_TR_NOOP(QStringLiteral("Debug")), QT_TR_NOOP(QStringLiteral("UI"))}},
{tr("System"),
{QT_TR_NOOP(QStringLiteral("System")), QT_TR_NOOP(QStringLiteral("Profiles")),
QT_TR_NOOP(QStringLiteral("Audio"))}},
{tr("Graphics"), {QT_TR_NOOP(QStringLiteral("Graphics"))}},
{tr("Controls"),
{QT_TR_NOOP(QStringLiteral("Input")), QT_TR_NOOP(QStringLiteral("Hotkeys"))}}}};
for (const auto& entry : items) {
auto* const item = new QListWidgetItem(entry.first);
@@ -78,16 +82,17 @@ void ConfigureDialog::UpdateVisibleTabs() {
if (items.isEmpty())
return;
const std::map<QString, QWidget*> widgets = {{"General", ui->generalTab},
{"System", ui->systemTab},
{"Profiles", ui->profileManagerTab},
{"Input", ui->inputTab},
{"Hotkeys", ui->hotkeysTab},
{"Graphics", ui->graphicsTab},
{"Audio", ui->audioTab},
{"Debug", ui->debugTab},
{"Web", ui->webTab},
{"UI", ui->uiTab}};
const std::map<QString, QWidget*> widgets = {
{QStringLiteral("General"), ui->generalTab},
{QStringLiteral("System"), ui->systemTab},
{QStringLiteral("Profiles"), ui->profileManagerTab},
{QStringLiteral("Input"), ui->inputTab},
{QStringLiteral("Hotkeys"), ui->hotkeysTab},
{QStringLiteral("Graphics"), ui->graphicsTab},
{QStringLiteral("Audio"), ui->audioTab},
{QStringLiteral("Debug"), ui->debugTab},
{QStringLiteral("Web"), ui->webTab},
{QStringLiteral("UI"), ui->uiTab}};
ui->tabWidget->clear();
@@ -100,12 +105,12 @@ void ConfigureDialog::UpdateVisibleTabs() {
void ConfigureDialog::onLanguageChanged(const QString& locale) {
emit languageChanged(locale);
// first apply the configuration, and then restore the display
applyConfiguration();
retranslateUi();
setConfiguration();
ApplyConfiguration();
RetranslateUI();
SetConfiguration();
}
void ConfigureDialog::retranslateUi() {
void ConfigureDialog::RetranslateUI() {
int old_row = ui->selectorList->currentRow();
int old_index = ui->tabWidget->currentIndex();
ui->retranslateUi(this);
@@ -114,12 +119,12 @@ void ConfigureDialog::retranslateUi() {
ui->selectorList->setCurrentRow(old_row);
ui->tabWidget->setCurrentIndex(old_index);
ui->generalTab->retranslateUi();
ui->uiTab->retranslateUi();
ui->systemTab->retranslateUi();
ui->inputTab->retranslateUi();
ui->graphicsTab->retranslateUi();
ui->audioTab->retranslateUi();
ui->debugTab->retranslateUi();
ui->webTab->retranslateUi();
ui->generalTab->RetranslateUI();
ui->uiTab->RetranslateUI();
ui->systemTab->RetranslateUI();
ui->inputTab->RetranslateUI();
ui->graphicsTab->RetranslateUI();
ui->audioTab->RetranslateUI();
ui->debugTab->RetranslateUI();
ui->webTab->RetranslateUI();
}

2
src/yuzu/configuration/configure_dialog.h
View File

@@ -32,7 +32,7 @@ private:
void SetConfiguration();
void UpdateVisibleTabs();
void PopulateSelectionList();
void retranslateUi();
void RetranslateUI();
std::unique_ptr<Ui::ConfigureDialog> ui;
HotkeyRegistry& registry;

2
src/yuzu/configuration/configure_general.cpp
View File

@@ -36,6 +36,6 @@ void ConfigureGeneral::ApplyConfiguration() {
Settings::values.use_cpu_jit = ui->use_cpu_jit->isChecked();
}
void ConfigureGeneral::retranslateUi() {
void ConfigureGeneral::RetranslateUI() {
ui->retranslateUi(this);
}

2
src/yuzu/configuration/configure_general.h
View File

@@ -21,7 +21,7 @@ public:
~ConfigureGeneral() override;
void ApplyConfiguration();
void retranslateUi();
void RetranslateUI();
void SetConfiguration();
private:

2
src/yuzu/configuration/configure_graphics.cpp
View File

@@ -111,6 +111,6 @@ void ConfigureGraphics::UpdateBackgroundColorButton(QColor color) {
ui->bg_button->setIcon(color_icon);
}
void ConfigureGraphics::retranslateUi() {
void ConfigureGraphics::RetranslateUI() {
ui->retranslateUi(this);
}

2
src/yuzu/configuration/configure_graphics.h
View File

@@ -19,7 +19,7 @@ public:
~ConfigureGraphics() override;
void ApplyConfiguration();
void retranslateUi();
void RetranslateUI();
void SetConfiguration();
void UpdateBackgroundColorButton(QColor color);

2
src/yuzu/configuration/configure_input.cpp
View File

@@ -210,6 +210,6 @@ void ConfigureInput::RestoreDefaults() {
UpdateUIEnabled();
}
void ConfigureInput::retranslateUi() {
void ConfigureInput::RetranslateUI() {
ui->retranslateUi(this);
}

2
src/yuzu/configuration/configure_input.h
View File

@@ -31,7 +31,7 @@ public:
/// Save all button configurations to settings file
void ApplyConfiguration();
void retranslateUi();
void RetranslateUI();
private:
void UpdateUIEnabled();

2
src/yuzu/configuration/configure_input_simple.cpp
View File

@@ -138,6 +138,6 @@ void ConfigureInputSimple::OnConfigure() {
std::get<2>(INPUT_PROFILES.at(ui->profile_combobox->currentIndex()))(this);
}
void ConfigureInputSimple::retranslateUi() {
void ConfigureInputSimple::RetranslateUI() {
ui->retranslateUi(this);
}

2
src/yuzu/configuration/configure_input_simple.h
View File

@@ -28,7 +28,7 @@ public:
/// Save all button configurations to settings file
void ApplyConfiguration();
void retranslateUi();
void RetranslateUI();
/// Load configuration settings.
void LoadConfiguration();

2
src/yuzu/configuration/configure_system.cpp
View File

@@ -103,6 +103,6 @@ void ConfigureSystem::RefreshConsoleID() {
tr("Console ID: 0x%1").arg(QString::number(console_id, 16).toUpper()));
}
void ConfigureSystem::retranslateUi() {
void ConfigureSystem::RetranslateUI() {
ui->retranslateUi(this);
}

6
src/yuzu/configuration/configure_system.h
View File

@@ -21,12 +21,10 @@ public:
~ConfigureSystem() override;
void ApplyConfiguration();
void setConfiguration();
void retranslateUi();
void SetConfiguration();
void RetranslateUI();
private:
void SetConfiguration();
void ReadSystemSettings();
void RefreshConsoleID();

17
src/yuzu/configuration/configure_ui.cpp
View File

@@ -36,7 +36,8 @@ ConfigureUi::ConfigureUi(QWidget* parent) : QWidget(parent), ui(new Ui::Configur
InitializeLanguageComboBox();
for (const auto& theme : UISettings::themes) {
ui->theme_combobox->addItem(theme.first, theme.second);
ui->theme_combobox->addItem(QString::fromStdString(theme.first),
QString::fromStdString(theme.second));
}
InitializeIconSizeComboBox();
@@ -56,7 +57,7 @@ ConfigureUi::ConfigureUi(QWidget* parent) : QWidget(parent), ui(new Ui::Configur
ConfigureUi::~ConfigureUi() = default;
void ConfigureGameList::ApplyConfiguration() {
void ConfigureUi::ApplyConfiguration() {
UISettings::values.theme =
ui->theme_combobox->itemData(ui->theme_combobox->currentIndex()).toString();
UISettings::values.show_unknown = ui->show_unknown->isChecked();
@@ -71,7 +72,7 @@ void ConfigureUi::RequestGameListUpdate() {
UISettings::values.is_game_list_reload_pending.exchange(true);
}
void ConfigureGameList::SetConfiguration() {
void ConfigureUi::SetConfiguration() {
ui->theme_combobox->setCurrentIndex(ui->theme_combobox->findData(UISettings::values.theme));
ui->language_combobox->setCurrentIndex(
ui->language_combobox->findData(UISettings::values.language));
@@ -112,11 +113,11 @@ void ConfigureUi::RetranslateUI() {
void ConfigureUi::InitializeLanguageComboBox() {
ui->language_combobox->addItem(tr("<System>"), QString());
ui->language_combobox->addItem(tr("English"), QStringLiteral("en"));
QDirIterator it(":/languages", QDirIterator::NoIteratorFlags);
QDirIterator it(QStringLiteral(":/languages"), QDirIterator::NoIteratorFlags);
while (it.hasNext()) {
QString locale = it.next();
locale.truncate(locale.lastIndexOf('.'));
locale.remove(0, locale.lastIndexOf('/') + 1);
locale.truncate(locale.lastIndexOf(QLatin1Char('.')));
locale.remove(0, locale.lastIndexOf(QLatin1Char('/')) + 1);
const QString lang = QLocale::languageToString(QLocale(locale).language());
ui->language_combobox->addItem(lang, locale);
}
@@ -149,7 +150,3 @@ void ConfigureUi::onLanguageChanged(int index) {
emit languageChanged(ui->language_combobox->itemData(index).toString());
}
void ConfigureUi::retranslateUi() {
ui->retranslateUi(this);
}

3
src/yuzu/configuration/configure_ui.h
View File

@@ -19,7 +19,7 @@ public:
~ConfigureUi() override;
void ApplyConfiguration();
void retranslateUi();
void RetranslateUI();
void SetConfiguration();
private slots:
@@ -32,7 +32,6 @@ private:
void RequestGameListUpdate();
void changeEvent(QEvent*) override;
void RetranslateUI();
void InitializeLanguageComboBox();
void InitializeIconSizeComboBox();