CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE set groups for instances by not setting groups for instances

Browse Source 
So simple. Better in every way.
This commit is contained in:
Petr Mrázek
2018-07-31 01:54:08 +02:00
parent 9965decd81
commit 0c73ddee73
15 changed files with 92 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
application/MainWindow.cpp
View File

@ -1446,7 +1446,8 @@ void MainWindow::on_actionChangeInstGroup_triggered()
return;
bool ok = false;
QString name(m_selectedInstance->group());
InstanceId instId = m_selectedInstance->id();
QString name(MMC->instances()->getInstanceGroup(instId));
auto groups = MMC->instances()->getGroups();
groups.insert(0, "");
groups.sort(Qt::CaseInsensitive);
@ -1455,7 +1456,9 @@ void MainWindow::on_actionChangeInstGroup_triggered()
name = QInputDialog::getItem(this, tr("Group name"), tr("Enter a new group name."), groups, foo, true, &ok);
name = name.simplified();
if (ok)
m_selectedInstance->setGroupPost(name);
{
MMC->instances()->setInstanceGroup(instId, name);
}
}
void MainWindow::deleteGroup()

2
application/dialogs/CopyInstanceDialog.cpp
View File

@ -45,7 +45,7 @@ CopyInstanceDialog::CopyInstanceDialog(InstancePtr original, QWidget *parent)
groupList.removeOne("");
groupList.push_front("");
ui->groupBox->addItems(groupList);
int index = groupList.indexOf(m_original->group());
int index = groupList.indexOf(MMC->instances()->getInstanceGroup(m_original->id()));
if(index == -1)
{
index = 0;

2
application/pages/instance/LegacyUpgradePage.cpp
View File

@ -38,7 +38,7 @@ void LegacyUpgradePage::on_upgradeButton_clicked()
QString newName = tr("%1 (Migrated)").arg(m_inst->name());
auto upgradeTask = new LegacyUpgradeTask(m_inst);
upgradeTask->setName(newName);
upgradeTask->setGroup(m_inst->group());
upgradeTask->setGroup(MMC->instances()->getInstanceGroup(m_inst->id()));
upgradeTask->setIcon(m_inst->iconKey());
std::unique_ptr<Task> task(MMC->instances()->wrapInstanceTask(upgradeTask));
runModalTask(task.get());