mirrors/Sandboxie
mirrors
/
Sandboxie
mirror of https://github.com/sandboxie-plus/Sandboxie.git
1
0
Fork 0
Code Releases Activity

Merge pull request #2234 from okrc/okrc-patch-2 

Cleanup configuration
This commit is contained in:
DavidXanatos 2022-09-17 22:00:51 +02:00 committed by GitHub
parent 3bcab8ab50 e6fdde10eb
commit f0f3001ee7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
SandboxiePlus/SandMan/Views/SbieView.cpp
View File

@ -704,6 +704,9 @@ void CSbieView::RenameGroup(const QString OldName, const QString NewName)
auto Group = m_Groups.take(OldName); auto Group = m_Groups.take(OldName);
m_Groups.insert(NewName, Group); m_Groups.insert(NewName, Group);
if (m_Collapsed.remove(OldName))
m_Collapsed.insert(NewName);
RenameItem(OldName, NewName); RenameItem(OldName, NewName);
} }
@ -774,6 +777,7 @@ void CSbieView::OnGroupAction(QAction* Action)
if (List.isEmpty()) if (List.isEmpty())
return; return;
m_Groups[""].removeAll(Name); m_Groups[""].removeAll(Name);
m_Groups[List.first()].removeAll(Name);
m_Groups[List.first()].append(Name); m_Groups[List.first()].append(Name);
} }
else if (Action == m_pRenGroupe) else if (Action == m_pRenGroupe)
@ -814,6 +818,7 @@ void CSbieView::OnGroupAction(QAction* Action)
break; break;
} }
} }
m_Collapsed.remove(Group);
} }
} }
} }
@ -958,6 +963,12 @@ QString CSbieView::AddNewGroup()
bool CSbieView::TestNameAndWarn(const QString& Name) bool CSbieView::TestNameAndWarn(const QString& Name)
{ {
if (Name.contains(QRegularExpression("[,()]")))
{
QMessageBox::critical(this, "Sandboxie-Plus", tr("The Sandbox name and Box Group name cannot use the ',()' symbol."));
return false;
}
if (m_Groups.contains(Name)) { if (m_Groups.contains(Name)) {
QMessageBox::critical(this, "Sandboxie-Plus", tr("This name is already used for a Box Group.")); QMessageBox::critical(this, "Sandboxie-Plus", tr("This name is already used for a Box Group."));
return false; return false;
@ -1193,16 +1204,19 @@ void CSbieView::OnSandBoxAction(QAction* Action, const QList<CSandBoxPtr>& SandB
} }
else if (Action == m_pMenuRename) else if (Action == m_pMenuRename)
{ {
QString OldValue = SandBoxes.first()->GetName().replace("_", " "); QString OldValue = SandBoxes.first()->GetName();
QString Value = QInputDialog::getText(this, "Sandboxie-Plus", tr("Please enter a new name for the Sandbox."), QLineEdit::Normal, OldValue); QString Value = QInputDialog::getText(this, "Sandboxie-Plus", tr("Please enter a new name for the Sandbox."), QLineEdit::Normal, OldValue).replace(" ", "_");
if (Value.isEmpty() || Value == OldValue) if (Value.isEmpty() || Value == OldValue)
return; return;
if (!TestNameAndWarn(Value)) if (!TestNameAndWarn(Value))
return; return;
Results.append((SandBoxes.first()->RenameBox(Value.replace(" ", "_")))); SB_STATUS Status = SandBoxes.first()->RenameBox(Value);
if (!Status.IsError())
RenameItem(OldValue, Value); {
RenameItem(OldValue, Value);
}
Results.append(Status);
} }
else if (Action == m_pMenuRecover) else if (Action == m_pMenuRecover)
{ {
@ -1218,10 +1232,17 @@ void CSbieView::OnSandBoxAction(QAction* Action, const QList<CSandBoxPtr>& SandB
SB_STATUS Status = theGUI->DeleteBoxContent(pBox, CSandMan::eForDelete); SB_STATUS Status = theGUI->DeleteBoxContent(pBox, CSandMan::eForDelete);
if (Status.GetMsgCode() == SB_Canceled) if (Status.GetMsgCode() == SB_Canceled)
break; break;
QString Name = pBox->GetName();
if (!Status.IsError()) if (!Status.IsError())
Status = pBox->RemoveBox(); Status = pBox->RemoveBox();
Results.append(Status); Results.append(Status);
}
for (auto I = m_Groups.begin(); I != m_Groups.end(); ++I)
{
if (I.value().removeOne(Name))
break;
}
}
} }
else if (Action == m_pMenuCleanUp) else if (Action == m_pMenuCleanUp)
{ {
@ -1340,6 +1361,9 @@ void CSbieView::OnSandBoxAction(QAction* Action, const QList<CSandBoxPtr>& SandB
} }
CSandMan::CheckResults(Results); CSandMan::CheckResults(Results);
//m_UserConfigChanged = true;
SaveUserConfig();
} }
void CSbieView::OnProcessAction() void CSbieView::OnProcessAction()