ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6857 from spycrab/qt_minor_win 

Qt: Minor window fixes
This commit is contained in:
Léo Lam 2018-05-14 19:11:56 +02:00 committed by GitHub
parent ca5dc25694 7e9bf12246
commit 5b15060127
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/DolphinQt2/Config/FilesystemWidget.cpp
View File

@ -310,6 +310,9 @@ void FilesystemWidget::CheckIntegrity(const DiscIO::Partition& partition)
std::launch::async, [this, partition] { return m_volume->CheckIntegrity(partition); }); std::launch::async, [this, partition] { return m_volume->CheckIntegrity(partition); });
dialog->setLabelText(tr("Verifying integrity of partition...")); dialog->setLabelText(tr("Verifying integrity of partition..."));
dialog->setWindowFlags(dialog->windowFlags() & ~Qt::WindowContextHelpButtonHint);
dialog->setWindowTitle(tr("Verifying partition"));
dialog->setMinimum(0); dialog->setMinimum(0);
dialog->setMaximum(0); dialog->setMaximum(0);
dialog->show(); dialog->show();

1
Source/Core/DolphinQt2/GameList/GameList.cpp
View File

@ -400,6 +400,7 @@ void GameList::DeleteFile()
QMessageBox confirm_dialog(this); QMessageBox confirm_dialog(this);
confirm_dialog.setIcon(QMessageBox::Warning); confirm_dialog.setIcon(QMessageBox::Warning);
confirm_dialog.setWindowTitle(tr("Confirm"));
confirm_dialog.setText(tr("Are you sure you want to delete this file?")); confirm_dialog.setText(tr("Are you sure you want to delete this file?"));
confirm_dialog.setInformativeText(tr("This cannot be undone!")); confirm_dialog.setInformativeText(tr("This cannot be undone!"));
confirm_dialog.setStandardButtons(QMessageBox::Yes | QMessageBox::Cancel); confirm_dialog.setStandardButtons(QMessageBox::Yes | QMessageBox::Cancel);

1
Source/Core/DolphinQt2/NetPlay/PadMappingDialog.cpp
View File

@ -15,6 +15,7 @@
PadMappingDialog::PadMappingDialog(QWidget* parent) : QDialog(parent) PadMappingDialog::PadMappingDialog(QWidget* parent) : QDialog(parent)
{ {
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
setWindowTitle(tr("Assign Controllers"));
CreateWidgets(); CreateWidgets();
ConnectWidgets(); ConnectWidgets();

1
Source/Core/DolphinQt2/Updater.cpp
View File

@ -33,6 +33,7 @@ void Updater::OnUpdateAvailable(const NewVersionInformation& info)
int choice = RunOnObject(m_parent, [&] { int choice = RunOnObject(m_parent, [&] {
QDialog* dialog = new QDialog(m_parent); QDialog* dialog = new QDialog(m_parent);
dialog->setWindowTitle(tr("Update available")); dialog->setWindowTitle(tr("Update available"));
dialog->setWindowFlags(dialog->windowFlags() & ~Qt::WindowContextHelpButtonHint);
auto* label = new QLabel( auto* label = new QLabel(
tr("<h2>A new version of Dolphin is available!</h2>Dolphin %1 is available for " tr("<h2>A new version of Dolphin is available!</h2>Dolphin %1 is available for "