archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-20 11:21:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

DolphinQt: Profile combobox fixes.

Browse source
This commit is contained in:
Jordan Woyak 2019-04-28 14:00:35 -05:00
parent d531fe6a1d
commit 6784225573
2 changed files with 36 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp
View file

@ -90,6 +90,7 @@ void MappingWindow::CreateProfilesLayout()
auto* button_layout = new QHBoxLayout(); auto* button_layout = new QHBoxLayout();
m_profiles_combo->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed); m_profiles_combo->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);
m_profiles_combo->setMinimumWidth(100);
m_profiles_combo->setEditable(true); m_profiles_combo->setEditable(true);
m_profiles_layout->addWidget(m_profiles_combo); m_profiles_layout->addWidget(m_profiles_combo);
@ -155,12 +156,26 @@ void MappingWindow::ConnectWidgets()
connect(m_button_box, &QDialogButtonBox::rejected, this, &QDialog::reject); connect(m_button_box, &QDialogButtonBox::rejected, this, &QDialog::reject);
} }
void MappingWindow::UpdateProfileIndex()
{
// Make sure currentIndex and currentData are accurate when the user manually types a name.
const auto current_text = m_profiles_combo->currentText();
const int text_index = m_profiles_combo->findText(current_text);
m_profiles_combo->setCurrentIndex(text_index);
if (text_index == -1)
m_profiles_combo->setCurrentText(current_text);
}
void MappingWindow::OnDeleteProfilePressed() void MappingWindow::OnDeleteProfilePressed()
{ {
UpdateProfileIndex();
const QString profile_name = m_profiles_combo->currentText(); const QString profile_name = m_profiles_combo->currentText();
const QString profile_path = m_profiles_combo->currentData().toString(); const QString profile_path = m_profiles_combo->currentData().toString();
if (!File::Exists(profile_path.toStdString())) if (m_profiles_combo->currentIndex() == -1 || !File::Exists(profile_path.toStdString()))
{ {
ModalMessageBox error(this); ModalMessageBox error(this);
error.setIcon(QMessageBox::Critical); error.setIcon(QMessageBox::Critical);
@ -184,6 +199,7 @@ void MappingWindow::OnDeleteProfilePressed()
} }
m_profiles_combo->removeItem(m_profiles_combo->currentIndex()); m_profiles_combo->removeItem(m_profiles_combo->currentIndex());
m_profiles_combo->setCurrentIndex(-1);
File::Delete(profile_path.toStdString()); File::Delete(profile_path.toStdString());
@ -196,10 +212,19 @@ void MappingWindow::OnDeleteProfilePressed()
void MappingWindow::OnLoadProfilePressed() void MappingWindow::OnLoadProfilePressed()
{ {
const QString profile_path = m_profiles_combo->currentData().toString(); UpdateProfileIndex();
if (m_profiles_combo->currentIndex() == 0) if (m_profiles_combo->currentIndex() == -1)
{
ModalMessageBox error(this);
error.setIcon(QMessageBox::Critical);
error.setWindowTitle(tr("Error"));
error.setText(tr("The profile '%1' does not exist").arg(m_profiles_combo->currentText()));
error.exec();
return; return;
}
const QString profile_path = m_profiles_combo->currentData().toString();
IniFile ini; IniFile ini;
ini.Load(profile_path.toStdString()); ini.Load(profile_path.toStdString());
@ -213,13 +238,14 @@ void MappingWindow::OnLoadProfilePressed()
void MappingWindow::OnSaveProfilePressed() void MappingWindow::OnSaveProfilePressed()
{ {
const QString profile_name = m_profiles_combo->currentText(); const QString profile_name = m_profiles_combo->currentText();
const std::string profile_path = File::GetUserPath(D_CONFIG_IDX) + PROFILES_DIR +
m_config->GetProfileName() + "/" + profile_name.toStdString() +
".ini";
if (profile_name.isEmpty()) if (profile_name.isEmpty())
return; return;
const std::string profile_path = File::GetUserPath(D_CONFIG_IDX) + PROFILES_DIR +
m_config->GetProfileName() + "/" + profile_name.toStdString() +
".ini";
File::CreateFullPath(profile_path); File::CreateFullPath(profile_path);
IniFile ini; IniFile ini;
@ -227,11 +253,8 @@ void MappingWindow::OnSaveProfilePressed()
m_controller->SaveConfig(ini.GetOrCreateSection("Profile")); m_controller->SaveConfig(ini.GetOrCreateSection("Profile"));
ini.Save(profile_path); ini.Save(profile_path);
if (m_profiles_combo->currentIndex() == 0 || m_profiles_combo->findText(profile_name) == -1) if (m_profiles_combo->findText(profile_name) == -1)
{
m_profiles_combo->addItem(profile_name, QString::fromStdString(profile_path)); m_profiles_combo->addItem(profile_name, QString::fromStdString(profile_path));
m_profiles_combo->setCurrentIndex(m_profiles_combo->count() - 1);
}
} }
void MappingWindow::OnSelectDevice(int) void MappingWindow::OnSelectDevice(int)
@ -359,7 +382,6 @@ void MappingWindow::SetMappingType(MappingWindow::Type type)
m_config = widget->GetConfig(); m_config = widget->GetConfig();
m_controller = m_config->GetController(GetPort()); m_controller = m_config->GetController(GetPort());
m_profiles_combo->addItem(QStringLiteral(""));
const std::string profiles_path = const std::string profiles_path =
File::GetUserPath(D_CONFIG_IDX) + PROFILES_DIR + m_config->GetProfileName(); File::GetUserPath(D_CONFIG_IDX) + PROFILES_DIR + m_config->GetProfileName();
@ -369,6 +391,7 @@ void MappingWindow::SetMappingType(MappingWindow::Type type)
SplitPath(filename, nullptr, &basename, nullptr); SplitPath(filename, nullptr, &basename, nullptr);
m_profiles_combo->addItem(QString::fromStdString(basename), QString::fromStdString(filename)); m_profiles_combo->addItem(QString::fromStdString(basename), QString::fromStdString(filename));
} }
m_profiles_combo->setCurrentIndex(-1);
} }
void MappingWindow::AddWidget(const QString& name, QWidget* widget) void MappingWindow::AddWidget(const QString& name, QWidget* widget)

2
Source/Core/DolphinQt/Config/Mapping/MappingWindow.h
View file

@ -73,6 +73,8 @@ private:
void OnDeleteProfilePressed(); void OnDeleteProfilePressed();
void OnLoadProfilePressed(); void OnLoadProfilePressed();
void OnSaveProfilePressed(); void OnSaveProfilePressed();
void UpdateProfileIndex();
void OnDefaultFieldsPressed(); void OnDefaultFieldsPressed();
void OnClearFieldsPressed(); void OnClearFieldsPressed();
void OnSelectDevice(int index); void OnSelectDevice(int index);