Archive/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-28 13:28:01 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Qt: fix vfs dir remove button enabled state

Browse source
This commit is contained in:
Megamouse 2021-04-10 14:39:18 +02:00
parent 332eb5fbd6
commit 7a105333dc
2 changed files with 36 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

71
rpcs3/rpcs3qt/vfs_dialog_tab.cpp
View file

@ -11,7 +11,7 @@ inline std::string sstr(const QString& _in) { return _in.toStdString(); }
vfs_dialog_tab::vfs_dialog_tab(vfs_settings_info settingsInfo, std::shared_ptr<gui_settings> guiSettings, std::shared_ptr<emu_settings> emuSettings, QWidget* parent) vfs_dialog_tab::vfs_dialog_tab(vfs_settings_info settingsInfo, std::shared_ptr<gui_settings> guiSettings, std::shared_ptr<emu_settings> emuSettings, QWidget* parent)
: QWidget(parent), m_info(std::move(settingsInfo)), m_gui_settings(std::move(guiSettings)), m_emu_settings(std::move(emuSettings)) : QWidget(parent), m_info(std::move(settingsInfo)), m_gui_settings(std::move(guiSettings)), m_emu_settings(std::move(emuSettings))
{ {
m_dirList = new QListWidget(this); m_dir_dist = new QListWidget(this);
QStringList alldirs = m_gui_settings->GetValue(m_info.listLocation).toStringList(); QStringList alldirs = m_gui_settings->GetValue(m_info.listLocation).toStringList();
const QString current_dir = qstr(m_info.cfg_node->to_string()); const QString current_dir = qstr(m_info.cfg_node->to_string());
@ -20,77 +20,70 @@ vfs_dialog_tab::vfs_dialog_tab(vfs_settings_info settingsInfo, std::shared_ptr<g
for (const QString& dir : alldirs) for (const QString& dir : alldirs)
{ {
QListWidgetItem* item = new QListWidgetItem(dir, m_dirList); QListWidgetItem* item = new QListWidgetItem(dir, m_dir_dist);
if (dir == current_dir) if (dir == current_dir)
selected_item = item; selected_item = item;
} }
// We must show the currently selected config. // We must show the currently selected config.
if (!selected_item) if (!selected_item)
selected_item = new QListWidgetItem(current_dir, m_dirList); selected_item = new QListWidgetItem(current_dir, m_dir_dist);
selected_item->setSelected(true); selected_item->setSelected(true);
m_dirList->setMinimumWidth(m_dirList->sizeHintForColumn(0)); m_dir_dist->setMinimumWidth(m_dir_dist->sizeHintForColumn(0));
QPushButton* addDir = new QPushButton(QStringLiteral("+")); QPushButton* addDir = new QPushButton(QStringLiteral("+"));
addDir->setToolTip(tr("Add new directory")); addDir->setToolTip(tr("Add new directory"));
addDir->setFixedWidth(addDir->sizeHint().height()); // Make button square addDir->setFixedWidth(addDir->sizeHint().height()); // Make button square
connect(addDir, &QAbstractButton::clicked, this, &vfs_dialog_tab::AddNewDirectory); connect(addDir, &QAbstractButton::clicked, this, &vfs_dialog_tab::AddNewDirectory);
QPushButton* removeDir = new QPushButton(QStringLiteral("-")); QPushButton* button_remove_dir = new QPushButton(QStringLiteral("-"));
removeDir->setToolTip(tr("Remove directory")); button_remove_dir->setToolTip(tr("Remove directory"));
removeDir->setFixedWidth(removeDir->sizeHint().height()); // Make button square button_remove_dir->setFixedWidth(button_remove_dir->sizeHint().height()); // Make button square
removeDir->setEnabled(false); button_remove_dir->setEnabled(false);
connect(removeDir, &QAbstractButton::clicked, this, &vfs_dialog_tab::RemoveDirectory); connect(button_remove_dir, &QAbstractButton::clicked, this, &vfs_dialog_tab::RemoveDirectory);
QHBoxLayout* selectedConfigLayout = new QHBoxLayout; QHBoxLayout* selected_config_layout = new QHBoxLayout;
m_selectedConfigLabel = new QLabel(current_dir.isEmpty() ? EmptyPath : current_dir); m_selected_config_label = new QLabel(current_dir.isEmpty() ? EmptyPath : current_dir);
selectedConfigLayout->addWidget(new QLabel(tr("%0 directory:").arg(m_info.name))); selected_config_layout->addWidget(new QLabel(tr("%0 directory:").arg(m_info.name)));
selectedConfigLayout->addWidget(m_selectedConfigLabel); selected_config_layout->addWidget(m_selected_config_label);
selectedConfigLayout->addStretch(); selected_config_layout->addStretch();
selectedConfigLayout->addWidget(addDir); selected_config_layout->addWidget(addDir);
selectedConfigLayout->addWidget(removeDir); selected_config_layout->addWidget(button_remove_dir);
QVBoxLayout* vbox = new QVBoxLayout; QVBoxLayout* vbox = new QVBoxLayout;
vbox->addWidget(m_dirList); vbox->addWidget(m_dir_dist);
vbox->addLayout(selectedConfigLayout); vbox->addLayout(selected_config_layout);
setLayout(vbox); setLayout(vbox);
connect(m_dirList, &QListWidget::currentItemChanged, [this](QListWidgetItem* current, QListWidgetItem*) connect(m_dir_dist, &QListWidget::currentRowChanged, button_remove_dir, [this, button_remove_dir](int row)
{ {
if (!current) QListWidgetItem* item = m_dir_dist->item(row);
return; m_selected_config_label->setText((item && !item->text().isEmpty()) ? item->text() : EmptyPath);
button_remove_dir->setEnabled(item && row > 0);
m_selectedConfigLabel->setText(current->text().isEmpty() ? EmptyPath : current->text());
});
connect(m_dirList, &QListWidget::currentRowChanged, [this, removeDir](int row)
{
SetCurrentRow(row);
removeDir->setEnabled(row > 0);
}); });
} }
void vfs_dialog_tab::SetSettings() const void vfs_dialog_tab::SetSettings() const
{ {
QStringList allDirs; QStringList allDirs;
for (int i = 0; i < m_dirList->count(); ++i) for (int i = 0; i < m_dir_dist->count(); ++i)
{ {
allDirs += m_dirList->item(i)->text(); allDirs += m_dir_dist->item(i)->text();
} }
m_gui_settings->SetValue(m_info.listLocation, allDirs); m_gui_settings->SetValue(m_info.listLocation, allDirs);
const std::string new_dir = m_selectedConfigLabel->text() == EmptyPath ? "" : sstr(m_selectedConfigLabel->text()); const std::string new_dir = m_selected_config_label->text() == EmptyPath ? "" : sstr(m_selected_config_label->text());
m_info.cfg_node->from_string(new_dir); m_info.cfg_node->from_string(new_dir);
m_emu_settings->SetSetting(m_info.settingLoc, new_dir); m_emu_settings->SetSetting(m_info.settingLoc, new_dir);
} }
void vfs_dialog_tab::Reset() const void vfs_dialog_tab::Reset() const
{ {
m_dirList->clear(); m_dir_dist->clear();
m_dirList->setCurrentItem(new QListWidgetItem(qstr(m_info.cfg_node->def), m_dirList)); m_dir_dist->setCurrentItem(new QListWidgetItem(qstr(m_info.cfg_node->def), m_dir_dist));
} }
void vfs_dialog_tab::AddNewDirectory() const void vfs_dialog_tab::AddNewDirectory() const
@ -103,11 +96,15 @@ void vfs_dialog_tab::AddNewDirectory() const
if (!dir.endsWith("/")) if (!dir.endsWith("/"))
dir += '/'; dir += '/';
m_dirList->setCurrentItem(new QListWidgetItem(dir, m_dirList)); m_dir_dist->setCurrentItem(new QListWidgetItem(dir, m_dir_dist));
} }
void vfs_dialog_tab::RemoveDirectory() const void vfs_dialog_tab::RemoveDirectory() const
{ {
QListWidgetItem* item = m_dirList->takeItem(m_currentRow); const int row = m_dir_dist->currentRow();
delete item; if (row > 0)
{
QListWidgetItem* item = m_dir_dist->item(row);
delete item;
}
} }

6
rpcs3/rpcs3qt/vfs_dialog_tab.h
View file

@ -39,16 +39,14 @@ public:
private: private:
void AddNewDirectory() const; void AddNewDirectory() const;
void RemoveDirectory() const; void RemoveDirectory() const;
void SetCurrentRow(int row) { m_currentRow = row; }
const QString EmptyPath = tr("Empty Path"); const QString EmptyPath = tr("Empty Path");
vfs_settings_info m_info; vfs_settings_info m_info;
std::shared_ptr<gui_settings> m_gui_settings; std::shared_ptr<gui_settings> m_gui_settings;
std::shared_ptr<emu_settings> m_emu_settings; std::shared_ptr<emu_settings> m_emu_settings;
int m_currentRow = -1;
// UI variables needed in higher scope // UI variables needed in higher scope
QListWidget* m_dirList; QListWidget* m_dir_dist;
QLabel* m_selectedConfigLabel; QLabel* m_selected_config_label;
}; };