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

Typo fixes 

Co-authored-by: isaak654 <isaak654@users.noreply.github.com>
This commit is contained in:
offhub 2023-07-03 17:58:38 +03:00 committed by GitHub
parent b4eb160af4
commit 68da02e632
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -30,7 +30,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Fixed
- fixed uninstall issue in the Sandboxie Classic installer [d1863ff](https://github.com/sandboxie-plus/Sandboxie/commit/d1863ffadfe105c695de71c9e841c2fd568116fe)
- added workaround fot chrome not starting on windows 11 with KB5027231 [3040](https://github.com/sandboxie-plus/Sandboxie/issues/3040)
- added workaround for Chrome not starting on Windows 11 with KB5027231 [#3040](https://github.com/sandboxie-plus/Sandboxie/issues/3040)
### Removed
- cleaned up duplicate code (thanks lmou523) [#3067](https://github.com/sandboxie-plus/Sandboxie/pull/3067)

28
SandboxiePlus/MiscHelpers/Common/SplitTreeView.cpp
View File

@ -18,7 +18,7 @@ CSplitTreeView::CSplitTreeView(QAbstractItemModel* pModel, QWidget *parent) : QW
QStyle* pStyle = QStyleFactory::create("windows");
#endif
m_LockSellection = 0;
m_LockSelection = 0;
// Tree
m_pTree = new QTreeView();
@ -177,9 +177,9 @@ void CSplitTreeView::collapse(const QModelIndex &index)
void CSplitTreeView::OnTreeSelectionChanged(const QItemSelection& Selected, const QItemSelection& Deselected)
{
if (m_LockSellection)
if (m_LockSelection)
return;
m_LockSellection = 1;
m_LockSelection = 1;
QItemSelection SelectedItems;
foreach(const QModelIndex& Index, m_pTree->selectionModel()->selectedIndexes())
{
@ -210,17 +210,17 @@ void CSplitTreeView::OnTreeSelectionChanged(const QItemSelection& Selected, cons
m_pList->selectionModel()->select(QItemSelection(ModelL, ModelR), QItemSelectionModel::Deselect);
}*/
m_LockSellection = 0;
m_LockSelection = 0;
}
void CSplitTreeView::OnListSelectionChanged(const QItemSelection& Selected, const QItemSelection& Deselected)
{
if (m_LockSellection != 2)
if (m_LockSelection != 2)
emit selectionChanged(Selected, Deselected);
if (m_LockSellection)
if (m_LockSelection)
return;
m_LockSellection = 1;
m_LockSelection = 1;
QItemSelection SelectedItems;
foreach(const QModelIndex& Index, m_pList->selectionModel()->selectedIndexes())
{
@ -247,28 +247,28 @@ void CSplitTreeView::OnListSelectionChanged(const QItemSelection& Selected, cons
continue;
m_pTree->selectionModel()->select(ModelIndex, QItemSelectionModel::Deselect);
}*/
m_LockSellection = 0;
m_LockSelection = 0;
}
void CSplitTreeView::OnTreeCurrentChanged(const QModelIndex &current, const QModelIndex &previous)
{
if (m_LockSellection)
if (m_LockSelection)
return;
m_LockSellection = 2;
m_LockSelection = 2;
int hPos = m_pList->horizontalScrollBar()->value(); // fix horizontalScrollBar position reset on selection
m_pList->selectionModel()->setCurrentIndex(m_pOneModel->mapToSource(current), QItemSelectionModel::SelectCurrent);
m_pList->horizontalScrollBar()->setValue(hPos);
m_LockSellection = 0;
m_LockSelection = 0;
emit currentChanged(m_pOneModel->mapToSource(current), m_pOneModel->mapToSource(previous));
}
void CSplitTreeView::OnListCurrentChanged(const QModelIndex &current, const QModelIndex &previous)
{
if (m_LockSellection)
if (m_LockSelection)
return;
m_LockSellection = 2;
m_LockSelection = 2;
m_pTree->selectionModel()->setCurrentIndex(m_pOneModel->mapFromSource(current), QItemSelectionModel::SelectCurrent);
m_LockSellection = 0;
m_LockSelection = 0;
emit currentChanged(current, previous);
}

2
SandboxiePlus/MiscHelpers/Common/SplitTreeView.h
View File

@ -112,5 +112,5 @@ private:
QAbstractItemModel* m_pModel;
COneColumnModel* m_pOneModel;
int m_LockSellection;
int m_LockSelection;
};

6
SandboxiePlus/SandMan/AddonManager.cpp
View File

@ -231,7 +231,7 @@ void CAddonManager::InstallAddonAsync(const QString& FilePath, CAddonPtr pAddon)
CloseHandle(pi.hThread);
}
else
Status = SB_ERR(SB_OtherError, QVariantList() << tr("Failes to start installer (%1)!").arg(GetLastError()));
Status = SB_ERR(SB_OtherError, QVariantList() << tr("Failed to start installer (%1)!").arg(GetLastError()));
LocalFree(modifiedEnvironment);
}
@ -265,7 +265,7 @@ void CAddonManager::InstallAddonAsync(const QString& FilePath, CAddonPtr pAddon)
QDir(FileDir).removeRecursively();
}
else
Status = SB_ERR(SB_OtherError, QVariantList() << tr("Failes to unpack addon!"));
Status = SB_ERR(SB_OtherError, QVariantList() << tr("Failed to unpack addon!"));
Archive.Close();
}
@ -337,7 +337,7 @@ void CAddonManager::RemoveAddonAsync(CAddonPtr pAddon)
CloseHandle(pi.hThread);
}
else
Status = SB_ERR(SB_OtherError, QVariantList() << tr("Failes to start uninstaller!"));
Status = SB_ERR(SB_OtherError, QVariantList() << tr("Failed to start uninstaller!"));
}
else
{

4
SandboxiePlus/SandMan/SandMan.cpp
View File

@ -2188,7 +2188,7 @@ void CSandMan::OnStatusChanged()
int WizardLevel = abs(theConf->GetInt("Options/WizardLevel", 0));
if (WizardLevel < (theConf->GetInt("Options/CheckForUpdates", 2) != 1 ? SETUP_LVL_2 : SETUP_LVL_1)) {
if (!CSetupWizard::ShowWizard(WizardLevel)) { // if user canceled mark that and not show again, untill there is somethign new
if(QMessageBox::question(NULL, "Sandboxie-Plus", tr("Do you want the setup wizard to be omited?"), QMessageBox::Yes, QMessageBox::No | QMessageBox::Default) == QMessageBox::Yes)
if(QMessageBox::question(NULL, "Sandboxie-Plus", tr("Do you want the setup wizard to be omitted?"), QMessageBox::Yes, QMessageBox::No | QMessageBox::Default) == QMessageBox::Yes)
theConf->SetValue("Options/WizardLevel", -SETUP_LVL_CURRENT);
}
}
@ -3404,7 +3404,7 @@ QString CSandMan::FormatError(const SB_STATUS& Error)
case SB_NameExists: Message = tr("A sandbox with that name already exists"); break;
case SB_PasswordBad: Message = tr("The config password must not be longer than 64 characters"); break;
case SB_Canceled: Message = tr("The operation was canceled by the user"); break;
case SB_DeleteNoMount: Message = tr("The content of an un mounted sandbox can not be deleted"); break;
case SB_DeleteNoMount: Message = tr("The content of an unmounted sandbox can not be deleted"); break;
case SB_OtherError: Message = tr("%1"); break;

2
SandboxiePlus/SandMan/Troubleshooting/Sandboxing/installer.js
View File

@ -8,7 +8,7 @@
let form = [
{ id: 'path', name: tr('Enter Installer Path'), type: 'file' },
{ id: 'box', name: tr('Sellect a sandbox to instll into'), type: 'box' },
{ id: 'box', name: tr('Select a sandbox to install into'), type: 'box' },
];
let ret = wizard.showForm(form);

4
SandboxiePlus/SandMan/Troubleshooting/Sandboxing/webcam.js
View File

@ -7,7 +7,7 @@
*
*/
let message = tr('To enable webcam support on windows 11 the isolation level must be reduced. \n'+
let message = tr('To enable webcam support on Windows 11 the isolation level must be reduced. \n'+
'If you want to proceed please press NEXT and select a sandbox to modify. \n');
if(!sbie.isCertValid())
@ -19,7 +19,7 @@ let form = [
{type: 'box', id: 'box'}
];
let data = wizard.showForm(form, tr('Sellect which box to turn into a reduced isoaltion app compartment box.'));
let data = wizard.showForm(form, tr('Select which box to turn into a reduced isolation app compartment box.'));
let box = sbie.getBox(data['box']);

6
SandboxiePlus/SandMan/Troubleshooting/UI/desktop.js
View File

@ -1,8 +1,8 @@
/*
* group: ui
* class: ui
* name: Browser shortcut is mitting from the desktop
* description: This procedure will add a browser shortcut to thr desktop
* name: Browser shortcut is missing from the desktop
* description: This procedure will add a browser shortcut to the desktop
*
*/
@ -45,7 +45,7 @@ let form1 = [
{type: 'box', id: 'box', name: tr('Select Sandbox')}
];
let data1 = wizard.showForm(form1, tr('Sellect which browser you want to create a shortcut for and in what box'));
let data1 = wizard.showForm(form1, tr('Select which browser you want to create a shortcut for and in what box'));
let box = sbie.getBox(data1['box']);

2
SandboxiePlus/SandMan/Troubleshooting/UI/shell.js
View File

@ -16,7 +16,7 @@ if(sys_version.major >= 11) {
form.push({type: 'check', id: 'legacy', name: tr('Install legacy shell extensions')});
}
let obj = wizard.showForm(form, tr('Sellect which shell options should be reinstalled'));
let obj = wizard.showForm(form, tr('Select which shell options should be reinstalled'));
sbie.shellRemove();
sbie.shellInstall(obj);

4
SandboxiePlus/SandMan/Windows/SnapshotsWindow.cpp
View File

@ -137,7 +137,7 @@ void CSnapshotsWindow::UpdateSnapshot(const QModelIndex& Index)
QVariant ID = m_pSnapshotModel->GetItemID(Index);
OnSaveInfo();
m_SellectedID = ID;
m_SelectedID = ID;
QVariantMap BoxSnapshot = m_SnapshotMap[ID];
@ -164,7 +164,7 @@ void CSnapshotsWindow::OnSaveInfo()
return;
m_SaveInfoPending = 0;
m_pBox->SetSnapshotInfo(m_SellectedID.toString(), ui.txtName->text(), ui.txtInfo->toPlainText());
m_pBox->SetSnapshotInfo(m_SelectedID.toString(), ui.txtName->text(), ui.txtInfo->toPlainText());
UpdateSnapshots();
}

2
SandboxiePlus/SandMan/Windows/SnapshotsWindow.h
View File

@ -46,7 +46,7 @@ protected:
QString m_DefaultSnapshot;
QMap<QVariant, QVariantMap> m_SnapshotMap;
QVariant m_SellectedID;
QVariant m_SelectedID;
int m_SaveInfoPending;
private:

16
SandboxiePlus/SandMan/Wizards/BoxAssistant.cpp
View File

@ -167,7 +167,7 @@ void CBoxAssistant::OnDownload(const QString& Path, const QVariantMap& Params)
QString IssueDir;
C7zFileEngineHandler IssueFS("issue");
if (!IssueFS.Open(FinalPath)) {
QMessageBox::critical(this, "Sandboxie-Plus", tr("Downloaded troubleshooting instructions are currupted!"));
QMessageBox::critical(this, "Sandboxie-Plus", tr("Downloaded troubleshooting instructions are corrupted!"));
QFile::remove(Path);
return;
}
@ -333,7 +333,7 @@ bool CBoxAssistant::StartEngine()
m_pDebugger->show();
}
else {
QMessageBox::critical(this, "Sandboxie-Plus", tr("V4ScriptDebuggerBackend could not be instantiated, probably V4ScriptDebugger.dll and or its dependencies are missing, script debuger could not be opened."));
QMessageBox::critical(this, "Sandboxie-Plus", tr("V4ScriptDebuggerBackend could not be instantiated, probably V4ScriptDebugger.dll and or its dependencies are missing, script debugger could not be opened."));
}
}
@ -383,7 +383,7 @@ void CBoxAssistant::reject()
if (m_pEngine && currentId() != Page_Submit) {
if (theConf->GetInt("Options/WarnWizardOnClose", -1) == -1) {
bool State = false;
if (CCheckableMessageBox::question(this, "Sandboxie-Plus", tr("A troubleshooting procedure is in progress, canceling the wizard will abort it, this may leave the sandbox in an incosistent state.")
if (CCheckableMessageBox::question(this, "Sandboxie-Plus", tr("A troubleshooting procedure is in progress, canceling the wizard will abort it, this may leave the sandbox in an inconsistent state.")
, tr("Don't ask in future"), &State, QDialogButtonBox::Ok | QDialogButtonBox::Cancel, QDialogButtonBox::Cancel) == QDialogButtonBox::Cancel)
return;
if (State)
@ -885,7 +885,7 @@ void CRunPage::OnStateChanged(int state, const QString& Text)
break;
}
case CBoxEngine::eError:
m_pTopLabel->setText(tr("Somethign failed internally this troubleshooting procedure can not continue. "
m_pTopLabel->setText(tr("Something failed internally this troubleshooting procedure can not continue. "
"You can click on next to submit an issue report.") + (pEngine ? tr("\n\nError: ") + Text : ""));
case CBoxEngine::eCanceled:
break;
@ -986,16 +986,16 @@ CSubmitPage::CSubmitPage(QWidget *parent)
pLayout->addWidget(m_pReport, row++, 0, 1, 3);
m_pAttachIni = new QCheckBox(tr("Attach Sandboxie.ini"));
m_pAttachIni->setToolTip(tr("Sandboxing compatybility is relyent on the configuration hence attaching the sandboxie.ini helps a lot with finding the issue."));
m_pAttachIni->setToolTip(tr("Sandboxing compatibility is reliant on the configuration hence attaching the Sandboxie.ini file helps a lot with finding the issue."));
pLayout->addWidget(m_pAttachIni, row, 0);
m_pAttachLog = new QCheckBox(tr("Attach Logs"));
m_pAttachLog->setTristate(true);
m_pAttachLog->setToolTip(tr("Select partially checked state to sends only message log but no trace log.\nBefore sending you can review the logs in the main window."));
m_pAttachLog->setToolTip(tr("Selecting partially checked state sends only the message log, but not the trace log.\nBefore sending, you can review the logs in the main window."));
pLayout->addWidget(m_pAttachLog, row, 1);
m_pAttachDmp = new QCheckBox(tr("Attach Crash Dumps"));
m_pAttachDmp->setToolTip(tr("An applicatin crashed during the troubleshooting procedure, attaching a crash dump can help with the debugging."));
m_pAttachDmp->setToolTip(tr("An application crashed during the troubleshooting procedure, attaching a crash dump can help with the debugging."));
pLayout->addWidget(m_pAttachDmp, row, 2);
m_pMail = new QLineEdit();
@ -1202,7 +1202,7 @@ bool CSubmitPage::validatePage()
return;
}
QMessageBox::information(this, "Sandboxie-Plus", tr("Your issue report have been successfully submitted, thank you."));
QMessageBox::information(this, "Sandboxie-Plus", tr("Your issue report has been successfully submitted, thank you."));
wizard()->close();
});

14
SandboxiePlus/SandMan/Wizards/SetupWizard.cpp
View File

@ -536,7 +536,7 @@ CSBUpdate::CSBUpdate(QWidget *parent)
int row = 0;
int rows = 4;
m_pUpdate = new QCheckBox(tr("Regularly Check for all udpates to Sandboxie-Plus and optional components"));
m_pUpdate = new QCheckBox(tr("Regularly Check for all updates to Sandboxie-Plus and optional components"));
m_pUpdate->setToolTip(tr("Let sandboxie regularly check for latest updates."));
layout->addWidget(m_pUpdate, row++, 0, 1, rows);
connect(m_pUpdate, &QCheckBox::toggled, this, &CSBUpdate::UpdateOptions);
@ -583,23 +583,23 @@ CSBUpdate::CSBUpdate(QWidget *parent)
connect(pInsiderInfo, SIGNAL(linkActivated(const QString&)), theGUI, SLOT(OpenUrl(const QString&)));
layout->addWidget(pInsiderInfo, row++, 3, 1, 1);
//m_pTemplates = new QCheckBox(tr("Keep Compatybility Templates up to date"));
//m_pTemplates->setToolTip(tr("Check for latest compatybility tempaltes."));
//m_pTemplates = new QCheckBox(tr("Keep Compatibility Templates up to date"));
//m_pTemplates->setToolTip(tr("Check for latest compatibility templates."));
//layout->addWidget(m_pTemplates, row++, 1, 1, rows-1);
//registerField("updateCompat", m_pTemplates);
m_pHotfixes = new QCheckBox(tr("Keep Compatybility Templates up to date and apply hotfixes"));
m_pHotfixes->setToolTip(tr("Check for latest compatybility tempaltes and hotfixes."));
m_pHotfixes = new QCheckBox(tr("Keep Compatibility Templates up to date and apply hotfixes"));
m_pHotfixes->setToolTip(tr("Check for latest compatibility templates and hotfixes."));
layout->addWidget(m_pHotfixes, row++, 1, 1, rows-1);
registerField("applyHotfixes", m_pHotfixes);
m_pIssues = new QCheckBox(tr("Get the latest Scripts for the Troubleshooting Wizard"));
m_pIssues->setToolTip(tr("Check for latest troubleshooting scripts for the troubleshooting wizars."));
m_pIssues->setToolTip(tr("Check for latest troubleshooting scripts for the troubleshooting wizard."));
layout->addWidget(m_pIssues, row++, 1, 1, rows-1);
registerField("updateIssues", m_pIssues);
m_pAddons = new QCheckBox(tr("Keep the list of optional Addon components up to date"));
m_pAddons->setToolTip(tr("Check for latest avaialble addons."));
m_pAddons->setToolTip(tr("Check for latest available addons."));
layout->addWidget(m_pAddons, row++, 1, 1, rows-1);
registerField("updateAddons", m_pAddons);