archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-09 16:31:28 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Qt: use Qt standard button layout in vfs_dialog

Browse source
This commit is contained in:
Megamouse 2019-10-04 22:47:54 +02:00
parent f97ed7738d
commit 04a6b065b4
4 changed files with 34 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

39
rpcs3/rpcs3qt/vfs_dialog.cpp
View file

@ -1,5 +1,6 @@
#include "vfs_dialog.h" #include "vfs_dialog.h"
#include <QDialogButtonBox>
#include <QPushButton> #include <QPushButton>
#include <QMessageBox> #include <QMessageBox>
@ -36,8 +37,13 @@ vfs_dialog::vfs_dialog(std::shared_ptr<gui_settings> guiSettings, std::shared_pt
tabs->addTab(dev_usb000_tab, "dev_usb000"); tabs->addTab(dev_usb000_tab, "dev_usb000");
// Create buttons // Create buttons
QPushButton* resetAll = new QPushButton(tr("Reset Directories")); QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Close | QDialogButtonBox::Save | QDialogButtonBox::RestoreDefaults);
connect(resetAll, &QAbstractButton::clicked, [=] buttons->button(QDialogButtonBox::RestoreDefaults)->setText(tr("Reset Directories"));
buttons->button(QDialogButtonBox::Save)->setDefault(true);
connect(buttons, &QDialogButtonBox::clicked, [=](QAbstractButton* button)
{
if (button == buttons->button(QDialogButtonBox::RestoreDefaults))
{ {
if (QMessageBox::question(this, tr("Confirm Reset"), tr("Reset all file system directories?")) != QMessageBox::Yes) if (QMessageBox::question(this, tr("Confirm Reset"), tr("Reset all file system directories?")) != QMessageBox::Yes)
return; return;
@ -46,13 +52,8 @@ vfs_dialog::vfs_dialog(std::shared_ptr<gui_settings> guiSettings, std::shared_pt
{ {
static_cast<vfs_dialog_tab*>(tabs->widget(i))->Reset(); static_cast<vfs_dialog_tab*>(tabs->widget(i))->Reset();
} }
}); }
else if (button == buttons->button(QDialogButtonBox::Save))
QPushButton* save = new QPushButton(tr("Save"));
save->setAutoDefault(true);
save->setDefault(true);
connect(save, &QAbstractButton::clicked, [=]
{ {
for (int i = 0; i < tabs->count(); ++i) for (int i = 0; i < tabs->count(); ++i)
{ {
@ -60,22 +61,20 @@ vfs_dialog::vfs_dialog(std::shared_ptr<gui_settings> guiSettings, std::shared_pt
} }
m_emu_settings->SaveSettings(); m_emu_settings->SaveSettings();
accept(); accept();
}
else if (button == buttons->button(QDialogButtonBox::Close))
{
reject();
}
}); });
QPushButton* close = new QPushButton(tr("Close"));
connect(close, &QAbstractButton::clicked, this, &QDialog::reject);
QHBoxLayout* buttons = new QHBoxLayout;
buttons->addWidget(resetAll);
buttons->addStretch();
buttons->addWidget(save);
buttons->addWidget(close);
QVBoxLayout* vbox = new QVBoxLayout; QVBoxLayout* vbox = new QVBoxLayout;
vbox->addWidget(tabs); vbox->addWidget(tabs);
vbox->addLayout(buttons); vbox->addWidget(buttons);
setLayout(vbox); setLayout(vbox);
setWindowTitle(tr("Virtual File System")); setWindowTitle(tr("Virtual File System"));
setObjectName("vfs_dialog"); setObjectName("vfs_dialog");
buttons->button(QDialogButtonBox::Save)->setFocus();
} }

2
rpcs3/rpcs3qt/vfs_dialog.h
View file

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "vfs_dialog_tab.h" #include "vfs_dialog_tab.h"

2
rpcs3/rpcs3qt/vfs_dialog_tab.cpp
View file

@ -1,4 +1,4 @@
#include "vfs_dialog_tab.h" #include "vfs_dialog_tab.h"
#include <QFileDialog> #include <QFileDialog>
#include <QCoreApplication> #include <QCoreApplication>

2
rpcs3/rpcs3qt/vfs_dialog_tab.h
View file

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "stdafx.h" #include "stdafx.h"
#include "Emu/System.h" #include "Emu/System.h"