citra-emu
/
citra
Archived
1
0
Fork 0
Code

Merge pull request #4768 from FearlessTobi/stuff-undso 

Port multiple minor yuzu PRs
This commit is contained in:
Pengfei Zhu 2019-05-11 21:38:00 +08:00 committed by GitHub
parent 46b015befd 563e1622ca
commit af197c18e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/citra_qt/compatdb.cpp
View File

@ -56,7 +56,7 @@ void CompatDB::Submit() {
button(NextButton)->setEnabled(false); button(NextButton)->setEnabled(false);
button(NextButton)->setText(tr("Submitting")); button(NextButton)->setText(tr("Submitting"));
button(QWizard::CancelButton)->setVisible(false); button(CancelButton)->setVisible(false);
testcase_watcher.setFuture(QtConcurrent::run( testcase_watcher.setFuture(QtConcurrent::run(
[] { return Core::System::GetInstance().TelemetrySession().SubmitTestcase(); })); [] { return Core::System::GetInstance().TelemetrySession().SubmitTestcase(); }));
@ -72,12 +72,12 @@ void CompatDB::OnTestcaseSubmitted() {
tr("An error occured while sending the Testcase")); tr("An error occured while sending the Testcase"));
button(NextButton)->setEnabled(true); button(NextButton)->setEnabled(true);
button(NextButton)->setText(tr("Next")); button(NextButton)->setText(tr("Next"));
button(QWizard::CancelButton)->setVisible(true); button(CancelButton)->setVisible(true);
} else { } else {
next(); next();
// older versions of QT don't support the "NoCancelButtonOnLastPage" option, this is a // older versions of QT don't support the "NoCancelButtonOnLastPage" option, this is a
// workaround // workaround
button(QWizard::CancelButton)->setVisible(false); button(CancelButton)->setVisible(false);
} }
} }

4
src/citra_qt/configuration/configure_dialog.cpp
View File

@ -17,9 +17,13 @@ ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry, bool
ui->webTab->SetWebServiceConfigEnabled(enable_web_config); ui->webTab->SetWebServiceConfigEnabled(enable_web_config);
this->PopulateSelectionList(); this->PopulateSelectionList();
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
connect(ui->uiTab, &ConfigureUi::languageChanged, this, &ConfigureDialog::onLanguageChanged); connect(ui->uiTab, &ConfigureUi::languageChanged, this, &ConfigureDialog::onLanguageChanged);
connect(ui->selectorList, &QListWidget::itemSelectionChanged, this, connect(ui->selectorList, &QListWidget::itemSelectionChanged, this,
&ConfigureDialog::UpdateVisibleTabs); &ConfigureDialog::UpdateVisibleTabs);
adjustSize(); adjustSize();
ui->selectorList->setCurrentRow(0); ui->selectorList->setCurrentRow(0);

2
src/citra_qt/hotkeys.h
View File

@ -67,8 +67,6 @@ public:
private: private:
struct Hotkey { struct Hotkey {
Hotkey() : shortcut(nullptr), context(Qt::WindowShortcut) {}
QKeySequence keyseq; QKeySequence keyseq;
QShortcut* shortcut = nullptr; QShortcut* shortcut = nullptr;
Qt::ShortcutContext context = Qt::WindowShortcut; Qt::ShortcutContext context = Qt::WindowShortcut;